@@ -187,6 +266,9 @@ const XTERM_HTML = `
var C1_CSI = String.fromCharCode(155);
var PRIVATE_MODE_SCAN_TAIL_LIMIT = 4096;
var term = null;
+ var scrollIndicator = document.getElementById('scroll-indicator');
+ var scrollThumb = document.getElementById('scroll-thumb');
+ var scrollIndicatorHideTimer = null;
var writeQueue = [];
var writesDraining = false;
var afterDrainCallbacks = [];
@@ -195,8 +277,13 @@ const XTERM_HTML = `
var userScale = 1;
var panX = 0;
var panY = 0;
+ var smoothScrollOffsetY = 0;
+ var pendingNormalScrollDeltaY = 0;
+ var normalScrollFrameId = null;
var initRows = 24;
var terminalGeneration = 0;
+ var defaultTheme = ${JSON.stringify(DEFAULT_TERMINAL_THEME)};
+ var terminalTheme = defaultTheme;
var activeAltScreenSnapshot = false;
var trackedMouseTrackingMode = 'none';
var sgrMouseMode = false;
@@ -253,9 +340,57 @@ const XTERM_HTML = `
function updateTransform() {
surface.style.transform = 'translate(' + panX + 'px,' + panY + 'px) scale(' + getTotalScale() + ')';
+ updateScrollIndicator(false);
if (selMode === 'select') repositionOverlay();
}
+ function updateScrollIndicator(reveal) {
+ if (!scrollIndicator || !scrollThumb || !term || !term.buffer || !term.buffer.active) return;
+ var buffer = term.buffer.active;
+ var maxViewportY = buffer.baseY || 0;
+ if (maxViewportY <= 0 || shouldRouteScrollToTerminalInput()) {
+ scrollIndicator.classList.remove('visible');
+ return;
+ }
+ var trackHeight = Math.max(0, window.innerHeight - 8);
+ var totalRows = maxViewportY + (term.rows || 0);
+ if (trackHeight <= 0 || totalRows <= 0) return;
+ var thumbHeight = Math.max(24, trackHeight * (term.rows || 0) / totalRows);
+ var maxTop = Math.max(0, trackHeight - thumbHeight);
+ var top = maxViewportY > 0 ? (buffer.viewportY / maxViewportY) * maxTop : 0;
+ scrollThumb.style.height = thumbHeight + 'px';
+ scrollThumb.style.transform = 'translateY(' + top + 'px)';
+ if (!reveal) return;
+ scrollIndicator.classList.add('visible');
+ if (scrollIndicatorHideTimer) clearTimeout(scrollIndicatorHideTimer);
+ scrollIndicatorHideTimer = setTimeout(function() {
+ scrollIndicator.classList.remove('visible');
+ scrollIndicatorHideTimer = null;
+ }, 550);
+ }
+
+ function normalizeTerminalTheme(input) {
+ var source = input && typeof input === 'object' && input.theme && typeof input.theme === 'object'
+ ? input.theme
+ : null;
+ if (!source) return defaultTheme;
+ var next = {};
+ var keys = Object.keys(defaultTheme);
+ for (var i = 0; i < keys.length; i++) {
+ var key = keys[i];
+ if (typeof source[key] === 'string') next[key] = source[key];
+ }
+ return Object.assign({}, defaultTheme, next);
+ }
+
+ function applyTerminalTheme(input) {
+ terminalTheme = normalizeTerminalTheme(input);
+ var background = terminalTheme.background || '${colors.terminalBg}';
+ document.documentElement.style.background = background;
+ document.body.style.background = background;
+ if (term) term.options.theme = terminalTheme;
+ }
+
function getCellHeight() {
if (!term || !term._core) return 15;
var core = term._core;
@@ -376,6 +511,7 @@ const XTERM_HTML = `
userScale = 1;
panX = 0;
panY = 0;
+ smoothScrollOffsetY = 0;
updateTransform();
adjustRowsForViewport();
@@ -494,7 +630,7 @@ const XTERM_HTML = `
pumpWrites(terminalGeneration);
}
- function init(cols, rows, initialData) {
+ function init(cols, rows, initialData, nextTheme) {
terminalGeneration++;
var gen = terminalGeneration;
ready = false;
@@ -503,6 +639,7 @@ const XTERM_HTML = `
afterDrainCallbacks = [];
initRows = rows || 24;
firstDataPending = true;
+ smoothScrollOffsetY = 0;
mouseModeScanTail = '';
trackedMouseTrackingMode = 'none';
sgrMouseMode = false;
@@ -535,32 +672,11 @@ const XTERM_HTML = `
oldSurface.removeAttribute('id');
}
+ applyTerminalTheme(nextTheme);
term = new Terminal({
cols: cols || 80,
rows: rows || 24,
- theme: {
- background: '${colors.terminalBg}',
- foreground: '#c0caf5',
- cursor: '#c0caf5',
- cursorAccent: '${colors.terminalBg}',
- selectionBackground: '#33467c',
- black: '#15161e',
- red: '#f7768e',
- green: '#9ece6a',
- yellow: '#e0af68',
- blue: '#7aa2f7',
- magenta: '#bb9af7',
- cyan: '#7dcfff',
- white: '#a9b1d6',
- brightBlack: '#414868',
- brightRed: '#f7768e',
- brightGreen: '#9ece6a',
- brightYellow: '#e0af68',
- brightBlue: '#7aa2f7',
- brightMagenta: '#bb9af7',
- brightCyan: '#7dcfff',
- brightWhite: '#c0caf5'
- },
+ theme: terminalTheme,
fontFamily: '"Menlo", "Consolas", "DejaVu Sans Mono", monospace',
fontSize: 13,
scrollback: 5000,
@@ -693,7 +809,7 @@ const XTERM_HTML = `
if (handledMessageIds.length > 256) handledMessageIds.shift();
}
if (msg.type === 'init') {
- init(msg.cols, msg.rows, msg.initialData);
+ init(msg.cols, msg.rows, msg.initialData, msg.terminalTheme);
} else if (msg.type === 'resize') {
resize(msg.cols, msg.rows);
} else if (msg.type === 'write') {
@@ -718,6 +834,8 @@ const XTERM_HTML = `
measureFitDimensions(msg.containerHeight);
} else if (msg.type === 'reset-zoom') {
applyFitScale('reset-zoom-msg');
+ } else if (msg.type === 'set-theme') {
+ applyTerminalTheme(msg.terminalTheme);
} else if (msg.type === 'cancel-select') {
if (selMode === 'select') cancelSelect();
} else if (msg.type === 'do-select-all') {
@@ -849,6 +967,7 @@ const XTERM_HTML = `
function attachTermObservers() {
if (!term) return;
try { term.onLineFeed(logFeedAndEvict); } catch (e) {}
+ try { term.onScroll(function() { updateScrollIndicator(false); }); } catch (e) {}
// Why: emit modes on every parsed write so RN's mirror stays current
// without round-trip; covers \\x1b[?2004h/l and alt-screen toggles.
try {
@@ -975,6 +1094,10 @@ const XTERM_HTML = `
return mode !== 'none' && mode !== 'x10';
}
+ function shouldRouteScrollToTerminalInput() {
+ return isWheelMouseTrackingMode(getMouseTrackingMode()) || isAlternateBufferActive();
+ }
+
function buildMouseWheelScrollInput(lines, clientX, clientY) {
var count = Math.min(Math.abs(lines), 32);
if (count === 0) return '';
@@ -1024,6 +1147,83 @@ const XTERM_HTML = `
term.scrollLines(lines);
}
+ function clampNormalScrollLines(lines) {
+ if (!term || !term.buffer || !term.buffer.active || lines === 0) return 0;
+ var buffer = term.buffer.active;
+ if (lines > 0) {
+ return Math.min(lines, Math.max(0, buffer.baseY - buffer.viewportY));
+ }
+ return Math.max(lines, -buffer.viewportY);
+ }
+
+ function canScrollNormalBufferDelta(deltaY) {
+ if (!term || !term.buffer || !term.buffer.active || deltaY === 0) return false;
+ var buffer = term.buffer.active;
+ if (deltaY > 0) return buffer.viewportY < buffer.baseY;
+ return buffer.viewportY > 0;
+ }
+
+ function applyNormalBufferScrollDelta(deltaY) {
+ if (!term || deltaY === 0) return false;
+ var effectiveCellH = getCellHeight() * getTotalScale();
+ if (effectiveCellH <= 0) return false;
+ if (!canScrollNormalBufferDelta(deltaY)) {
+ resetSmoothScrollOffset();
+ return false;
+ }
+ smoothScrollOffsetY -= deltaY;
+ var lines = Math.trunc(-smoothScrollOffsetY / effectiveCellH);
+ if (lines !== 0) {
+ var applied = clampNormalScrollLines(lines);
+ if (applied !== 0) {
+ term.scrollLines(applied);
+ // Why: xterm's renderer is row-based. Buffer touch pixels and only
+ // commit whole rows so TUI canvas layers do not shimmer between
+ // fractional transforms and xterm repaints.
+ smoothScrollOffsetY += applied * effectiveCellH;
+ }
+ if (applied !== lines) smoothScrollOffsetY = 0;
+ }
+ var limit = effectiveCellH - 1;
+ if (smoothScrollOffsetY > limit) smoothScrollOffsetY = limit;
+ if (smoothScrollOffsetY < -limit) smoothScrollOffsetY = -limit;
+ updateScrollIndicator(true);
+ return true;
+ }
+
+ function enqueueNormalBufferScrollDelta(deltaY) {
+ if (!term || deltaY === 0) return false;
+ if (!canScrollNormalBufferDelta(deltaY)) {
+ resetSmoothScrollOffset();
+ return false;
+ }
+ pendingNormalScrollDeltaY += deltaY;
+ if (normalScrollFrameId !== null) return true;
+ // Why: dense terminal rows are expensive to repaint. Coalesce touchmove
+ // deltas into one xterm row-scroll per frame instead of repainting from
+ // the input event stream.
+ normalScrollFrameId = requestAnimationFrame(function() {
+ normalScrollFrameId = null;
+ var delta = pendingNormalScrollDeltaY;
+ pendingNormalScrollDeltaY = 0;
+ if (!applyNormalBufferScrollDelta(delta)) {
+ resetSmoothScrollOffset();
+ }
+ });
+ return true;
+ }
+
+ function resetSmoothScrollOffset() {
+ pendingNormalScrollDeltaY = 0;
+ if (normalScrollFrameId !== null) {
+ cancelAnimationFrame(normalScrollFrameId);
+ normalScrollFrameId = null;
+ }
+ if (smoothScrollOffsetY === 0) return;
+ smoothScrollOffsetY = 0;
+ updateScrollIndicator(false);
+ }
+
function cellToViewportPx(col, absRow) {
if (!term) return { x: 0, y: 0 };
var cellW = getCellWidth();
@@ -1339,6 +1539,9 @@ const XTERM_HTML = `
return;
}
if (dispatch.mode === 'surface') {
+ if (e.touches.length === 0 && longPressOrigin && selMode !== 'select') {
+ notify({ type: 'terminal-tap' });
+ }
clearLongPress();
if (e.touches.length === 0) {
dispatch.mode = 'idle';
@@ -1392,6 +1595,15 @@ const XTERM_HTML = `
pinchDist: 0, pinchScale: 0, pinchSurfX: 0, pinchSurfY: 0
};
+ function updateTouchVelocity(deltaY, dt) {
+ if (dt <= 0) return;
+ var instantVelocity = deltaY / dt;
+ if (!isFinite(instantVelocity)) return;
+ // Why: touchmove cadence is uneven in WebView. Blend recent samples so
+ // momentum launch doesn't inherit a one-frame spike or stall.
+ ts.velY = ts.velY === 0 ? instantVelocity : ts.velY * 0.55 + instantVelocity * 0.45;
+ }
+
function getDistance(a, b) {
var dx = a.clientX - b.clientX, dy = a.clientY - b.clientY;
return Math.sqrt(dx * dx + dy * dy);
@@ -1413,6 +1625,7 @@ const XTERM_HTML = `
}
if (e.touches.length === 2) {
ts.isPinching = true;
+ smoothScrollOffsetY = 0;
ts.pinchDist = getDistance(e.touches[0], e.touches[1]);
ts.pinchScale = userScale;
var mx = (e.touches[0].clientX + e.touches[1].clientX) / 2;
@@ -1458,20 +1671,30 @@ const XTERM_HTML = `
var dt = now - ts.lastTime;
if (userScale > 1.05) {
+ smoothScrollOffsetY = 0;
panX += x - ts.lastX;
panY += y - ts.lastY;
clampPan();
updateTransform();
} else {
var deltaY = ts.lastY - y;
- if (dt > 0) ts.velY = deltaY / dt;
ts.lastTime = now;
- var effectiveCellH = getCellHeight() * currentScale;
- ts.accumDelta += deltaY;
- var lines = Math.trunc(ts.accumDelta / effectiveCellH);
- if (lines !== 0) {
- ts.accumDelta -= lines * effectiveCellH;
- routeScrollLines(lines, x, y);
+ if (shouldRouteScrollToTerminalInput()) {
+ updateTouchVelocity(deltaY, dt);
+ resetSmoothScrollOffset();
+ var effectiveCellH = getCellHeight() * getTotalScale();
+ ts.accumDelta += deltaY;
+ var lines = Math.trunc(ts.accumDelta / effectiveCellH);
+ if (lines !== 0) {
+ ts.accumDelta -= lines * effectiveCellH;
+ routeScrollLines(lines, x, y);
+ }
+ } else {
+ if (enqueueNormalBufferScrollDelta(deltaY)) {
+ updateTouchVelocity(deltaY, dt);
+ } else {
+ ts.velY = 0;
+ }
}
}
ts.lastX = x;
@@ -1501,17 +1724,26 @@ const XTERM_HTML = `
if (e.touches.length === 0 && userScale <= 1.05) {
var vel = ts.velY;
- var FRICTION = 0.95;
- var MIN_VEL = 0.02;
+ var FRICTION = 0.972;
+ var MIN_VEL = 0.012;
function momentumStep() {
vel *= FRICTION;
if (Math.abs(vel) < MIN_VEL) { ts.momentumId = null; return; }
- var effectiveCellH = getCellHeight() * currentScale;
- ts.accumDelta += vel * 16;
- var lines = Math.trunc(ts.accumDelta / effectiveCellH);
- if (lines !== 0) {
- ts.accumDelta -= lines * effectiveCellH;
- routeScrollLines(lines, ts.lastX, ts.lastY);
+ var delta = vel * 16;
+ if (shouldRouteScrollToTerminalInput()) {
+ resetSmoothScrollOffset();
+ var effectiveCellH = getCellHeight() * getTotalScale();
+ ts.accumDelta += delta;
+ var lines = Math.trunc(ts.accumDelta / effectiveCellH);
+ if (lines !== 0) {
+ ts.accumDelta -= lines * effectiveCellH;
+ routeScrollLines(lines, ts.lastX, ts.lastY);
+ }
+ } else {
+ if (!applyNormalBufferScrollDelta(delta)) {
+ ts.momentumId = null;
+ return;
+ }
}
ts.momentumId = requestAnimationFrame(momentumStep);
}
@@ -1561,6 +1793,7 @@ const XTERM_HTML = `
export const TerminalWebView = forwardRef
(function TerminalWebView(
{
style,
+ terminalTheme,
onWebReady,
onSelectionMode,
onSelectionCopy,
@@ -1568,7 +1801,8 @@ export const TerminalWebView = forwardRef(function
onModesChanged,
onKeyboardAvoidanceMetrics,
onHaptic,
- onTerminalInput
+ onTerminalInput,
+ onTerminalTap
},
ref
) {
@@ -1576,6 +1810,7 @@ export const TerminalWebView = forwardRef(function
const isWebReadyRef = useRef(false)
const pendingMessagesRef = useRef([])
const messageIdRef = useRef(0)
+ const terminalThemeKey = useMemo(() => JSON.stringify(terminalTheme ?? null), [terminalTheme])
const measureResolveRef = useRef<
((result: { cols: number; rows: number } | null) => void) | null
>(null)
@@ -1670,6 +1905,8 @@ export const TerminalWebView = forwardRef(function
} else if (msg.type === 'terminal-input') {
const bytes = typeof msg.bytes === 'string' ? msg.bytes : ''
if (bytes.length > 0) onTerminalInput?.(bytes)
+ } else if (msg.type === 'terminal-tap') {
+ onTerminalTap?.()
} else if (msg.type === 'keyboard-avoidance-metrics') {
const cursorY = typeof msg.cursorY === 'number' ? msg.cursorY : 0
const rows = typeof msg.rows === 'number' ? msg.rows : 0
@@ -1702,7 +1939,8 @@ export const TerminalWebView = forwardRef(function
onModesChanged,
onKeyboardAvoidanceMetrics,
onHaptic,
- onTerminalInput
+ onTerminalInput,
+ onTerminalTap
]
)
@@ -1710,6 +1948,10 @@ export const TerminalWebView = forwardRef(function
isWebReadyRef.current = false
}, [])
+ useEffect(() => {
+ postMessage({ type: 'set-theme', terminalTheme })
+ }, [postMessage, terminalThemeKey, terminalTheme])
+
useImperativeHandle(
ref,
() => ({
@@ -1733,7 +1975,7 @@ export const TerminalWebView = forwardRef(function
readyPromiseRef.current = new Promise((resolve) => {
readyResolveRef.current = resolve
})
- postMessage({ type: 'init', cols, rows, initialData })
+ postMessage({ type: 'init', cols, rows, initialData, terminalTheme })
},
resize(cols: number, rows: number) {
postMessage({ type: 'resize', cols, rows })
@@ -1778,7 +2020,7 @@ export const TerminalWebView = forwardRef(function
await Promise.race([p, new Promise((resolve) => setTimeout(resolve, 3000))])
}
}),
- [postMessage, sendToWebView]
+ [postMessage, sendToWebView, terminalTheme]
)
return (
@@ -1788,7 +2030,7 @@ export const TerminalWebView = forwardRef(function
style={[styles.webview, style]}
originWhitelist={['*']}
javaScriptEnabled
- scrollEnabled={true}
+ scrollEnabled={false}
scalesPageToFit={false}
onLoadStart={handleLoadStart}
onMessage={handleMessage}
diff --git a/mobile/src/terminal/terminal-live-input.test.ts b/mobile/src/terminal/terminal-live-input.test.ts
new file mode 100644
index 00000000000..0bad02da6d0
--- /dev/null
+++ b/mobile/src/terminal/terminal-live-input.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from 'vitest'
+import {
+ TERMINAL_LIVE_INPUT_MAX_BYTES,
+ getTerminalLiveSpecialKeyBytes,
+ isTerminalLiveInputWithinByteLimit
+} from './terminal-live-input'
+
+describe('terminal live input', () => {
+ it('maps phone keyboard special keys to PTY bytes', () => {
+ expect(getTerminalLiveSpecialKeyBytes('Backspace')).toBe('\x7f')
+ expect(getTerminalLiveSpecialKeyBytes('Enter')).toBeNull()
+ expect(getTerminalLiveSpecialKeyBytes('a')).toBeNull()
+ })
+
+ it('enforces the paste-sized byte budget', () => {
+ expect(isTerminalLiveInputWithinByteLimit('hello')).toBe(true)
+ expect(isTerminalLiveInputWithinByteLimit('x'.repeat(TERMINAL_LIVE_INPUT_MAX_BYTES))).toBe(true)
+ expect(isTerminalLiveInputWithinByteLimit('x'.repeat(TERMINAL_LIVE_INPUT_MAX_BYTES + 1))).toBe(
+ false
+ )
+ expect(
+ isTerminalLiveInputWithinByteLimit('é'.repeat(TERMINAL_LIVE_INPUT_MAX_BYTES / 2 + 1))
+ ).toBe(false)
+ })
+})
diff --git a/mobile/src/terminal/terminal-live-input.ts b/mobile/src/terminal/terminal-live-input.ts
new file mode 100644
index 00000000000..87b6544fc74
--- /dev/null
+++ b/mobile/src/terminal/terminal-live-input.ts
@@ -0,0 +1,19 @@
+const TERMINAL_LIVE_INPUT_MAX_BYTES = 256 * 1024
+
+const encoder = new TextEncoder()
+
+export function getTerminalLiveSpecialKeyBytes(key: string): string | null {
+ if (key === 'Backspace') {
+ return '\x7f'
+ }
+ return null
+}
+
+export function isTerminalLiveInputWithinByteLimit(
+ text: string,
+ maxBytes = TERMINAL_LIVE_INPUT_MAX_BYTES
+): boolean {
+ return encoder.encode(text).byteLength <= maxBytes
+}
+
+export { TERMINAL_LIVE_INPUT_MAX_BYTES }
diff --git a/mobile/src/terminal/terminal-webview-scroll-routing.test.ts b/mobile/src/terminal/terminal-webview-scroll-routing.test.ts
new file mode 100644
index 00000000000..bf5b7f7e27f
--- /dev/null
+++ b/mobile/src/terminal/terminal-webview-scroll-routing.test.ts
@@ -0,0 +1,110 @@
+import { readFileSync } from 'node:fs'
+import { describe, expect, it } from 'vitest'
+
+const source = readFileSync(new URL('./TerminalWebView.tsx', import.meta.url), 'utf8')
+
+function sliceBetween(startPattern: string, endPattern: string): string {
+ const start = source.indexOf(startPattern)
+ expect(start).toBeGreaterThanOrEqual(0)
+ const end = source.indexOf(endPattern, start)
+ expect(end).toBeGreaterThan(start)
+ return source.slice(start, end)
+}
+
+describe('TerminalWebView scroll routing', () => {
+ it('routes alternate-screen and mouse-aware scroll before smooth normal scroll', () => {
+ expect(source).toContain(
+ 'return isWheelMouseTrackingMode(getMouseTrackingMode()) || isAlternateBufferActive();'
+ )
+
+ const touchMoveBlock = sliceBetween(
+ "targetSurface.addEventListener('touchmove'",
+ '}, { capture: true, passive: false });'
+ )
+ expect(touchMoveBlock.indexOf('if (shouldRouteScrollToTerminalInput())')).toBeLessThan(
+ touchMoveBlock.indexOf('if (enqueueNormalBufferScrollDelta(deltaY))')
+ )
+ expect(touchMoveBlock).toContain('routeScrollLines(lines, x, y);')
+
+ const momentumBlock = sliceBetween('function momentumStep()', 'if (Math.abs(vel) > MIN_VEL)')
+ expect(momentumBlock.indexOf('if (shouldRouteScrollToTerminalInput())')).toBeLessThan(
+ momentumBlock.indexOf('if (!applyNormalBufferScrollDelta(delta))')
+ )
+ expect(momentumBlock).toContain('routeScrollLines(lines, ts.lastX, ts.lastY);')
+ })
+
+ it('does not rubber-band normal scroll at scrollback edges', () => {
+ expect(source).toContain('function canScrollNormalBufferDelta(deltaY)')
+ const smoothScrollBlock = sliceBetween(
+ 'function applyNormalBufferScrollDelta(deltaY)',
+ 'function enqueueNormalBufferScrollDelta(deltaY)'
+ )
+ expect(smoothScrollBlock).toContain('if (!canScrollNormalBufferDelta(deltaY))')
+ expect(smoothScrollBlock).toContain('resetSmoothScrollOffset();')
+ expect(smoothScrollBlock).toContain('return false;')
+ expect(smoothScrollBlock).toContain('return true;')
+
+ const touchMoveBlock = sliceBetween(
+ "targetSurface.addEventListener('touchmove'",
+ '}, { capture: true, passive: false });'
+ )
+ expect(touchMoveBlock).toContain('if (enqueueNormalBufferScrollDelta(deltaY))')
+ expect(touchMoveBlock).toContain('ts.velY = 0;')
+
+ const momentumBlock = sliceBetween('function momentumStep()', 'if (Math.abs(vel) > MIN_VEL)')
+ expect(momentumBlock).toContain('if (!applyNormalBufferScrollDelta(delta))')
+ expect(momentumBlock).toContain('ts.momentumId = null;')
+ })
+
+ it('coalesces normal touch scroll row commits onto animation frames', () => {
+ const enqueueBlock = sliceBetween(
+ 'function enqueueNormalBufferScrollDelta(deltaY)',
+ 'function resetSmoothScrollOffset()'
+ )
+ expect(enqueueBlock).toContain('pendingNormalScrollDeltaY += deltaY;')
+ expect(enqueueBlock).toContain('if (normalScrollFrameId !== null) return true;')
+ expect(enqueueBlock).toContain('normalScrollFrameId = requestAnimationFrame(function()')
+ expect(enqueueBlock).toContain('applyNormalBufferScrollDelta(delta)')
+
+ const resetBlock = sliceBetween(
+ 'function resetSmoothScrollOffset()',
+ 'function cellToViewportPx'
+ )
+ expect(resetBlock).toContain('pendingNormalScrollDeltaY = 0;')
+ expect(resetBlock).toContain('cancelAnimationFrame(normalScrollFrameId);')
+ })
+
+ it('hides xterm scrollbars and drives the mobile scroll indicator from committed rows', () => {
+ expect(source).toContain('')
+ expect(source).toContain('.xterm .xterm-viewport::-webkit-scrollbar')
+ expect(source).toContain('.xterm .xterm-scrollable-element > .xterm-scrollbar')
+ expect(source).toContain('overflow-y: hidden !important;')
+ expect(source).toContain('display: none !important;')
+ expect(source).toContain('function updateScrollIndicator(reveal)')
+ expect(source).toContain('buffer.viewportY / maxViewportY')
+ expect(source).not.toContain('fractionalRows')
+ expect(source).toContain('scrollThumb.style.transform =')
+ expect(source).toContain('updateScrollIndicator(true);')
+ })
+
+ it('does not apply fractional smooth scroll transforms to terminal content', () => {
+ const updateTransformBlock = sliceBetween(
+ 'function updateTransform()',
+ 'function updateScrollIndicator(reveal)'
+ )
+ expect(updateTransformBlock).toContain(
+ "surface.style.transform = 'translate(' + panX + 'px,' + panY + 'px) scale(' + getTotalScale() + ')';"
+ )
+ expect(source).not.toContain("querySelector('.xterm-screen')")
+ expect(source).not.toContain('updateTerminalScreenTransform')
+ expect(updateTransformBlock).not.toContain("getVisualPanY() + 'px) scale('")
+ expect(updateTransformBlock).not.toContain('smoothScrollOffsetY')
+ })
+
+ it('smooths velocity samples and uses lower friction for mobile momentum', () => {
+ expect(source).toContain('function updateTouchVelocity(deltaY, dt)')
+ expect(source).toContain('ts.velY * 0.55 + instantVelocity * 0.45')
+ expect(source).toContain('var FRICTION = 0.972;')
+ expect(source).toContain('var MIN_VEL = 0.012;')
+ })
+})
diff --git a/mobile/src/theme/mobile-theme.ts b/mobile/src/theme/mobile-theme.ts
index d0f80c671e0..83dadecec6a 100644
--- a/mobile/src/theme/mobile-theme.ts
+++ b/mobile/src/theme/mobile-theme.ts
@@ -6,6 +6,7 @@ export const colors = {
bgPanel: '#1a1a1a',
bgRaised: '#242424',
borderSubtle: '#2a2a2a',
+ editorSurface: '#1e1e1e',
textPrimary: '#e0e0e0',
textSecondary: '#888888',
@@ -16,6 +17,19 @@ export const colors = {
statusGreen: '#22c55e',
statusAmber: '#f59e0b',
statusRed: '#ef4444',
+ gitDecorationAdded: '#81b88b',
+ gitDecorationDeleted: '#c74e39',
+ diffAddedBg: 'rgba(129, 184, 139, 0.1)',
+ diffDeletedBg: 'rgba(199, 78, 57, 0.11)',
+
+ syntaxComment: '#6a9955',
+ syntaxKeyword: '#569cd6',
+ syntaxString: '#ce9178',
+ syntaxNumber: '#b5cea8',
+ syntaxType: '#4ec9b0',
+ syntaxFunction: '#dcdcaa',
+ syntaxVariable: '#9cdcfe',
+ syntaxMeta: '#c586c0',
// Terminal WebView background (Tokyonight) — separate from app chrome
terminalBg: '#1a1b26'
diff --git a/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift b/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
index 2dd0c7e4a02..8c7d6a4a4e4 100644
--- a/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
+++ b/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
@@ -196,7 +196,7 @@ final class Provider {
var action = try runAction()
do {
return try renderActionResult(action: action, snapshot: observe(params: params))
- } catch let error as ProviderError where (error.code == "window_not_found" || error.code == "window_stale") && (requestedWindowId(params) != nil || requestedWindowIndex(params) != nil) {
+ } catch let error as ProviderError where (error.code == "window_not_found" || error.code == "window_stale") && hasRequestedWindowSelector(params) {
var fallbackParams = params
fallbackParams.removeValue(forKey: "windowId")
fallbackParams.removeValue(forKey: "windowIndex")
@@ -209,6 +209,8 @@ final class Provider {
private func observe(params: [String: JSONValue]) throws -> Snapshot {
let query = try requiredString(params, "app")
+ let windowId = try requestedWindowId(params)
+ let windowIndex = try requestedWindowIndex(params)
let app = try resolveApp(query)
if params["restoreWindow"]?.bool == true {
recoverWindow(app)
@@ -216,8 +218,8 @@ final class Provider {
let snapshot = try buildSnapshot(
app: app,
includeScreenshot: params["noScreenshot"]?.bool != true,
- windowId: requestedWindowId(params),
- windowIndex: requestedWindowIndex(params),
+ windowId: windowId,
+ windowIndex: windowIndex,
restoreWindow: params["restoreWindow"]?.bool == true
)
let keys = [query, app.name, app.bundleId ?? ""].filter { !$0.isEmpty }.map { $0.lowercased() }
@@ -226,13 +228,13 @@ final class Provider {
if !isExplicitSnapshotNamespace(namespace) {
snapshots[key] = snapshot
snapshots[snapshotWindowKey(key, snapshot.windowId)] = snapshot
- if let windowIndex = requestedWindowIndex(params) {
+ if let windowIndex {
snapshots[snapshotWindowIndexKey(key, windowIndex)] = snapshot
}
}
snapshots[namespacedSnapshotKey(namespace, key)] = snapshot
snapshots[namespacedSnapshotKey(namespace, snapshotWindowKey(key, snapshot.windowId))] = snapshot
- if let windowIndex = requestedWindowIndex(params) {
+ if let windowIndex {
snapshots[namespacedSnapshotKey(namespace, snapshotWindowIndexKey(key, windowIndex))] = snapshot
}
}
@@ -240,7 +242,7 @@ final class Provider {
}
private func currentSnapshot(params: [String: JSONValue]) throws -> Snapshot {
- let cached = cachedSnapshot(params: params)
+ let cached = try cachedSnapshot(params: params)
// Why: cached AX frames can be stale after a window move or resize, and
// stale geometry can turn an intended action into a misclick.
let snapshot = try observe(params: params.merging(["noScreenshot": .bool(true)]) { _, replacement in replacement })
@@ -256,15 +258,15 @@ final class Provider {
return snapshot
}
- private func cachedSnapshot(params: [String: JSONValue]) -> Snapshot? {
+ private func cachedSnapshot(params: [String: JSONValue]) throws -> Snapshot? {
guard let query = params["app"]?.string, !query.isEmpty else { return nil }
let namespace = snapshotNamespace(params)
- if let targetWindowId = requestedWindowId(params) {
+ if let targetWindowId = try requestedWindowId(params) {
let windowKey = snapshotWindowKey(query.lowercased(), targetWindowId)
return snapshots[namespacedSnapshotKey(namespace, windowKey)] ??
(isExplicitSnapshotNamespace(namespace) ? nil : snapshots[windowKey])
}
- if let targetWindowIndex = requestedWindowIndex(params) {
+ if let targetWindowIndex = try requestedWindowIndex(params) {
let windowKey = snapshotWindowIndexKey(query.lowercased(), targetWindowIndex)
return snapshots[namespacedSnapshotKey(namespace, windowKey)] ??
(isExplicitSnapshotNamespace(namespace) ? nil : snapshots[windowKey])
@@ -275,16 +277,15 @@ final class Provider {
}
private func validateRequestedElements(cached: Snapshot?, current: Snapshot, params: [String: JSONValue]) throws {
- let requestedKeys = ["elementIndex", "fromElementIndex", "toElementIndex"].filter {
- params[$0]?.number != nil
+ let requestedIndexes = try ["elementIndex", "fromElementIndex", "toElementIndex"].compactMap { key -> Int? in
+ guard params[key]?.number != nil else { return nil }
+ return try optionalInteger(params, key)
}
- guard !requestedKeys.isEmpty else { return }
+ guard !requestedIndexes.isEmpty else { return }
guard let cached else {
throw ProviderError.coded("element_not_found", "element indexes require a fresh get-app-state snapshot for this app/window")
}
- for key in requestedKeys {
- guard let value = params[key]?.number else { continue }
- let index = Int(value)
+ for index in requestedIndexes {
guard let expected = cached.elements[index], let actual = current.elements[index] else {
throw ProviderError.coded("element_not_found", "element \(index) is stale; run get-app-state again and use a fresh element index")
}
@@ -577,9 +578,9 @@ final class Provider {
private func click(params: [String: JSONValue]) throws -> [String: Any] {
let snapshot = try currentSnapshot(params: params)
let button = params["mouseButton"]?.string ?? "left"
- let count = Int(params["clickCount"]?.number ?? 1)
- if let elementIndex = params["elementIndex"]?.number {
- let record = try element(snapshot, Int(elementIndex))
+ let count = try optionalInteger(params, "clickCount") ?? 1
+ if let elementIndex = try optionalInteger(params, "elementIndex") {
+ let record = try element(snapshot, elementIndex)
if count <= 1, let actionName = try performClickAction(record: record, mouseButton: button) {
return actionMetadata(path: "accessibility", actionName: actionName)
}
@@ -618,7 +619,7 @@ final class Provider {
private func performSecondaryAction(params: [String: JSONValue]) throws -> [String: Any] {
let snapshot = try currentSnapshot(params: params)
- let record = try element(snapshot, Int(try requiredNumber(params, "elementIndex")))
+ let record = try element(snapshot, try requiredInteger(params, "elementIndex"))
let requested = try requiredString(params, "action")
let action = record.actions.first { SnapshotRenderHeuristics.prettyAction($0).caseInsensitiveCompare(requested) == .orderedSame || $0.caseInsensitiveCompare(requested) == .orderedSame }
guard let action else {
@@ -632,7 +633,7 @@ final class Provider {
private func setValue(params: [String: JSONValue]) throws -> [String: Any] {
let snapshot = try currentSnapshot(params: params)
- let record = try element(snapshot, Int(try requiredNumber(params, "elementIndex")))
+ let record = try element(snapshot, try requiredInteger(params, "elementIndex"))
guard isSettable(record.element, kAXValueAttribute as String) else {
throw ProviderError.coded("value_not_settable", "element \(record.index) is not settable")
}
@@ -691,11 +692,12 @@ final class Provider {
let snapshot = try currentSnapshot(params: params)
let direction = try requiredString(params, "direction")
let pages = params["pages"]?.number ?? 1
- if let elementIndex = params["elementIndex"]?.number {
- let record = try element(snapshot, Int(elementIndex))
+ if let elementIndex = try optionalInteger(params, "elementIndex") {
+ let record = try element(snapshot, elementIndex)
let action = "AXScroll\(direction.capitalized)ByPage"
- if pages.rounded() == pages, record.actions.contains(action) {
- for _ in 0.. Int {
+ guard let value = boundedInteger(try requiredNumber(params, key), as: Int.self) else {
+ throw ProviderError.coded("invalid_argument", "\(key) is out of range")
+ }
+ return value
+}
+
+private func optionalInteger(_ params: [String: JSONValue], _ key: String) throws -> Int? {
+ guard let raw = params[key]?.number else { return nil }
+ guard let value = boundedInteger(raw, as: Int.self) else {
+ throw ProviderError.coded("invalid_argument", "\(key) is out of range")
+ }
+ return value
+}
+
private func parsePid(_ query: String) -> pid_t? {
guard query.hasPrefix("pid:") else { return nil }
guard let pid = Int32(query.dropFirst(4)), pid > 0 else { return nil }
@@ -949,9 +967,16 @@ private func openBundle(_ bundleId: String) {
process.waitUntilExit()
}
-private func requestedWindowId(_ params: [String: JSONValue]) -> CGWindowID? {
- guard let value = params["windowId"]?.number, value >= 0 else { return nil }
- return CGWindowID(UInt32(value))
+private func hasRequestedWindowSelector(_ params: [String: JSONValue]) -> Bool {
+ params["windowId"] != nil || params["windowIndex"] != nil
+}
+
+private func requestedWindowId(_ params: [String: JSONValue]) throws -> CGWindowID? {
+ guard let raw = params["windowId"] else { return nil }
+ guard let value = raw.number, value >= 0, let id = boundedInteger(value, as: UInt32.self) else {
+ throw ProviderError.coded("invalid_argument", "windowId is out of range")
+ }
+ return CGWindowID(id)
}
private func snapshotWindowKey(_ query: String, _ windowId: CGWindowID) -> String {
@@ -980,9 +1005,12 @@ private func isExplicitSnapshotNamespace(_ namespace: String) -> Bool {
namespace != "default"
}
-private func requestedWindowIndex(_ params: [String: JSONValue]) -> Int? {
- guard let value = params["windowIndex"]?.number, value >= 0 else { return nil }
- return Int(value)
+private func requestedWindowIndex(_ params: [String: JSONValue]) throws -> Int? {
+ guard let raw = params["windowIndex"] else { return nil }
+ guard let value = raw.number, value >= 0, let index = boundedInteger(value, as: Int.self) else {
+ throw ProviderError.coded("invalid_argument", "windowIndex is out of range")
+ }
+ return index
}
private func usableWindow(_ element: AXUIElement) -> Bool {
@@ -1788,7 +1816,9 @@ private enum Input {
}
static func scroll(pid: pid_t, at point: CGPoint, direction: String, pages: Double) throws {
- let delta = Int32(max(1, (12 * pages).rounded()))
+ guard let delta = boundedInteger(max(1, (12 * pages).rounded()), as: Int32.self) else {
+ throw ProviderError.coded("invalid_argument", "pages is out of range")
+ }
let wheel1: Int32 = direction == "up" ? delta : direction == "down" ? -delta : 0
let wheel2: Int32 = direction == "left" ? delta : direction == "right" ? -delta : 0
guard let event = CGEvent(scrollWheelEvent2Source: nil, units: .line, wheelCount: 2, wheel1: wheel1, wheel2: wheel2, wheel3: 0) else {
@@ -2056,6 +2086,7 @@ private final class PermissionRuntime: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(_ notification: Notification) {
windowController = PermissionWindowController(
+ initialPermission: initialPermission,
terminateWhenDragAssistantCloses: initialPermission != nil
)
if let initialPermission {
@@ -2067,6 +2098,10 @@ private final class PermissionRuntime: NSObject, NSApplicationDelegate {
}
}
+ func applicationDidBecomeActive(_ notification: Notification) {
+ windowController?.refreshPermissions()
+ }
+
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
initialPermission == nil
}
@@ -2074,9 +2109,11 @@ private final class PermissionRuntime: NSObject, NSApplicationDelegate {
private final class PermissionWindowController: NSWindowController {
private var dragAssistant: PermissionDragAssistantController?
+ private var dragAssistantPermission: PermissionKind?
+ private let initialPermission: PermissionKind?
private let terminateWhenDragAssistantCloses: Bool
- convenience init(terminateWhenDragAssistantCloses: Bool = false) {
+ convenience init(initialPermission: PermissionKind? = nil, terminateWhenDragAssistantCloses: Bool = false) {
let window = NSWindow(
contentRect: NSRect(x: 0, y: 0, width: 300, height: 315),
styleMask: [.titled, .closable, .miniaturizable, .fullSizeContentView],
@@ -2089,13 +2126,20 @@ private final class PermissionWindowController: NSWindowController {
window.backgroundColor = PermissionPalette.background
window.center()
window.isReleasedWhenClosed = false
- self.init(window: window, terminateWhenDragAssistantCloses: terminateWhenDragAssistantCloses)
- window.contentView = PermissionView(frame: window.contentView?.bounds ?? .zero) { [weak self] permission in
- self?.showDragAssistant(for: permission)
- }
+ self.init(window: window, initialPermission: initialPermission, terminateWhenDragAssistantCloses: terminateWhenDragAssistantCloses)
+ window.contentView = PermissionView(
+ frame: window.contentView?.bounds ?? .zero,
+ showDragAssistant: { [weak self] permission in
+ self?.showDragAssistant(for: permission)
+ },
+ close: { [weak self] in
+ self?.closePermissionWindow()
+ }
+ )
}
- init(window: NSWindow?, terminateWhenDragAssistantCloses: Bool) {
+ init(window: NSWindow?, initialPermission: PermissionKind?, terminateWhenDragAssistantCloses: Bool) {
+ self.initialPermission = initialPermission
self.terminateWhenDragAssistantCloses = terminateWhenDragAssistantCloses
super.init(window: window)
}
@@ -2106,9 +2150,13 @@ private final class PermissionWindowController: NSWindowController {
private func showDragAssistant(for permission: PermissionKind) {
dragAssistant?.close()
+ dragAssistantPermission = permission
dragAssistant = PermissionDragAssistantController(
permission: permission,
fallbackVisibleFrame: window?.screen?.visibleFrame,
+ onRefreshPermissions: { [weak self] in
+ self?.refreshPermissions()
+ },
onClose: { [weak self] in
if self?.terminateWhenDragAssistantCloses == true {
NSApp.terminate(nil)
@@ -2118,13 +2166,57 @@ private final class PermissionWindowController: NSWindowController {
dragAssistant?.showWhenReady()
}
+ private func closeDragAssistant() {
+ dragAssistant?.close()
+ dragAssistant = nil
+ dragAssistantPermission = nil
+ }
+
+ private func completeDragAssistant() {
+ guard let dragAssistant else {
+ dragAssistantPermission = nil
+ if terminateWhenDragAssistantCloses {
+ NSApp.terminate(nil)
+ }
+ return
+ }
+ self.dragAssistant = nil
+ dragAssistantPermission = nil
+ dragAssistant.complete()
+ }
+
+ private func closePermissionWindow() {
+ // Why: the floating assistant is a separate retained window controller and
+ // can keep the helper app alive after the main permission window closes.
+ closeDragAssistant()
+ window?.close()
+ }
+
func openPermission(_ permission: PermissionKind) {
permission.requestAndOpenSettings()
showDragAssistant(for: permission)
}
+
+ func refreshPermissions() {
+ if let initialPermission, initialPermission.isGranted {
+ // Why: targeted permission helpers should finish once the requested
+ // grant lands, even if other Computer Use permissions remain unset.
+ completeDragAssistant()
+ return
+ }
+ if dragAssistantPermission?.isGranted == true {
+ // Why: after one grant in full setup, the remaining missing permission
+ // needs fresh guidance instead of the old assistant's instructions.
+ closeDragAssistant()
+ }
+ if PermissionKind.allCases.allSatisfy(\.isGranted) {
+ closeDragAssistant()
+ }
+ (window?.contentView as? PermissionView)?.refreshPermissions()
+ }
}
-private enum PermissionKind {
+private enum PermissionKind: CaseIterable {
case accessibility
case screenshots
@@ -2148,6 +2240,42 @@ private enum PermissionKind {
}
}
+ var title: String {
+ switch self {
+ case .accessibility:
+ "Accessibility"
+ case .screenshots:
+ "Screenshots"
+ }
+ }
+
+ var detail: String {
+ switch self {
+ case .accessibility:
+ "Read and control app interfaces"
+ case .screenshots:
+ "Capture windows for visual state"
+ }
+ }
+
+ var icon: NSImage {
+ switch self {
+ case .accessibility:
+ NSImage(systemSymbolName: "figure", accessibilityDescription: "Accessibility") ?? NSImage()
+ case .screenshots:
+ NSImage(systemSymbolName: "camera.viewfinder", accessibilityDescription: "Screen Recording") ?? NSImage()
+ }
+ }
+
+ var isGranted: Bool {
+ switch self {
+ case .accessibility:
+ accessibilityTrusted()
+ case .screenshots:
+ screenCaptureTrusted()
+ }
+ }
+
func requestAndOpenSettings() {
switch self {
case .accessibility:
@@ -2162,9 +2290,13 @@ private enum PermissionKind {
private final class PermissionView: NSView {
private let appURL = Bundle.main.bundleURL
private let showDragAssistant: (PermissionKind) -> Void
+ private let close: () -> Void
+ private var contentStack: NSStackView?
+ private var contentConstraints: [NSLayoutConstraint] = []
- init(frame frameRect: NSRect, showDragAssistant: @escaping (PermissionKind) -> Void) {
+ init(frame frameRect: NSRect, showDragAssistant: @escaping (PermissionKind) -> Void, close: @escaping () -> Void) {
self.showDragAssistant = showDragAssistant
+ self.close = close
super.init(frame: frameRect)
wantsLayer = true
layer?.backgroundColor = PermissionPalette.background.cgColor
@@ -2176,6 +2308,10 @@ private final class PermissionView: NSView {
}
private func build() {
+ NSLayoutConstraint.deactivate(contentConstraints)
+ contentStack?.removeFromSuperview()
+ contentConstraints = []
+
let stack = NSStackView()
stack.orientation = .vertical
stack.alignment = .leading
@@ -2183,6 +2319,7 @@ private final class PermissionView: NSView {
stack.distribution = .gravityAreas
stack.translatesAutoresizingMaskIntoConstraints = false
addSubview(stack)
+ contentStack = stack
let icon = NSImageView(image: NSWorkspace.shared.icon(forFile: appURL.path))
icon.imageScaling = .scaleProportionallyUpOrDown
@@ -2192,9 +2329,12 @@ private final class PermissionView: NSView {
icon.heightAnchor.constraint(equalToConstant: 58)
])
- let title = label("Enable Orca Computer Use", size: 22, weight: .bold)
+ let missingPermissions = PermissionKind.allCases.filter { !$0.isGranted }
+ let ready = missingPermissions.isEmpty
+
+ let title = label(ready ? "Computer Use is Ready" : "Enable Orca Computer Use", size: 22, weight: .bold)
let subtitle = label(
- "Grant permissions so Orca can use apps when you ask.",
+ ready ? "Orca can use local apps when you ask." : "Grant permissions so Orca can use apps when you ask.",
size: 12,
weight: .regular
)
@@ -2211,41 +2351,32 @@ private final class PermissionView: NSView {
header.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
subtitle.widthAnchor.constraint(equalTo: stack.widthAnchor, constant: -10).isActive = true
- stack.addArrangedSubview(permissionRow(
- icon: NSImage(systemSymbolName: "figure", accessibilityDescription: "Accessibility"),
- title: "Accessibility",
- detail: "Read and control app interfaces",
- buttonTitle: "Allow"
- ) {
- PermissionKind.accessibility.requestAndOpenSettings()
- self.showDragAssistant(.accessibility)
- })
+ if ready {
+ stack.addArrangedSubview(doneButton())
+ } else {
+ for permission in missingPermissions {
+ stack.addArrangedSubview(permissionRow(permission: permission) { [weak self] in
+ permission.requestAndOpenSettings()
+ self?.showDragAssistant(permission)
+ })
+ }
+ }
- stack.addArrangedSubview(permissionRow(
- icon: NSImage(systemSymbolName: "camera.viewfinder", accessibilityDescription: "Screen Recording"),
- title: "Screenshots",
- detail: "Capture windows for visual state",
- buttonTitle: "Allow"
- ) {
- PermissionKind.screenshots.requestAndOpenSettings()
- self.showDragAssistant(.screenshots)
- })
-
- NSLayoutConstraint.activate([
+ contentConstraints = [
stack.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 18),
stack.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -18),
stack.topAnchor.constraint(equalTo: topAnchor, constant: 22),
stack.bottomAnchor.constraint(lessThanOrEqualTo: bottomAnchor, constant: -20)
- ])
+ ]
+ NSLayoutConstraint.activate(contentConstraints)
}
- private func permissionRow(
- icon: NSImage?,
- title: String,
- detail: String,
- buttonTitle: String,
- action: @escaping () -> Void
- ) -> NSView {
+ func refreshPermissions() {
+ // Why: TCC grants can change in System Settings while this window stays open.
+ build()
+ }
+
+ private func permissionRow(permission: PermissionKind, action: @escaping () -> Void) -> NSView {
let row = NSView()
row.wantsLayer = true
row.layer?.cornerRadius = 14
@@ -2254,13 +2385,13 @@ private final class PermissionView: NSView {
row.layer?.backgroundColor = PermissionPalette.card.cgColor
row.translatesAutoresizingMaskIntoConstraints = false
- let iconView = NSImageView(image: icon ?? NSImage())
+ let iconView = NSImageView(image: permission.icon)
iconView.symbolConfiguration = NSImage.SymbolConfiguration(pointSize: 30, weight: .regular)
iconView.contentTintColor = .controlAccentColor
iconView.translatesAutoresizingMaskIntoConstraints = false
- let titleLabel = label(title, size: 13, weight: .bold)
- let detailLabel = label(detail, size: 11, weight: .regular)
+ let titleLabel = label(permission.title, size: 13, weight: .bold)
+ let detailLabel = label(permission.detail, size: 11, weight: .regular)
detailLabel.textColor = PermissionPalette.secondaryText
let textStack = NSStackView(views: [titleLabel, detailLabel])
textStack.orientation = .vertical
@@ -2268,7 +2399,7 @@ private final class PermissionView: NSView {
textStack.spacing = 4
textStack.translatesAutoresizingMaskIntoConstraints = false
- let button = NSButton(title: buttonTitle, target: nil, action: nil)
+ let button = NSButton(title: "Allow", target: nil, action: nil)
button.bezelStyle = .rounded
button.controlSize = .regular
button.font = NSFont.systemFont(ofSize: 13, weight: .semibold)
@@ -2278,8 +2409,8 @@ private final class PermissionView: NSView {
.foregroundColor: NSColor.white,
.font: NSFont.systemFont(ofSize: 13, weight: .semibold)
]
- button.attributedTitle = NSAttributedString(string: buttonTitle, attributes: buttonTitleAttributes)
- button.attributedAlternateTitle = NSAttributedString(string: buttonTitle, attributes: buttonTitleAttributes)
+ button.attributedTitle = NSAttributedString(string: "Allow", attributes: buttonTitleAttributes)
+ button.attributedAlternateTitle = NSAttributedString(string: "Allow", attributes: buttonTitleAttributes)
let target = ButtonTarget(action)
button.target = target
button.action = #selector(ButtonTarget.run)
@@ -2306,6 +2437,29 @@ private final class PermissionView: NSView {
return row
}
+ private func doneButton() -> NSView {
+ let button = NSButton(title: "Done", target: nil, action: nil)
+ button.bezelStyle = .rounded
+ button.controlSize = .regular
+ button.font = NSFont.systemFont(ofSize: 13, weight: .semibold)
+ button.contentTintColor = .white
+ button.bezelColor = .controlAccentColor
+ let buttonTitleAttributes: [NSAttributedString.Key: Any] = [
+ .foregroundColor: NSColor.white,
+ .font: NSFont.systemFont(ofSize: 13, weight: .semibold)
+ ]
+ button.attributedTitle = NSAttributedString(string: "Done", attributes: buttonTitleAttributes)
+ button.attributedAlternateTitle = NSAttributedString(string: "Done", attributes: buttonTitleAttributes)
+ let target = ButtonTarget(close)
+ button.target = target
+ button.action = #selector(ButtonTarget.run)
+ objc_setAssociatedObject(button, "orca-action", target, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+ button.translatesAutoresizingMaskIntoConstraints = false
+ button.widthAnchor.constraint(greaterThanOrEqualToConstant: 82).isActive = true
+ button.heightAnchor.constraint(equalToConstant: 32).isActive = true
+ return button
+ }
+
private func label(_ text: String, size: CGFloat, weight: NSFont.Weight) -> NSTextField {
let label = NSTextField(labelWithString: text)
label.font = NSFont.systemFont(ofSize: size, weight: weight)
@@ -2323,11 +2477,19 @@ private final class PermissionDragAssistantController: NSWindowController {
}
private let fallbackVisibleFrame: NSRect?
+ private let onRefreshPermissions: () -> Void
private let onClose: () -> Void
private var hasSeenSettingsWindow = false
private var followTimer: Timer?
+ private var isDismissed = false
+ private var scheduledShowWorkItems: [DispatchWorkItem] = []
- convenience init(permission: PermissionKind, fallbackVisibleFrame: NSRect?, onClose: @escaping () -> Void) {
+ convenience init(
+ permission: PermissionKind,
+ fallbackVisibleFrame: NSRect?,
+ onRefreshPermissions: @escaping () -> Void,
+ onClose: @escaping () -> Void
+ ) {
let window = NSPanel(
contentRect: NSRect(x: 0, y: 0, width: 390, height: 92),
styleMask: [.borderless, .nonactivatingPanel],
@@ -2347,15 +2509,25 @@ private final class PermissionDragAssistantController: NSWindowController {
window.isMovable = false
window.isMovableByWindowBackground = false
window.hasShadow = true
- self.init(window: window, fallbackVisibleFrame: fallbackVisibleFrame, onClose: onClose)
- window.contentView = PermissionDragAssistantView(permission: permission, appURL: Bundle.main.bundleURL) { [weak self, weak window] in
- window?.close()
- self?.onClose()
+ self.init(
+ window: window,
+ fallbackVisibleFrame: fallbackVisibleFrame,
+ onRefreshPermissions: onRefreshPermissions,
+ onClose: onClose
+ )
+ window.contentView = PermissionDragAssistantView(permission: permission, appURL: Bundle.main.bundleURL) { [weak self] in
+ self?.dismissFromCloseButton()
}
}
- init(window: NSWindow?, fallbackVisibleFrame: NSRect?, onClose: @escaping () -> Void) {
+ init(
+ window: NSWindow?,
+ fallbackVisibleFrame: NSRect?,
+ onRefreshPermissions: @escaping () -> Void,
+ onClose: @escaping () -> Void
+ ) {
self.fallbackVisibleFrame = fallbackVisibleFrame
+ self.onRefreshPermissions = onRefreshPermissions
self.onClose = onClose
super.init(window: window)
}
@@ -2365,31 +2537,52 @@ private final class PermissionDragAssistantController: NSWindowController {
}
func showWhenReady() {
+ guard !isDismissed else { return }
startFollowingSettingsWindow()
schedulePositionAndShow()
}
override func close() {
+ isDismissed = true
+ scheduledShowWorkItems.forEach { $0.cancel() }
+ scheduledShowWorkItems.removeAll()
followTimer?.invalidate()
followTimer = nil
super.close()
}
+ private func dismissFromCloseButton() {
+ // Why: closing the NSWindow directly skips this controller's timer cleanup,
+ // letting the assistant reappear while System Settings remains visible.
+ complete()
+ }
+
+ func complete() {
+ close()
+ onClose()
+ }
+
private func schedulePositionAndShow() {
+ scheduledShowWorkItems.forEach { $0.cancel() }
+ scheduledShowWorkItems.removeAll()
let delays = [0.12, 0.25, 0.4, 0.65, 0.95, 1.35, 1.8, 2.5]
for (index, delay) in delays.enumerated() {
- DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
- guard let self, self.window?.isVisible != true else { return }
+ let workItem = DispatchWorkItem { [weak self] in
+ guard let self, !self.isDismissed, self.window?.isVisible != true else { return }
if let settingsWindow = self.systemSettingsWindowState(), settingsWindow.isVisible {
self.positionNearSettingsWindow(settingsWindow.frame)
+ guard !self.isDismissed else { return }
self.showWindow(nil)
self.window?.orderFrontRegardless()
} else if index == delays.count - 1 && self.systemSettingsIsFrontmost() {
self.positionFallback()
+ guard !self.isDismissed else { return }
self.showWindow(nil)
self.window?.orderFrontRegardless()
}
}
+ scheduledShowWorkItems.append(workItem)
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: workItem)
}
}
@@ -2397,12 +2590,18 @@ private final class PermissionDragAssistantController: NSWindowController {
followTimer?.invalidate()
followTimer = Timer.scheduledTimer(withTimeInterval: 0.35, repeats: true) { [weak self] _ in
Task { @MainActor in
- self?.syncVisibilityWithSettingsWindow()
+ guard let self, !self.isDismissed else { return }
+ self.syncVisibilityWithSettingsWindow()
}
}
}
private func syncVisibilityWithSettingsWindow() {
+ guard !isDismissed else {
+ followTimer?.invalidate()
+ followTimer = nil
+ return
+ }
guard let window else {
followTimer?.invalidate()
followTimer = nil
@@ -2418,10 +2617,14 @@ private final class PermissionDragAssistantController: NSWindowController {
// Why: System Settings can stay visible on one display while the user
// works on another; follow actual occlusion instead of app focus.
if let settingsWindow, settingsWindow.isVisible {
+ onRefreshPermissions()
+ guard !isDismissed else { return }
positionNearSettingsWindow(settingsWindow.frame)
+ guard !isDismissed else { return }
if !window.isVisible {
showWindow(nil)
}
+ guard !isDismissed else { return }
window.orderFrontRegardless()
} else if window.isVisible {
window.orderOut(nil)
diff --git a/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/NumericArgumentParsing.swift b/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/NumericArgumentParsing.swift
new file mode 100644
index 00000000000..46ff554f6d7
--- /dev/null
+++ b/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/NumericArgumentParsing.swift
@@ -0,0 +1,10 @@
+import Foundation
+
+/// Converts a JSON-derived number to a fixed-width integer, truncating toward
+/// zero like `Int(Double)` does, but returning nil instead of trapping when the
+/// value is non-finite or outside the destination type's range. A malformed
+/// request (e.g. `elementIndex: 1e300`) would otherwise crash the whole agent
+/// process on the unchecked `Int(Double)` cast.
+public func boundedInteger(_ value: Double, as type: T.Type = T.self) -> T? {
+ T(exactly: value.rounded(.towardZero))
+}
diff --git a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/NumericArgumentParsingTests.swift b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/NumericArgumentParsingTests.swift
new file mode 100644
index 00000000000..72c77838286
--- /dev/null
+++ b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/NumericArgumentParsingTests.swift
@@ -0,0 +1,41 @@
+import XCTest
+@testable import OrcaComputerUseMacOSCore
+
+final class NumericArgumentParsingTests: XCTestCase {
+ func testConvertsIntegralValues() {
+ XCTAssertEqual(boundedInteger(5.0, as: Int.self), 5)
+ XCTAssertEqual(boundedInteger(0.0, as: Int.self), 0)
+ XCTAssertEqual(boundedInteger(-3.0, as: Int.self), -3)
+ }
+
+ func testTruncatesTowardZeroLikeIntInit() {
+ XCTAssertEqual(boundedInteger(5.9, as: Int.self), 5)
+ XCTAssertEqual(boundedInteger(-5.9, as: Int.self), -5)
+ }
+
+ // The crash this guards against: Int(1e300) traps because the value is
+ // finite but outside Int's range. A malformed request must not take the
+ // agent down.
+ func testReturnsNilForOutOfRangeValues() {
+ XCTAssertNil(boundedInteger(1e300, as: Int.self))
+ XCTAssertNil(boundedInteger(-1e300, as: Int.self))
+ }
+
+ func testReturnsNilForNonFiniteValues() {
+ XCTAssertNil(boundedInteger(.nan, as: Int.self))
+ XCTAssertNil(boundedInteger(.infinity, as: Int.self))
+ XCTAssertNil(boundedInteger(-.infinity, as: Int.self))
+ }
+
+ func testHonorsUnsignedDestinationBounds() {
+ XCTAssertEqual(boundedInteger(4.0, as: UInt32.self), 4)
+ XCTAssertNil(boundedInteger(-1.0, as: UInt32.self))
+ XCTAssertNil(boundedInteger(1e300, as: UInt32.self))
+ }
+
+ func testHonorsSignedFixedWidthDestinationBounds() {
+ XCTAssertEqual(boundedInteger(Double(Int32.max), as: Int32.self), Int32.max)
+ XCTAssertNil(boundedInteger(Double(Int32.max) + 1, as: Int32.self))
+ XCTAssertNil(boundedInteger(Double(Int32.min) - 1, as: Int32.self))
+ }
+}
diff --git a/package.json b/package.json
index 5ddd3db72f5..bd626f360ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "orca",
- "version": "1.4.23-rc.3",
+ "version": "1.4.34",
"description": "Next-gen IDE for parallel agentic development",
"homepage": "https://github.com/stablyai/orca",
"author": "stablyai",
@@ -30,9 +30,10 @@
"typecheck:tsc:cli": "tsc --noEmit -p config/tsconfig.cli.json --composite false",
"typecheck:tsc:web": "tsc --noEmit -p config/tsconfig.web.json --composite false",
"typecheck:tsc": "tsc --noEmit -p config/tsconfig.node.json --composite false && tsc --noEmit -p config/tsconfig.cli.json --composite false && tsc --noEmit -p config/tsconfig.web.json --composite false",
- "start": "node config/scripts/ensure-native-runtime.mjs --runtime=electron && electron-vite preview",
- "dev": "node config/scripts/ensure-native-runtime.mjs --runtime=electron && node config/scripts/run-electron-vite-dev.mjs",
- "dev-stable-name": "node config/scripts/ensure-native-runtime.mjs --runtime=electron && node config/scripts/run-electron-vite-dev.mjs --stable-name",
+ "ensure:electron-runtime": "node config/scripts/ensure-native-runtime.mjs --runtime=electron",
+ "start": "pnpm run ensure:electron-runtime && electron-vite preview",
+ "dev": "pnpm run ensure:electron-runtime && node config/scripts/run-electron-vite-dev.mjs",
+ "dev-stable-name": "pnpm run ensure:electron-runtime && node config/scripts/run-electron-vite-dev.mjs --stable-name",
"dev:web": "vite --config vite.web.config.ts --host 127.0.0.1",
"build:relay": "node config/scripts/build-relay.mjs",
"build:computer-macos": "node config/scripts/build-computer-macos.mjs",
@@ -41,19 +42,19 @@
"build:cli": "tsc -p config/tsconfig.cli.json --outDir out --composite false --incremental false && node config/scripts/install-dev-cli.mjs",
"build:electron-vite": "node config/scripts/run-electron-vite-build.mjs",
"build:web": "vite build --config vite.web.config.ts && node config/scripts/verify-web-build.mjs",
- "build": "pnpm run typecheck && pnpm run build:relay && pnpm run build:computer-macos && pnpm run build:electron-vite && pnpm run build:web && pnpm run build:cli",
- "build:release": "pnpm run build:relay && pnpm run build:computer-macos && pnpm run verify:computer-native && pnpm run build:electron-vite && pnpm run build:web && pnpm run build:cli",
- "postinstall": "pnpm rebuild electron && node config/scripts/rebuild-native-deps.mjs",
+ "build": "pnpm run typecheck && pnpm run build:relay && pnpm run build:computer-macos && pnpm run build:cli && pnpm run build:electron-vite && pnpm run build:web",
+ "build:release": "pnpm run build:relay && pnpm run build:computer-macos && pnpm run verify:computer-native && pnpm run build:cli && pnpm run build:electron-vite && pnpm run build:web",
+ "postinstall": "node config/scripts/rebuild-native-deps.mjs",
"rebuild:electron": "node config/scripts/rebuild-native-deps.mjs",
"rebuild:node": "pnpm rebuild better-sqlite3 node-pty",
- "build:unpack": "pnpm run build && electron-builder --config config/electron-builder.config.cjs --dir",
- "build:win": "pnpm run build && electron-builder --config config/electron-builder.config.cjs --win",
+ "build:unpack": "pnpm run build && pnpm run ensure:electron-runtime && electron-builder --config config/electron-builder.config.cjs --dir",
+ "build:win": "pnpm run build && pnpm run ensure:electron-runtime && electron-builder --config config/electron-builder.config.cjs --win",
"build:icons": "bash resources/icon-source/generate.sh",
- "build:mac": "pnpm run build && electron-builder --config config/electron-builder.config.cjs --mac",
- "build:mac:release": "node config/scripts/verify-macos-release-env.mjs && ORCA_MAC_RELEASE=1 pnpm run build && ORCA_MAC_RELEASE=1 electron-builder --config config/electron-builder.config.cjs --mac",
- "build:linux": "pnpm run build && electron-builder --config config/electron-builder.config.cjs --linux",
- "test:e2e": "npx playwright test --config tests/playwright.config.ts --project electron-headless",
- "test:e2e:headful": "npx playwright test --config tests/playwright.config.ts --project electron-headful",
+ "build:mac": "pnpm run build && pnpm run ensure:electron-runtime && electron-builder --config config/electron-builder.config.cjs --mac",
+ "build:mac:release": "node config/scripts/verify-macos-release-env.mjs && ORCA_MAC_RELEASE=1 pnpm run build && pnpm run ensure:electron-runtime && ORCA_MAC_RELEASE=1 electron-builder --config config/electron-builder.config.cjs --mac",
+ "build:linux": "pnpm run build && pnpm run ensure:electron-runtime && electron-builder --config config/electron-builder.config.cjs --linux",
+ "test:e2e": "pnpm run ensure:electron-runtime && npx playwright test --config tests/playwright.config.ts --project electron-headless",
+ "test:e2e:headful": "pnpm run ensure:electron-runtime && npx playwright test --config tests/playwright.config.ts --project electron-headful",
"test:e2e:computer": "vitest run --config tests/e2e/vitest.config.ts"
},
"dependencies": {
@@ -81,15 +82,15 @@
"@tiptap/pm": "^3.22.5",
"@tiptap/react": "^3.22.5",
"@tiptap/starter-kit": "^3.22.5",
- "@xterm/addon-fit": "0.12.0-beta.216",
- "@xterm/addon-ligatures": "0.11.0-beta.216",
- "@xterm/addon-search": "0.17.0-beta.216",
- "@xterm/addon-serialize": "0.15.0-beta.216",
- "@xterm/addon-unicode11": "0.10.0-beta.216",
- "@xterm/addon-web-links": "0.13.0-beta.216",
- "@xterm/addon-webgl": "0.20.0-beta.215",
- "@xterm/headless": "6.1.0-beta.216",
- "@xterm/xterm": "6.1.0-beta.216",
+ "@xterm/addon-fit": "0.12.0-beta.220",
+ "@xterm/addon-ligatures": "0.11.0-beta.220",
+ "@xterm/addon-search": "0.17.0-beta.220",
+ "@xterm/addon-serialize": "0.15.0-beta.220",
+ "@xterm/addon-unicode11": "0.10.0-beta.220",
+ "@xterm/addon-web-links": "0.13.0-beta.220",
+ "@xterm/addon-webgl": "0.20.0-beta.219",
+ "@xterm/headless": "6.1.0-beta.220",
+ "@xterm/xterm": "6.1.0-beta.220",
"agent-browser": "~0.24.1",
"better-sqlite3": "^12.9.0",
"class-variance-authority": "^0.7.1",
@@ -202,15 +203,14 @@
"@parcel/watcher",
"better-sqlite3",
"cpu-features",
- "electron",
"esbuild",
"node-pty",
"sherpa-onnx"
],
"patchedDependencies": {
"node-pty@1.1.0": "config/patches/node-pty@1.1.0.patch",
- "@xterm/addon-ligatures@0.11.0-beta.216": "config/patches/@xterm__addon-ligatures@0.11.0-beta.216.patch",
- "@xterm/addon-webgl@0.20.0-beta.215": "config/patches/@xterm__addon-webgl@0.20.0-beta.215.patch"
+ "@xterm/addon-ligatures@0.11.0-beta.220": "config/patches/@xterm__addon-ligatures@0.11.0-beta.220.patch",
+ "@xterm/addon-webgl@0.20.0-beta.219": "config/patches/@xterm__addon-webgl@0.20.0-beta.219.patch"
}
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4f88558b1cb..a38afa4facc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,14 +5,14 @@ settings:
excludeLinksFromLockfile: false
patchedDependencies:
- '@xterm/addon-ligatures@0.11.0-beta.216':
+ '@xterm/addon-ligatures@0.11.0-beta.220':
hash: df21db050a4d85552cafbe583ece863d7fa19ed634a1219210a0455b986b6634
- path: config/patches/@xterm__addon-ligatures@0.11.0-beta.216.patch
- '@xterm/addon-webgl@0.20.0-beta.215':
- hash: 4923357da531172cda1fd570a33fd852349d9eb6317f4befa8b3af18c221039d
- path: config/patches/@xterm__addon-webgl@0.20.0-beta.215.patch
+ path: config/patches/@xterm__addon-ligatures@0.11.0-beta.220.patch
+ '@xterm/addon-webgl@0.20.0-beta.219':
+ hash: b7465b48cca8d596e3bf0e441f939100c95adaddef13e85df089ed0ad6f6b1ea
+ path: config/patches/@xterm__addon-webgl@0.20.0-beta.219.patch
node-pty@1.1.0:
- hash: 93c259888173175ad66ab303977deb17f2aee9e276cb35522dc61815c65358d4
+ hash: 407ae07e1e0e2ff2e8b58696449c54c31e51d87535bc6aa4a7a7b0b561407282
path: config/patches/node-pty@1.1.0.patch
importers:
@@ -92,32 +92,32 @@ importers:
specifier: ^3.22.5
version: 3.22.5
'@xterm/addon-fit':
- specifier: 0.12.0-beta.216
- version: 0.12.0-beta.216(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.12.0-beta.220
+ version: 0.12.0-beta.220(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-ligatures':
- specifier: 0.11.0-beta.216
- version: 0.11.0-beta.216(patch_hash=df21db050a4d85552cafbe583ece863d7fa19ed634a1219210a0455b986b6634)(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.11.0-beta.220
+ version: 0.11.0-beta.220(patch_hash=df21db050a4d85552cafbe583ece863d7fa19ed634a1219210a0455b986b6634)(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-search':
- specifier: 0.17.0-beta.216
- version: 0.17.0-beta.216(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.17.0-beta.220
+ version: 0.17.0-beta.220(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-serialize':
- specifier: 0.15.0-beta.216
- version: 0.15.0-beta.216(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.15.0-beta.220
+ version: 0.15.0-beta.220(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-unicode11':
- specifier: 0.10.0-beta.216
- version: 0.10.0-beta.216(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.10.0-beta.220
+ version: 0.10.0-beta.220(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-web-links':
- specifier: 0.13.0-beta.216
- version: 0.13.0-beta.216(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.13.0-beta.220
+ version: 0.13.0-beta.220(@xterm/xterm@6.1.0-beta.220)
'@xterm/addon-webgl':
- specifier: 0.20.0-beta.215
- version: 0.20.0-beta.215(patch_hash=4923357da531172cda1fd570a33fd852349d9eb6317f4befa8b3af18c221039d)(@xterm/xterm@6.1.0-beta.216)
+ specifier: 0.20.0-beta.219
+ version: 0.20.0-beta.219(patch_hash=b7465b48cca8d596e3bf0e441f939100c95adaddef13e85df089ed0ad6f6b1ea)(@xterm/xterm@6.1.0-beta.220)
'@xterm/headless':
- specifier: 6.1.0-beta.216
- version: 6.1.0-beta.216
+ specifier: 6.1.0-beta.220
+ version: 6.1.0-beta.220
'@xterm/xterm':
- specifier: 6.1.0-beta.216
- version: 6.1.0-beta.216
+ specifier: 6.1.0-beta.220
+ version: 6.1.0-beta.220
agent-browser:
specifier: ~0.24.1
version: 0.24.1
@@ -162,7 +162,7 @@ importers:
version: 0.55.1
node-pty:
specifier: ^1.1.0
- version: 1.1.0(patch_hash=93c259888173175ad66ab303977deb17f2aee9e276cb35522dc61815c65358d4)
+ version: 1.1.0(patch_hash=407ae07e1e0e2ff2e8b58696449c54c31e51d87535bc6aa4a7a7b0b561407282)
pdfjs-dist:
specifier: ^5.7.284
version: 5.7.284
@@ -3018,47 +3018,47 @@ packages:
resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==}
engines: {node: '>=14.6'}
- '@xterm/addon-fit@0.12.0-beta.216':
- resolution: {integrity: sha512-IgKE3ngNodSnmj1O+EEYpKQZkSbAUbghPlCWd8G32RL0piIMqb3FX3BuYLnWZeLNoD9iMtublLMG1T9XjGeVvA==}
+ '@xterm/addon-fit@0.12.0-beta.220':
+ resolution: {integrity: sha512-lTiEjsdJBYTvIdA8USs90j+pu7/9oCQEh8JYBDJoRxzzAcvk4V1GlEA++Ztspbfk4nSh2HVxwJvdeTD6ffAQlg==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-ligatures@0.11.0-beta.216':
- resolution: {integrity: sha512-NJrK8MRi64Kb1Kxz5Jmrnd7H2gTlBqM3wHfObneD7T4xGFoPZkeX2/Kit4IcHt2Y5CTAQFAc92DilsncVm1HnQ==}
+ '@xterm/addon-ligatures@0.11.0-beta.220':
+ resolution: {integrity: sha512-fw/mSPqwgBNVX2ejW3rKhXablP3pelKJWYlt1QIr40+zZ//ERcHZWZNLB1I9fojiGW++tCnIHKh0GPpI2h5HgA==}
engines: {node: '>8.0.0'}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-search@0.17.0-beta.216':
- resolution: {integrity: sha512-p//4yv5aB2eyQcCFmPQ/s7tTFSTwKbtxs89xP1gvMbT9QuZgjW9FNqaQKb1GLDWtMpSfZdy7RrUp4GiCg3PVJQ==}
+ '@xterm/addon-search@0.17.0-beta.220':
+ resolution: {integrity: sha512-2QwmGiZ8sn1ISYLuHIt0heUYN0wR6d+AWFZRGsekXbLCvRw/qjclCSKsDsIO1bTMBjey5K1MeZbse6kTKx+kDg==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-serialize@0.15.0-beta.216':
- resolution: {integrity: sha512-scj/83XfYHg5LiDscYDP9dnadUMZt8To1tbdncQP/dZq2pD4TsTMokW1pciVYYazLBxCeKZybbVLEuOo7IPCqQ==}
+ '@xterm/addon-serialize@0.15.0-beta.220':
+ resolution: {integrity: sha512-ssZ8rnSU0EOdDsFS5cI5LHKy/T0rQfZBE9iPph7rUxSAwZXbMGz0Vrsob79IKRvfE6oMZlFn+NE0Gg/mKq62Iw==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-unicode11@0.10.0-beta.216':
- resolution: {integrity: sha512-i7TrEHOTzUEOClH1+6IHoHy7bR/XHVRBjHc5e0u6A1HucFkAlCU+bqUY8EfwNOh1/iUjuB06EtNh6BM1o/ZAlA==}
+ '@xterm/addon-unicode11@0.10.0-beta.220':
+ resolution: {integrity: sha512-83VMUPOp7VKWsVlw+a6TrZP38VAQM7xigu0JcSj2gVO1xsYRyme9wlgKDX+lmgWrfJPSjgB0vfXpcxI4dt/Wvw==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-web-links@0.13.0-beta.216':
- resolution: {integrity: sha512-ZP3BDy1na/37TZHO8FB+XHJFoO8muyPoOzkaL2X28n5A9ZFQPbf834EMRsvDczKnfQvtZcve+ZCmMJj1ZHGjow==}
+ '@xterm/addon-web-links@0.13.0-beta.220':
+ resolution: {integrity: sha512-XILFvFY0lOpTafIQxUOkS6x/MfZzarW3WbHZ40KEzAE8ImJqwOQiiqG17noLMUDD6rSOv7BRWNJACq4FflBNvg==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/addon-webgl@0.20.0-beta.215':
- resolution: {integrity: sha512-oCbH3YxiGOzRcKxwTfSRCA1TqpoT/AitO2X5MuqD14DVnb4Z3rTKQYfHBA7R6HA7U4K9OzmtIsi5+VyEIEaWsg==}
+ '@xterm/addon-webgl@0.20.0-beta.219':
+ resolution: {integrity: sha512-IaAcDDP0lhHIdYJuTFKZIMsRqlN8iR5U8lW9MiTK4mUAjettqZN2z/tkSsl4yV3GZ9/siOZofDl+GO1TK7y7ww==}
peerDependencies:
- '@xterm/xterm': ^6.1.0-beta.216
+ '@xterm/xterm': ^6.1.0-beta.220
- '@xterm/headless@6.1.0-beta.216':
- resolution: {integrity: sha512-HCut3ABwBv5zVUAB+5KVTW4svr/fCeVMW9xtaJIhmXZsNHOrhVFOGX7E2CYzRa8xdX/aI2JdTIhgLl8xjcHEoA==}
+ '@xterm/headless@6.1.0-beta.220':
+ resolution: {integrity: sha512-oc+cI28eP/ktv91ddk1MxsEdfS41dnNvB3eMjNxfP7v+SaM7aXgXAL8Kj0/zzbpX/dG0nbA9wi3YvsybzCN3OQ==}
- '@xterm/xterm@6.1.0-beta.216':
- resolution: {integrity: sha512-87rfymzVje5eYUlGG94hz1WkOYvFRcFDGdiOAbg4d8xt8OGSGR2nMNU4I1n5MDE1RBPBqRd+WVJ5w7q3pwMoZA==}
+ '@xterm/xterm@6.1.0-beta.220':
+ resolution: {integrity: sha512-rwEKE75wfwfNWeGnjl0iQRA1W50HigKoGcGMeF3o5CqDSdI9IjmwzpV9xHXqLH6CYj6s9N1g6bbKFVDou9dJ/A==}
abbrev@4.0.0:
resolution: {integrity: sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==}
@@ -8922,39 +8922,39 @@ snapshots:
'@xmldom/xmldom@0.9.10':
optional: true
- '@xterm/addon-fit@0.12.0-beta.216(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-fit@0.12.0-beta.220(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/addon-ligatures@0.11.0-beta.216(patch_hash=df21db050a4d85552cafbe583ece863d7fa19ed634a1219210a0455b986b6634)(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-ligatures@0.11.0-beta.220(patch_hash=df21db050a4d85552cafbe583ece863d7fa19ed634a1219210a0455b986b6634)(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
lru-cache: 6.0.0
opentype.js: 0.8.0
- '@xterm/addon-search@0.17.0-beta.216(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-search@0.17.0-beta.220(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/addon-serialize@0.15.0-beta.216(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-serialize@0.15.0-beta.220(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/addon-unicode11@0.10.0-beta.216(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-unicode11@0.10.0-beta.220(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/addon-web-links@0.13.0-beta.216(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-web-links@0.13.0-beta.220(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/addon-webgl@0.20.0-beta.215(patch_hash=4923357da531172cda1fd570a33fd852349d9eb6317f4befa8b3af18c221039d)(@xterm/xterm@6.1.0-beta.216)':
+ '@xterm/addon-webgl@0.20.0-beta.219(patch_hash=b7465b48cca8d596e3bf0e441f939100c95adaddef13e85df089ed0ad6f6b1ea)(@xterm/xterm@6.1.0-beta.220)':
dependencies:
- '@xterm/xterm': 6.1.0-beta.216
+ '@xterm/xterm': 6.1.0-beta.220
- '@xterm/headless@6.1.0-beta.216': {}
+ '@xterm/headless@6.1.0-beta.220': {}
- '@xterm/xterm@6.1.0-beta.216': {}
+ '@xterm/xterm@6.1.0-beta.220': {}
abbrev@4.0.0: {}
@@ -11367,7 +11367,7 @@ snapshots:
undici: 6.25.0
which: 6.0.1
- node-pty@1.1.0(patch_hash=93c259888173175ad66ab303977deb17f2aee9e276cb35522dc61815c65358d4):
+ node-pty@1.1.0(patch_hash=407ae07e1e0e2ff2e8b58696449c54c31e51d87535bc6aa4a7a7b0b561407282):
dependencies:
node-addon-api: 7.1.1
diff --git a/src/cli/args.test.ts b/src/cli/args.test.ts
index 868e66516e6..a134a8a2a9e 100644
--- a/src/cli/args.test.ts
+++ b/src/cli/args.test.ts
@@ -10,4 +10,31 @@ describe('parseArgs', () => {
expect(parsed.flags.get('value')).toBe('')
expect(parsed.flags.get('json')).toBe(true)
})
+
+ it('accepts a flag value that starts with -- via the = form', () => {
+ const parsed = parseArgs(['terminal', 'send', '--text=--help'])
+
+ expect(parsed.commandPath).toEqual(['terminal', 'send'])
+ expect(parsed.flags.get('text')).toBe('--help')
+ })
+
+ it('splits --flag=value on the first = so values may contain =', () => {
+ const parsed = parseArgs(['set', 'cookie', '--value=a=b=c'])
+
+ expect(parsed.flags.get('value')).toBe('a=b=c')
+ })
+
+ it('treats --flag= as an empty string value', () => {
+ const parsed = parseArgs(['--value='])
+
+ expect(parsed.flags.get('value')).toBe('')
+ })
+
+ it('still parses boolean flags and space-separated values', () => {
+ const parsed = parseArgs(['tab', 'create', '--json', '--url', 'https://example.com'])
+
+ expect(parsed.commandPath).toEqual(['tab', 'create'])
+ expect(parsed.flags.get('json')).toBe(true)
+ expect(parsed.flags.get('url')).toBe('https://example.com')
+ })
})
diff --git a/src/cli/args.ts b/src/cli/args.ts
index 5b993306321..02992e3b30f 100644
--- a/src/cli/args.ts
+++ b/src/cli/args.ts
@@ -29,7 +29,17 @@ export function parseArgs(argv: string[]): ParsedArgs {
continue
}
- const flag = token.slice(2)
+ const assignment = token.slice(2)
+ // Why: `--flag=value` is the only unambiguous way to pass a value that
+ // itself starts with `--` (e.g. `--text=--help`); the space-separated form
+ // treats a `--`-leading next token as a new flag, so it can't express one.
+ const equalsIndex = assignment.indexOf('=')
+ if (equalsIndex !== -1) {
+ flags.set(assignment.slice(0, equalsIndex), assignment.slice(equalsIndex + 1))
+ continue
+ }
+
+ const flag = assignment
const hasNext = i + 1 < argv.length
const next = argv[i + 1]
if (!hasNext || next.startsWith('--')) {
@@ -65,7 +75,9 @@ export function supportsBrowserPageFlag(commandPath: string[]): boolean {
return false
}
if (
- ['automations', 'repo', 'worktree', 'terminal', 'computer', 'note'].includes(commandPath[0])
+ ['automations', 'repo', 'worktree', 'terminal', 'file', 'computer', 'note'].includes(
+ commandPath[0]
+ )
) {
return false
}
@@ -87,6 +99,7 @@ export function isCommandGroup(commandPath: string[]): boolean {
'repo',
'worktree',
'terminal',
+ 'file',
'tab',
'cookie',
'intercept',
@@ -98,8 +111,10 @@ export function isCommandGroup(commandPath: string[]): boolean {
'storage',
'orchestration',
'computer',
+ 'agent',
'environment'
].includes(commandPath[0])) ||
+ (commandPath.length === 2 && commandPath[0] === 'agent' && commandPath[1] === 'hooks') ||
(commandPath.length === 2 &&
commandPath[0] === 'storage' &&
['local', 'session'].includes(commandPath[1]))
diff --git a/src/cli/browser.test.ts b/src/cli/browser.test.ts
index 161368f7a0e..86bbee3039a 100644
--- a/src/cli/browser.test.ts
+++ b/src/cli/browser.test.ts
@@ -1,5 +1,4 @@
/* eslint-disable max-lines -- Why: this file groups every CLI browser-command test (page targeting, profiles, waits, viewport) so test-fixture imports and the runtime-client mock stay shared in one place. */
-import path from 'path'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
const callMock = vi.fn()
@@ -90,7 +89,7 @@ describe('orca cli browser page targeting', () => {
expect(callMock).toHaveBeenNthCalledWith(1, 'worktree.list', { limit: 10_000 })
expect(callMock).toHaveBeenNthCalledWith(2, 'browser.snapshot', {
page: 'page-1',
- worktree: `path:${path.resolve('/tmp/repo/feature')}`
+ worktree: 'id:repo::/tmp/repo/feature'
})
})
@@ -124,7 +123,7 @@ describe('orca cli browser page targeting', () => {
expect(callMock).toHaveBeenNthCalledWith(2, 'browser.tabSwitch', {
index: undefined,
page: 'page-2',
- worktree: `path:${path.resolve('/tmp/repo/feature')}`
+ worktree: 'id:repo::/tmp/repo/feature'
})
})
diff --git a/src/cli/dispatch.ts b/src/cli/dispatch.ts
index 97698764522..c560fd75f11 100644
--- a/src/cli/dispatch.ts
+++ b/src/cli/dispatch.ts
@@ -4,6 +4,7 @@ import { CORE_HANDLERS } from './handlers/core'
import { AUTOMATION_HANDLERS } from './handlers/automations'
import { REPO_HANDLERS } from './handlers/repo'
import { WORKTREE_HANDLERS } from './handlers/worktree'
+import { FILE_HANDLERS } from './handlers/file'
import { TERMINAL_HANDLERS } from './handlers/terminal'
import { BROWSER_NAV_HANDLERS } from './handlers/browser-nav'
import { BROWSER_INTERACT_HANDLERS } from './handlers/browser-interact'
@@ -16,6 +17,7 @@ import { BROWSER_STORAGE_HANDLERS } from './handlers/browser-storage'
import { ORCHESTRATION_HANDLERS } from './handlers/orchestration'
import { COMPUTER_HANDLERS } from './handlers/computer'
import { ENVIRONMENT_HANDLERS } from './handlers/environment'
+import { AGENT_HOOK_HANDLERS } from './handlers/agent-hooks'
export type HandlerContext = {
flags: Map
@@ -33,6 +35,7 @@ function buildHandlers(): Map {
AUTOMATION_HANDLERS,
REPO_HANDLERS,
WORKTREE_HANDLERS,
+ FILE_HANDLERS,
TERMINAL_HANDLERS,
BROWSER_NAV_HANDLERS,
BROWSER_INTERACT_HANDLERS,
@@ -44,6 +47,7 @@ function buildHandlers(): Map {
BROWSER_STORAGE_HANDLERS,
ORCHESTRATION_HANDLERS,
COMPUTER_HANDLERS,
+ AGENT_HOOK_HANDLERS,
ENVIRONMENT_HANDLERS
]
for (const group of groups) {
diff --git a/src/cli/handlers/agent-hooks.ts b/src/cli/handlers/agent-hooks.ts
new file mode 100644
index 00000000000..fdd6b3114f1
--- /dev/null
+++ b/src/cli/handlers/agent-hooks.ts
@@ -0,0 +1,163 @@
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'fs'
+import { homedir } from 'os'
+import { dirname, join } from 'path'
+import { randomUUID } from 'crypto'
+import type { CommandHandler } from '../dispatch'
+import { printResult } from '../format'
+import { RuntimeClientError, type RuntimeClient, type RuntimeRpcSuccess } from '../runtime-client'
+import type { AgentHookInstallStatus } from '../../shared/agent-hook-types'
+import { getDefaultPersistedState } from '../../shared/constants'
+import type { PersistedState } from '../../shared/types'
+import {
+ applyAgentStatusHooksEnabled,
+ getManagedAgentHookStatuses
+} from '../../main/agent-hooks/managed-agent-hook-controls'
+import { getDefaultUserDataPath } from '../runtime-client'
+
+type AgentHookCommandResult = {
+ enabled: boolean
+ settingsPath: string
+ appliedBy: 'runtime' | 'offline'
+ statuses: AgentHookInstallStatus[]
+}
+
+function getDataPath(): string {
+ return join(getDefaultUserDataPath(), 'orca-data.json')
+}
+
+function isRecord(value: unknown): value is Record {
+ return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function readPersistedState(dataPath: string): PersistedState {
+ if (!existsSync(dataPath)) {
+ return getDefaultPersistedState(homedir())
+ }
+ try {
+ const parsed = JSON.parse(readFileSync(dataPath, 'utf-8'))
+ if (!isRecord(parsed)) {
+ throw new Error('file does not contain a JSON object')
+ }
+ return parsed as PersistedState
+ } catch (error) {
+ throw new RuntimeClientError(
+ 'runtime_error',
+ `Could not read ${dataPath}: ${error instanceof Error ? error.message : String(error)}`
+ )
+ }
+}
+
+function writePersistedState(dataPath: string, state: PersistedState): void {
+ mkdirSync(dirname(dataPath), { recursive: true })
+ const tmpPath = join(dirname(dataPath), `.${Date.now()}-${randomUUID()}.tmp`)
+ let renamed = false
+ try {
+ writeFileSync(tmpPath, `${JSON.stringify(state, null, 2)}\n`, 'utf-8')
+ renameSync(tmpPath, dataPath)
+ renamed = true
+ } finally {
+ if (!renamed && existsSync(tmpPath)) {
+ try {
+ unlinkSync(tmpPath)
+ } catch {
+ // best effort
+ }
+ }
+ }
+}
+
+function readEnabledFromDisk(): boolean {
+ const state = readPersistedState(getDataPath())
+ return state.settings?.agentStatusHooksEnabled !== false
+}
+
+function updateEnabledOnDisk(enabled: boolean): string {
+ const dataPath = getDataPath()
+ const state = readPersistedState(dataPath)
+ state.settings = {
+ ...getDefaultPersistedState(homedir()).settings,
+ ...state.settings,
+ agentStatusHooksEnabled: enabled
+ }
+ writePersistedState(dataPath, state)
+ return dataPath
+}
+
+async function updateRunningRuntime(client: RuntimeClient, enabled: boolean): Promise {
+ try {
+ const status = await client.getCliStatus()
+ if (!status.result.runtime.reachable) {
+ return false
+ }
+ await client.call(
+ 'settings.update',
+ { agentStatusHooksEnabled: enabled },
+ { timeoutMs: 10_000 }
+ )
+ return true
+ } catch {
+ return false
+ }
+}
+
+function localSuccess(result: TResult): RuntimeRpcSuccess {
+ return {
+ id: 'local',
+ ok: true,
+ result,
+ _meta: {
+ runtimeId: 'local'
+ }
+ }
+}
+
+function formatAgentHookCommandResult(result: AgentHookCommandResult): string {
+ const statusSummary = result.statuses
+ .map((status) => `${status.agent}: ${status.state}`)
+ .join('\n')
+ return [
+ `agentStatusHooksEnabled: ${result.enabled}`,
+ `appliedBy: ${result.appliedBy}`,
+ `settingsPath: ${result.settingsPath}`,
+ statusSummary
+ ]
+ .filter(Boolean)
+ .join('\n')
+}
+
+async function setAgentHooksEnabled(
+ client: RuntimeClient,
+ enabled: boolean
+): Promise {
+ const updatedRuntime = await updateRunningRuntime(client, enabled)
+ const settingsPath = updatedRuntime ? getDataPath() : updateEnabledOnDisk(enabled)
+ const statuses = updatedRuntime
+ ? getManagedAgentHookStatuses()
+ : applyAgentStatusHooksEnabled(enabled)
+ return {
+ enabled,
+ settingsPath,
+ appliedBy: updatedRuntime ? 'runtime' : 'offline',
+ statuses
+ }
+}
+
+export const AGENT_HOOK_HANDLERS: Record = {
+ 'agent hooks status': async ({ json }) => {
+ const result: AgentHookCommandResult = {
+ enabled: readEnabledFromDisk(),
+ settingsPath: getDataPath(),
+ appliedBy: 'offline',
+ statuses: getManagedAgentHookStatuses()
+ }
+ printResult(localSuccess(result), json, formatAgentHookCommandResult)
+ },
+ 'agent hooks off': async ({ client, json }) => {
+ const result = await setAgentHooksEnabled(client, false)
+ printResult(localSuccess(result), json, formatAgentHookCommandResult)
+ },
+ 'agent hooks on': async ({ client, json }) => {
+ const result = await setAgentHooksEnabled(client, true)
+ printResult(localSuccess(result), json, formatAgentHookCommandResult)
+ }
+}
diff --git a/src/cli/handlers/computer.test.ts b/src/cli/handlers/computer.test.ts
index dca8f050ba7..62f86363a48 100644
--- a/src/cli/handlers/computer.test.ts
+++ b/src/cli/handlers/computer.test.ts
@@ -1,5 +1,4 @@
/* eslint-disable max-lines -- Why: computer CLI coverage shares one mocked runtime setup across command contracts. */
-import path from 'path'
import { beforeEach, describe, expect, it, vi } from 'vitest'
const callMock = vi.fn()
@@ -71,7 +70,7 @@ describe('orca computer CLI handlers', () => {
expect(callMock).toHaveBeenNthCalledWith(1, 'worktree.list', { limit: 10_000 })
expect(callMock).toHaveBeenNthCalledWith(2, 'computer.listApps', {
- worktree: `path:${path.resolve('/tmp/repo')}`
+ worktree: 'id:repo::/tmp/repo'
})
})
@@ -142,7 +141,7 @@ describe('orca computer CLI handlers', () => {
expect(callMock).toHaveBeenNthCalledWith(2, 'computer.getAppState', {
app: 'Finder',
- worktree: `path:${path.resolve('/tmp/repo')}`,
+ worktree: 'id:repo::/tmp/repo',
noScreenshot: true,
restoreWindow: true
})
@@ -176,7 +175,7 @@ describe('orca computer CLI handlers', () => {
expect(callMock).toHaveBeenNthCalledWith(2, 'computer.listWindows', {
app: 'Finder',
- worktree: `path:${path.resolve('/tmp/repo')}`
+ worktree: 'id:repo::/tmp/repo'
})
const output = vi.mocked(console.log).mock.calls[0][0]
expect(output).toContain('[0] id:42 "Recents"')
@@ -241,7 +240,7 @@ describe('orca computer CLI handlers', () => {
expect(callMock).toHaveBeenNthCalledWith(2, 'computer.drag', {
app: 'Finder',
- worktree: `path:${path.resolve('/tmp/repo')}`,
+ worktree: 'id:repo::/tmp/repo',
fromElementIndex: undefined,
toElementIndex: undefined,
fromX: 1,
diff --git a/src/cli/handlers/file.test.ts b/src/cli/handlers/file.test.ts
new file mode 100644
index 00000000000..b4e11d020db
--- /dev/null
+++ b/src/cli/handlers/file.test.ts
@@ -0,0 +1,329 @@
+/* eslint-disable max-lines -- Why: file CLI coverage shares one mocked runtime setup across command contracts. */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const callMock = vi.fn()
+
+vi.mock('../runtime-client', () => {
+ class RuntimeClient {
+ readonly isRemote: boolean
+ call = callMock
+ getCliStatus = vi.fn()
+ openOrca = vi.fn()
+
+ constructor(
+ _userDataPath?: string,
+ _requestTimeoutMs?: number,
+ remotePairingCode?: string | null,
+ environmentSelector?: string | null
+ ) {
+ this.isRemote = Boolean(remotePairingCode || environmentSelector)
+ }
+ }
+
+ class RuntimeClientError extends Error {
+ readonly code: string
+
+ constructor(code: string, message: string) {
+ super(message)
+ this.code = code
+ }
+ }
+
+ class RuntimeRpcFailureError extends RuntimeClientError {
+ readonly response: unknown
+
+ constructor(response: unknown) {
+ super('runtime_error', 'runtime_error')
+ this.response = response
+ }
+ }
+
+ return {
+ RuntimeClient,
+ RuntimeClientError,
+ RuntimeRpcFailureError
+ }
+})
+
+import { main } from '../index'
+import { buildWorktree, okFixture, queueFixtures, worktreeListFixture } from '../test-fixtures'
+
+describe('orca file CLI handlers', () => {
+ beforeEach(() => {
+ vi.restoreAllMocks()
+ callMock.mockReset()
+ process.exitCode = undefined
+ vi.spyOn(console, 'log').mockImplementation(() => {})
+ vi.spyOn(console, 'error').mockImplementation(() => {})
+ })
+
+ it('prints group help with file commands', async () => {
+ await main(['file', '--help'], '/tmp/repo')
+
+ const output = vi.mocked(console.log).mock.calls[0][0]
+ expect(output).toContain('open')
+ expect(output).toContain('diff')
+ expect(output).toContain('open-changed')
+ })
+
+ it('opens a positional path in the inferred current worktree', async () => {
+ queueFixtures(
+ callMock,
+ worktreeListFixture([buildWorktree('/tmp/repo', 'feature')]),
+ okFixture('req_open', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ })
+ )
+
+ await main(['file', 'open', 'src/App.tsx'], '/tmp/repo/src')
+
+ expect(callMock).toHaveBeenNthCalledWith(1, 'worktree.list', { limit: 10_000 })
+ expect(callMock).toHaveBeenNthCalledWith(2, 'files.open', {
+ worktree: 'id:repo::/tmp/repo',
+ relativePath: 'src/App.tsx'
+ })
+ expect(vi.mocked(console.log).mock.calls[0][0]).toBe('Opened src/App.tsx.')
+ })
+
+ it('opens a staged diff for an explicit worktree without cwd inference', async () => {
+ queueFixtures(
+ callMock,
+ okFixture('req_diff', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ })
+ )
+
+ await main(
+ ['file', 'diff', '--path', 'src/App.tsx', '--staged', '--worktree', 'id:wt-1'],
+ '/tmp/elsewhere'
+ )
+
+ expect(callMock).toHaveBeenCalledTimes(1)
+ expect(callMock).toHaveBeenCalledWith('files.openDiff', {
+ worktree: 'id:wt-1',
+ relativePath: 'src/App.tsx',
+ staged: true
+ })
+ })
+
+ it('rejects --worktree without a value before cwd inference or RPC calls', async () => {
+ const priorExitCode = process.exitCode
+
+ await main(['file', 'open', 'src/App.tsx', '--worktree'], '/tmp/repo/src')
+
+ expect(callMock).not.toHaveBeenCalled()
+ expect(vi.mocked(console.error).mock.calls[0][0]).toContain('Missing value for --worktree.')
+ expect(process.exitCode).toBe(1)
+
+ process.exitCode = priorExitCode
+ })
+
+ it('opens git-changed files as diffs by default', async () => {
+ queueFixtures(
+ callMock,
+ worktreeListFixture([buildWorktree('/tmp/repo', 'feature')]),
+ okFixture('req_status', {
+ entries: [
+ { path: 'src/App.tsx', status: 'modified', area: 'unstaged' },
+ { path: 'package.json', status: 'modified', area: 'staged' },
+ { path: 'docs/new.md', status: 'untracked', area: 'untracked' }
+ ],
+ conflictOperation: 'unknown'
+ }),
+ okFixture('req_diff_1', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ }),
+ okFixture('req_diff_2', {
+ worktree: 'wt-1',
+ relativePath: 'package.json',
+ kind: 'text',
+ opened: true
+ }),
+ okFixture('req_diff_3', {
+ worktree: 'wt-1',
+ relativePath: 'docs/new.md',
+ kind: 'markdown',
+ opened: true
+ })
+ )
+
+ await main(['file', 'open-changed'], '/tmp/repo/src')
+
+ expect(callMock).toHaveBeenNthCalledWith(2, 'git.status', {
+ worktree: 'id:repo::/tmp/repo'
+ })
+ expect(callMock).toHaveBeenNthCalledWith(3, 'files.openDiff', {
+ worktree: 'id:repo::/tmp/repo',
+ relativePath: 'src/App.tsx',
+ staged: false
+ })
+ expect(callMock).toHaveBeenNthCalledWith(4, 'files.openDiff', {
+ worktree: 'id:repo::/tmp/repo',
+ relativePath: 'package.json',
+ staged: true
+ })
+ expect(callMock).toHaveBeenNthCalledWith(5, 'files.openDiff', {
+ worktree: 'id:repo::/tmp/repo',
+ relativePath: 'docs/new.md',
+ staged: false
+ })
+ expect(vi.mocked(console.log).mock.calls[0][0]).toBe('Opened 3 changed file targets.')
+ })
+
+ it('skips unresolved conflict entries in diff mode without opening a normal diff', async () => {
+ queueFixtures(
+ callMock,
+ okFixture('req_status', {
+ entries: [
+ {
+ path: 'src/conflicted.ts',
+ status: 'modified',
+ area: 'unstaged',
+ conflictStatus: 'unresolved'
+ },
+ { path: 'src/App.tsx', status: 'modified', area: 'staged' }
+ ],
+ conflictOperation: 'merge'
+ }),
+ okFixture('req_diff', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ })
+ )
+
+ await main(['file', 'open-changed', '--worktree', 'id:wt-1'], '/tmp/elsewhere')
+
+ expect(callMock).toHaveBeenCalledTimes(2)
+ expect(callMock).toHaveBeenNthCalledWith(1, 'git.status', { worktree: 'id:wt-1' })
+ expect(callMock).toHaveBeenNthCalledWith(2, 'files.openDiff', {
+ worktree: 'id:wt-1',
+ relativePath: 'src/App.tsx',
+ staged: true
+ })
+ const output = vi.mocked(console.log).mock.calls[0][0]
+ expect(output).toContain('Opened 1 changed file targets.')
+ expect(output).toContain(
+ 'src/conflicted.ts: unresolved conflict may not have a single diff target'
+ )
+ })
+
+ it('opens changed files in both edit and diff modes while skipping deleted edit targets', async () => {
+ queueFixtures(
+ callMock,
+ okFixture('req_status', {
+ entries: [
+ { path: 'src/App.tsx', status: 'modified', area: 'unstaged' },
+ { path: 'src/App.tsx', status: 'modified', area: 'staged' },
+ { path: 'docs/old.md', status: 'deleted', area: 'unstaged' }
+ ],
+ conflictOperation: 'unknown'
+ }),
+ okFixture('req_open', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ }),
+ okFixture('req_diff_1', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ }),
+ okFixture('req_diff_2', {
+ worktree: 'wt-1',
+ relativePath: 'src/App.tsx',
+ kind: 'text',
+ opened: true
+ }),
+ okFixture('req_diff_3', {
+ worktree: 'wt-1',
+ relativePath: 'docs/old.md',
+ kind: 'markdown',
+ opened: true
+ })
+ )
+
+ await main(
+ ['file', 'open-changed', '--mode', 'both', '--worktree', 'id:wt-1'],
+ '/tmp/elsewhere'
+ )
+
+ expect(callMock).toHaveBeenNthCalledWith(1, 'git.status', { worktree: 'id:wt-1' })
+ expect(callMock).toHaveBeenNthCalledWith(2, 'files.open', {
+ worktree: 'id:wt-1',
+ relativePath: 'src/App.tsx'
+ })
+ expect(callMock).toHaveBeenNthCalledWith(3, 'files.openDiff', {
+ worktree: 'id:wt-1',
+ relativePath: 'src/App.tsx',
+ staged: false
+ })
+ expect(callMock).toHaveBeenNthCalledWith(4, 'files.openDiff', {
+ worktree: 'id:wt-1',
+ relativePath: 'src/App.tsx',
+ staged: true
+ })
+ expect(callMock).toHaveBeenNthCalledWith(5, 'files.openDiff', {
+ worktree: 'id:wt-1',
+ relativePath: 'docs/old.md',
+ staged: false
+ })
+ const output = vi.mocked(console.log).mock.calls[0][0]
+ expect(output).toContain('Opened 4 changed file targets.')
+ expect(output).toContain('docs/old.md: deleted file has no edit target')
+ })
+
+ it('requires an explicit worktree for remote file commands', async () => {
+ const priorExitCode = process.exitCode
+
+ await main(['file', 'open-changed', '--pairing-code', 'remote-runtime'], '/tmp/repo/src')
+
+ expect(callMock).not.toHaveBeenCalled()
+ expect(vi.mocked(console.error).mock.calls[0][0]).toContain(
+ 'Remote file commands require --worktree'
+ )
+ expect(process.exitCode).toBe(1)
+
+ process.exitCode = priorExitCode
+ })
+
+ it('rejects --mode without a value before cwd inference or RPC calls', async () => {
+ const priorExitCode = process.exitCode
+
+ await main(['file', 'open-changed', '--mode'], '/tmp/repo/src')
+
+ expect(callMock).not.toHaveBeenCalled()
+ expect(vi.mocked(console.error).mock.calls[0][0]).toContain(
+ 'Missing value for --mode. Use edit, diff, or both.'
+ )
+ expect(process.exitCode).toBe(1)
+
+ process.exitCode = priorExitCode
+ })
+
+ it('validates mode before resolving a worktree', async () => {
+ const priorExitCode = process.exitCode
+
+ await main(['file', 'open-changed', '--mode', 'invalid'], '/tmp/repo/src')
+
+ expect(callMock).not.toHaveBeenCalled()
+ expect(vi.mocked(console.error).mock.calls[0][0]).toContain(
+ 'Invalid --mode. Use edit, diff, or both.'
+ )
+ expect(process.exitCode).toBe(1)
+
+ process.exitCode = priorExitCode
+ })
+})
diff --git a/src/cli/handlers/file.ts b/src/cli/handlers/file.ts
new file mode 100644
index 00000000000..8431e860899
--- /dev/null
+++ b/src/cli/handlers/file.ts
@@ -0,0 +1,215 @@
+import type { GitStatusEntry, GitStatusResult } from '../../shared/git-status-types'
+import type { RuntimeFileOpenResult } from '../../shared/runtime-types'
+import type { CommandHandler, HandlerContext } from '../dispatch'
+import { getOptionalStringFlag, getRequiredStringFlag } from '../flags'
+import { printResult } from '../format'
+import { RuntimeClientError } from '../runtime-client'
+import { getOptionalWorktreeSelector, resolveCurrentWorktreeSelector } from '../selectors'
+
+type FileOpenMode = 'edit' | 'diff'
+type OpenChangedMode = FileOpenMode | 'both'
+
+type FileOpenRecord = {
+ path: string
+ mode: FileOpenMode
+ staged?: boolean
+ opened: boolean
+ kind?: RuntimeFileOpenResult['kind']
+ skipped?: boolean
+ reason?: string
+}
+
+type FileOpenChangedResult = {
+ worktree: string
+ mode: OpenChangedMode
+ opened: FileOpenRecord[]
+ skipped: FileOpenRecord[]
+ totalChanged: number
+}
+
+async function getFileWorktreeSelector({ flags, cwd, client }: HandlerContext): Promise {
+ const worktree = flags.get('worktree')
+ if (flags.has('worktree') && (typeof worktree !== 'string' || worktree.length === 0)) {
+ throw new RuntimeClientError('invalid_argument', 'Missing value for --worktree.')
+ }
+ const explicit = await getOptionalWorktreeSelector(flags, 'worktree', cwd, client)
+ if (explicit) {
+ return explicit
+ }
+ if (client.isRemote) {
+ throw new RuntimeClientError(
+ 'invalid_argument',
+ 'Remote file commands require --worktree because the client cwd cannot identify a server worktree.'
+ )
+ }
+ return await resolveCurrentWorktreeSelector(cwd, client)
+}
+
+function getOpenChangedMode(flags: Map): OpenChangedMode {
+ const value = flags.get('mode')
+ if (flags.has('mode') && (typeof value !== 'string' || value.length === 0)) {
+ throw new RuntimeClientError(
+ 'invalid_argument',
+ 'Missing value for --mode. Use edit, diff, or both.'
+ )
+ }
+ const mode = getOptionalStringFlag(flags, 'mode') ?? 'diff'
+ if (mode === 'edit' || mode === 'diff' || mode === 'both') {
+ return mode
+ }
+ throw new RuntimeClientError('invalid_argument', 'Invalid --mode. Use edit, diff, or both.')
+}
+
+function canOpenEntryForEdit(entry: GitStatusEntry): string | null {
+ if (entry.status === 'deleted') {
+ return 'deleted file has no edit target'
+ }
+ if (entry.conflictStatus === 'unresolved') {
+ return 'unresolved conflict may not have a single editable file'
+ }
+ return null
+}
+
+async function openFileEdit(
+ ctx: HandlerContext,
+ worktree: string,
+ path: string
+): Promise {
+ const result = await ctx.client.call('files.open', {
+ worktree,
+ relativePath: path
+ })
+ return {
+ path,
+ mode: 'edit',
+ opened: result.result.opened,
+ kind: result.result.kind,
+ ...(result.result.opened ? {} : { skipped: true, reason: `${result.result.kind} file` })
+ }
+}
+
+async function openFileDiff(
+ ctx: HandlerContext,
+ worktree: string,
+ path: string,
+ staged: boolean
+): Promise {
+ const result = await ctx.client.call('files.openDiff', {
+ worktree,
+ relativePath: path,
+ staged
+ })
+ return {
+ path,
+ mode: 'diff',
+ staged,
+ opened: result.result.opened,
+ kind: result.result.kind
+ }
+}
+
+function formatOpenChangedResult(result: FileOpenChangedResult): string {
+ if (result.totalChanged === 0) {
+ return 'No changed files.'
+ }
+ const lines = [`Opened ${result.opened.length} changed file targets.`]
+ if (result.skipped.length > 0) {
+ lines.push(`Skipped ${result.skipped.length} changed file targets:`)
+ for (const skipped of result.skipped) {
+ lines.push(`- ${skipped.path}: ${skipped.reason ?? 'not opened'}`)
+ }
+ }
+ return lines.join('\n')
+}
+
+function formatFileOpen(result: RuntimeFileOpenResult): string {
+ return result.opened
+ ? `Opened ${result.relativePath}.`
+ : `Did not open ${result.relativePath}: ${result.kind} file.`
+}
+
+function formatFileDiff(result: RuntimeFileOpenResult): string {
+ return `Opened diff for ${result.relativePath}.`
+}
+
+export const FILE_HANDLERS: Record = {
+ 'file open': async (ctx) => {
+ const relativePath = getRequiredStringFlag(ctx.flags, 'path')
+ const worktree = await getFileWorktreeSelector(ctx)
+ const result = await ctx.client.call('files.open', {
+ worktree,
+ relativePath
+ })
+ printResult(result, ctx.json, formatFileOpen)
+ },
+ 'file diff': async (ctx) => {
+ const relativePath = getRequiredStringFlag(ctx.flags, 'path')
+ const staged = ctx.flags.get('staged') === true
+ const worktree = await getFileWorktreeSelector(ctx)
+ const result = await ctx.client.call('files.openDiff', {
+ worktree,
+ relativePath,
+ staged
+ })
+ printResult(result, ctx.json, formatFileDiff)
+ },
+ 'file open-changed': async (ctx) => {
+ const mode = getOpenChangedMode(ctx.flags)
+ const worktree = await getFileWorktreeSelector(ctx)
+ const status = await ctx.client.call('git.status', { worktree })
+ const opened: FileOpenRecord[] = []
+ const skipped: FileOpenRecord[] = []
+ const openedEditPaths = new Set()
+
+ for (const entry of status.result.entries) {
+ if (mode === 'edit' || mode === 'both') {
+ const editSkipReason = canOpenEntryForEdit(entry)
+ if (editSkipReason) {
+ skipped.push({
+ path: entry.path,
+ mode: 'edit',
+ opened: false,
+ skipped: true,
+ reason: editSkipReason
+ })
+ } else if (!openedEditPaths.has(entry.path)) {
+ openedEditPaths.add(entry.path)
+ const record = await openFileEdit(ctx, worktree, entry.path)
+ const records = record.opened ? opened : skipped
+ records.push(record)
+ }
+ }
+
+ if (mode === 'diff' || mode === 'both') {
+ const staged = entry.area === 'staged'
+ if (entry.conflictStatus === 'unresolved') {
+ skipped.push({
+ path: entry.path,
+ mode: 'diff',
+ staged,
+ opened: false,
+ skipped: true,
+ reason: 'unresolved conflict may not have a single diff target'
+ })
+ } else {
+ opened.push(await openFileDiff(ctx, worktree, entry.path, staged))
+ }
+ }
+ }
+
+ printResult(
+ {
+ ...status,
+ result: {
+ worktree,
+ mode,
+ opened,
+ skipped,
+ totalChanged: status.result.entries.length
+ }
+ },
+ ctx.json,
+ formatOpenChangedResult
+ )
+ }
+}
diff --git a/src/cli/handlers/orchestration.test.ts b/src/cli/handlers/orchestration.test.ts
new file mode 100644
index 00000000000..210e2d343a6
--- /dev/null
+++ b/src/cli/handlers/orchestration.test.ts
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const callMock = vi.fn()
+
+// Why: isolate the handler's flag-to-param mapping; printResult only writes output.
+vi.mock('../format', () => ({ printResult: vi.fn() }))
+
+import { ORCHESTRATION_HANDLERS } from './orchestration'
+
+describe('orchestration reset CLI handler', () => {
+ beforeEach(() => {
+ callMock.mockReset().mockResolvedValue({ result: { reset: 'all' } })
+ })
+
+ const invoke = (flags: Map) =>
+ ORCHESTRATION_HANDLERS['orchestration reset']({
+ flags,
+ client: { call: callMock },
+ json: true
+ } as never)
+
+ it('sends all: true for a bare `reset` (no scope flag)', async () => {
+ await invoke(new Map())
+ expect(callMock).toHaveBeenCalledWith('orchestration.reset', {
+ all: true,
+ tasks: undefined,
+ messages: undefined
+ })
+ })
+
+ it('sends only the tasks scope for --tasks', async () => {
+ await invoke(new Map([['tasks', true]]))
+ expect(callMock).toHaveBeenCalledWith('orchestration.reset', {
+ all: undefined,
+ tasks: true,
+ messages: undefined
+ })
+ })
+
+ it('sends only the all scope for --all (no implicit extra scopes)', async () => {
+ await invoke(new Map([['all', true]]))
+ expect(callMock).toHaveBeenCalledWith('orchestration.reset', {
+ all: true,
+ tasks: undefined,
+ messages: undefined
+ })
+ })
+})
diff --git a/src/cli/handlers/orchestration.ts b/src/cli/handlers/orchestration.ts
index 5398c55aadf..baa72bba969 100644
--- a/src/cli/handlers/orchestration.ts
+++ b/src/cli/handlers/orchestration.ts
@@ -438,8 +438,9 @@ export const ORCHESTRATION_HANDLERS: Record = {
},
'orchestration reset': async ({ flags, client, json }) => {
+ const hasScopeFlag = flags.has('all') || flags.has('tasks') || flags.has('messages')
const result = await client.call<{ reset: string }>('orchestration.reset', {
- all: flags.has('all') ? true : undefined,
+ all: flags.has('all') || !hasScopeFlag ? true : undefined,
tasks: flags.has('tasks') ? true : undefined,
messages: flags.has('messages') ? true : undefined
})
diff --git a/src/cli/help.ts b/src/cli/help.ts
index a269e5404d4..1e1202dc345 100644
--- a/src/cli/help.ts
+++ b/src/cli/help.ts
@@ -42,6 +42,11 @@ Worktrees:
worktree rm Remove a worktree from Orca and git
worktree ps Show a compact orchestration summary across worktrees
+Files:
+ file open Open a workspace file in the Orca editor
+ file diff Open a workspace file diff in the Orca editor
+ file open-changed Open all git-changed files for a workspace
+
Terminals:
terminal list List live Orca-managed terminals
terminal show Show terminal metadata and preview
@@ -167,6 +172,9 @@ Common Commands:
orca worktree set --worktree [--display-name ] [--issue ] [--comment ] [--parent-worktree |--no-parent] [--json]
orca worktree rm --worktree [--force] [--run-hooks] [--json]
orca worktree ps [--limit ] [--json]
+ orca file open [--worktree ] [--json]
+ orca file diff [--staged] [--worktree ] [--json]
+ orca file open-changed [--mode edit|diff|both] [--worktree ] [--json]
orca terminal list [--worktree ] [--limit 
Pi
+ 
oh-my-pi
Droid
@@ -106,7 +108,7 @@ Control your agents from your phone.
- **iOS:** [Download from App Store](https://apps.apple.com/us/app/orca-ide/id6766130217)
-- **Android:** [Download from GH release](https://github.com/stablyai/orca/releases/tag/mobile-v0.0.9)
+- **Android:** [Download from GH release](https://github.com/stablyai/orca/releases/tag/mobile-v0.0.10)
---
diff --git a/config/electron-builder.config.cjs b/config/electron-builder.config.cjs
index e541a5212db..5177a7a7a6e 100644
--- a/config/electron-builder.config.cjs
+++ b/config/electron-builder.config.cjs
@@ -35,7 +35,7 @@ module.exports = {
'!resources/onboarding/feature-wall/**'
],
// Why: the CLI entry-point lives in out/cli/ but imports shared modules
- // from out/shared/ (e.g. runtime-bootstrap). Both directories must be
+ // from out/shared/ and local hook mutators from out/main/. These paths must be
// unpacked so that Node's require() can resolve the cross-directory imports
// when the CLI runs outside the asar archive.
// Why: daemon-entry.js is forked as a separate Node.js process and must be
@@ -54,6 +54,17 @@ module.exports = {
asarUnpack: [
'out/cli/**',
'out/shared/**',
+ 'out/main/agent-hooks/**',
+ 'out/main/antigravity/**',
+ 'out/main/claude/**',
+ 'out/main/codex/**',
+ 'out/main/copilot/**',
+ 'out/main/cursor/**',
+ 'out/main/droid/**',
+ 'out/main/gemini/**',
+ 'out/main/grok/**',
+ 'out/main/hermes/**',
+ 'out/main/win32-utils.js',
'out/main/daemon-entry.js',
'out/main/computer-sidecar.js',
'out/main/chunks/**',
@@ -61,6 +72,7 @@ module.exports = {
'node_modules/ws/**',
'node_modules/tweetnacl/**',
'node_modules/zod/**',
+ 'node_modules/yaml/**',
'node_modules/sherpa-onnx*/**'
],
afterPack: async (context) => {
diff --git a/config/patches/@xterm__addon-ligatures@0.11.0-beta.216.patch b/config/patches/@xterm__addon-ligatures@0.11.0-beta.220.patch
similarity index 100%
rename from config/patches/@xterm__addon-ligatures@0.11.0-beta.216.patch
rename to config/patches/@xterm__addon-ligatures@0.11.0-beta.220.patch
diff --git a/config/patches/@xterm__addon-webgl@0.20.0-beta.215.patch b/config/patches/@xterm__addon-webgl@0.20.0-beta.215.patch
deleted file mode 100644
index 146715f0b8d..00000000000
--- a/config/patches/@xterm__addon-webgl@0.20.0-beta.215.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/lib/addon-webgl.js b/lib/addon-webgl.js
-index fb36c5ef32cfdf11a325825354ecd42592318014..5ac18bda75e9205c398c7e3082ca1a1fee123c70 100644
---- a/lib/addon-webgl.js
-+++ b/lib/addon-webgl.js
-@@ -1,2 +1,2 @@
--!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.WebglAddon=e():t.WebglAddon=e()}(globalThis,()=>(()=>{"use strict";var t={0(t,e,i){Object.defineProperty(e,"__esModule",{value:!0}),e.TEXT_BASELINE=e.DIM_OPACITY=void 0;const s=i(95);e.DIM_OPACITY=.5,e.TEXT_BASELINE=s.isFirefox||s.isLegacyEdge?"bottom":"ideographic"},28(t,e,i){Object.defineProperty(e,"__esModule",{value:!0}),e.GlyphRenderer=void 0;const s=i(115),r=i(564),a=i(426);i(816);const o=i(719),n=i(959);let L,T=0,h=0,l=0;class d extends a.Disposable{_terminal;_gl;_dimensions;_optionsService;_program;_vertexArrayObject;_projectionLocation;_resolutionLocation;_textureLocation;_atlasTextures;_attributesBuffer;_atlas;_activeBuffer=0;_vertices={count:0,attributes:new Float32Array(0),attributesBuffers:[new Float32Array(0),new Float32Array(0)]};constructor(t,e,i,r){super(),this._terminal=t,this._gl=e,this._dimensions=i,this._optionsService=r;const L=this._gl;void 0===s.TextureAtlas.maxAtlasPages&&(s.TextureAtlas.maxAtlasPages=Math.min(32,(0,n.throwIfFalsy)(L.getParameter(L.MAX_TEXTURE_IMAGE_UNITS))),s.TextureAtlas.maxTextureSize=(0,n.throwIfFalsy)(L.getParameter(L.MAX_TEXTURE_SIZE))),this._program=(0,n.throwIfFalsy)((0,o.createProgram)(L,"#version 300 es\nlayout (location = 0) in vec2 a_unitquad;\nlayout (location = 1) in vec2 a_cellpos;\nlayout (location = 2) in vec2 a_offset;\nlayout (location = 3) in vec2 a_size;\nlayout (location = 4) in float a_texpage;\nlayout (location = 5) in vec2 a_texcoord;\nlayout (location = 6) in vec2 a_texsize;\n\nuniform mat4 u_projection;\nuniform vec2 u_resolution;\n\nout vec2 v_texcoord;\nflat out int v_texpage;\n\nvoid main() {\n vec2 zeroToOne = (a_offset / u_resolution) + a_cellpos + (a_unitquad * a_size);\n gl_Position = u_projection * vec4(zeroToOne, 0.0, 1.0);\n v_texpage = int(a_texpage);\n v_texcoord = a_texcoord + a_unitquad * a_texsize;\n}",function(t){let e="";for(let i=1;i
Droid
diff --git a/docs/readme/README.ja.md b/docs/readme/README.ja.md
index befbff6dd91..2bfe4360fef 100644
--- a/docs/readme/README.ja.md
+++ b/docs/readme/README.ja.md
@@ -37,6 +37,7 @@ Orca は任意の CLI エージェントに対応しています（_このリス