+ warning
+
+ {t('settings.computerUse.enableRiskSummary')}
+-
+
- {t('settings.computerUse.enableRiskScreen')} +
- {t('settings.computerUse.enableRiskActions')} +
- {t('settings.computerUse.enableRiskAllApps')} +
- {t('settings.computerUse.enableRiskStop')} +
+ {t('settings.computerUse.enableRiskMacos')} +
+ )} + + )} + actions={[ + { + label: t('common.cancel'), + onClick: onClose, + variant: 'secondary', + }, + { + label: t('settings.computerUse.enableRiskConfirm'), + onClick: onConfirm, + variant: 'primary', + loading, + }, + ]} + /> + ) +} diff --git a/desktop/src/i18n/locales/en.ts b/desktop/src/i18n/locales/en.ts index 87b666fb..105eb616 100644 --- a/desktop/src/i18n/locales/en.ts +++ b/desktop/src/i18n/locales/en.ts @@ -1389,6 +1389,14 @@ Row 9, all 8 cells: continuing from straight down, turning left through lower-le 'settings.computerUse.title': 'Computer Use', 'settings.computerUse.description': 'Allow Claude to take screenshots, click, type, and control your computer. Requires Python 3. On macOS, accessibility permissions are also needed.', 'settings.computerUse.enabledToggle': 'Enabled', + 'settings.computerUse.enableRiskTitle': 'Enable Computer Use?', + 'settings.computerUse.enableRiskSummary': 'Computer Use gives Claude broad control of this computer. Only enable it when you understand and accept these risks.', + 'settings.computerUse.enableRiskScreen': 'Claude can take screenshots and may see sensitive or private information on screen.', + 'settings.computerUse.enableRiskActions': 'Claude can click, type, use the clipboard and system shortcuts, and may send, change, or delete content.', + 'settings.computerUse.enableRiskAllApps': 'Once enabled, Claude can control all supported applications without asking for permission app by app. Product safety restrictions still apply.', + 'settings.computerUse.enableRiskStop': 'You can interrupt control at any time with Stop or Esc, and disable Computer Use here.', + 'settings.computerUse.enableRiskMacos': 'macOS still requires the system-level Accessibility and Screen Recording permissions. Those operating-system prompts are separate from app authorization.', + 'settings.computerUse.enableRiskConfirm': 'Enable Computer Use', 'settings.computerUse.disabledHint': 'Computer Use is off. New sessions will not inject the computer-use MCP server or expose desktop-control tools to the Coding Agent.', 'settings.computerUse.notSupported': 'Computer Use is only supported on macOS and Windows.', 'settings.computerUse.macosUnsupportedTitle': 'Computer Use requires macOS {version} or later', @@ -2027,27 +2035,6 @@ Row 9, all 8 cells: continuing from straight down, turning left through lower-le 'permission.planRejected': 'Plan rejected', // ─── Computer Use Approval ────────────────────────────────────── - 'computerUseApproval.titleApps': 'Computer Use wants to control these apps', - 'computerUseApproval.titleTcc': 'Computer Use needs macOS permissions', - 'computerUseApproval.reason': 'Why Claude is asking', - 'computerUseApproval.allow': 'Allow for session', - 'computerUseApproval.deny': 'Deny', - 'computerUseApproval.alreadyGranted': 'Already granted for this session', - 'computerUseApproval.notInstalled': 'App not installed', - 'computerUseApproval.unfilteredScreenshots': 'On Windows, screenshots can include every visible window on this display, including apps not listed below. Input remains limited to the apps you allow.', - 'computerUseApproval.sensitiveApp': 'This app is treated as sensitive and deserves extra review.', - 'computerUseApproval.alsoRequested': 'Also requested', - 'computerUseApproval.hideWhileWorking': '{count} other apps will be hidden while Claude works.', - 'computerUseApproval.hideWhileWorkingRestore': '{count} other apps will be hidden while Claude works, then restored when Claude is done.', - 'computerUseApproval.accessibility': 'Accessibility', - 'computerUseApproval.screenRecording': 'Screen Recording', - 'computerUseApproval.granted': 'Granted', - 'computerUseApproval.notGranted': 'Not granted', - 'computerUseApproval.openAccessibility': 'Open Accessibility', - 'computerUseApproval.openScreenRecording': 'Open Screen Recording', - 'computerUseApproval.tryAgain': 'Try again', - 'computerUseApproval.tccHint': 'Grant the missing permissions in System Settings, then come back and choose "Try again".', - 'computerUseApproval.tryAgainHint': 'Try again returns control to Claude so it can call request_access once more after macOS permission changes take effect.', // ─── Ask User Question ────────────────────────────────────── 'question.needsInput': 'Claude needs your input', diff --git a/desktop/src/i18n/locales/jp.ts b/desktop/src/i18n/locales/jp.ts index ba2cf150..ee54e26e 100644 --- a/desktop/src/i18n/locales/jp.ts +++ b/desktop/src/i18n/locales/jp.ts @@ -1391,6 +1391,14 @@ export const jp: Record {
})
})
+ it('requires explicit risk confirmation before enabling all supported apps', async () => {
+ computerUseApiMock.getAuthorizedApps.mockResolvedValue({
+ ...enabledConfig,
+ enabled: false,
+ })
+
+ render(()
- computerUseApiMock.getStatus.mockResolvedValue({
- ...readyStatus,
- venv: {
- ...readyStatus.venv,
- created: true,
- },
- dependencies: {
- ...readyStatus.dependencies,
- installed: true,
- },
- })
- computerUseApiMock.getInstalledApps.mockResolvedValue({ apps: [] })
- computerUseApiMock.getAuthorizedApps
- .mockResolvedValueOnce({
- ...enabledConfig,
- enabled: false,
- })
- .mockReturnValueOnce(staleRefresh.promise)
-
- render(![]()
to
- // /api/... is refused by the server and silently shows nothing. Icons
- // must arrive as blob URLs through the authenticated channel.
- computerUseApiMock.getStatus.mockResolvedValue(nativeStatus)
- computerUseApiMock.getAuthorizedApps.mockResolvedValue(authorizedConfig)
- computerUseApiMock.loadAppIcon.mockResolvedValue('blob:icon-preview')
-
- render((null)
- // App authorization state
- const [installedApps, setInstalledApps] = useState([])
- const [authorizedBundleIds, setAuthorizedBundleIds] = useState>(new Set())
- const [authorizedApps, setAuthorizedApps] = useState([])
- const [appsLoading, setAppsLoading] = useState(false)
- const [appsSaved, setAppsSaved] = useState(false)
- const [searchQuery, setSearchQuery] = useState('')
- const [computerUseEnabled, setComputerUseEnabled] = useState(true)
- const [clipboardAccess, setClipboardAccess] = useState(true)
- const [systemKeys, setSystemKeys] = useState(true)
+ const [computerUseEnabled, setComputerUseEnabled] = useState(false)
+ const [enableConfirmOpen, setEnableConfirmOpen] = useState(false)
+ const [enableSaving, setEnableSaving] = useState(false)
const [pythonPathDraft, setPythonPathDraft] = useState('')
const [pythonPathSaved, setPythonPathSaved] = useState('')
const [pythonPathSaving, setPythonPathSaving] = useState(false)
const [pythonPathMessage, setPythonPathMessage] = useState(null)
// Native (cu-helper) Codex-style UI state
- const [pickerOpen, setPickerOpen] = useState(false)
const [cardOpening, setCardOpening] = useState(false)
const [cardError, setCardError] = useState(null)
const configMutationSeqRef = useRef(0)
@@ -100,10 +92,6 @@ export function ComputerUseSettings() {
) => {
if (requestSeq !== configMutationSeqRef.current) return
setComputerUseEnabled(configResult.enabled)
- setAuthorizedApps(configResult.authorizedApps)
- setAuthorizedBundleIds(new Set(configResult.authorizedApps.map(a => a.bundleId)))
- setClipboardAccess(configResult.grantFlags.clipboardRead)
- setSystemKeys(configResult.grantFlags.systemKeyCombos)
setPythonPathDraft(configResult.pythonPath ?? '')
setPythonPathSaved(configResult.pythonPath ?? '')
}, [])
@@ -122,33 +110,12 @@ export function ComputerUseSettings() {
}
}, [applyConfig])
- const fetchApps = useCallback(async () => {
- const requestSeq = configMutationSeqRef.current
- setAppsLoading(true)
- try {
- const [appsResult, configResult] = await Promise.all([
- computerUseApi.getInstalledApps(),
- computerUseApi.getAuthorizedApps(),
- ])
- setInstalledApps(appsResult.apps)
- applyConfig(configResult, requestSeq)
- } catch {
- // API not ready
- } finally {
- setAppsLoading(false)
- }
- }, [applyConfig])
-
useEffect(() => {
fetchStatus()
fetchConfig()
}, [fetchStatus, fetchConfig])
- // Load apps when environment is ready
const envReady = status?.venv.created && status?.dependencies.installed
- useEffect(() => {
- if (envReady) fetchApps()
- }, [envReady, fetchApps])
const handleSetup = async () => {
setSetupRunning(true)
@@ -157,7 +124,6 @@ export function ComputerUseSettings() {
const result = await computerUseApi.runSetup()
setSetupResult(result)
await fetchStatus()
- if (result.success) await fetchApps()
} catch {
setSetupResult({ success: false, steps: [{ name: 'error', ok: false, message: 'Request failed' }] })
} finally {
@@ -165,59 +131,23 @@ export function ComputerUseSettings() {
}
}
- const toggleApp = (app: InstalledApp) => {
- configMutationSeqRef.current += 1
- const newSet = new Set(authorizedBundleIds)
- let newAuthorized = [...authorizedApps]
- if (newSet.has(app.bundleId)) {
- newSet.delete(app.bundleId)
- newAuthorized = newAuthorized.filter(a => a.bundleId !== app.bundleId)
- } else {
- newSet.add(app.bundleId)
- newAuthorized.push({
- bundleId: app.bundleId,
- displayName: app.displayName,
- authorizedAt: new Date().toISOString(),
- })
- }
- setAuthorizedBundleIds(newSet)
- setAuthorizedApps(newAuthorized)
-
- // Auto-save
- computerUseApi.setAuthorizedApps({
- authorizedApps: newAuthorized,
- grantFlags: { clipboardRead: clipboardAccess, clipboardWrite: clipboardAccess, systemKeyCombos: systemKeys },
- }).then(() => {
- setAppsSaved(true)
- setTimeout(() => setAppsSaved(false), 1500)
- })
- }
-
- const toggleFlag = (flag: 'clipboard' | 'systemKeys', value: boolean) => {
- configMutationSeqRef.current += 1
- if (flag === 'clipboard') setClipboardAccess(value)
- else setSystemKeys(value)
-
- computerUseApi.setAuthorizedApps({
- authorizedApps,
- grantFlags: {
- clipboardRead: flag === 'clipboard' ? value : clipboardAccess,
- clipboardWrite: flag === 'clipboard' ? value : clipboardAccess,
- systemKeyCombos: flag === 'systemKeys' ? value : systemKeys,
- },
- })
- }
-
const toggleComputerUseEnabled = async (value: boolean): Promise => {
const requestSeq = ++configMutationSeqRef.current
const previous = computerUseEnabled
setConfigError(null)
setComputerUseEnabled(value)
try {
- await computerUseApi.setAuthorizedApps({ enabled: value })
+ await computerUseApi.setAuthorizedApps(value
+ ? {
+ enabled: true,
+ grantFlags: {
+ clipboardRead: true,
+ clipboardWrite: true,
+ systemKeyCombos: true,
+ },
+ }
+ : { enabled: false })
if (requestSeq !== configMutationSeqRef.current) return true
- setAppsSaved(true)
- setTimeout(() => setAppsSaved(false), 1500)
return true
} catch {
if (requestSeq === configMutationSeqRef.current) {
@@ -248,65 +178,28 @@ export function ComputerUseSettings() {
}
}, [t, fetchStatus])
- // Master Computer Use toggle on the native path. Mirrors toggleComputerUseEnabled
- // for persistence, but additionally pops the native OS-permission card when
- // turning ON while macOS permissions are still missing (the headline flow).
- const toggleAnyApp = (value: boolean) => {
- void (async () => {
- const saved = await toggleComputerUseEnabled(value)
- if (
- saved &&
- value &&
- (status?.permissions.accessibility === false ||
- status?.permissions.screenRecording === false)
- ) {
- await openPermissionCard()
- }
- })()
- }
-
- // Persist an authorized-apps list change (native add/remove). Reuses the same
- // setAuthorizedApps shape + saved-flash + stale-guard discipline as toggleApp.
- const persistAuthorizedApps = useCallback((next: AuthorizedApp[]) => {
- configMutationSeqRef.current += 1
- setAuthorizedApps(next)
- setAuthorizedBundleIds(new Set(next.map(a => a.bundleId)))
- computerUseApi.setAuthorizedApps({
- authorizedApps: next,
- grantFlags: { clipboardRead: clipboardAccess, clipboardWrite: clipboardAccess, systemKeyCombos: systemKeys },
- }).then(() => {
- setAppsSaved(true)
- setTimeout(() => setAppsSaved(false), 1500)
- })
- }, [clipboardAccess, systemKeys])
-
- const removeAuthorizedApp = (bundleId: string) => {
- persistAuthorizedApps(authorizedApps.filter(a => a.bundleId !== bundleId))
- }
-
- const addAuthorizedApp = (app: InstalledApp) => {
- if (authorizedBundleIds.has(app.bundleId)) {
- setPickerOpen(false)
+ const requestComputerUseEnabled = (value: boolean) => {
+ if (value) {
+ setEnableConfirmOpen(true)
return
}
- persistAuthorizedApps([
- ...authorizedApps,
- {
- bundleId: app.bundleId,
- displayName: app.displayName,
- authorizedAt: new Date().toISOString(),
- },
- ])
- setPickerOpen(false)
+ void toggleComputerUseEnabled(false)
}
- // Lazy-load installed apps the first time the picker opens (the native path
- // has no Python env-ready gate, so fetchApps' envReady effect never fires).
- const openPicker = useCallback(() => {
- setSearchQuery('')
- setPickerOpen(true)
- if (installedApps.length === 0) void fetchApps()
- }, [installedApps.length, fetchApps])
+ const confirmComputerUseEnabled = async () => {
+ setEnableSaving(true)
+ const saved = await toggleComputerUseEnabled(true)
+ setEnableSaving(false)
+ if (!saved) return
+ setEnableConfirmOpen(false)
+ if (
+ status?.engine === 'macos-native'
+ && (status.permissions.accessibility === false
+ || status.permissions.screenRecording === false)
+ ) {
+ await openPermissionCard()
+ }
+ }
const savePythonPath = async (value = pythonPathDraft) => {
configMutationSeqRef.current += 1
@@ -367,35 +260,19 @@ export function ComputerUseSettings() {
? `${t('settings.computerUse.pythonCustomInvalid')} — ${status.python.path}${status.python.error ? `: ${status.python.error}` : ''}`
: t('settings.computerUse.pythonNotFound')
- // Filter apps by search query
- const filteredApps = useMemo(() => {
- if (!searchQuery) return installedApps
- const q = searchQuery.toLowerCase()
- return installedApps.filter(
- a => a.displayName.toLowerCase().includes(q) || a.bundleId.toLowerCase().includes(q)
- )
- }, [installedApps, searchQuery])
-
- // Sort: authorized apps first, then alphabetical
- const sortedApps = useMemo(() => {
- return [...filteredApps].sort((a, b) => {
- const aAuth = authorizedBundleIds.has(a.bundleId) ? 0 : 1
- const bAuth = authorizedBundleIds.has(b.bundleId) ? 0 : 1
- if (aAuth !== bAuth) return aAuth - bAuth
- return a.displayName.localeCompare(b.displayName)
- })
- }, [filteredApps, authorizedBundleIds])
-
// Native (cu-helper) path: drop the entire Python setup flow in favor of the
// Codex-style page. Branch ONLY when on macOS AND the Swift helper resolves.
const native = status?.engine === 'macos-native'
- // Picker list (native "+ 添加应用"): installed apps not yet authorized, sorted.
- const pickerApps = useMemo(() => {
- return [...filteredApps]
- .filter(a => !authorizedBundleIds.has(a.bundleId))
- .sort((a, b) => a.displayName.localeCompare(b.displayName))
- }, [filteredApps, authorizedBundleIds])
+ const enableDialog = (
+ setEnableConfirmOpen(false)}
+ onConfirm={confirmComputerUseEnabled}
+ />
+ )
// The renderer cannot choose between the native macOS page and the
// compatibility page until the capability probe finishes. Rendering the
@@ -477,29 +354,21 @@ export function ComputerUseSettings() {
if (native && status) {
return (
- setPickerOpen(false)}
- onAddApp={addAuthorizedApp}
- appsLoading={appsLoading}
- pickerApps={pickerApps}
- searchQuery={searchQuery}
- onSearch={setSearchQuery}
- />
+ <>
+
-
-
- {/* App picker dialog.
- Uses the shared Modal rather than a hand-rolled overlay: Modal portals
- to document.body, so it cannot be trapped by an ancestor's stacking
- context, and it sits on `--z-dialog` instead of a bare `z-50` that the
- rest of the `--z-*` scale does not know about. It also brings the focus
- trap, Escape-to-close and focus restore this picker used to lack. */}
-
- {/* Cancel Modal's content padding so the app rows stay edge-to-edge —
- their divider lines are the list's structure, and inset dividers
- would read as a nested card. The search field keeps the padding. */}
-
)
}
diff --git a/runtime/test_helpers.py b/runtime/test_helpers.py
index edbb1271..3c85d227 100644
--- a/runtime/test_helpers.py
+++ b/runtime/test_helpers.py
@@ -250,7 +250,8 @@ class TestMutatingCommandsAreGuarded(unittest.TestCase):
"""Coordinate actions must not jump while mouse animation is enabled."""
source = _win_source()
self.assertIn("def _move_cursor_to", source)
- self.assertIn("1 - (1 - progress) ** 3", source)
+ self.assertIn("def _spring_cursor_path", source)
+ self.assertNotIn("1 - (1 - progress) ** 3", source)
dispatcher = source.index("def main()")
for command in ("click", "drag", "move_mouse", "scroll"):
marker = f'if command == "{command}":'
@@ -262,6 +263,28 @@ class TestMutatingCommandsAreGuarded(unittest.TestCase):
f"{command} must honor the mouse-animation gate",
)
+ @unittest.skipUnless(IS_WINDOWS, "requires the Windows helper module")
+ def test_spring_cursor_path_starts_smoothly_and_lands_exactly(self):
+ spec = importlib.util.spec_from_file_location("win_helper_motion", WIN_HELPER)
+ assert spec is not None and spec.loader is not None
+ module = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(module)
+
+ points = module._spring_cursor_path(0, 0, 1000, 500)
+ self.assertGreater(len(points), 12)
+ self.assertEqual(points[-1], (1000, 500))
+ first_distance = (points[0][0] ** 2 + points[0][1] ** 2) ** 0.5
+ total_distance = (1000 ** 2 + 500 ** 2) ** 0.5
+ self.assertLess(first_distance / total_distance, 0.10)
+ self.assertTrue(all(a != b for a, b in zip(points, points[1:])))
+
+ def test_drag_reuses_the_shared_cursor_motion(self):
+ source = _win_source()
+ dispatcher = source.index('if command == "drag":')
+ body = source[dispatcher:source.index('if command == "move_mouse":', dispatcher)]
+ self.assertGreaterEqual(body.count("_move_cursor_to("), 2)
+ self.assertNotIn("for step in range", body)
+
def test_helper_uses_per_monitor_dpi_coordinates(self):
source = _win_source()
self.assertIn("DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2", source)
@@ -577,6 +600,15 @@ class TestCursorBadge(unittest.TestCase):
self.assertIn("WindowFromPoint", source)
self.assertIn("GetForegroundWindow", source)
+ def test_overlay_activity_does_not_hide_before_animated_motion(self):
+ source = CURSOR_BADGE.read_text(encoding="utf-8")
+ start = source.index(" def _on_activity")
+ end = source.index(" def _read_parent", start)
+ body = source[start:end]
+ self.assertNotIn("ShowWindow", body)
+ self.assertIn("GetCursorPos", body)
+ self.assertIn("self._requested_visible = self._target_pid is not None", body)
+
def test_overlay_readiness_precedes_the_first_action(self):
source = CURSOR_BADGE.read_text(encoding="utf-8")
self.assertIn('print("READY", flush=True)', source)
diff --git a/runtime/win_cursor_badge.py b/runtime/win_cursor_badge.py
index d68d1a08..a45e06c1 100644
--- a/runtime/win_cursor_badge.py
+++ b/runtime/win_cursor_badge.py
@@ -569,14 +569,18 @@ class VirtualCursorOverlay:
with self._lock:
if point is not None:
- # Hide for the target lookup. A click-through layered window can
- # still be returned by WindowFromPoint on some Windows builds.
- if self.hwnd and self._shown:
- user32.ShowWindow(self.hwnd, SW_HIDE)
- self._shown = False
+ # Keep the cursor visible between related actions. Hiding here
+ # made every movement reappear only after the first injected
+ # frame, which looked like a jump into the middle of the path.
+ # `_pid_at_point` already skips this transparent overlay.
self._destination = point
self._target_pid = target_pid or self._pid_at_point(point)
- self._requested_visible = False # reveal on injected motion
+ if self._agent_position is None:
+ current = POINT()
+ if user32.GetCursorPos(ctypes.byref(current)):
+ self._agent_position = (int(current.x), int(current.y))
+ self._requested_visible = self._target_pid is not None
+ self._hidden_for_user = False
elif target_pid is not None:
self._target_pid = target_pid
diff --git a/runtime/win_helper.py b/runtime/win_helper.py
index 15c11d1d..061c4d8e 100644
--- a/runtime/win_helper.py
+++ b/runtime/win_helper.py
@@ -1196,30 +1196,70 @@ def _absolute_mouse_move(x: int, y: int) -> _INPUT:
)
+def _spring_cursor_path(
+ start_x: int,
+ start_y: int,
+ target_x: int,
+ target_y: int,
+) -> list[tuple[int, int]]:
+ """Sample the same damped-spring motion used by the macOS cursor."""
+ distance = ((target_x - start_x) ** 2 + (target_y - start_y) ** 2) ** 0.5
+ if distance < 2:
+ return [(target_x, target_y)]
+
+ # CursorMotionState.swift uses k=196 and a damping ratio of 0.85. A
+ # 60-Hz fixed step gives Windows the same zero-velocity start and gentle
+ # settle while keeping physical-pointer actions bounded.
+ frame_interval = 1.0 / 60.0
+ stiffness = 196.0
+ damping = 2.0 * 0.85 * stiffness ** 0.5
+ max_duration = min(0.45, max(0.20, distance / 3000.0))
+ sample_count = max(1, round(max_duration / frame_interval))
+
+ pos_x, pos_y = float(start_x), float(start_y)
+ vel_x = vel_y = 0.0
+ points: list[tuple[int, int]] = []
+ for _ in range(sample_count):
+ vel_x += (stiffness * (target_x - pos_x) - damping * vel_x) * frame_interval
+ vel_y += (stiffness * (target_y - pos_y) - damping * vel_y) * frame_interval
+ pos_x += vel_x * frame_interval
+ pos_y += vel_y * frame_interval
+ point = (round(pos_x), round(pos_y))
+ if not points or point != points[-1]:
+ points.append(point)
+
+ remaining = ((target_x - pos_x) ** 2 + (target_y - pos_y) ** 2) ** 0.5
+ speed = (vel_x ** 2 + vel_y ** 2) ** 0.5
+ if remaining < 0.5 and speed < 6.0:
+ break
+
+ target = (target_x, target_y)
+ if not points or points[-1] != target:
+ points.append(target)
+ return points
+
+
def _move_cursor_to(x: int, y: int, animate: bool) -> None:
- """Move the shared pointer along a short eased path for overlay parity."""
+ """Move the shared pointer with the macOS virtual-cursor spring."""
current = wintypes.POINT()
if not _user32.GetCursorPos(ctypes.byref(current)):
_send_inputs([_absolute_mouse_move(x, y)])
return
start_x, start_y = int(current.x), int(current.y)
- distance = ((x - start_x) ** 2 + (y - start_y) ** 2) ** 0.5
- if not animate or distance < 2:
+ if not animate:
_send_inputs([_absolute_mouse_move(x, y)])
return
- # 100-260ms is long enough to read as motion without slowing the agent.
- duration = min(0.26, max(0.10, distance / 4000.0))
- steps = max(6, min(18, round(duration * 60)))
- for step in range(1, steps + 1):
- progress = step / steps
- eased = 1 - (1 - progress) ** 3
- next_x = round(start_x + (x - start_x) * eased)
- next_y = round(start_y + (y - start_y) * eased)
+ points = _spring_cursor_path(start_x, start_y, x, y)
+ started = time.perf_counter()
+ for index, (next_x, next_y) in enumerate(points):
_send_inputs([_absolute_mouse_move(next_x, next_y)])
- if step < steps:
- time.sleep(duration / steps)
+ if index < len(points) - 1:
+ deadline = started + (index + 1) / 60.0
+ delay = deadline - time.perf_counter()
+ if delay > 0:
+ time.sleep(delay)
_VIRTUAL_KEYS = {
@@ -1859,14 +1899,7 @@ def main() -> int:
animate = bool(payload.get("animate", True))
_move_cursor_to(start_x, start_y, animate)
_send_inputs([_mouse_input(MOUSEEVENTF_LEFTDOWN)])
- duration = 0.18 if animate else 0
- for step in range(1, 13):
- _send_inputs([_absolute_mouse_move(
- round(start_x + (target_x - start_x) * step / 12),
- round(start_y + (target_y - start_y) * step / 12),
- )])
- if duration and step < 12:
- time.sleep(duration / 12)
+ _move_cursor_to(target_x, target_y, animate)
_send_inputs([_mouse_input(MOUSEEVENTF_LEFTUP)])
return _finish(lease, True)
if command == "move_mouse":
diff --git a/src/server/__tests__/computer-use-api.test.ts b/src/server/__tests__/computer-use-api.test.ts
index 5f3b9fca..4fb96470 100644
--- a/src/server/__tests__/computer-use-api.test.ts
+++ b/src/server/__tests__/computer-use-api.test.ts
@@ -73,13 +73,18 @@ afterAll(async () => {
})
describe('Computer Use API authorized app config', () => {
- it('defaults Computer Use enabled for existing users without config', async () => {
+ it('defaults Computer Use off until the risk confirmation is accepted', async () => {
const res = await callAuthorizedApps('GET')
expect(res.status).toBe(200)
expect(await res.json()).toMatchObject({
- enabled: true,
+ enabled: false,
authorizedApps: [],
+ grantFlags: {
+ clipboardRead: true,
+ clipboardWrite: true,
+ systemKeyCombos: true,
+ },
})
})
@@ -484,63 +489,21 @@ describe('runPipInstallWithFallback', () => {
})
})
-describe('computeRuntimeGrantAdditions', () => {
- it('maps new grants to AuthorizedApp entries with ISO authorizedAt', async () => {
- const { computeRuntimeGrantAdditions } = await importComputerUseApi()
- const grantedAt = Date.UTC(2026, 0, 2, 3, 4, 5)
-
- const additions = computeRuntimeGrantAdditions(
- [],
- [{ bundleId: 'com.apple.Notes', displayName: 'Notes', grantedAt }],
+describe('retired per-app authorization endpoint', () => {
+ it('cannot emit a runtime approval request', async () => {
+ const response = await callComputerUseAction(
+ 'request-access',
+ 'POST',
+ JSON.stringify({
+ sessionId: 'session-1',
+ request: { requestId: 'request-1', apps: [] },
+ }),
)
- expect(additions).toEqual([
- {
- bundleId: 'com.apple.Notes',
- displayName: 'Notes',
- authorizedAt: new Date(grantedAt).toISOString(),
- },
- ])
- })
-
- it('dedupes grants already present in the stored config by bundleId', async () => {
- const { computeRuntimeGrantAdditions } = await importComputerUseApi()
-
- const additions = computeRuntimeGrantAdditions(
- [{ bundleId: 'com.apple.Notes', displayName: 'Notes' }],
- [
- { bundleId: 'com.apple.Notes', displayName: 'Notes', grantedAt: 1 },
- { bundleId: 'com.apple.Safari', displayName: 'Safari', grantedAt: 2 },
- ],
- )
-
- expect(additions.map((a) => a.bundleId)).toEqual(['com.apple.Safari'])
- })
-
- it('dedupes duplicate bundleIds within the same grant batch', async () => {
- const { computeRuntimeGrantAdditions } = await importComputerUseApi()
-
- const additions = computeRuntimeGrantAdditions(
- [],
- [
- { bundleId: 'com.apple.Safari', displayName: 'Safari', grantedAt: 1 },
- { bundleId: 'com.apple.Safari', displayName: 'Safari (dup)', grantedAt: 2 },
- ],
- )
-
- expect(additions).toHaveLength(1)
- expect(additions[0]).toMatchObject({ bundleId: 'com.apple.Safari', displayName: 'Safari' })
- })
-
- it('skips grants without a bundleId and returns [] for an empty batch', async () => {
- const { computeRuntimeGrantAdditions } = await importComputerUseApi()
-
- expect(computeRuntimeGrantAdditions([], [])).toEqual([])
- expect(
- computeRuntimeGrantAdditions([], [
- { bundleId: '', displayName: 'No Bundle', grantedAt: 1 },
- ]),
- ).toEqual([])
+ expect(response.status).toBe(410)
+ await expect(response.json()).resolves.toMatchObject({
+ error: 'APP_AUTHORIZATION_REMOVED',
+ })
})
})
diff --git a/src/server/api/computer-use.ts b/src/server/api/computer-use.ts
index e4e150c0..c90bbc28 100644
--- a/src/server/api/computer-use.ts
+++ b/src/server/api/computer-use.ts
@@ -12,8 +12,6 @@ import { access, readFile, mkdir, writeFile, rm } from 'fs/promises'
import { createHash } from 'crypto'
import path from 'path'
import { fileURLToPath } from 'url'
-import type { AppGrant, CuPermissionRequest } from '../../vendor/computer-use-mcp/types.js'
-import { computerUseApprovalService } from '../services/computerUseApprovalService.js'
import { diagnosticsService } from '../services/diagnosticsService.js'
import { normalizeIconSize, readAppIconPng } from '../services/macAppIcon.js'
import { listInstalledMacApps } from './macInstalledApps.js'
@@ -910,13 +908,8 @@ export type ComputerUseConfigPatch = {
pythonPath?: string | null
}
-type RequestAccessBody = {
- sessionId?: string
- request?: CuPermissionRequest
-}
-
const DEFAULT_CONFIG: ComputerUseConfig = {
- enabled: true,
+ enabled: false,
authorizedApps: [],
grantFlags: DEFAULT_DESKTOP_GRANT_FLAGS,
pythonPath: null,
@@ -1042,56 +1035,6 @@ export async function openComputerUseSettings(
: { ok: false, message: result.stderr || `Failed to run ${command.cmd}` }
}
-/**
- * Compute the AuthorizedApp entries to APPEND for a batch of runtime grants,
- * deduped by bundleId against the already-stored apps. Pure (no I/O) so it can
- * be unit-tested directly.
- *
- * Mapping: AppGrant.grantedAt (epoch ms) -> AuthorizedApp.authorizedAt (ISO
- * string). NOTE the stored schema (StoredAuthorizedApp) carries no `tier`, so
- * a runtime read/click-tier grant is reloaded as full-tier next session — a
- * pre-existing limitation of the stored schema, out of scope here.
- */
-export function computeRuntimeGrantAdditions(
- existingApps: AuthorizedApp[],
- granted: AppGrant[],
-): AuthorizedApp[] {
- const existing = new Set(existingApps.map((app) => app.bundleId))
- const additions: AuthorizedApp[] = []
- // Dedupe against BOTH the stored set and within this batch, so a request
- // listing the same bundleId twice can't double-append.
- const seen = new Set(existing)
- for (const grant of granted) {
- if (!grant.bundleId || seen.has(grant.bundleId)) continue
- seen.add(grant.bundleId)
- additions.push({
- bundleId: grant.bundleId,
- displayName: grant.displayName,
- authorizedAt: new Date(grant.grantedAt).toISOString(),
- })
- }
- return additions
-}
-
-/**
- * Append newly-granted apps (from a runtime request_access approval) to the
- * persisted config. Best-effort: any failure is swallowed so it can never tank
- * the grant response the model is awaiting. Idempotent across repeat calls in a
- * long session because additions are deduped by bundleId.
- */
-async function persistRuntimeGrants(granted: AppGrant[]): Promise
+ <>
+
-/**
- * An app's real icon, falling back to a letter tile.
- *
- * The `/apps` payload deliberately carries no icon bytes — it lists every
- * installed application, and inlining hundreds of PNGs would bloat one
- * response. Each row instead points an `![]()
` at the icon endpoint, which
- * reads the bundle's own `.icns` the same way Finder does. `loading="lazy"`
- * matters here: the picker is a long scroller, and without it every row off
- * screen would still cost a request and a rasterisation.
- *
- * A bundle with no icon 404s, which is an ordinary outcome rather than a
- * failure — that is what the letter tile is for.
- */
-function AppIcon({ name, bundleId }: { name: string; bundleId?: string }) {
- const [iconUrl, setIconUrl] = useState(null)
-
- useEffect(() => {
- if (!bundleId) {
- setIconUrl(null)
- return
- }
- let cancelled = false
- setIconUrl(null)
- void computerUseApi.loadAppIcon(bundleId).then(url => {
- if (!cancelled) setIconUrl(url)
- })
- return () => {
- cancelled = true
- }
- }, [bundleId])
-
- const tileClass =
- 'flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-[10px] border border-[var(--color-border)] bg-[var(--color-surface-container-high)] shadow-[inset_0_1px_0_rgba(255,255,255,0.04)]'
-
- if (iconUrl) {
- return (
-
- {/* ─── 始终允许的应用 (Always-allowed apps) ─── */}
-
{/* Title */}
+
+ {enableDialog}
+
)
}
@@ -855,65 +630,6 @@ export function ComputerUseSettings() {
type Translate = ReturnType
@@ -531,7 +401,7 @@ export function ComputerUseSettings() {
{ void toggleComputerUseEnabled(value) }}
+ onChange={requestComputerUseEnabled}
label={t('settings.computerUse.enabledToggle')}
size="sm"
/>
@@ -746,106 +616,11 @@ export function ComputerUseSettings() {
- {/* ─── App Authorization Section ─── */}
- {envReady && (
-
-
- )}
) : null}
-
-
-
- {/* Grant flags */}
- - {t('settings.computerUse.appsTitle')} - {appsSaved && ( - - check - {t('settings.computerUse.appsSaved')} - - )} -
-- {t('settings.computerUse.appsDescription')} -
-
-
-
-
-
- {/* Search */}
-
- search
- setSearchQuery(e.target.value)}
- placeholder={t('settings.computerUse.appsSearch')}
- className="w-full pl-9 pr-4 py-2 text-sm bg-[var(--color-surface-container-low)] border border-[var(--color-border)] rounded-[var(--radius-lg)] text-[var(--color-text-primary)] placeholder:text-[var(--color-text-tertiary)] focus:outline-none focus:border-[var(--color-brand)]"
- />
-
-
- {/* App list */}
- {appsLoading ? (
-
- {t('settings.computerUse.appsLoading')}
-
- ) : installedApps.length === 0 ? (
-
- {t('settings.computerUse.appsEmpty')}
-
- ) : (
-
- {sortedApps.map(app => {
- const isAuthorized = authorizedBundleIds.has(app.bundleId)
- return (
-
- )
- })}
-
- )}
-
-
-
- )
- }
-
- // Shown both while the icon is in flight and when the bundle has none. The
- // letter is a stable placeholder rather than a spinner, so a list of
- // iconless utilities does not read as permanently loading.
- const letter = name.trim().charAt(0).toUpperCase() || '?'
- return (
-
- {letter}
-
- )
-}
-
/** macOS OS-permission status row (辅助功能 / 屏幕录制): a refined row with a
* status dot (granted=emerald, needed=amber, checking=neutral) + label + state,
* built to live inside a divide-y group rather than as a standalone boxy card. */
@@ -974,45 +690,23 @@ function NativeComputerUse({
status,
enabled,
onToggleEnabled,
- authorizedApps,
- onRemoveApp,
- appsSaved,
configError,
statusError,
cardOpening,
cardError,
onOpenCard,
onRecheck,
- pickerOpen,
- onOpenPicker,
- onClosePicker,
- onAddApp,
- appsLoading,
- pickerApps,
- searchQuery,
- onSearch,
}: {
t: Translate
status: ComputerUseStatus
enabled: boolean
onToggleEnabled: (value: boolean) => void
- authorizedApps: AuthorizedApp[]
- onRemoveApp: (bundleId: string) => void
- appsSaved: boolean
configError: string | null
statusError: boolean
cardOpening: boolean
cardError: string | null
onOpenCard: () => void
onRecheck: () => void
- pickerOpen: boolean
- onOpenPicker: () => void
- onClosePicker: () => void
- onAddApp: (app: InstalledApp) => void
- appsLoading: boolean
- pickerApps: InstalledApp[]
- searchQuery: string
- onSearch: (value: string) => void
}) {
const accessibility = status.permissions.accessibility
const screenRecording = status.permissions.screenRecording
@@ -1141,153 +835,6 @@ function NativeComputerUse({
-
- - {t('settings.computerUse.allowedAppsTitle')} - {appsSaved && ( - - - check_circle - - {t('settings.computerUse.appsSaved')} - - )} -
- -- {t('settings.computerUse.allowedAppsDesc')} -
- - {authorizedApps.length === 0 ? ( -
-
- ) : (
-
- apps
-
- - {t('settings.computerUse.allowedAppsEmpty')} -
-
-
- )}
-
- {authorizedApps.map(app => (
-
-
-
- ))}
-
-
-
-
- {app.displayName}
-
-
- {app.bundleId}
-
-
-
-
-
- {/* The list scrolls, not the dialog — otherwise the search field
- scrolls out of view exactly when a long list needs it most. */}
-
-
- search
-
- onSearch(e.target.value)}
- placeholder={t('settings.computerUse.appsSearch')}
- className="w-full rounded-lg border border-[var(--color-border)] bg-[var(--color-surface-container-low)] py-2 pl-9 pr-4 text-sm text-[var(--color-text-primary)] placeholder:text-[var(--color-text-tertiary)] transition focus:border-[var(--color-brand)] focus:outline-none focus:ring-1 focus:ring-[var(--color-brand)]"
- />
-
-
- {appsLoading ? (
-
-
-
- progress_activity
-
-
- {t('settings.computerUse.appsPickerLoading')}
-
-
- ) : pickerApps.length === 0 ? (
-
-
- search_off
-
-
- {t('settings.computerUse.appsPickerEmpty')}
-
-
- ) : (
- pickerApps.map(app => (
-
- ))
- )}
-