From ee1fa76081bc03a9e18d7684e9150ecd0f186f69 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <31011319+senamakel@users.noreply.github.com>
Date: Sat, 25 Jul 2026 09:18:42 +0300
Subject: [PATCH] refactor: remove screen awareness and capture surfaces
 (#5186)

---
 .github/tauri-cef-expected-sha                |    2 +-
 AGENTS.md                                     |    2 +-
 app/schema.json                               |  225 ----
 app/scripts/e2e-run-all-flows.sh              |    3 +-
 app/src-tauri/entitlements.sidecar.plist      |   15 +-
 .../permissions/allow-core-process.toml       |    9 +-
 .../permissions/allow-webview-recipe.toml     |    5 +-
 app/src-tauri/src/cdp/session.rs              |   12 -
 app/src-tauri/src/companion/mod.rs            |   51 +-
 app/src-tauri/src/companion/pipeline.rs       |  118 +-
 app/src-tauri/src/companion/pipeline_tests.rs |   51 +-
 app/src-tauri/src/companion/pointing.rs       |  128 --
 app/src-tauri/src/companion/pointing_tests.rs |  170 ---
 app/src-tauri/src/companion/session.rs        |   12 +-
 app/src-tauri/src/companion/session_tests.rs  |   25 -
 app/src-tauri/src/companion/types.rs          |   18 +-
 app/src-tauri/src/lib.rs                      |    5 -
 .../src/meet_audio/captions_bridge.js         |    4 +-
 app/src-tauri/src/screen_capture/mod.rs       | 1068 -----------------
 app/src-tauri/src/webview_accounts/runtime.js |  706 +----------
 app/src-tauri/vendor/tauri-cef                |    2 +-
 .../ScreenIntelligenceDebugPanel.tsx          |  266 ----
 .../components/intelligence/WorkflowsTab.tsx  |    3 +-
 .../ScreenIntelligenceDebugPanel.test.tsx     |  161 ---
 .../__tests__/oauthAuthReadiness.test.ts      |    4 +-
 .../settings/hooks/useSettingsNavigation.ts   |    2 -
 .../settings/layout/settingsNavIcons.tsx      |    1 -
 .../settings/panels/CompanionPanel.tsx        |   18 +-
 .../settings/panels/DeveloperOptionsPanel.tsx |   20 +-
 .../panels/ScreenAwarenessDebugPanel.tsx      |  292 -----
 .../panels/ScreenIntelligencePanel.tsx        |  281 -----
 .../panels/__tests__/CompanionPanel.test.tsx  |   21 +-
 .../__tests__/DeveloperOptionsPanel.test.tsx  |    4 +-
 .../panels/__tests__/EmbeddingsPanel.test.tsx |    2 +-
 .../ScreenAwarenessDebugPanel.test.tsx        |  310 -----
 .../ScreenIntelligencePanel.test.tsx          |  339 ------
 .../PermissionsSection.tsx                    |  144 ---
 .../__tests__/PermissionsSection.test.tsx     |  130 --
 .../settings/settingsRouteElements.test.tsx   |   29 +
 .../settings/settingsRouteElements.tsx        |   15 -
 .../settings/settingsRouteRegistry.ts         |   25 +-
 .../skills/ScreenIntelligenceSetupModal.tsx   |  332 -----
 .../ScreenIntelligenceSetupModal.test.tsx     |  147 ---
 app/src/components/skills/skillIcons.tsx      |    2 -
 app/src/features/human/Mascot/Ghosty.tsx      |   12 -
 app/src/features/human/Mascot/riveMaps.ts     |    6 +-
 app/src/features/human/useHumanMascot.test.ts |   11 +
 app/src/features/human/useHumanMascot.ts      |    6 +-
 app/src/features/screen-intelligence/api.ts   |  156 ---
 .../useScreenIntelligenceSkillStatus.ts       |   66 -
 .../useScreenIntelligenceState.ts             |  255 ----
 app/src/lib/coreState/__tests__/store.test.ts |    2 +-
 app/src/lib/coreState/store.ts                |    4 +-
 app/src/lib/i18n/ar.ts                        |  136 ---
 app/src/lib/i18n/bn.ts                        |  137 ---
 app/src/lib/i18n/de.ts                        |  143 ---
 app/src/lib/i18n/en.ts                        |  148 +--
 app/src/lib/i18n/es.ts                        |  140 ---
 app/src/lib/i18n/fr.ts                        |  140 ---
 app/src/lib/i18n/hi.ts                        |  139 +--
 app/src/lib/i18n/id.ts                        |  138 ---
 app/src/lib/i18n/it.ts                        |  143 +--
 app/src/lib/i18n/ko.ts                        |  137 ---
 app/src/lib/i18n/pl.ts                        |  140 ---
 app/src/lib/i18n/pt.ts                        |  139 ---
 app/src/lib/i18n/ru.ts                        |  140 ---
 app/src/lib/i18n/zh-CN.ts                     |  132 --
 app/src/overlay/CompanionPointer.tsx          |   45 -
 app/src/overlay/OverlayApp.tsx                |    2 -
 .../__tests__/CompanionPointer.test.tsx       |   80 --
 .../__tests__/companionStateLabel.test.ts     |    1 -
 app/src/pages/Skills.tsx                      |   73 +-
 .../__tests__/OnboardingLayout.test.tsx       |    2 +-
 app/src/providers/CoreStateProvider.tsx       |    6 +-
 .../CoreStateProvider.identityFlip.test.tsx   |    4 +-
 .../__tests__/CoreStateProvider.test.tsx      |    4 +-
 .../__tests__/companionPayload.test.ts        |    2 +-
 .../services/__tests__/coreRpcClient.test.ts  |   99 --
 app/src/services/__tests__/rpcMethods.test.ts |   49 +-
 app/src/services/companionEvents.ts           |    1 -
 app/src/services/coreStateApi.test.ts         |    2 +-
 app/src/services/coreStateApi.ts              |    7 +-
 app/src/services/rpcMethods.ts                |    8 -
 .../store/__tests__/socketSelectors.test.ts   |    2 +-
 app/src/store/companionSlice.test.ts          |   24 +-
 app/src/store/companionSlice.ts               |    4 +-
 app/src/test/mockDefaultSkillStatusHooks.ts   |   10 +-
 .../__tests__/toolTimelineFormatting.test.ts  |    7 -
 app/src/utils/tauriCommands/aboutApp.ts       |    1 -
 app/src/utils/tauriCommands/accessibility.ts  |  331 -----
 app/src/utils/tauriCommands/config.ts         |   25 -
 app/src/utils/tauriCommands/index.ts          |    1 -
 app/src/utils/toolDefinitions.ts              |   10 +-
 app/src/utils/toolTimelineFormatting.ts       |    6 -
 app/test/e2e/specs/mega-flow.spec.ts          |    8 -
 .../e2e/specs/screen-intelligence.spec.ts     |  136 ---
 .../settings-feature-preferences.spec.ts      |   27 +-
 app/test/e2e/specs/tool-browser-flow.spec.ts  |   62 +-
 .../playwright/specs/mcp-tab-flow.spec.ts     |    1 -
 .../specs/screen-intelligence.spec.ts         |   33 -
 .../settings-feature-preferences.spec.ts      |    9 +-
 docs/RELEASE-MANUAL-SMOKE.md                  |    3 -
 docs/TEST-COVERAGE-MATRIX.md                  |   29 +-
 docs/library-minimal-recipe.md                |    4 +-
 ...ve-screen-awareness-implementation-plan.md |  364 ++++++
 ...26-07-24-remove-screen-awareness-design.md |  139 +++
 docs/tinyagents-inference-migration-plan.md   |    4 +-
 gitbooks/SUMMARY.md                           |    1 -
 .../developing/architecture/tauri-shell.md    |   13 +-
 gitbooks/developing/testing-strategy.md       |   16 +-
 gitbooks/features/native-tools/README.md      |    2 +-
 .../native-tools/browser-and-computer.md      |    9 +-
 gitbooks/features/native-tools/image-tools.md |    1 -
 gitbooks/features/screen-intelligence.md      |  105 --
 scripts/ci/rust-coverage-changed.sh           |    6 +
 scripts/feature-ids.json                      |    8 +-
 scripts/i18n-find-english.ts                  |    1 -
 scripts/test-rust-e2e.sh                      |    1 -
 src/core/all.rs                               |    7 -
 src/core/cli.rs                               |    4 -
 src/core/legacy_aliases.rs                    |    4 -
 src/openhuman/about_app/README.md             |    4 +-
 src/openhuman/about_app/catalog_data.rs       |   81 +-
 src/openhuman/about_app/catalog_tests.rs      |   42 +-
 src/openhuman/about_app/types.rs              |   26 +-
 src/openhuman/accessibility/README.md         |   16 +-
 src/openhuman/accessibility/capture.rs        |  336 ------
 src/openhuman/accessibility/focus.rs          |  300 +----
 src/openhuman/accessibility/mod.rs            |   22 +-
 src/openhuman/accessibility/permissions.rs    |   25 +-
 .../accessibility/permissions_tests.rs        |   22 +-
 src/openhuman/accessibility/types.rs          |  177 +--
 .../agent/harness/builtin_definitions.rs      |    1 -
 .../agent/harness/definition_tests.rs         |    1 -
 .../agent_registry/agents/help/prompt.md      |    2 +-
 src/openhuman/agent_registry/agents/loader.rs |   40 +-
 src/openhuman/agent_registry/agents/mod.rs    |    1 -
 .../agents/orchestrator/agent.toml            |    5 +-
 .../agents/screen_awareness_agent/agent.toml  |   37 -
 .../agents/screen_awareness_agent/mod.rs      |    1 -
 .../agents/screen_awareness_agent/prompt.md   |   14 -
 .../agents/screen_awareness_agent/prompt.rs   |   38 -
 .../agents/vision_agent/agent.toml            |   10 +-
 .../agents/vision_agent/prompt.md             |   13 +-
 src/openhuman/app_state/README.md             |    7 +-
 src/openhuman/app_state/ops.rs                |   87 +-
 src/openhuman/app_state/ops_tests.rs          |    1 -
 src/openhuman/config/README.md                |    4 +-
 src/openhuman/config/mod.rs                   |   20 +-
 src/openhuman/config/ops/mod.rs               |   14 +-
 src/openhuman/config/ops/ui.rs                |   76 +-
 src/openhuman/config/ops_tests.rs             |   28 -
 src/openhuman/config/schema/accessibility.rs  |   97 --
 src/openhuman/config/schema/mod.rs            |    2 -
 src/openhuman/config/schema/types.rs          |   23 +-
 src/openhuman/config/schemas/controllers.rs   |   30 +-
 src/openhuman/config/schemas/helpers.rs       |   14 -
 src/openhuman/config/schemas/schema_defs.rs   |   40 -
 src/openhuman/config/schemas_tests.rs         |    1 -
 src/openhuman/credentials/README.md           |    4 +-
 src/openhuman/credentials/bus.rs              |    2 +-
 src/openhuman/credentials/ops.rs              |   51 +-
 src/openhuman/credentials/ops_tests.rs        |    1 -
 src/openhuman/image/README.md                 |   19 +-
 src/openhuman/image/mod.rs                    |    2 +-
 src/openhuman/inference/README.md             |    2 +-
 src/openhuman/mcp_server/resources.rs         |    6 -
 src/openhuman/memory_store/client.rs          |    6 +-
 .../memory_store/namespace_store/documents.rs |    4 +-
 src/openhuman/mod.rs                          |    1 -
 src/openhuman/overlay/README.md               |    4 +-
 src/openhuman/overlay/mod.rs                  |    2 +-
 src/openhuman/overlay/types.rs                |    2 +-
 src/openhuman/screen_intelligence/README.md   |   93 --
 src/openhuman/screen_intelligence/capture.rs  |    7 -
 .../screen_intelligence/capture_worker.rs     |  189 ---
 .../screen_intelligence/cli/capture.rs        |  155 ---
 .../screen_intelligence/cli/doctor.rs         |  107 --
 src/openhuman/screen_intelligence/cli/mod.rs  |  204 ----
 .../screen_intelligence/cli/server.rs         |   78 --
 .../screen_intelligence/cli/session.rs        |  152 ---
 src/openhuman/screen_intelligence/engine.rs   |  629 ----------
 .../screen_intelligence/engine_tests.rs       |   34 -
 src/openhuman/screen_intelligence/helpers.rs  |  300 -----
 .../screen_intelligence/image_processing.rs   |  370 ------
 src/openhuman/screen_intelligence/input.rs    |  120 --
 src/openhuman/screen_intelligence/limits.rs   |    7 -
 src/openhuman/screen_intelligence/mod.rs      |   32 -
 src/openhuman/screen_intelligence/ops.rs      |  310 -----
 .../screen_intelligence/permissions.rs        |    2 -
 .../screen_intelligence/processing_worker.rs  |  432 -------
 src/openhuman/screen_intelligence/schemas.rs  |  408 -------
 .../screen_intelligence/schemas_tests.rs      |  176 ---
 src/openhuman/screen_intelligence/server.rs   |  613 ----------
 src/openhuman/screen_intelligence/state.rs    |   80 --
 src/openhuman/screen_intelligence/tests.rs    |  924 --------------
 src/openhuman/screen_intelligence/tools.rs    |  391 ------
 src/openhuman/screen_intelligence/types.rs    |  196 ---
 src/openhuman/screen_intelligence/vision.rs   |  129 --
 src/openhuman/tools/README.md                 |    5 +-
 .../tools/impl/browser/action_parser.rs       |   11 +-
 src/openhuman/tools/impl/browser/browser.rs   |   42 +-
 .../tools/impl/browser/browser_tests.rs       |   56 +-
 .../tools/impl/browser/image_output.rs        |  112 --
 src/openhuman/tools/impl/browser/mod.rs       |    6 -
 .../tools/impl/browser/native_backend.rs      |   26 -
 .../tools/impl/browser/playwright_backend.rs  |    3 -
 .../tools/impl/browser/playwright_runner.mjs  |    7 -
 .../tools/impl/browser/screenshot.rs          |  567 ---------
 src/openhuman/tools/impl/browser/types.rs     |    7 -
 src/openhuman/tools/local_cli.rs              |  251 ----
 src/openhuman/tools/mod.rs                    |    2 -
 src/openhuman/tools/ops.rs                    |   24 +-
 src/openhuman/tools/ops_tests.rs              |   26 +-
 src/openhuman/tools/user_filter.rs            |   13 -
 src/openhuman/voice/README.md                 |    2 +-
 src/openhuman/voice/bus.rs                    |    6 +-
 ...io_list_tools_stack_overflow_regression.rs |    1 -
 .../config_auth_app_state_connectivity_e2e.rs |   34 +-
 tests/json_rpc_e2e.rs                         |  225 +---
 ...gent_credentials_state_raw_coverage_e2e.rs |    2 +-
 ...ools_approval_channels_raw_coverage_e2e.rs |   46 +-
 .../tools_channels_raw_coverage_e2e.rs        |   29 +-
 tests/screen_intelligence_vision_e2e.rs       |  810 -------------
 224 files changed, 1083 insertions(+), 18584 deletions(-)
 delete mode 100644 app/src-tauri/src/companion/pointing.rs
 delete mode 100644 app/src-tauri/src/companion/pointing_tests.rs
 delete mode 100644 app/src-tauri/src/screen_capture/mod.rs
 delete mode 100644 app/src/components/intelligence/ScreenIntelligenceDebugPanel.tsx
 delete mode 100644 app/src/components/intelligence/__tests__/ScreenIntelligenceDebugPanel.test.tsx
 delete mode 100644 app/src/components/settings/panels/ScreenAwarenessDebugPanel.tsx
 delete mode 100644 app/src/components/settings/panels/ScreenIntelligencePanel.tsx
 delete mode 100644 app/src/components/settings/panels/__tests__/ScreenAwarenessDebugPanel.test.tsx
 delete mode 100644 app/src/components/settings/panels/__tests__/ScreenIntelligencePanel.test.tsx
 delete mode 100644 app/src/components/settings/panels/screen-intelligence/PermissionsSection.tsx
 delete mode 100644 app/src/components/settings/panels/screen-intelligence/__tests__/PermissionsSection.test.tsx
 create mode 100644 app/src/components/settings/settingsRouteElements.test.tsx
 delete mode 100644 app/src/components/skills/ScreenIntelligenceSetupModal.tsx
 delete mode 100644 app/src/components/skills/__tests__/ScreenIntelligenceSetupModal.test.tsx
 delete mode 100644 app/src/features/screen-intelligence/api.ts
 delete mode 100644 app/src/features/screen-intelligence/useScreenIntelligenceSkillStatus.ts
 delete mode 100644 app/src/features/screen-intelligence/useScreenIntelligenceState.ts
 delete mode 100644 app/src/overlay/CompanionPointer.tsx
 delete mode 100644 app/src/overlay/__tests__/CompanionPointer.test.tsx
 delete mode 100644 app/src/utils/tauriCommands/accessibility.ts
 delete mode 100644 app/test/e2e/specs/screen-intelligence.spec.ts
 delete mode 100644 app/test/playwright/specs/screen-intelligence.spec.ts
 create mode 100644 docs/plans/2026-07-24-remove-screen-awareness-implementation-plan.md
 create mode 100644 docs/specs/2026-07-24-remove-screen-awareness-design.md
 delete mode 100644 gitbooks/features/screen-intelligence.md
 delete mode 100644 src/openhuman/accessibility/capture.rs
 delete mode 100644 src/openhuman/agent_registry/agents/screen_awareness_agent/agent.toml
 delete mode 100644 src/openhuman/agent_registry/agents/screen_awareness_agent/mod.rs
 delete mode 100644 src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.md
 delete mode 100644 src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.rs
 delete mode 100644 src/openhuman/config/schema/accessibility.rs
 delete mode 100644 src/openhuman/screen_intelligence/README.md
 delete mode 100644 src/openhuman/screen_intelligence/capture.rs
 delete mode 100644 src/openhuman/screen_intelligence/capture_worker.rs
 delete mode 100644 src/openhuman/screen_intelligence/cli/capture.rs
 delete mode 100644 src/openhuman/screen_intelligence/cli/doctor.rs
 delete mode 100644 src/openhuman/screen_intelligence/cli/mod.rs
 delete mode 100644 src/openhuman/screen_intelligence/cli/server.rs
 delete mode 100644 src/openhuman/screen_intelligence/cli/session.rs
 delete mode 100644 src/openhuman/screen_intelligence/engine.rs
 delete mode 100644 src/openhuman/screen_intelligence/engine_tests.rs
 delete mode 100644 src/openhuman/screen_intelligence/helpers.rs
 delete mode 100644 src/openhuman/screen_intelligence/image_processing.rs
 delete mode 100644 src/openhuman/screen_intelligence/input.rs
 delete mode 100644 src/openhuman/screen_intelligence/limits.rs
 delete mode 100644 src/openhuman/screen_intelligence/mod.rs
 delete mode 100644 src/openhuman/screen_intelligence/ops.rs
 delete mode 100644 src/openhuman/screen_intelligence/permissions.rs
 delete mode 100644 src/openhuman/screen_intelligence/processing_worker.rs
 delete mode 100644 src/openhuman/screen_intelligence/schemas.rs
 delete mode 100644 src/openhuman/screen_intelligence/schemas_tests.rs
 delete mode 100644 src/openhuman/screen_intelligence/server.rs
 delete mode 100644 src/openhuman/screen_intelligence/state.rs
 delete mode 100644 src/openhuman/screen_intelligence/tests.rs
 delete mode 100644 src/openhuman/screen_intelligence/tools.rs
 delete mode 100644 src/openhuman/screen_intelligence/types.rs
 delete mode 100644 src/openhuman/screen_intelligence/vision.rs
 delete mode 100644 src/openhuman/tools/impl/browser/image_output.rs
 delete mode 100644 src/openhuman/tools/impl/browser/screenshot.rs
 delete mode 100644 src/openhuman/tools/local_cli.rs
 delete mode 100644 tests/screen_intelligence_vision_e2e.rs

diff --git a/.github/tauri-cef-expected-sha b/.github/tauri-cef-expected-sha
index 0809bcda4..9e09716ab 100644
--- a/.github/tauri-cef-expected-sha
+++ b/.github/tauri-cef-expected-sha
@@ -1 +1 @@
-f09d7e746a44a5187d2abc116e8a4cd7a9f94a67
+455b47debb9d1f5d0f1527266e48af1670ad4bc5
diff --git a/AGENTS.md b/AGENTS.md
index 98e54bc3b..503409361 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -163,7 +163,7 @@ No `UserProvider`/`AIProvider`/`SkillProvider` — auth lives in `CoreStateProvi
 
 ## Tauri shell (`app/src-tauri/`)
 
-Thin desktop host. Key modules: `core_process`, `core_rpc`, `cdp`, `cef_preflight`, `cef_profile`, `dictation_hotkeys`, `file_logging`, `mascot_native_window`, `screen_capture`, `window_state`, per-provider scanners (`discord_scanner`, `slack_scanner`, `telegram_scanner`, `whatsapp_scanner`, `wechat_scanner`, `gmessages_scanner`, `imessage_scanner`, `meet_scanner`), `meet_audio`/`meet_call`/`meet_video`, `fake_camera`, `webview_accounts`, `webview_apis`.
+Thin desktop host. Key modules: `core_process`, `core_rpc`, `cdp`, `cef_preflight`, `cef_profile`, `dictation_hotkeys`, `file_logging`, `mascot_native_window`, `window_state`, per-provider scanners (`discord_scanner`, `slack_scanner`, `telegram_scanner`, `whatsapp_scanner`, `wechat_scanner`, `gmessages_scanner`, `imessage_scanner`, `meet_scanner`), `meet_audio`/`meet_call`/`meet_video`, `fake_camera`, `webview_accounts`, `webview_apis`.
 
 IPC commands (authoritative list: `generate_handler!` in `app/src-tauri/src/lib.rs`): `core_rpc::relay_http_rpc`, `core_rpc_url`, `core_rpc_token`, `start_core_process`/`restart_core_process`, update commands (`check_app_update`, `apply_core_update`, …), window commands (`activate_main_window`, `mascot_window_*`, `notch_window_*`), `webview_accounts::*`, `workspace_paths::*`, `artifact_commands::*`, hotkeys (dictation/PTT/companion), `meet_call::*`, `native_notifications::*`, `mcp_commands::*`, `loopback_oauth::*`.
 
diff --git a/app/schema.json b/app/schema.json
index 2bed0647b..7ec1cca42 100644
--- a/app/schema.json
+++ b/app/schema.json
@@ -834,70 +834,6 @@
         }
       ]
     },
-    {
-      "description": "Update screen intelligence runtime settings.",
-      "function": "update_screen_intelligence_settings",
-      "inputs": [
-        {
-          "comment": "Enable screen intelligence.",
-          "name": "enabled",
-          "required": false,
-          "ty": { "Option": "Bool" }
-        },
-        {
-          "comment": "Capture policy mode.",
-          "name": "capture_policy",
-          "required": false,
-          "ty": { "Option": "String" }
-        },
-        {
-          "comment": "Policy mode override.",
-          "name": "policy_mode",
-          "required": false,
-          "ty": { "Option": "String" }
-        },
-        {
-          "comment": "Baseline capture FPS.",
-          "name": "baseline_fps",
-          "required": false,
-          "ty": { "Option": "F64" }
-        },
-        {
-          "comment": "Enable vision analysis.",
-          "name": "vision_enabled",
-          "required": false,
-          "ty": { "Option": "Bool" }
-        },
-        {
-          "comment": "Enable autocomplete integration.",
-          "name": "autocomplete_enabled",
-          "required": false,
-          "ty": { "Option": "Bool" }
-        },
-        {
-          "comment": "Allowed app list.",
-          "name": "allowlist",
-          "required": false,
-          "ty": { "Option": { "Array": "String" } }
-        },
-        {
-          "comment": "Denied app list.",
-          "name": "denylist",
-          "required": false,
-          "ty": { "Option": { "Array": "String" } }
-        }
-      ],
-      "method": "openhuman.config_update_screen_intelligence_settings",
-      "namespace": "config",
-      "outputs": [
-        {
-          "comment": "Updated config snapshot.",
-          "name": "snapshot",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
     {
       "description": "Replace tunnel settings with provided config payload.",
       "function": "update_tunnel_settings",
@@ -1246,167 +1182,6 @@
         }
       ]
     },
-    {
-      "description": "Capture screenshot and return image ref.",
-      "function": "capture_image_ref",
-      "inputs": [],
-      "method": "openhuman.screen_intelligence_capture_image_ref",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        {
-          "comment": "Capture image_ref payload.",
-          "name": "capture",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
-    {
-      "description": "Trigger immediate screen capture.",
-      "function": "capture_now",
-      "inputs": [],
-      "method": "openhuman.screen_intelligence_capture_now",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        { "comment": "Capture result payload.", "name": "capture", "required": true, "ty": "Json" }
-      ]
-    },
-    {
-      "description": "Perform input action through accessibility automation.",
-      "function": "input_action",
-      "inputs": [
-        {
-          "comment": "Input action payload.",
-          "name": "action",
-          "required": true,
-          "ty": { "Ref": "InputActionParams" }
-        }
-      ],
-      "method": "openhuman.screen_intelligence_input_action",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        {
-          "comment": "Input action result payload.",
-          "name": "result",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
-    {
-      "description": "Request one accessibility permission.",
-      "function": "request_permission",
-      "inputs": [
-        { "comment": "Permission name.", "name": "permission", "required": true, "ty": "String" }
-      ],
-      "method": "openhuman.screen_intelligence_request_permission",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        {
-          "comment": "Permission status payload.",
-          "name": "permissions",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
-    {
-      "description": "Request required accessibility permissions.",
-      "function": "request_permissions",
-      "inputs": [],
-      "method": "openhuman.screen_intelligence_request_permissions",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        {
-          "comment": "Permission status payload.",
-          "name": "permissions",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
-    {
-      "description": "Start screen intelligence session.",
-      "function": "start_session",
-      "inputs": [
-        {
-          "comment": "Capture interval in milliseconds.",
-          "name": "sample_interval_ms",
-          "required": false,
-          "ty": { "Option": "U64" }
-        },
-        {
-          "comment": "Capture policy mode.",
-          "name": "capture_policy",
-          "required": false,
-          "ty": { "Option": "String" }
-        }
-      ],
-      "method": "openhuman.screen_intelligence_start_session",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        { "comment": "Session status payload.", "name": "session", "required": true, "ty": "Json" }
-      ]
-    },
-    {
-      "description": "Read screen intelligence accessibility status.",
-      "function": "status",
-      "inputs": [],
-      "method": "openhuman.screen_intelligence_status",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        {
-          "comment": "Accessibility status payload.",
-          "name": "status",
-          "required": true,
-          "ty": "Json"
-        }
-      ]
-    },
-    {
-      "description": "Stop screen intelligence session.",
-      "function": "stop_session",
-      "inputs": [
-        {
-          "comment": "Optional stop reason.",
-          "name": "reason",
-          "required": false,
-          "ty": { "Option": "String" }
-        }
-      ],
-      "method": "openhuman.screen_intelligence_stop_session",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        { "comment": "Session status payload.", "name": "session", "required": true, "ty": "Json" }
-      ]
-    },
-    {
-      "description": "Flush stored vision summaries.",
-      "function": "vision_flush",
-      "inputs": [],
-      "method": "openhuman.screen_intelligence_vision_flush",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        { "comment": "Vision flush payload.", "name": "result", "required": true, "ty": "Json" }
-      ]
-    },
-    {
-      "description": "Read recent vision summaries.",
-      "function": "vision_recent",
-      "inputs": [
-        {
-          "comment": "Maximum number of summaries.",
-          "name": "limit",
-          "required": false,
-          "ty": { "Option": "U64" }
-        }
-      ],
-      "method": "openhuman.screen_intelligence_vision_recent",
-      "namespace": "screen_intelligence",
-      "outputs": [
-        { "comment": "Vision recent payload.", "name": "result", "required": true, "ty": "Json" }
-      ]
-    },
     {
       "description": "Manage desktop service lifecycle.",
       "function": "install",
diff --git a/app/scripts/e2e-run-all-flows.sh b/app/scripts/e2e-run-all-flows.sh
index 72541c2ae..37f50ab5f 100755
--- a/app/scripts/e2e-run-all-flows.sh
+++ b/app/scripts/e2e-run-all-flows.sh
@@ -403,7 +403,7 @@ if should_run_suite "settings"; then
 fi
 
 # ---------------------------------------------------------------------------
-# System / AI / voice / screen / Tauri
+# System / AI / voice / Tauri
 # linux-cef-deb-runtime.spec.ts is Linux-only (tests /usr/bin path resolution
 # for .deb package installs) — skipped on macOS/Windows.
 # ---------------------------------------------------------------------------
@@ -412,7 +412,6 @@ if should_run_suite "system"; then
   echo "## Running suite: system"
   run "test/e2e/specs/local-model-runtime.spec.ts"            "local-model"               "system"
   run "test/e2e/specs/voice-mode.spec.ts"                     "voice-mode"                "system"
-  run "test/e2e/specs/screen-intelligence.spec.ts"            "screen-intelligence"       "system"
   run "test/e2e/specs/audio-toolkit-flow.spec.ts"             "audio-toolkit"             "system"
   run "test/e2e/specs/tauri-commands.spec.ts"                 "tauri-commands"            "system"
   # service-connectivity-flow tests the old sidecar service model removed in
diff --git a/app/src-tauri/entitlements.sidecar.plist b/app/src-tauri/entitlements.sidecar.plist
index cdad97f19..abeaaa8d7 100644
--- a/app/src-tauri/entitlements.sidecar.plist
+++ b/app/src-tauri/entitlements.sidecar.plist
@@ -22,14 +22,13 @@
          (JSON-RPC server, Socket.IO) under the macOS Hardened Runtime. -->
     <key>com.apple.security.network.server</key>
     <true/>
-    <!-- Required for the autocomplete focus query and screen-intelligence
-         foreground-context query to send Apple Events to "System Events"
-         under the Hardened Runtime. Without this entitlement, signed DMG
-         builds have AE calls blocked outright before the macOS consent
-         dialog renders, producing the broken-looking error popup tracked
-         in #985. The companion `NSAppleEventsUsageDescription` in
-         `Info.plist` supplies the user-facing text shown in that
-         consent dialog. -->
+    <!-- Required for the autocomplete focus query to send Apple Events to
+         "System Events" under the Hardened Runtime. Without this entitlement,
+         signed DMG builds have AE calls blocked outright before the macOS
+         consent dialog renders, producing the broken-looking error popup
+         tracked in #985. The companion `NSAppleEventsUsageDescription` in
+         `Info.plist` supplies the user-facing text shown in that consent
+         dialog. -->
     <key>com.apple.security.automation.apple-events</key>
     <true/>
     <!-- Required so embedded Chromium can enumerate Bluetooth audio devices
diff --git a/app/src-tauri/permissions/allow-core-process.toml b/app/src-tauri/permissions/allow-core-process.toml
index 396701560..8b91bc83d 100644
--- a/app/src-tauri/permissions/allow-core-process.toml
+++ b/app/src-tauri/permissions/allow-core-process.toml
@@ -1,6 +1,6 @@
 [[permission]]
 identifier = "allow-core-process"
-description = "Privileged desktop permissions for core process control, service management, dictation, account webview, window/UI, screen share, notifications, Gmail CDP, log access, Meet, and CEF/profile maintenance"
+description = "Privileged desktop permissions for core process control, service management, dictation, account webview, window/UI, notifications, Gmail CDP, log access, Meet, and CEF/profile maintenance"
 
 [permission.commands]
 
@@ -120,13 +120,6 @@ allow = [
     "notch_window_show",
     "notch_window_hide",
 
-    # =========================
-    # SCREEN SHARE
-    # =========================
-    "screen_share_begin_session",
-    "screen_share_thumbnail",
-    "screen_share_finalize_session",
-
     # =========================
     # NOTIFICATIONS
     # =========================
diff --git a/app/src-tauri/permissions/allow-webview-recipe.toml b/app/src-tauri/permissions/allow-webview-recipe.toml
index fd1f5e754..822394a83 100644
--- a/app/src-tauri/permissions/allow-webview-recipe.toml
+++ b/app/src-tauri/permissions/allow-webview-recipe.toml
@@ -1,12 +1,9 @@
 [[permission]]
 identifier = "allow-webview-recipe"
-description = "Allow injected per-provider recipe code (running inside the third-party site's origin) to invoke the recipe ingest command back to Rust. Also includes the session-gated screen-share commands (#713 / #812) so the in-page getDisplayMedia shim can open a short-lived enumeration session after a real user gesture. The session gate prevents drive-by window-title / thumbnail exfiltration by third-party scripts running in the same origin."
+description = "Allow injected per-provider recipe code (running inside the third-party site's origin) to invoke the recipe ingest command back to Rust."
 
 [permission.commands]
 allow = [
     "webview_recipe_event",
-    "screen_share_begin_session",
-    "screen_share_thumbnail",
-    "screen_share_finalize_session",
 ]
 deny = []
diff --git a/app/src-tauri/src/cdp/session.rs b/app/src-tauri/src/cdp/session.rs
index 77a8d429b..7e581de38 100644
--- a/app/src-tauri/src/cdp/session.rs
+++ b/app/src-tauri/src/cdp/session.rs
@@ -531,13 +531,6 @@ async fn run_session_cycle<R: Runtime>(
         // Without these, Meet sits on the consent dialog forever and cam/mic
         // never enumerate (verified during #1022 smoke).
         //
-        // displayCapture is intentionally NOT in this set. Pre-granting it
-        // via `Browser.grantPermissions` bypasses the transient-activation
-        // requirement Chromium enforces on `getDisplayMedia`, which would
-        // let the page initiate a desktop capture without any user gesture.
-        // Without the pre-grant the page's screen-share button triggers
-        // Chrome's native screen-picker on click — same UX, but the gesture
-        // gate stays in place.
         if origin_host_is(&origin, "meet.google.com") {
             perms.extend_from_slice(&["audioCapture", "videoCapture", "clipboardReadWrite"]);
         }
@@ -554,11 +547,6 @@ async fn run_session_cycle<R: Runtime>(
         // tracking issue — granting these perms now means once the paint
         // bug clears, the huddle is functional immediately rather than
         // requiring a follow-up perms wire-up.
-        //
-        // displayCapture deliberately omitted for the same reason as Meet:
-        // pre-granting bypasses Chromium's gesture gate on
-        // `getDisplayMedia`; screen-share inside a huddle still works via
-        // the native screen-picker on user click.
         if origin_host_is(&origin, "app.slack.com") {
             perms.extend_from_slice(&["audioCapture", "videoCapture", "clipboardReadWrite"]);
         }
diff --git a/app/src-tauri/src/companion/mod.rs b/app/src-tauri/src/companion/mod.rs
index e47420031..29e3de69b 100644
--- a/app/src-tauri/src/companion/mod.rs
+++ b/app/src-tauri/src/companion/mod.rs
@@ -1,14 +1,12 @@
 //! Desktop companion — Clicky-style interaction loop (shell-side).
 //!
 //! Migrated out of the Rust core (`src/openhuman/desktop_companion`) into the
-//! Tauri shell. Ties hotkey activation, **native** microphone capture, screen
-//! context, LLM reasoning, speech synthesis, and visual pointing into one
-//! product experience:
+//! Tauri shell. Ties hotkey activation, **native** microphone capture, LLM
+//! reasoning, and speech synthesis into one product experience:
 //!
 //! - `audio`    — native `cpal` mic capture (mono i16 PCM ~16 kHz)
 //! - `session`  — session lifecycle + state machine (idle→listening→…→idle)
-//! - `pipeline` — one interaction turn (STT → LLM → TTS → pointing)
-//! - `pointing` — `[POINT:x,y:label:screenN]` tag parsing + monitor mapping
+//! - `pipeline` — one interaction turn (STT → LLM → TTS)
 //! - `events`   — `companion://state_changed` Tauri event delivery
 //!
 //! STT/TTS run in the embedded core over JSON-RPC; the LLM turn runs shell-side
@@ -18,19 +16,17 @@
 pub mod audio;
 pub mod events;
 pub mod pipeline;
-pub mod pointing;
 pub mod session;
 pub mod types;
 
 use log::{debug, info, warn};
 use parking_lot::Mutex;
 use std::sync::atomic::{AtomicU64, Ordering};
-use tauri::{AppHandle, Manager};
+use tauri::AppHandle;
 use tokio_util::sync::CancellationToken;
 
 use crate::AppRuntime;
 use audio::MicCapture;
-use pointing::ScreenGeometry;
 use types::*;
 
 const LOG_PREFIX: &str = "[companion]";
@@ -167,12 +163,12 @@ pub fn handle_hotkey_pressed(app: AppHandle<AppRuntime>) {
 ///
 /// Only push mode consumes releases. Tap mode intentionally waits for the next
 /// press, preserving toggle behavior.
-pub fn handle_hotkey_released(app: AppHandle<AppRuntime>) {
+pub fn handle_hotkey_released(_app: AppHandle<AppRuntime>) {
     if current_config()
         .activation_mode
         .eq_ignore_ascii_case("push")
     {
-        finish_capture_and_run(app);
+        finish_capture_and_run();
     }
 }
 
@@ -182,7 +178,7 @@ pub fn handle_hotkey_released(app: AppHandle<AppRuntime>) {
 /// the interaction turn.
 pub fn handle_activation(app: AppHandle<AppRuntime>) {
     if ACTIVE_CAPTURE.lock().is_some() {
-        finish_capture_and_run(app);
+        finish_capture_and_run();
     } else {
         start_capture(&app);
     }
@@ -227,7 +223,7 @@ fn start_capture(app: &AppHandle<AppRuntime>) {
     }
 }
 
-fn finish_capture_and_run(app: AppHandle<AppRuntime>) {
+fn finish_capture_and_run() {
     let _lifecycle = SESSION_LIFECYCLE.lock();
     let Some(capture) = ACTIVE_CAPTURE.lock().take() else {
         debug!("{LOG_PREFIX} capture stop ignored — not listening");
@@ -235,10 +231,9 @@ fn finish_capture_and_run(app: AppHandle<AppRuntime>) {
     };
     let (samples, rate) = capture.stop();
     info!("{LOG_PREFIX} captured {} samples @ {rate}Hz", samples.len());
-    let screens = monitors_geometry(&app);
     let (turn_id, cancel) = register_active_turn();
     tauri::async_runtime::spawn(async move {
-        let result = pipeline::run_audio_turn(&samples, rate, &screens, cancel.clone()).await;
+        let result = pipeline::run_audio_turn(&samples, rate, cancel.clone()).await;
         if let Err(e) = result {
             if cancel.is_cancelled() {
                 debug!("{LOG_PREFIX} interrupted companion turn stopped: {e}");
@@ -285,34 +280,6 @@ fn clear_active_turn(id: u64) {
     }
 }
 
-/// Enumerate connected monitors as [`ScreenGeometry`] for POINT-tag coordinate
-/// mapping. Best-effort — returns an empty vec if no window/monitor info is
-/// available (pointing then falls back to raw coordinates).
-fn monitors_geometry(app: &AppHandle<AppRuntime>) -> Vec<ScreenGeometry> {
-    let Some(window) = app.get_webview_window("main") else {
-        debug!("{LOG_PREFIX} no main window — cannot enumerate monitors");
-        return Vec::new();
-    };
-    let Ok(monitors) = window.available_monitors() else {
-        return Vec::new();
-    };
-    monitors
-        .iter()
-        .enumerate()
-        .map(|(index, m)| {
-            let pos = m.position();
-            let size = m.size();
-            ScreenGeometry {
-                index,
-                x: pos.x as f64,
-                y: pos.y as f64,
-                width: size.width as f64,
-                height: size.height as f64,
-            }
-        })
-        .collect()
-}
-
 #[cfg(test)]
 mod turn_cancellation_tests {
     use super::*;
diff --git a/app/src-tauri/src/companion/pipeline.rs b/app/src-tauri/src/companion/pipeline.rs
index 7c7aafbb7..2878daf96 100644
--- a/app/src-tauri/src/companion/pipeline.rs
+++ b/app/src-tauri/src/companion/pipeline.rs
@@ -1,4 +1,4 @@
-//! Companion interaction pipeline: STT → screen context → LLM → TTS → pointing.
+//! Companion interaction pipeline: STT → LLM → TTS.
 //!
 //! Orchestrates a single interaction turn for the desktop companion. Migrated
 //! from the former core `desktop_companion::pipeline`, re-plumbed for the shell:
@@ -26,7 +26,6 @@ use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tokio_util::sync::CancellationToken;
 
-use super::pointing::{self, PointTarget, PointingParseResult, ScreenGeometry};
 use super::session;
 use super::types::*;
 
@@ -43,10 +42,8 @@ const CONTEXT_WINDOW: usize = 20;
 pub struct TurnResult {
     /// The user's transcribed speech (or typed input).
     pub transcript: String,
-    /// The LLM's response text (POINT tags stripped).
+    /// The LLM's response text.
     pub response_text: String,
-    /// Parsed pointing targets from the LLM response.
-    pub targets: Vec<PointTarget>,
     /// Whether TTS audio was synthesized.
     pub tts_synthesized: bool,
     /// Whether the turn was cancelled before completion.
@@ -58,12 +55,8 @@ pub struct TurnResult {
 /// **Precondition**: the session must already be in `Listening` state. The
 /// caller is responsible for the `Idle → Listening` transition before invoking.
 ///
-/// Transitions: Listening → Thinking → Speaking/Pointing → Idle.
-pub async fn run_text_turn(
-    text: &str,
-    screens: &[ScreenGeometry],
-    cancel: CancellationToken,
-) -> Result<TurnResult, String> {
+/// Transitions: Listening → Thinking → Speaking → Idle.
+pub async fn run_text_turn(text: &str, cancel: CancellationToken) -> Result<TurnResult, String> {
     let trimmed = text.trim();
     if trimmed.is_empty() {
         return Err("empty input".into());
@@ -82,19 +75,8 @@ pub async fn run_text_turn(
     let history = session::conversation_history();
     let history_window = tail_history(&history, CONTEXT_WINDOW);
 
-    // Foreground app/window context (best-effort and user-configurable).
-    let screen_context = if super::current_config().include_app_context {
-        gather_screen_context().await
-    } else {
-        None
-    };
-
-    if cancel.is_cancelled() {
-        return Ok(cancelled_result(trimmed));
-    }
-
     // LLM call.
-    let raw_reply = match llm_companion(trimmed, &history_window, screen_context.as_deref()).await {
+    let response_text = match llm_companion(trimmed, &history_window).await {
         Ok(reply) => reply,
         Err(err) => {
             if cancel.is_cancelled() {
@@ -110,17 +92,7 @@ pub async fn run_text_turn(
         return Ok(cancelled_result(trimmed));
     }
 
-    // Parse POINT tags.
-    let PointingParseResult {
-        targets,
-        clean_text,
-    } = pointing::parse_and_map(&raw_reply, screens);
-
-    debug!(
-        "{LOG_PREFIX} LLM reply chars={} targets={}",
-        clean_text.len(),
-        targets.len()
-    );
+    debug!("{LOG_PREFIX} LLM reply chars={}", response_text.len());
 
     // Record conversation turns.
     let now_ms = chrono::Utc::now().timestamp_millis();
@@ -129,18 +101,18 @@ pub async fn run_text_turn(
         content: trimmed.to_string(),
         timestamp_ms: now_ms,
     });
-    if !clean_text.is_empty() {
+    if !response_text.is_empty() {
         let _ = session::push_conversation_turn(ConversationTurn {
             role: "assistant".into(),
-            content: clean_text.clone(),
+            content: response_text.clone(),
             timestamp_ms: now_ms,
         });
     }
 
     // TTS (skip if response is empty).
-    let tts_ok = if !clean_text.is_empty() && !cancel.is_cancelled() {
+    let tts_ok = if !response_text.is_empty() && !cancel.is_cancelled() {
         session::transition_state(CompanionState::Speaking, None)?;
-        match tts(&clean_text).await {
+        match tts(&response_text).await {
             Ok(()) => {
                 debug!("{LOG_PREFIX} TTS synthesized");
                 true
@@ -158,18 +130,12 @@ pub async fn run_text_turn(
         return Ok(cancelled_result(trimmed));
     }
 
-    // Pointing phase.
-    if !targets.is_empty() {
-        let _ = session::transition_state(CompanionState::Pointing, None);
-    }
-
     // Back to idle.
     session::finish_turn();
 
     let result = TurnResult {
         transcript: trimmed.to_string(),
-        response_text: clean_text,
-        targets,
+        response_text,
         tts_synthesized: tts_ok,
         cancelled: false,
     };
@@ -178,15 +144,14 @@ pub async fn run_text_turn(
     Ok(result)
 }
 
-/// Run a full audio-input companion turn: STT → screen context → LLM → TTS → pointing.
+/// Run a full audio-input companion turn: STT → LLM → TTS.
 ///
 /// **Precondition**: the session must already be in `Listening` state.
 ///
-/// Transitions: Listening → Thinking → Speaking/Pointing → Idle.
+/// Transitions: Listening → Thinking → Speaking → Idle.
 pub async fn run_audio_turn(
     audio_samples: &[i16],
     sample_rate: u32,
-    screens: &[ScreenGeometry],
     cancel: CancellationToken,
 ) -> Result<TurnResult, String> {
     if audio_samples.is_empty() {
@@ -219,7 +184,6 @@ pub async fn run_audio_turn(
             return Ok(TurnResult {
                 transcript: String::new(),
                 response_text: String::new(),
-                targets: Vec::new(),
                 tts_synthesized: false,
                 cancelled: false,
             });
@@ -238,7 +202,7 @@ pub async fn run_audio_turn(
     debug!("{LOG_PREFIX} STT transcript chars={}", transcript.len());
 
     // Hand off to the text pipeline for the rest.
-    run_text_turn(&transcript, screens, cancel).await
+    run_text_turn(&transcript, cancel).await
 }
 
 // ─── Core-RPC / backend adapters ────────────────────────────────────
@@ -319,41 +283,25 @@ async fn fetch_backend_creds() -> Result<(String, String), String> {
 /// System prompt for the desktop companion LLM.
 const COMPANION_SYSTEM_PROMPT: &str = "\
 You are OpenHuman, a helpful desktop AI companion. The user is talking to you \
-via voice or text while using their computer. You can see their screen \
-(a screenshot and foreground app info may be provided).\n\
+via voice or text while using their computer.\n\
 \n\
 Guidelines:\n\
 - Be concise and conversational. 1-3 sentences unless the question demands more.\n\
-- When you want to point the user to a UI element on screen, embed a \
-`[POINT:x,y:label:screenN]` tag in your response where x,y are pixel \
-coordinates relative to the screen, label describes the element, and N is \
-the zero-based screen index.\n\
 - Do not use markdown formatting (no asterisks, backticks, or bullet markers) — \
 your response will be spoken aloud via TTS.\n\
-- If screen context is provided, reference what you see when relevant.\n\
 - If you don't know or can't help, say so briefly.\n\
 ";
 
-/// Build a chat-completions request with screen context and conversation
-/// history, then return the assistant's reply. Runs shell-side against the
+/// Build a chat-completions request with conversation history, then return the
+/// assistant's reply. Runs shell-side against the
 /// backend using creds fetched from core.
-async fn llm_companion(
-    prompt: &str,
-    history: &[&ConversationTurn],
-    screen_context: Option<&str>,
-) -> Result<String, String> {
+async fn llm_companion(prompt: &str, history: &[&ConversationTurn]) -> Result<String, String> {
     let (token, backend_url) = fetch_backend_creds().await?;
     let endpoint = companion_chat_endpoint(&backend_url);
 
     let mut messages: Vec<Value> = Vec::with_capacity(history.len() + 2);
 
-    // System prompt with optional screen context.
-    let system = if let Some(ctx) = screen_context {
-        format!("{COMPANION_SYSTEM_PROMPT}\nCurrent screen context:\n{ctx}")
-    } else {
-        COMPANION_SYSTEM_PROMPT.to_string()
-    };
-    messages.push(json!({ "role": "system", "content": system }));
+    messages.push(json!({ "role": "system", "content": COMPANION_SYSTEM_PROMPT }));
 
     // Rolling conversation history.
     for turn in history {
@@ -405,33 +353,6 @@ fn companion_chat_endpoint(backend_url: &str) -> String {
     )
 }
 
-/// Gather foreground app/window context as a text summary for the LLM.
-///
-/// The accessibility backbone remains in the embedded core after desktop
-/// controls moved out, so the shell can reuse its public, read-only foreground
-/// query without restoring any automation commands.
-async fn gather_screen_context() -> Option<String> {
-    #[cfg(target_os = "macos")]
-    {
-        openhuman_core::openhuman::accessibility::foreground_context().map(|ctx| {
-            format_foreground_context(ctx.app_name.as_deref(), ctx.window_title.as_deref())
-        })
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        None
-    }
-}
-
-#[cfg(any(target_os = "macos", test))]
-fn format_foreground_context(app_name: Option<&str>, window_title: Option<&str>) -> String {
-    format!(
-        "App: {} | Window: {}",
-        app_name.unwrap_or("unknown"),
-        window_title.unwrap_or("unknown"),
-    )
-}
-
 fn extract_chat_completion_text(raw: &Value) -> Option<String> {
     raw.get("choices")
         .and_then(|c| c.as_array())
@@ -455,7 +376,6 @@ fn cancelled_result(transcript: &str) -> TurnResult {
     TurnResult {
         transcript: transcript.to_string(),
         response_text: String::new(),
-        targets: Vec::new(),
         tts_synthesized: false,
         cancelled: true,
     }
diff --git a/app/src-tauri/src/companion/pipeline_tests.rs b/app/src-tauri/src/companion/pipeline_tests.rs
index 893cf72e4..089b1740a 100644
--- a/app/src-tauri/src/companion/pipeline_tests.rs
+++ b/app/src-tauri/src/companion/pipeline_tests.rs
@@ -1,12 +1,11 @@
 //! Tests for the companion interaction pipeline.
 //!
 //! These tests exercise the pipeline's orchestration logic — state
-//! transitions, cancellation, conversation history, and POINT-tag
-//! integration. Real STT/LLM/TTS calls are not made; the pipeline's
+//! transitions, cancellation, and conversation history. Real STT/LLM/TTS
+//! calls are not made; the pipeline's
 //! network calls fail fast in a test environment (no embedded core).
 
 use super::*;
-use crate::companion::pointing::ScreenGeometry;
 use crate::companion::session;
 
 /// Serialize tests that touch the process-global session state. Shared with
@@ -23,16 +22,6 @@ fn lock_and_reset() -> std::sync::MutexGuard<'static, ()> {
     guard
 }
 
-fn single_screen() -> Vec<ScreenGeometry> {
-    vec![ScreenGeometry {
-        index: 0,
-        x: 0.0,
-        y: 0.0,
-        width: 1920.0,
-        height: 1080.0,
-    }]
-}
-
 // ── Helper tests ─────────────────────────────────────────────────────
 
 #[test]
@@ -73,7 +62,6 @@ fn cancelled_result_has_correct_fields() {
     let r = cancelled_result("hello");
     assert_eq!(r.transcript, "hello");
     assert!(r.response_text.is_empty());
-    assert!(r.targets.is_empty());
     assert!(!r.tts_synthesized);
     assert!(r.cancelled);
 }
@@ -134,7 +122,7 @@ fn companion_chat_endpoint_joins_only_the_backend_path() {
 async fn text_turn_rejects_empty_input() {
     let _guard = lock_and_reset();
     let cancel = CancellationToken::new();
-    let result = run_text_turn("", &single_screen(), cancel).await;
+    let result = run_text_turn("", cancel).await;
     assert!(result.is_err());
     assert!(result.unwrap_err().contains("empty"));
     session::reset_for_test();
@@ -144,7 +132,7 @@ async fn text_turn_rejects_empty_input() {
 async fn text_turn_rejects_whitespace_only() {
     let _guard = lock_and_reset();
     let cancel = CancellationToken::new();
-    let result = run_text_turn("   \n  ", &single_screen(), cancel).await;
+    let result = run_text_turn("   \n  ", cancel).await;
     assert!(result.is_err());
     session::reset_for_test();
 }
@@ -156,7 +144,7 @@ async fn text_turn_cancellation_returns_cancelled() {
     cancel.cancel();
     // Transition to Listening first so Thinking is a valid transition.
     session::transition_state(CompanionState::Listening, None).unwrap();
-    let result = run_text_turn("hello", &single_screen(), cancel).await;
+    let result = run_text_turn("hello", cancel).await;
     let turn = result.unwrap();
     assert!(turn.cancelled);
     assert!(turn.response_text.is_empty());
@@ -169,7 +157,7 @@ async fn text_turn_cancellation_returns_cancelled() {
 async fn audio_turn_rejects_empty_samples() {
     let _guard = lock_and_reset();
     let cancel = CancellationToken::new();
-    let result = run_audio_turn(&[], 16_000, &single_screen(), cancel).await;
+    let result = run_audio_turn(&[], 16_000, cancel).await;
     assert!(result.is_err());
     assert!(result.unwrap_err().contains("no audio"));
     let status = session::session_status();
@@ -178,33 +166,12 @@ async fn audio_turn_rejects_empty_samples() {
     session::reset_for_test();
 }
 
-// ── Screen context ───────────────────────────────────────────────────
-
-#[tokio::test]
-async fn gather_screen_context_returns_option() {
-    let ctx = gather_screen_context().await;
-    // Just verify it doesn't panic — value depends on platform/capability.
-    let _ = ctx;
-}
-
-#[test]
-fn foreground_context_summary_preserves_app_and_window() {
-    assert_eq!(
-        format_foreground_context(Some("Safari"), Some("OpenHuman")),
-        "App: Safari | Window: OpenHuman"
-    );
-    assert_eq!(
-        format_foreground_context(None, None),
-        "App: unknown | Window: unknown"
-    );
-}
-
 // ── System prompt ────────────────────────────────────────────────────
 
 #[test]
-fn companion_system_prompt_mentions_point_tags() {
-    assert!(COMPANION_SYSTEM_PROMPT.contains("[POINT:"));
-    assert!(COMPANION_SYSTEM_PROMPT.contains("screenN"));
+fn companion_system_prompt_does_not_request_screen_context_or_point_tags() {
+    assert!(!COMPANION_SYSTEM_PROMPT.contains("screen context"));
+    assert!(!COMPANION_SYSTEM_PROMPT.contains("[POINT:"));
 }
 
 #[test]
diff --git a/app/src-tauri/src/companion/pointing.rs b/app/src-tauri/src/companion/pointing.rs
deleted file mode 100644
index 5e3248cca..000000000
--- a/app/src-tauri/src/companion/pointing.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-//! POINT tag parser and multi-monitor coordinate mapping.
-//!
-//! The companion LLM embeds `[POINT:x,y:label:screenN]` tags in its
-//! response text (Clicky convention). This module extracts those tags,
-//! maps screen-relative coordinates to absolute desktop coordinates
-//! using monitor geometry, and strips the tags from the display text.
-//!
-//! Migrated verbatim from the former core `desktop_companion::pointing`
-//! (the parsing logic has no core dependencies — it is pure regex + math).
-
-use log::debug;
-use serde::{Deserialize, Serialize};
-
-const LOG_PREFIX: &str = "[companion_pointing]";
-
-/// A parsed point target from the LLM response.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct PointTarget {
-    /// Screen-relative X coordinate (as emitted by the LLM).
-    pub x: f64,
-    /// Screen-relative Y coordinate.
-    pub y: f64,
-    /// Human-readable label for the target element.
-    pub label: String,
-    /// Zero-based screen index.
-    pub screen_index: usize,
-    /// Absolute desktop X after multi-monitor mapping.
-    pub absolute_x: f64,
-    /// Absolute desktop Y after multi-monitor mapping.
-    pub absolute_y: f64,
-}
-
-/// Monitor geometry used for coordinate mapping.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ScreenGeometry {
-    /// Zero-based index.
-    pub index: usize,
-    /// Left edge in absolute desktop coordinates.
-    pub x: f64,
-    /// Top edge in absolute desktop coordinates.
-    pub y: f64,
-    /// Width in points.
-    pub width: f64,
-    /// Height in points.
-    pub height: f64,
-}
-
-/// Result of parsing POINT tags from an LLM response.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PointingParseResult {
-    /// Extracted point targets with mapped coordinates.
-    pub targets: Vec<PointTarget>,
-    /// The response text with POINT tags stripped out.
-    pub clean_text: String,
-}
-
-/// Lazily compiled POINT-tag regex.
-fn point_tag_regex() -> &'static regex::Regex {
-    static RE: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new();
-    RE.get_or_init(|| {
-        regex::Regex::new(r"\[POINT:(-?\d+(?:\.\d+)?),(-?\d+(?:\.\d+)?):([^:\]]+):screen(\d+)\]")
-            .expect("companion POINT tag regex is static and valid")
-    })
-}
-
-/// Parse `[POINT:x,y:label:screenN]` tags from LLM response text and map
-/// coordinates to absolute desktop positions using the given screen geometry.
-pub fn parse_and_map(text: &str, screens: &[ScreenGeometry]) -> PointingParseResult {
-    let re = point_tag_regex();
-
-    let mut targets = Vec::new();
-    let clean_text = re
-        .replace_all(text, |caps: &regex::Captures| {
-            let x: f64 = caps[1].parse().unwrap_or(0.0);
-            let y: f64 = caps[2].parse().unwrap_or(0.0);
-            let label = caps[3].trim().to_string();
-            let screen_index: usize = caps[4].parse().unwrap_or(0);
-
-            let (abs_x, abs_y) = map_to_absolute(x, y, screen_index, screens);
-
-            debug!(
-                "{LOG_PREFIX} parsed target: ({x},{y}) label=\"{label}\" screen{screen_index} -> abs({abs_x},{abs_y})"
-            );
-
-            targets.push(PointTarget {
-                x,
-                y,
-                label,
-                screen_index,
-                absolute_x: abs_x,
-                absolute_y: abs_y,
-            });
-
-            // Replace the tag with empty string in the display text.
-            String::new()
-        })
-        .to_string();
-
-    PointingParseResult {
-        targets,
-        clean_text: clean_text.trim().to_string(),
-    }
-}
-
-/// Map screen-relative coordinates to absolute desktop coordinates.
-///
-/// If the screen index is out of range, falls back to screen 0 (primary).
-/// Coordinates are clamped to screen bounds.
-fn map_to_absolute(x: f64, y: f64, screen_index: usize, screens: &[ScreenGeometry]) -> (f64, f64) {
-    if screens.is_empty() {
-        return (x, y);
-    }
-
-    let screen = screens
-        .iter()
-        .find(|s| s.index == screen_index)
-        .or_else(|| screens.first())
-        .unwrap();
-
-    let clamped_x = x.clamp(0.0, screen.width);
-    let clamped_y = y.clamp(0.0, screen.height);
-
-    (screen.x + clamped_x, screen.y + clamped_y)
-}
-
-#[cfg(test)]
-#[path = "pointing_tests.rs"]
-mod tests;
diff --git a/app/src-tauri/src/companion/pointing_tests.rs b/app/src-tauri/src/companion/pointing_tests.rs
deleted file mode 100644
index 3f5c93f97..000000000
--- a/app/src-tauri/src/companion/pointing_tests.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-//! Tests for POINT tag parsing and coordinate mapping.
-
-use super::*;
-
-fn single_screen() -> Vec<ScreenGeometry> {
-    vec![ScreenGeometry {
-        index: 0,
-        x: 0.0,
-        y: 0.0,
-        width: 1920.0,
-        height: 1080.0,
-    }]
-}
-
-fn dual_screens() -> Vec<ScreenGeometry> {
-    vec![
-        ScreenGeometry {
-            index: 0,
-            x: 0.0,
-            y: 0.0,
-            width: 1920.0,
-            height: 1080.0,
-        },
-        ScreenGeometry {
-            index: 1,
-            x: 1920.0,
-            y: 0.0,
-            width: 2560.0,
-            height: 1440.0,
-        },
-    ]
-}
-
-// ── Basic parsing ─────────────────────────────────────────────────────
-
-#[test]
-fn parse_single_point_tag() {
-    let text = "Click the button [POINT:100,200:Save Button:screen0] to save.";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.targets.len(), 1);
-    assert_eq!(result.targets[0].x, 100.0);
-    assert_eq!(result.targets[0].y, 200.0);
-    assert_eq!(result.targets[0].label, "Save Button");
-    assert_eq!(result.targets[0].screen_index, 0);
-    assert_eq!(result.clean_text, "Click the button  to save.");
-}
-
-#[test]
-fn parse_multiple_point_tags() {
-    let text = "First [POINT:10,20:A:screen0] then [POINT:30,40:B:screen1] done.";
-    let result = parse_and_map(text, &dual_screens());
-
-    assert_eq!(result.targets.len(), 2);
-    assert_eq!(result.targets[0].label, "A");
-    assert_eq!(result.targets[1].label, "B");
-}
-
-#[test]
-fn parse_no_point_tags() {
-    let text = "No pointing needed here.";
-    let result = parse_and_map(text, &single_screen());
-
-    assert!(result.targets.is_empty());
-    assert_eq!(result.clean_text, "No pointing needed here.");
-}
-
-#[test]
-fn parse_decimal_coordinates() {
-    let text = "[POINT:100.5,200.75:Pin:screen0]";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.targets[0].x, 100.5);
-    assert_eq!(result.targets[0].y, 200.75);
-}
-
-#[test]
-fn parse_negative_coordinates_clamped() {
-    let text = "[POINT:-50,-100:Off-screen:screen0]";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.targets[0].absolute_x, 0.0);
-    assert_eq!(result.targets[0].absolute_y, 0.0);
-}
-
-// ── Multi-monitor mapping ─────────────────────────────────────────────
-
-#[test]
-fn map_to_primary_screen() {
-    let text = "[POINT:500,300:Target:screen0]";
-    let result = parse_and_map(text, &dual_screens());
-
-    assert_eq!(result.targets[0].absolute_x, 500.0);
-    assert_eq!(result.targets[0].absolute_y, 300.0);
-}
-
-#[test]
-fn map_to_secondary_screen() {
-    let text = "[POINT:500,300:Target:screen1]";
-    let result = parse_and_map(text, &dual_screens());
-
-    // screen1 starts at x=1920
-    assert_eq!(result.targets[0].absolute_x, 2420.0);
-    assert_eq!(result.targets[0].absolute_y, 300.0);
-}
-
-#[test]
-fn screen_index_out_of_range_falls_back_to_primary() {
-    let text = "[POINT:100,200:Target:screen5]";
-    let result = parse_and_map(text, &single_screen());
-
-    // Falls back to screen 0
-    assert_eq!(result.targets[0].absolute_x, 100.0);
-    assert_eq!(result.targets[0].absolute_y, 200.0);
-}
-
-#[test]
-fn coordinates_clamped_to_screen_bounds() {
-    let text = "[POINT:5000,3000:Far:screen0]";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.targets[0].absolute_x, 1920.0);
-    assert_eq!(result.targets[0].absolute_y, 1080.0);
-}
-
-#[test]
-fn empty_screens_returns_raw_coordinates() {
-    let text = "[POINT:100,200:Target:screen0]";
-    let result = parse_and_map(text, &[]);
-
-    assert_eq!(result.targets[0].absolute_x, 100.0);
-    assert_eq!(result.targets[0].absolute_y, 200.0);
-}
-
-// ── Malformed tags ────────────────────────────────────────────────────
-
-#[test]
-fn malformed_tag_not_parsed() {
-    let text = "[POINT:abc,def:Bad:screen0] and [POINT:100:Missing:screen0]";
-    let result = parse_and_map(text, &single_screen());
-
-    // Neither matches the regex
-    assert!(result.targets.is_empty());
-}
-
-#[test]
-fn partial_tag_not_parsed() {
-    let text = "[POINT:100,200:No Screen] and POINT:100,200:bare:screen0]";
-    let result = parse_and_map(text, &single_screen());
-
-    assert!(result.targets.is_empty());
-}
-
-// ── Clean text ────────────────────────────────────────────────────────
-
-#[test]
-fn clean_text_strips_all_tags() {
-    let text = "Start [POINT:0,0:A:screen0] middle [POINT:0,0:B:screen0] end";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.clean_text, "Start  middle  end");
-}
-
-#[test]
-fn clean_text_trims_whitespace() {
-    let text = "  [POINT:0,0:A:screen0]  ";
-    let result = parse_and_map(text, &single_screen());
-
-    assert_eq!(result.clean_text, "");
-}
diff --git a/app/src-tauri/src/companion/session.rs b/app/src-tauri/src/companion/session.rs
index 7b8cca2ee..d2a7d788e 100644
--- a/app/src-tauri/src/companion/session.rs
+++ b/app/src-tauri/src/companion/session.rs
@@ -2,7 +2,7 @@
 //!
 //! A companion session represents a single period of desktop companion
 //! activity. It owns the state machine (idle → listening → thinking →
-//! speaking → pointing → idle), TTL enforcement, and conversation history.
+//! speaking → idle), TTL enforcement, and conversation history.
 //!
 //! Only one session may be active at a time. Sessions are created with
 //! explicit user consent and can be stopped manually or via TTL expiry.
@@ -345,13 +345,9 @@ pub fn conversation_history() -> Vec<ConversationTurn> {
 /// - Listening → Thinking (transcript received)
 /// - Listening → Idle (cancelled / released)
 /// - Thinking → Speaking (response ready)
-/// - Thinking → Pointing (response has point targets, no TTS)
 /// - Thinking → Idle (cancelled)
-/// - Speaking → Pointing (TTS done, point targets present)
-/// - Speaking → Idle (TTS done, no pointing)
+/// - Speaking → Idle (TTS done)
 /// - Speaking → Listening (interrupted — new turn)
-/// - Pointing → Idle (animation done)
-/// - Pointing → Listening (interrupted — new turn)
 /// - Error → Idle (reset)
 /// - Any → Error (error from any state)
 fn is_valid_transition(from: CompanionState, to: CompanionState) -> bool {
@@ -366,13 +362,9 @@ fn is_valid_transition(from: CompanionState, to: CompanionState) -> bool {
             | (CompanionState::Listening, CompanionState::Thinking)
             | (CompanionState::Listening, CompanionState::Idle)
             | (CompanionState::Thinking, CompanionState::Speaking)
-            | (CompanionState::Thinking, CompanionState::Pointing)
             | (CompanionState::Thinking, CompanionState::Idle)
-            | (CompanionState::Speaking, CompanionState::Pointing)
             | (CompanionState::Speaking, CompanionState::Idle)
             | (CompanionState::Speaking, CompanionState::Listening)
-            | (CompanionState::Pointing, CompanionState::Idle)
-            | (CompanionState::Pointing, CompanionState::Listening)
             | (CompanionState::Error, CompanionState::Idle)
     )
 }
diff --git a/app/src-tauri/src/companion/session_tests.rs b/app/src-tauri/src/companion/session_tests.rs
index fa60afa4c..72cec5a02 100644
--- a/app/src-tauri/src/companion/session_tests.rs
+++ b/app/src-tauri/src/companion/session_tests.rs
@@ -182,30 +182,6 @@ fn transition_thinking_to_speaking() {
     });
 }
 
-#[test]
-fn transition_speaking_to_pointing() {
-    with_clean_session(|| {
-        let _s = start_default_session();
-        transition_state(CompanionState::Listening, None).unwrap();
-        transition_state(CompanionState::Thinking, None).unwrap();
-        transition_state(CompanionState::Speaking, None).unwrap();
-        let prev = transition_state(CompanionState::Pointing, None).unwrap();
-        assert_eq!(prev, CompanionState::Speaking);
-    });
-}
-
-#[test]
-fn transition_pointing_to_idle() {
-    with_clean_session(|| {
-        let _s = start_default_session();
-        transition_state(CompanionState::Listening, None).unwrap();
-        transition_state(CompanionState::Thinking, None).unwrap();
-        transition_state(CompanionState::Pointing, None).unwrap();
-        let prev = transition_state(CompanionState::Idle, None).unwrap();
-        assert_eq!(prev, CompanionState::Pointing);
-    });
-}
-
 #[test]
 fn transition_full_happy_path() {
     with_clean_session(|| {
@@ -213,7 +189,6 @@ fn transition_full_happy_path() {
         transition_state(CompanionState::Listening, None).unwrap();
         transition_state(CompanionState::Thinking, None).unwrap();
         transition_state(CompanionState::Speaking, None).unwrap();
-        transition_state(CompanionState::Pointing, None).unwrap();
         transition_state(CompanionState::Idle, None).unwrap();
         assert_eq!(session_status().state, CompanionState::Idle);
     });
diff --git a/app/src-tauri/src/companion/types.rs b/app/src-tauri/src/companion/types.rs
index f5e25a79b..ecf93a576 100644
--- a/app/src-tauri/src/companion/types.rs
+++ b/app/src-tauri/src/companion/types.rs
@@ -17,12 +17,10 @@ pub enum CompanionState {
     Idle,
     /// Microphone is live — capturing user speech.
     Listening,
-    /// Transcript + screen context sent to LLM; awaiting response.
+    /// Transcript sent to LLM; awaiting response.
     Thinking,
     /// TTS is playing the response audio.
     Speaking,
-    /// Visual pointer is animating toward a UI target.
-    Pointing,
     /// An unrecoverable error occurred in the current turn.
     Error,
 }
@@ -34,7 +32,6 @@ impl std::fmt::Display for CompanionState {
             Self::Listening => write!(f, "listening"),
             Self::Thinking => write!(f, "thinking"),
             Self::Speaking => write!(f, "speaking"),
-            Self::Pointing => write!(f, "pointing"),
             Self::Error => write!(f, "error"),
         }
     }
@@ -63,12 +60,6 @@ pub struct CompanionConfig {
     /// Session TTL in seconds. `0` means no automatic expiry.
     #[serde(default = "default_ttl_secs")]
     pub ttl_secs: u64,
-    /// Whether to capture a screenshot on each activation.
-    #[serde(default = "default_true")]
-    pub capture_screen: bool,
-    /// Whether to include the foreground app context.
-    #[serde(default = "default_true")]
-    pub include_app_context: bool,
 }
 
 impl Default for CompanionConfig {
@@ -77,8 +68,6 @@ impl Default for CompanionConfig {
             hotkey: default_hotkey(),
             activation_mode: default_activation_mode(),
             ttl_secs: default_ttl_secs(),
-            capture_screen: true,
-            include_app_context: true,
         }
     }
 }
@@ -92,14 +81,11 @@ fn default_activation_mode() -> String {
 fn default_ttl_secs() -> u64 {
     3600
 }
-fn default_true() -> bool {
-    true
-}
 
 /// Parameters for starting a companion session.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct StartCompanionSessionParams {
-    /// Explicit user consent to screen monitoring and audio capture.
+    /// Explicit user consent to audio capture.
     pub consent: bool,
     /// Optional TTL override in seconds.
     #[serde(default, skip_serializing_if = "Option::is_none")]
diff --git a/app/src-tauri/src/lib.rs b/app/src-tauri/src/lib.rs
index 10c10028d..da509c576 100644
--- a/app/src-tauri/src/lib.rs
+++ b/app/src-tauri/src/lib.rs
@@ -94,7 +94,6 @@ mod ptt_hotkeys;
 mod ptt_overlay;
 #[cfg(target_os = "windows")]
 mod reset_reboot_schedule;
-mod screen_capture;
 mod slack_scanner;
 mod stderr_panic_hook;
 mod telegram_scanner;
@@ -3129,7 +3128,6 @@ pub fn run() {
     let builder = builder.manage(discord_scanner::ScannerRegistry::new());
     let builder = builder.manage(telegram_scanner::ScannerRegistry::new());
     let builder = builder.manage(wechat_scanner::ScannerRegistry::new());
-    let builder = builder.manage(screen_capture::ScreenShareState::new());
     let builder = builder.manage(meet_call::MeetCallState::new());
     let builder = builder.manage(meet_audio::MeetAudioState::new());
     let builder = builder.manage(meet_video::frame_bus::MeetVideoFrameBusState::new());
@@ -3874,9 +3872,6 @@ pub fn run() {
             webview_accounts::webview_set_focused_account,
             notification_settings::notification_settings_get,
             notification_settings::notification_settings_set,
-            screen_capture::screen_share_begin_session,
-            screen_capture::screen_share_thumbnail,
-            screen_capture::screen_share_finalize_session,
             native_notifications::notification_permission_state,
             native_notifications::notification_permission_request,
             activate_main_window,
diff --git a/app/src-tauri/src/meet_audio/captions_bridge.js b/app/src-tauri/src/meet_audio/captions_bridge.js
index 14b52a178..17696bc5d 100644
--- a/app/src-tauri/src/meet_audio/captions_bridge.js
+++ b/app/src-tauri/src/meet_audio/captions_bridge.js
@@ -17,9 +17,7 @@
 //     `__openhumanCaptionsBridgeInfo()` for the Tauri shell to drive
 //     over CDP `Runtime.evaluate`.
 //
-// Why scraping (and not getDisplayMedia, or Web Speech, or Meet's
-// undocumented APIs)?
-//   - getDisplayMedia would prompt the user for screen-share permission.
+// Why scraping (and not Web Speech or Meet's undocumented APIs)?
 //   - Web Speech doesn't reach the remote participants' audio — only
 //     local mic.
 //   - Meet has no public caption API.
diff --git a/app/src-tauri/src/screen_capture/mod.rs b/app/src-tauri/src/screen_capture/mod.rs
deleted file mode 100644
index 3614fd294..000000000
--- a/app/src-tauri/src/screen_capture/mod.rs
+++ /dev/null
@@ -1,1068 +0,0 @@
-//! Screen-capture source enumeration + picker orchestration for #713 / #812.
-//!
-//! Background (see issue #713 plan): embedded webviews (Meet, Slack Huddles,
-//! Discord, Zoom) run under the CEF Alloy runtime, which does not link
-//! Chromium's built-in `DesktopMediaPicker`. When the page calls
-//! `navigator.mediaDevices.getDisplayMedia`, Chromium falls back to
-//! auto-selecting the primary display — the user never sees a picker and
-//! their whole screen streams.
-//!
-//! Our `OnRequestMediaAccessPermission` callback in tauri-cef grants the
-//! `DESKTOP_VIDEO_CAPTURE` bit unconditionally. Stage 0 PoC proved that when
-//! the page calls `getUserMedia` with a hand-crafted
-//! `{ mandatory: { chromeMediaSource: 'desktop', chromeMediaSourceId: '<id>' } }`
-//! constraint, Chromium honours the ID and opens a real capture device —
-//! even though this constraint shape is normally extension-only.
-//!
-//! # Session gating (#812 Stage A)
-//!
-//! The first landing of this module exposed `screen_share_list_sources` and
-//! `screen_share_thumbnail` directly on the recipe-webview allowlist. That
-//! let any script running inside the embedded site (page JS, compromised
-//! third-party CDN) silently enumerate every open window title + live
-//! thumbnail with no picker interaction and no user gesture. CodeRabbit /
-//! graycyrus flagged this as a blocker on PR #809 (issue #812).
-//!
-//! The module now forces callers through a short-lived session:
-//!   * `screen_share_begin_session` — requires a live user gesture
-//!     (`navigator.userActivation.isActive`), an account-scoped webview
-//!     label (`acct_*`), and is rate-limited to 10 calls per account per
-//!     60s. Returns a random 128-bit token + the enumerated sources in
-//!     one round-trip.
-//!   * `screen_share_thumbnail` — requires a token whose session is still
-//!     alive and whose `allowed_ids` set contains the requested ID.
-//!   * `screen_share_finalize_session` — removes the session. Called by
-//!     the shim on Share or Cancel.
-//!
-//! Sessions auto-expire after 30s. A new `begin_session` for the same
-//! account replaces any in-flight session (prevents the stacked-overlay
-//! case from graycyrus refactor note #6).
-//!
-//! The picker UI itself is injected directly into each child webview's
-//! DOM by `webview_accounts/runtime.js` (see the `showInPagePicker` flow
-//! there), which is why we only need IPCs for enumeration + thumbnail
-//! capture and no picker-modal orchestration RPCs on the host side.
-//!
-//! macOS-first: other platforms stub out until the flow is proven end-
-//! to-end.
-
-use std::collections::{HashMap, HashSet, VecDeque};
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Mutex;
-use std::time::{Duration, Instant};
-
-use serde::{Deserialize, Serialize};
-use tauri::{Runtime, State, Webview};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ScreenSource {
-    /// `screen:<CGDirectDisplayID>:0` or `window:<CGWindowID>:0`. Chromium's
-    /// `DesktopMediaID::Parse` reads these directly; we rely on its existing
-    /// parser rather than round-tripping through the extension API.
-    pub id: String,
-    /// `"screen"` or `"window"`.
-    pub kind: String,
-    /// Human label shown in the picker (app name + window title, or display
-    /// name).
-    pub name: String,
-    /// Optional application name (windows only).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub app_name: Option<String>,
-    /// PNG thumbnail base64-encoded. Always empty from enumeration — the
-    /// shim lazy-fetches via `screen_share_thumbnail` so the picker UI opens
-    /// instantly.
-    #[serde(default)]
-    pub thumbnail_png_base64: String,
-}
-
-// ---------------------------------------------------------------------------
-// Parser (platform-agnostic, unit-testable)
-// ---------------------------------------------------------------------------
-
-/// What kind of source a parsed DesktopMediaID-format string describes.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[cfg(any(target_os = "macos", test))]
-pub(crate) enum SourceKind {
-    Screen,
-    Window,
-}
-
-/// Parse a `screen:<u32>:0` / `window:<u32>:0` source ID into
-/// `(kind, numeric id)`. Returns `None` if the prefix is unknown, the
-/// numeric segment doesn't fit in a `u32`, or the shape otherwise doesn't
-/// match what the enumerator emits. Pure logic so it can be unit-tested
-/// without touching platform APIs; macOS callers use it before dispatching
-/// to the capture backend.
-#[cfg(any(target_os = "macos", test))]
-pub(crate) fn parse_source_id(id: &str) -> Option<(SourceKind, u32)> {
-    let mut parts = id.splitn(3, ':');
-    let kind = match parts.next()? {
-        "screen" => SourceKind::Screen,
-        "window" => SourceKind::Window,
-        _ => return None,
-    };
-    let num = parts.next()?.parse::<u32>().ok()?;
-    Some((kind, num))
-}
-
-// ---------------------------------------------------------------------------
-// Session state (#812 Stage A)
-// ---------------------------------------------------------------------------
-
-/// Short TTL prevents stale tokens from being replayable. 30s is long enough
-/// for the slowest picker flow (enumerate → thumbs load → user chooses)
-/// observed in manual testing, short enough that a leaked token via console
-/// can't be reused later in the day.
-const SESSION_TTL: Duration = Duration::from_secs(30);
-/// Token bucket parameters. 10 attempts per 60s per account means a human
-/// mashing the Present-Now button can't get throttled; an automated
-/// enumeration loop hits the wall quickly.
-const RATE_LIMIT_MAX: usize = 10;
-const RATE_LIMIT_WINDOW: Duration = Duration::from_secs(60);
-/// 128-bit token. Seeded from OS time + atomic counter + thread id —
-/// deliberately no new dependency. Entropy is overkill for a 30s session:
-/// the attacker would need to guess the token AND the account-id AND the
-/// allowed-id set inside the TTL window.
-const TOKEN_BYTES: usize = 16;
-
-static TOKEN_COUNTER: AtomicU64 = AtomicU64::new(1);
-
-fn generate_token() -> String {
-    use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _};
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map(|d| d.as_nanos())
-        .unwrap_or(0);
-    let counter = TOKEN_COUNTER.fetch_add(1, Ordering::Relaxed);
-    let tid = thread_id_hash();
-    let mut buf = [0u8; TOKEN_BYTES];
-    // Interleave the three sources across the 16 bytes so no single
-    // predictable input (wall clock, counter) dominates the prefix.
-    buf[0..8].copy_from_slice(&(now as u64).to_le_bytes());
-    buf[8..16].copy_from_slice(&counter.to_le_bytes());
-    for (i, b) in buf.iter_mut().enumerate() {
-        *b ^= tid.rotate_left((i as u32) * 3);
-    }
-    URL_SAFE_NO_PAD.encode(buf)
-}
-
-fn thread_id_hash() -> u8 {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::{Hash, Hasher};
-    let mut h = DefaultHasher::new();
-    std::thread::current().id().hash(&mut h);
-    h.finish() as u8
-}
-
-#[derive(Debug)]
-struct Session {
-    account_id: String,
-    allowed_ids: HashSet<String>,
-    expires_at: Instant,
-}
-
-#[derive(Default)]
-pub struct ScreenShareState {
-    /// token → Session
-    sessions: Mutex<HashMap<String, Session>>,
-    /// account_id → rolling window of begin-session timestamps for rate limit
-    rate: Mutex<HashMap<String, VecDeque<Instant>>>,
-    /// account_id → current active token (so we can evict on replace)
-    active: Mutex<HashMap<String, String>>,
-}
-
-impl ScreenShareState {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
-fn purge_expired(sessions: &mut HashMap<String, Session>, active: &mut HashMap<String, String>) {
-    let now = Instant::now();
-    let expired_tokens: Vec<String> = sessions
-        .iter()
-        .filter_map(|(t, s)| {
-            if s.expires_at <= now {
-                Some(t.clone())
-            } else {
-                None
-            }
-        })
-        .collect();
-    for t in expired_tokens {
-        if let Some(sess) = sessions.remove(&t) {
-            if active.get(&sess.account_id).map(|x| x.as_str()) == Some(t.as_str()) {
-                active.remove(&sess.account_id);
-            }
-        }
-    }
-}
-
-fn check_and_record_rate(rate: &mut HashMap<String, VecDeque<Instant>>, account_id: &str) -> bool {
-    let now = Instant::now();
-    let window = rate.entry(account_id.to_string()).or_default();
-    while let Some(&front) = window.front() {
-        if now.duration_since(front) > RATE_LIMIT_WINDOW {
-            window.pop_front();
-        } else {
-            break;
-        }
-    }
-    if window.len() >= RATE_LIMIT_MAX {
-        return false;
-    }
-    window.push_back(now);
-    true
-}
-
-// ---------------------------------------------------------------------------
-// Commands
-// ---------------------------------------------------------------------------
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BeginSessionArgs {
-    pub account_id: String,
-    pub origin: String,
-    /// Frontend-reported `navigator.userActivation.isActive`. True only while
-    /// the call stack originates from a real user gesture (click, key, touch)
-    /// within the page's activation grace period. False for timers, async
-    /// continuations, or drive-by enumeration attempts.
-    pub has_user_activation: bool,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BeginSessionResult {
-    pub token: String,
-    pub sources: Vec<ScreenSource>,
-}
-
-/// Open a short-lived session that gates subsequent `screen_share_thumbnail`
-/// calls. The shim must call this before showing the picker UI; any page JS
-/// attempting the same call outside a user gesture is rejected.
-#[tauri::command]
-pub fn screen_share_begin_session<R: Runtime>(
-    webview: Webview<R>,
-    state: State<'_, ScreenShareState>,
-    args: BeginSessionArgs,
-) -> Result<BeginSessionResult, String> {
-    let caller_label = webview.label().to_string();
-    log::debug!(
-        "[screen-share] begin_session caller_label={} account_id={} origin={} activation={}",
-        caller_label,
-        args.account_id,
-        args.origin,
-        args.has_user_activation
-    );
-
-    // Gate 1: caller must be an account webview. `acct_*` is the label shape
-    // produced by `webview_accounts::label_for()`. Main/overlay windows and
-    // any other Tauri webview fail here.
-    if !caller_label.starts_with("acct_") {
-        log::warn!(
-            "[screen-share] begin_session rejected: caller_label={} is not an account webview",
-            caller_label
-        );
-        return Err("unauthorized caller".to_string());
-    }
-
-    // Gate 2: must be inside a user gesture. Frontend reads
-    // `navigator.userActivation.isActive` which is true only during the
-    // direct call stack of a click / key / touch handler.
-    if !args.has_user_activation {
-        log::warn!(
-            "[screen-share] begin_session rejected: no user activation for account_id={}",
-            args.account_id
-        );
-        return Err("user activation required".to_string());
-    }
-
-    // Housekeeping before checking rate / active state.
-    {
-        let mut sessions = state
-            .sessions
-            .lock()
-            .expect("screen_share.sessions poisoned");
-        let mut active = state.active.lock().expect("screen_share.active poisoned");
-        purge_expired(&mut sessions, &mut active);
-    }
-
-    // Gate 3: rate limit per account.
-    {
-        let mut rate = state.rate.lock().expect("screen_share.rate poisoned");
-        if !check_and_record_rate(&mut rate, &args.account_id) {
-            log::warn!(
-                "[screen-share] begin_session rate-limited account_id={} (>{} within {:?})",
-                args.account_id,
-                RATE_LIMIT_MAX,
-                RATE_LIMIT_WINDOW
-            );
-            return Err("rate-limited".to_string());
-        }
-    }
-
-    // Enumerate sources and build the session.
-    let sources = enumerate_sources()?;
-    let allowed_ids: HashSet<String> = sources.iter().map(|s| s.id.clone()).collect();
-    let token = generate_token();
-    let token_display = token_prefix(&token);
-
-    {
-        let mut sessions = state
-            .sessions
-            .lock()
-            .expect("screen_share.sessions poisoned");
-        let mut active = state.active.lock().expect("screen_share.active poisoned");
-
-        // Replace any in-flight session for this account — prevents stacked
-        // pickers if getDisplayMedia is called twice before the first
-        // resolves (graycyrus refactor #6).
-        if let Some(prev) = active.remove(&args.account_id) {
-            sessions.remove(&prev);
-            log::debug!(
-                "[screen-share] begin_session replacing prev session token={}…",
-                token_prefix(&prev)
-            );
-        }
-
-        sessions.insert(
-            token.clone(),
-            Session {
-                account_id: args.account_id.clone(),
-                allowed_ids,
-                expires_at: Instant::now() + SESSION_TTL,
-            },
-        );
-        active.insert(args.account_id.clone(), token.clone());
-    }
-
-    log::info!(
-        "[screen-share] begin_session opened token={}… account_id={} sources={}",
-        token_display,
-        args.account_id,
-        sources.len()
-    );
-
-    Ok(BeginSessionResult { token, sources })
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ThumbnailArgs {
-    pub token: String,
-    pub id: String,
-}
-
-/// Capture one source's thumbnail as base64 PNG. Gated behind the session
-/// token: only IDs the session was issued for (i.e. shown in the picker)
-/// can be thumbnailed, so a valid token can't be abused to snapshot
-/// arbitrary windows.
-#[tauri::command]
-pub fn screen_share_thumbnail<R: Runtime>(
-    webview: Webview<R>,
-    state: State<'_, ScreenShareState>,
-    args: ThumbnailArgs,
-) -> Result<String, String> {
-    let caller_label = webview.label().to_string();
-    log::debug!(
-        "[screen-share] thumbnail caller_label={} id={} token={}…",
-        caller_label,
-        args.id,
-        token_prefix(&args.token)
-    );
-
-    if !caller_label.starts_with("acct_") {
-        log::warn!(
-            "[screen-share] thumbnail rejected: caller_label={} is not an account webview",
-            caller_label
-        );
-        return Err("unauthorized caller".to_string());
-    }
-
-    // Validate the session is alive and knows about this ID.
-    {
-        let mut sessions = state
-            .sessions
-            .lock()
-            .expect("screen_share.sessions poisoned");
-        let mut active = state.active.lock().expect("screen_share.active poisoned");
-        purge_expired(&mut sessions, &mut active);
-
-        let session = sessions.get(&args.token).ok_or_else(|| {
-            log::warn!(
-                "[screen-share] thumbnail rejected: unknown/expired token={}…",
-                token_prefix(&args.token)
-            );
-            "invalid or expired token".to_string()
-        })?;
-        if !session.allowed_ids.contains(&args.id) {
-            log::warn!(
-                "[screen-share] thumbnail rejected: id={} not in session's allowed set (token={}…)",
-                args.id,
-                token_prefix(&args.token)
-            );
-            return Err("id not in session".to_string());
-        }
-    }
-
-    #[cfg(target_os = "macos")]
-    {
-        macos::thumbnail_for_id(&args.id).ok_or_else(|| "thumbnail unavailable".to_string())
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        let _ = args;
-        Err("thumbnails not implemented for this platform yet".to_string())
-    }
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FinalizeSessionArgs {
-    pub token: String,
-    #[serde(default)]
-    pub picked_id: Option<String>,
-}
-
-/// Called by the shim on Share or Cancel. Removes the session. Safe to call
-/// with an unknown/expired token — the call is a no-op then. Not gated on
-/// caller label because the only effect is cleanup of a token the caller
-/// already possesses.
-#[tauri::command]
-pub fn screen_share_finalize_session(
-    state: State<'_, ScreenShareState>,
-    args: FinalizeSessionArgs,
-) -> Result<(), String> {
-    let token_display = token_prefix(&args.token);
-    let mut sessions = state
-        .sessions
-        .lock()
-        .expect("screen_share.sessions poisoned");
-    let mut active = state.active.lock().expect("screen_share.active poisoned");
-    purge_expired(&mut sessions, &mut active);
-
-    if let Some(session) = sessions.remove(&args.token) {
-        if active.get(&session.account_id).map(|x| x.as_str()) == Some(args.token.as_str()) {
-            active.remove(&session.account_id);
-        }
-        log::info!(
-            "[screen-share] finalize_session token={}… account_id={} picked={}",
-            token_display,
-            session.account_id,
-            args.picked_id.as_deref().unwrap_or("<cancelled>")
-        );
-    } else {
-        log::debug!(
-            "[screen-share] finalize_session ignored (unknown token={}…)",
-            token_display
-        );
-    }
-    Ok(())
-}
-
-fn token_prefix(token: &str) -> String {
-    token.chars().take(8).collect()
-}
-
-fn enumerate_sources() -> Result<Vec<ScreenSource>, String> {
-    #[cfg(target_os = "macos")]
-    {
-        macos::enumerate().map_err(|e| format!("enumerate failed: {e}"))
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        Err("screen-share picker not implemented for this platform yet".to_string())
-    }
-}
-
-// ---------------------------------------------------------------------------
-// macOS backend
-// ---------------------------------------------------------------------------
-
-#[cfg(target_os = "macos")]
-mod macos {
-    use super::ScreenSource;
-
-    use core::ffi::c_void;
-    use std::ffi::CStr;
-
-    // Minimal CoreGraphics FFI so we don't need an extra `core-graphics`
-    // crate — these few symbols cover display + window enumeration and
-    // avoid pulling in ~50 extra transitive deps.
-
-    #[link(name = "CoreGraphics", kind = "framework")]
-    extern "C" {
-        fn CGGetActiveDisplayList(
-            max_displays: u32,
-            active_displays: *mut u32,
-            display_count: *mut u32,
-        ) -> i32;
-        fn CGMainDisplayID() -> u32;
-        fn CGDisplayPixelsWide(display: u32) -> usize;
-        fn CGDisplayPixelsHigh(display: u32) -> usize;
-        fn CGWindowListCopyWindowInfo(option: u32, relative_to_window: u32) -> *const c_void; // CFArrayRef
-        fn CGDisplayCreateImage(display: u32) -> *const c_void; // CGImageRef
-        fn CGWindowListCreateImage(
-            screen_bounds: CGRect,
-            list_option: u32,
-            window_id: u32,
-            image_option: u32,
-        ) -> *const c_void;
-        fn CGImageRelease(image: *const c_void);
-        fn CGImageGetWidth(image: *const c_void) -> usize;
-        fn CGImageGetHeight(image: *const c_void) -> usize;
-    }
-
-    #[link(name = "ImageIO", kind = "framework")]
-    extern "C" {
-        fn CGImageDestinationCreateWithData(
-            data: *const c_void, // CFMutableDataRef
-            uti: *const c_void,  // CFStringRef
-            count: usize,
-            options: *const c_void,
-        ) -> *const c_void;
-        fn CGImageDestinationAddImage(
-            dest: *const c_void,
-            image: *const c_void,
-            properties: *const c_void,
-        );
-        fn CGImageDestinationFinalize(dest: *const c_void) -> bool;
-    }
-
-    #[link(name = "CoreFoundation", kind = "framework")]
-    extern "C" {
-        fn CFRelease(cf: *const c_void);
-        fn CFArrayGetCount(array: *const c_void) -> isize;
-        fn CFArrayGetValueAtIndex(array: *const c_void, idx: isize) -> *const c_void;
-        fn CFDictionaryGetValue(dict: *const c_void, key: *const c_void) -> *const c_void;
-        fn CFStringGetCStringPtr(s: *const c_void, encoding: u32) -> *const i8;
-        fn CFStringGetCString(
-            s: *const c_void,
-            buffer: *mut i8,
-            buffer_size: isize,
-            encoding: u32,
-        ) -> bool;
-        fn CFStringGetLength(s: *const c_void) -> isize;
-        fn CFNumberGetValue(number: *const c_void, the_type: i32, value_ptr: *mut c_void) -> bool;
-        fn CFStringCreateWithCString(
-            alloc: *const c_void,
-            c_str: *const i8,
-            encoding: u32,
-        ) -> *const c_void;
-        fn CFDataCreateMutable(alloc: *const c_void, capacity: isize) -> *const c_void;
-        fn CFDataGetLength(data: *const c_void) -> isize;
-        fn CFDataGetBytePtr(data: *const c_void) -> *const u8;
-    }
-
-    #[repr(C)]
-    #[derive(Copy, Clone)]
-    struct CGPoint {
-        x: f64,
-        y: f64,
-    }
-    #[repr(C)]
-    #[derive(Copy, Clone)]
-    struct CGSize {
-        width: f64,
-        height: f64,
-    }
-    #[repr(C)]
-    #[derive(Copy, Clone)]
-    struct CGRect {
-        origin: CGPoint,
-        size: CGSize,
-    }
-
-    const CG_RECT_NULL: CGRect = CGRect {
-        origin: CGPoint {
-            x: f64::INFINITY,
-            y: f64::INFINITY,
-        },
-        size: CGSize {
-            width: 0.0,
-            height: 0.0,
-        },
-    };
-    // kCGWindowListOptionIncludingWindow (= 8).
-    const K_CG_WINDOW_LIST_OPTION_INCLUDING_WINDOW: u32 = 1 << 3;
-    // kCGWindowImageBoundsIgnoreFraming (= 1) | kCGWindowImageNominalResolution (= 16).
-    const K_CG_WINDOW_IMAGE_BOUNDS_IGNORE_FRAMING: u32 = 1 << 0;
-    const K_CG_WINDOW_IMAGE_NOMINAL_RESOLUTION: u32 = 1 << 4;
-
-    const K_CFSTRING_ENCODING_UTF8: u32 = 0x08000100;
-    const K_CFNUMBER_SINT64_TYPE: i32 = 4;
-    // kCGWindowListOptionOnScreenOnly (= 1) | kCGWindowListExcludeDesktopElements (= 16).
-    const K_CG_WINDOW_LIST_ON_SCREEN_ONLY: u32 = 1 << 0;
-    const K_CG_WINDOW_LIST_EXCLUDE_DESKTOP_ELEMENTS: u32 = 1 << 4;
-
-    /// Below this pixel count on either axis we treat a captured window
-    /// image as TCC-denied rather than real content. macOS 15 Sequoia
-    /// returns a valid 1×1 transparent CGImage when Screen Recording is
-    /// not granted (instead of the pre-Sequoia null return), and the old
-    /// empty-check alone let that through (see PR #809 review).
-    const MIN_USABLE_DIMENSION: usize = 4;
-
-    /// Allocate a CoreFoundation string. Returns `None` if the input
-    /// contains an interior NUL byte (CString rejects those). Callers
-    /// check the return rather than `expect()`ing, because unwinding
-    /// through a C frame is undefined behavior.
-    fn cfstr(s: &str) -> Option<*const c_void> {
-        let c = std::ffi::CString::new(s).ok()?;
-        let ptr = unsafe {
-            CFStringCreateWithCString(std::ptr::null(), c.as_ptr(), K_CFSTRING_ENCODING_UTF8)
-        };
-        if ptr.is_null() {
-            None
-        } else {
-            Some(ptr)
-        }
-    }
-
-    fn cfstring_to_string(cf: *const c_void) -> Option<String> {
-        if cf.is_null() {
-            return None;
-        }
-        unsafe {
-            let ptr = CFStringGetCStringPtr(cf, K_CFSTRING_ENCODING_UTF8);
-            if !ptr.is_null() {
-                return CStr::from_ptr(ptr).to_str().ok().map(|s| s.to_string());
-            }
-            let len = CFStringGetLength(cf);
-            // UTF-8 safety margin: 4 bytes per codepoint + NUL.
-            let cap = (len as usize) * 4 + 1;
-            let mut buf = vec![0i8; cap];
-            if CFStringGetCString(cf, buf.as_mut_ptr(), cap as isize, K_CFSTRING_ENCODING_UTF8) {
-                let c = CStr::from_ptr(buf.as_ptr());
-                c.to_str().ok().map(|s| s.to_string())
-            } else {
-                None
-            }
-        }
-    }
-
-    fn cfnumber_to_u64(num: *const c_void) -> Option<u64> {
-        if num.is_null() {
-            return None;
-        }
-        let mut v: i64 = 0;
-        unsafe {
-            if CFNumberGetValue(num, K_CFNUMBER_SINT64_TYPE, &mut v as *mut _ as *mut c_void) {
-                Some(v as u64)
-            } else {
-                None
-            }
-        }
-    }
-
-    pub(super) fn thumbnail_for_id(id: &str) -> Option<String> {
-        let (kind, num) = super::parse_source_id(id)?;
-        let b64 = match kind {
-            super::SourceKind::Screen => screen_thumbnail_b64(num),
-            super::SourceKind::Window => window_thumbnail_b64(num),
-        };
-        if b64.is_empty() {
-            None
-        } else {
-            Some(b64)
-        }
-    }
-
-    pub(super) fn enumerate() -> Result<Vec<ScreenSource>, String> {
-        let mut out = Vec::new();
-        out.extend(enumerate_screens());
-        out.extend(enumerate_windows());
-        Ok(out)
-    }
-
-    fn cgimage_to_png_bytes(image: *const c_void) -> Option<Vec<u8>> {
-        if image.is_null() {
-            return None;
-        }
-        let uti_key = cfstr("public.png")?;
-        unsafe {
-            let data = CFDataCreateMutable(std::ptr::null(), 0);
-            if data.is_null() {
-                CFRelease(uti_key);
-                return None;
-            }
-            let dest = CGImageDestinationCreateWithData(data, uti_key, 1, std::ptr::null());
-            if dest.is_null() {
-                CFRelease(uti_key);
-                CFRelease(data);
-                return None;
-            }
-            CGImageDestinationAddImage(dest, image, std::ptr::null());
-            let ok = CGImageDestinationFinalize(dest);
-            CFRelease(dest);
-            CFRelease(uti_key);
-            if !ok {
-                CFRelease(data);
-                return None;
-            }
-            let len = CFDataGetLength(data) as usize;
-            let ptr = CFDataGetBytePtr(data);
-            let bytes = std::slice::from_raw_parts(ptr, len).to_vec();
-            CFRelease(data);
-            Some(bytes)
-        }
-    }
-
-    fn screen_thumbnail_b64(display_id: u32) -> String {
-        use base64::{engine::general_purpose::STANDARD, Engine as _};
-        unsafe {
-            let image = CGDisplayCreateImage(display_id);
-            if image.is_null() {
-                return String::new();
-            }
-            let w = CGImageGetWidth(image);
-            let h = CGImageGetHeight(image);
-            if w < MIN_USABLE_DIMENSION || h < MIN_USABLE_DIMENSION {
-                log::warn!(
-                    "[screen-share] screen_thumbnail display_id={} returned {}×{} (likely TCC not granted)",
-                    display_id,
-                    w,
-                    h
-                );
-                CGImageRelease(image);
-                return String::new();
-            }
-            let png = cgimage_to_png_bytes(image);
-            CGImageRelease(image);
-            png.map(|b| STANDARD.encode(b)).unwrap_or_default()
-        }
-    }
-
-    fn window_thumbnail_b64(window_id: u32) -> String {
-        use base64::{engine::general_purpose::STANDARD, Engine as _};
-        unsafe {
-            let opts =
-                K_CG_WINDOW_IMAGE_BOUNDS_IGNORE_FRAMING | K_CG_WINDOW_IMAGE_NOMINAL_RESOLUTION;
-            let image = CGWindowListCreateImage(
-                CG_RECT_NULL,
-                K_CG_WINDOW_LIST_OPTION_INCLUDING_WINDOW,
-                window_id,
-                opts,
-            );
-            if image.is_null() {
-                return String::new();
-            }
-            let w = CGImageGetWidth(image);
-            let h = CGImageGetHeight(image);
-            if w < MIN_USABLE_DIMENSION || h < MIN_USABLE_DIMENSION {
-                log::warn!(
-                    "[screen-share] window_thumbnail window_id={} returned {}×{} (likely TCC not granted or Sequoia privacy policy)",
-                    window_id,
-                    w,
-                    h
-                );
-                CGImageRelease(image);
-                return String::new();
-            }
-            let png = cgimage_to_png_bytes(image);
-            CGImageRelease(image);
-            png.map(|b| STANDARD.encode(b)).unwrap_or_default()
-        }
-    }
-
-    fn enumerate_screens() -> Vec<ScreenSource> {
-        let mut ids = [0u32; 32];
-        let mut count: u32 = 0;
-        let err = unsafe { CGGetActiveDisplayList(ids.len() as u32, ids.as_mut_ptr(), &mut count) };
-        if err != 0 {
-            log::warn!("[screen-share] CGGetActiveDisplayList error={err}");
-            return Vec::new();
-        }
-        let main = unsafe { CGMainDisplayID() };
-        ids.iter()
-            .take(count as usize)
-            .enumerate()
-            .map(|(idx, &display_id)| {
-                let w = unsafe { CGDisplayPixelsWide(display_id) };
-                let h = unsafe { CGDisplayPixelsHigh(display_id) };
-                let is_main = display_id == main;
-                let name = if is_main {
-                    format!("Main Screen ({}×{})", w, h)
-                } else {
-                    format!("Display {} ({}×{})", idx + 1, w, h)
-                };
-                ScreenSource {
-                    id: format!("screen:{}:0", display_id),
-                    kind: "screen".to_string(),
-                    name,
-                    app_name: None,
-                    thumbnail_png_base64: String::new(),
-                }
-            })
-            .collect()
-    }
-
-    fn enumerate_windows() -> Vec<ScreenSource> {
-        let opts = K_CG_WINDOW_LIST_ON_SCREEN_ONLY | K_CG_WINDOW_LIST_EXCLUDE_DESKTOP_ELEMENTS;
-        let array = unsafe { CGWindowListCopyWindowInfo(opts, 0) };
-        if array.is_null() {
-            log::warn!("[screen-share] CGWindowListCopyWindowInfo returned null");
-            return Vec::new();
-        }
-
-        // cfstr can fail (interior NUL — never happens for these literals
-        // but stay defensive); bail cleanly if so.
-        let Some(key_window_number) = cfstr("kCGWindowNumber") else {
-            unsafe { CFRelease(array) };
-            return Vec::new();
-        };
-        let Some(key_window_name) = cfstr("kCGWindowName") else {
-            unsafe {
-                CFRelease(key_window_number);
-                CFRelease(array)
-            };
-            return Vec::new();
-        };
-        let Some(key_owner_name) = cfstr("kCGWindowOwnerName") else {
-            unsafe {
-                CFRelease(key_window_number);
-                CFRelease(key_window_name);
-                CFRelease(array);
-            }
-            return Vec::new();
-        };
-        let Some(key_layer) = cfstr("kCGWindowLayer") else {
-            unsafe {
-                CFRelease(key_window_number);
-                CFRelease(key_window_name);
-                CFRelease(key_owner_name);
-                CFRelease(array);
-            }
-            return Vec::new();
-        };
-
-        let count = unsafe { CFArrayGetCount(array) };
-        let mut out: Vec<ScreenSource> = Vec::new();
-        for i in 0..count {
-            let dict = unsafe { CFArrayGetValueAtIndex(array, i) };
-            if dict.is_null() {
-                continue;
-            }
-            let number_cf = unsafe { CFDictionaryGetValue(dict, key_window_number) };
-            let layer_cf = unsafe { CFDictionaryGetValue(dict, key_layer) };
-            let window_id_u64 = match cfnumber_to_u64(number_cf) {
-                Some(v) => v,
-                None => continue,
-            };
-            // `CGWindowID` is `uint32_t` upstream, but `cfnumber_to_u64`
-            // returns 64-bit (we read the CFNumber as SInt64 for sign
-            // safety). Values should never exceed `u32::MAX` in practice,
-            // but a silent cast would round-trip through `format!` and
-            // then fail parse_source_id — the user would see a source in
-            // the picker with a permanent grey placeholder. Skip loudly.
-            let window_id = match u32::try_from(window_id_u64) {
-                Ok(v) => v,
-                Err(_) => {
-                    log::warn!(
-                        "[screen-share] window_id {} overflows u32, skipping",
-                        window_id_u64
-                    );
-                    continue;
-                }
-            };
-            // Skip menu bar / dock / system chrome (layer != 0 → non-normal
-            // window). Normal app windows live at layer 0.
-            let layer = cfnumber_to_u64(layer_cf).unwrap_or(0);
-            if layer != 0 {
-                continue;
-            }
-            let title = unsafe { CFDictionaryGetValue(dict, key_window_name) };
-            let owner = unsafe { CFDictionaryGetValue(dict, key_owner_name) };
-            let title_str = cfstring_to_string(title).unwrap_or_default();
-            let owner_str = cfstring_to_string(owner).unwrap_or_default();
-            // Windows with no title are usually uninteresting (background
-            // helpers). Skip unless owner is informative and the window is
-            // the owner's only one — for MVP, simpler to just drop them.
-            if title_str.is_empty() {
-                continue;
-            }
-            let name = if owner_str.is_empty() {
-                title_str.clone()
-            } else {
-                format!("{} — {}", owner_str, title_str)
-            };
-            out.push(ScreenSource {
-                id: format!("window:{}:0", window_id),
-                kind: "window".to_string(),
-                name,
-                app_name: if owner_str.is_empty() {
-                    None
-                } else {
-                    Some(owner_str)
-                },
-                thumbnail_png_base64: String::new(),
-            });
-        }
-        unsafe {
-            CFRelease(key_window_number);
-            CFRelease(key_window_name);
-            CFRelease(key_owner_name);
-            CFRelease(key_layer);
-            CFRelease(array);
-        }
-        out
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // ---- parse_source_id tests (platform-agnostic) ----
-
-    #[test]
-    fn parses_screen_id() {
-        assert_eq!(parse_source_id("screen:1:0"), Some((SourceKind::Screen, 1)));
-        assert_eq!(
-            parse_source_id("screen:69734208:0"),
-            Some((SourceKind::Screen, 69734208))
-        );
-    }
-
-    #[test]
-    fn parses_window_id() {
-        assert_eq!(
-            parse_source_id("window:42:0"),
-            Some((SourceKind::Window, 42))
-        );
-    }
-
-    #[test]
-    fn trailing_segment_ignored() {
-        assert_eq!(
-            parse_source_id("screen:1:extra:stuff"),
-            Some((SourceKind::Screen, 1))
-        );
-    }
-
-    #[test]
-    fn rejects_unknown_prefix() {
-        assert_eq!(parse_source_id("tab:1:0"), None);
-        assert_eq!(parse_source_id("browser:1:0"), None);
-        assert_eq!(parse_source_id(""), None);
-    }
-
-    #[test]
-    fn rejects_missing_numeric() {
-        assert_eq!(parse_source_id("screen::0"), None);
-        assert_eq!(parse_source_id("screen:"), None);
-        assert_eq!(parse_source_id("screen"), None);
-    }
-
-    #[test]
-    fn rejects_non_numeric_id() {
-        assert_eq!(parse_source_id("screen:abc:0"), None);
-        assert_eq!(parse_source_id("window:0x1:0"), None);
-    }
-
-    #[test]
-    fn rejects_overflowing_id() {
-        assert_eq!(parse_source_id("screen:4294967296:0"), None);
-        assert_eq!(parse_source_id("screen:-1:0"), None);
-    }
-
-    #[test]
-    fn list_source_roundtrip() {
-        assert!(parse_source_id("screen:1:0").is_some());
-        assert!(parse_source_id("window:12345:0").is_some());
-    }
-
-    // ---- Session / rate-limit tests (pure logic, no platform APIs) ----
-
-    fn insert_test_session(
-        state: &ScreenShareState,
-        token: &str,
-        account_id: &str,
-        ttl: Duration,
-        ids: &[&str],
-    ) {
-        let mut sessions = state.sessions.lock().unwrap();
-        let mut active = state.active.lock().unwrap();
-        sessions.insert(
-            token.to_string(),
-            Session {
-                account_id: account_id.to_string(),
-                allowed_ids: ids.iter().map(|s| s.to_string()).collect(),
-                expires_at: Instant::now() + ttl,
-            },
-        );
-        active.insert(account_id.to_string(), token.to_string());
-    }
-
-    #[test]
-    fn purge_expired_removes_stale_sessions() {
-        let state = ScreenShareState::new();
-        insert_test_session(
-            &state,
-            "tok-expired",
-            "acct1",
-            Duration::from_millis(0),
-            &[],
-        );
-        // Sleep a blink so `expires_at <= now` is definitely true.
-        std::thread::sleep(Duration::from_millis(5));
-        insert_test_session(&state, "tok-live", "acct2", Duration::from_secs(10), &[]);
-
-        {
-            let mut s = state.sessions.lock().unwrap();
-            let mut a = state.active.lock().unwrap();
-            purge_expired(&mut s, &mut a);
-        }
-
-        let sessions = state.sessions.lock().unwrap();
-        assert!(!sessions.contains_key("tok-expired"));
-        assert!(sessions.contains_key("tok-live"));
-        let active = state.active.lock().unwrap();
-        assert!(!active.contains_key("acct1"));
-        assert_eq!(active.get("acct2").map(|s| s.as_str()), Some("tok-live"));
-    }
-
-    #[test]
-    fn rate_limit_blocks_11th_call_in_window() {
-        let mut rate: HashMap<String, VecDeque<Instant>> = HashMap::new();
-        for _ in 0..RATE_LIMIT_MAX {
-            assert!(check_and_record_rate(&mut rate, "acct-x"));
-        }
-        // 11th call must fail.
-        assert!(!check_and_record_rate(&mut rate, "acct-x"));
-    }
-
-    #[test]
-    fn rate_limit_scoped_per_account() {
-        let mut rate: HashMap<String, VecDeque<Instant>> = HashMap::new();
-        for _ in 0..RATE_LIMIT_MAX {
-            check_and_record_rate(&mut rate, "acct-a");
-        }
-        // Different account still has full budget.
-        assert!(check_and_record_rate(&mut rate, "acct-b"));
-    }
-
-    #[test]
-    fn generate_token_is_url_safe_and_unique() {
-        let a = generate_token();
-        let b = generate_token();
-        assert_ne!(a, b);
-        // URL-safe base64, no-pad, 16 bytes → 22 chars.
-        assert_eq!(a.len(), 22);
-        assert!(a
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_'));
-    }
-
-    #[test]
-    fn token_prefix_truncates() {
-        assert_eq!(token_prefix("0123456789abcdef"), "01234567");
-        assert_eq!(token_prefix("ab"), "ab");
-    }
-
-    // NOTE: full command-level tests (screen_share_begin_session etc.)
-    // would need a `tauri::Webview` mock, which the stable Tauri API
-    // doesn't expose. Gate + rate-limit logic is covered above; the
-    // command glue around it is thin enough to verify via live run.
-}
diff --git a/app/src-tauri/src/webview_accounts/runtime.js b/app/src-tauri/src/webview_accounts/runtime.js
index f439f3e49..e4ee1306e 100644
--- a/app/src-tauri/src/webview_accounts/runtime.js
+++ b/app/src-tauri/src/webview_accounts/runtime.js
@@ -96,676 +96,60 @@
   window.__openhumanRecipe = api;
   send('log', { level: 'info', msg: '[recipe-runtime] ready provider=' + ctx.provider + ' accountId=' + ctx.accountId });
 
-  // --- #713 getDisplayMedia shim ---
-  //
-  // Background: embedded webviews run under CEF Alloy, which does not link
-  // Chromium's DesktopMediaPicker. Without an interceptor, `getDisplayMedia`
-  // gets auto-granted by our permission handler and Chromium silently picks
-  // the primary display (issue #713 AC2: "OS screen/window picker appears").
-  //
-  // The picker UI is injected DIRECTLY into the child webview's own DOM
-  // rather than rendered as a React modal in the main OpenHuman window.
-  // Two reasons:
-  //   (a) Works uniformly for every embedded provider — Meet, Slack
-  //       Huddles, Discord, Zoom — without per-provider host-side glue.
-  //   (b) Dodges the CEF native-view stacking problem: a React modal in
-  //       the main window is always occluded by the child webview's
-  //       NSView, forcing a hide/bounds dance that flickers the embedded
-  //       site. An overlay inside the page is stacked in the page's own
-  //       compositing context, so it sits above Meet/Slack UI naturally.
-  //
-  // Flow:
-  //   1. Shim calls Tauri `screen_share_list_sources` to enumerate real
-  //      screens (`screen:<CGDirectDisplayID>:0`) and windows
-  //      (`window:<CGWindowID>:0`) natively.
-  //   2. Shim builds a fixed-position picker overlay inside the page's
-  //      document and awaits the user's choice.
-  //   3. On Share, shim calls `getUserMedia` with a hand-crafted
-  //      `chromeMediaSource: 'desktop' + chromeMediaSourceId` constraint.
-  //      Stage 0 PoC proved Chromium honours the ID directly because our
-  //      CEF permission callback grants `DESKTOP_VIDEO_CAPTURE` bits.
-  //   4. On Cancel, shim throws `NotAllowedError` — same shape the real
-  //      Chromium picker emits so page error handling is unchanged.
-  (function installGetDisplayMediaShim() {
-    if (!navigator.mediaDevices || typeof navigator.mediaDevices.getDisplayMedia !== 'function') {
-      // Never had getDisplayMedia to begin with (non-WebRTC webview); skip.
-      return;
-    }
-    if (navigator.mediaDevices.__ohGdmShimInstalled) return;
-
-    // `navigator.mediaDevices.getDisplayMedia` is a WebIDL-defined prototype
-    // method on `MediaDevices.prototype`. Chromium marks it
-    // `writable: true, configurable: true` but *only* on the prototype —
-    // plain `navigator.mediaDevices.getDisplayMedia = ...` on the instance
-    // creates an own-property shadow that Chromium's IDL bindings bypass
-    // when the page actually invokes the method. We override on the
-    // prototype with `defineProperty` so the shim is what runs for every
-    // MediaDevices instance in this page (including any iframes that
-    // inherit from the same prototype).
-    const proto = Object.getPrototypeOf(navigator.mediaDevices);
-    const descriptor = Object.getOwnPropertyDescriptor(proto, 'getDisplayMedia');
-    const origGetDisplayMedia = (descriptor && descriptor.value
-      ? descriptor.value
-      : navigator.mediaDevices.getDisplayMedia
-    ).bind(navigator.mediaDevices);
-
-    // Fire-and-forget session cleanup. Swallows errors because finalize
-    // is a no-op on the host side for unknown/expired tokens and we don't
-    // want a late IPC failure to leak into the getDisplayMedia rejection.
-    function finalizeSessionQuiet(token, pickedId) {
-      if (!token) return Promise.resolve();
-      return rawInvoke('screen_share_finalize_session', {
-        args: { token: token, pickedId: pickedId || null },
-      }).catch(function () {});
-    }
-
-    // In-flight guard (graycyrus refactor #6). The host-side state already
-    // evicts a stale session when begin_session fires twice, but without a
-    // shim-side guard a second call would still append a second picker DOM
-    // while the first is open — the user would see two stacked overlays.
-    // Reject a concurrent call the same way the MediaStreams spec does
-    // when an existing capture request is in progress.
-    let pickerInFlight = false;
-
-    const shim = async function (constraints) {
-      constraints = constraints || {};
-      if (pickerInFlight) {
-        send('log', { level: 'warn', msg: '[gdm-shim] picker already open, rejecting concurrent call' });
-        throw new DOMException(
-          'A screen-share picker is already open',
-          'InvalidStateError'
-        );
-      }
-      pickerInFlight = true;
-      try {
-        return await runShim(constraints);
-      } finally {
-        pickerInFlight = false;
-      }
-    };
-
-    const runShim = async function (constraints) {
-      constraints = constraints || {};
-      // User-activation gate (#812). `navigator.userActivation.isActive`
-      // is transient — true only during the direct call stack of a real
-      // gesture handler (click, key, touch). Third-party JS calling
-      // getDisplayMedia from a timer or async continuation gets filtered
-      // here, so our downstream commands (begin_session etc.) never open
-      // a session without a gesture. Fall through to the original
-      // implementation rather than throw so pages with legitimate
-      // non-gesture flows (rare but possible) aren't hard-blocked.
-      const hasActivation = !!(
-        typeof navigator !== 'undefined' &&
-        navigator.userActivation &&
-        navigator.userActivation.isActive
-      );
-      send('log', {
-        level: 'info',
-        msg:
-          '[gdm-shim] getDisplayMedia intercepted audio=' +
-          !!constraints.audio +
-          ' activation=' +
-          hasActivation,
-      });
-      if (!hasActivation) {
-        send('log', {
-          level: 'warn',
-          msg: '[gdm-shim] no user activation, falling through to native getDisplayMedia',
-        });
-        return origGetDisplayMedia(constraints);
-      }
-
-      let session;
-      try {
-        session = await rawInvoke('screen_share_begin_session', {
-          args: {
-            accountId: ctx.accountId,
-            origin: (typeof location !== 'undefined' && location.origin) || 'unknown',
-            hasUserActivation: hasActivation,
-          },
-        });
-      } catch (e) {
-        send('log', {
-          level: 'error',
-          msg: '[gdm-shim] begin_session IPC failed: ' + (e && e.message ? e.message : String(e)),
-        });
-        return origGetDisplayMedia(constraints);
-      }
-      if (!session || typeof session.token !== 'string' || !Array.isArray(session.sources)) {
-        send('log', {
-          level: 'warn',
-          msg: '[gdm-shim] begin_session returned malformed payload, falling back',
-        });
-        return origGetDisplayMedia(constraints);
-      }
-      const sessionToken = session.token;
-      const sources = session.sources;
-      if (sources.length === 0) {
-        send('log', { level: 'warn', msg: '[gdm-shim] no sources enumerated, falling back' });
-        await finalizeSessionQuiet(sessionToken, null);
-        return origGetDisplayMedia(constraints);
-      }
-
-      const pick = await showInPagePicker(sources, sessionToken);
-      if (!pick) {
-        send('log', { level: 'info', msg: '[gdm-shim] user cancelled picker' });
-        await finalizeSessionQuiet(sessionToken, null);
-        // Meet (and other video-conf sites) treat `NotAllowedError` on
-        // getDisplayMedia as "the browser blocked us" and pop a
-        // "needs permission" modal. Real Chrome ALSO throws
-        // NotAllowedError on picker cancel, but Meet silently swallows
-        // it there — presumably via a separate Permissions API check
-        // that reports 'granted'. Since we can't easily signal that
-        // state in CEF, throw `AbortError` instead: it's the MDN-blessed
-        // "user interrupted a UI operation" error and most sites (Meet
-        // included) dismiss it silently.
-        throw new DOMException('User cancelled screen share picker', 'AbortError');
-      }
-      // Finalize the session BEFORE getUserMedia: the Chromium capture
-      // path doesn't need the token, and leaving the session open past
-      // this point would just hold the `active` slot for the account
-      // until the 30s TTL fires.
-      await finalizeSessionQuiet(sessionToken, pick.id);
-      send('log', {
-        level: 'info',
-        msg: '[gdm-shim] picked id=' + pick.id + ' kind=' + pick.kind,
-      });
-      const videoMandatory = {
-        chromeMediaSource: 'desktop',
-        chromeMediaSourceId: pick.id,
-        maxFrameRate: 30,
+  // CEF Alloy's Permissions API does not reflect the media-access callback.
+  // Preserve the mic/camera response for providers that check it before
+  // calling getUserMedia; display-capture is deliberately not overridden.
+  try {
+    if (
+      navigator.permissions &&
+      typeof navigator.permissions.query === 'function' &&
+      !navigator.permissions.__ohPermissionsShimInstalled
+    ) {
+      const permProto = Object.getPrototypeOf(navigator.permissions);
+      const permDescriptor = Object.getOwnPropertyDescriptor(permProto, 'query');
+      const origQuery = (permDescriptor && permDescriptor.value
+        ? permDescriptor.value
+        : navigator.permissions.query
+      ).bind(navigator.permissions);
+      const spoofed = {
+        camera: 'granted',
+        microphone: 'granted',
       };
-      // System-audio capture via `chromeMediaSource: 'desktop'` needs a
-      // loopback driver on macOS (no stock API). If the page requested
-      // audio we try with audio first and fall back to video-only on
-      // rejection so Meet/Slack/etc don't see a generic "Can't share"
-      // error on every attempt. Chromium cleanly handles a missing audio
-      // track in the SDP.
-      const videoOnly = { video: { mandatory: videoMandatory }, audio: false };
-
-      let stream;
-      if (constraints.audio) {
-        const audioMandatory = {
-          chromeMediaSource: 'desktop',
-          chromeMediaSourceId: pick.id,
-        };
-        try {
-          stream = await navigator.mediaDevices.getUserMedia({
-            video: { mandatory: videoMandatory },
-            audio: { mandatory: audioMandatory },
-          });
-        } catch (e) {
-          send('log', {
-            level: 'warn',
-            msg:
-              '[gdm-shim] audio+video getUserMedia rejected (' +
-              (e && e.name ? e.name : '?') +
-              '), retrying video-only',
-          });
-          stream = await navigator.mediaDevices.getUserMedia(videoOnly);
+      const spoofedQuery = async function (descriptor) {
+        const n = descriptor && descriptor.name;
+        if (n && spoofed[n]) {
+          return {
+            state: spoofed[n],
+            status: spoofed[n],
+            name: n,
+            onchange: null,
+            addEventListener: function () {},
+            removeEventListener: function () {},
+            dispatchEvent: function () { return true; },
+          };
         }
-      } else {
-        stream = await navigator.mediaDevices.getUserMedia(videoOnly);
-      }
-
-      // Stream returned by the legacy `chromeMediaSource: 'desktop'`
-      // getUserMedia path is a real capture stream but its tracks lack
-      // the display-media metadata the page expects from real
-      // getDisplayMedia. Google Meet (and others) inspect
-      // `track.getSettings().displaySurface` before they will route the
-      // track over WebRTC — if the field is missing they throw "Can't
-      // share your screen — Something went wrong".
-      //
-      // Patch each video track to expose the right displaySurface and
-      // a `contentHint` of `detail` (standard WebRTC screen-capture
-      // content hint). The underlying capture pipeline is unchanged;
-      // we're only fixing the introspectable metadata the page relies
-      // on to identify a display-media track.
-      const displaySurface = pick.kind === 'screen' ? 'monitor' : 'window';
-      stream.getVideoTracks().forEach(function (track) {
-        try { track.contentHint = 'detail'; } catch (_) { /* ignore */ }
-        try {
-          const origGetSettings = track.getSettings.bind(track);
-          Object.defineProperty(track, 'getSettings', {
-            configurable: true,
-            writable: true,
-            value: function () {
-              const base = origGetSettings() || {};
-              return Object.assign({}, base, {
-                displaySurface: displaySurface,
-                logicalSurface: true,
-                cursor: 'motion',
-              });
-            },
-          });
-        } catch (e) {
-          send('log', {
-            level: 'warn',
-            msg: '[gdm-shim] patch getSettings failed: ' + (e && e.message ? e.message : e),
-          });
-        }
-      });
-
-      return stream;
-    };
-
-    // In-page picker. Renders straight into the host page's <body> so the
-    // overlay stacks above the site's own compositor (Meet/Slack/Discord
-    // UI) without any native-view gymnastics. All nodes are namespaced
-    // under `__ohsp_*` class/ID prefixes and attached to a closed shadow
-    // root where possible to avoid colliding with the host page's CSS.
-    function showInPagePicker(sources, sessionToken) {
-      return new Promise(function (resolveOuter, rejectOuter) {
-        function host() { return (document.body || document.documentElement); }
-        if (!host()) {
-          // DOM hasn't parsed yet — wait for it and retry. Previously we
-          // resolved null here, which the shim turned into an AbortError
-          // even though no picker was ever shown (coderabbit #809).
-          document.addEventListener(
-            'DOMContentLoaded',
-            function () {
-              showInPagePicker(sources, sessionToken).then(resolveOuter, rejectOuter);
-            },
-            { once: true }
-          );
-          return;
-        }
-
-        const root = document.createElement('div');
-        root.setAttribute('data-openhuman-screen-share-picker', '');
-        root.style.cssText = [
-          'all: initial',
-          'position: fixed',
-          'inset: 0',
-          'z-index: 2147483647',
-          'display: flex',
-          'align-items: center',
-          'justify-content: center',
-          'background: rgba(0,0,0,0.55)',
-          'backdrop-filter: blur(6px)',
-          '-webkit-backdrop-filter: blur(6px)',
-          'font-family: -apple-system, BlinkMacSystemFont, "Inter", "Segoe UI", sans-serif',
-        ].join(';');
-
-        const shadow = root.attachShadow ? root.attachShadow({ mode: 'closed' }) : root;
-
-        const styleTag = document.createElement('style');
-        styleTag.textContent = [
-          '* { box-sizing: border-box; margin: 0; padding: 0; font-family: inherit; }',
-          '.card { background: #fff; color: #1C1917; border-radius: 16px; width: min(640px, 92vw);',
-          '        max-height: 86vh; box-shadow: 0 24px 64px rgba(0,0,0,0.35); overflow: hidden;',
-          '        display: flex; flex-direction: column; }',
-          '.head { padding: 20px 24px; border-bottom: 1px solid #E7E5E4; display: flex;',
-          '        align-items: flex-start; justify-content: space-between; gap: 16px; }',
-          '.title { font-size: 17px; font-weight: 600; color: #1C1917; }',
-          '.origin { margin-top: 4px; font-size: 13px; color: #78716C; }',
-          '.closebtn { width: 32px; height: 32px; border: none; background: transparent;',
-          '            color: #78716C; cursor: pointer; border-radius: 8px; font-size: 18px;',
-          '            display: flex; align-items: center; justify-content: center; }',
-          '.closebtn:hover { background: #F5F5F4; color: #1C1917; }',
-          '.tabs { display: flex; gap: 4px; padding: 0 24px; border-bottom: 1px solid #E7E5E4; }',
-          '.tab { appearance: none; -webkit-appearance: none; background: transparent; border: 0;',
-          '       padding: 12px 16px; font-size: 14px; font-weight: 500; color: #78716C;',
-          '       cursor: pointer; border-bottom: 2px solid transparent; }',
-          '.tab.active { color: #4A83DD; border-bottom-color: #4A83DD; }',
-          '.body { padding: 20px 24px; overflow-y: auto; }',
-          '.grid { display: grid; grid-template-columns: repeat(2, minmax(0,1fr)); gap: 12px; }',
-          '.srcbtn { background: #FAFAF9; border: 2px solid #E7E5E4; border-radius: 10px;',
-          '          padding: 0; cursor: pointer; text-align: left; overflow: hidden;',
-          '          transition: border-color .15s, box-shadow .15s; }',
-          '.srcbtn:hover { border-color: #D4D4D1; }',
-          '.srcbtn.selected { border-color: #4A83DD;',
-          '                   box-shadow: 0 0 0 3px rgba(74,131,221,0.18); }',
-          '.srcthumb { aspect-ratio: 16/10; background: #F5F5F4; display: flex;',
-          '            align-items: center; justify-content: center; color: #A8A29E;',
-          '            font-size: 32px; }',
-          '.srcname { padding: 8px 10px; font-size: 13px; color: #1C1917; font-weight: 500;',
-          '           white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }',
-          '.srcapp { padding: 0 10px 8px; font-size: 11px; color: #78716C;',
-          '          white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }',
-          '.empty { padding: 32px 0; text-align: center; color: #78716C; font-size: 13px; }',
-          '.foot { padding: 12px 16px; border-top: 1px solid #E7E5E4; display: flex;',
-          '        justify-content: flex-end; gap: 8px; }',
-          '.btn { appearance: none; -webkit-appearance: none; border: 0; border-radius: 10px;',
-          '       padding: 9px 16px; font-size: 14px; font-weight: 500; cursor: pointer; }',
-          '.btn-secondary { background: transparent; color: #1C1917; }',
-          '.btn-secondary:hover { background: #F5F5F4; }',
-          '.btn-primary { background: #4A83DD; color: #fff; }',
-          '.btn-primary:hover { background: #3D6DC4; }',
-          '.btn-primary:disabled { background: #D4D4D1; cursor: not-allowed; }',
-        ].join('\n');
-        shadow.appendChild(styleTag);
-
-        function hostnameOf(url) {
-          try { return new URL(url).hostname || url; } catch (e) { return url; }
-        }
-
-        const origin = (typeof location !== 'undefined' && location.origin) || 'this site';
-        let activeTab = sources.some(function (s) { return s.kind === 'screen'; })
-          ? 'screen'
-          : 'window';
-        let selectedId = null;
-
-        // DOM is constructed imperatively (no innerHTML) because hosts
-        // like Google Meet ship strict Trusted Types CSP that rejects
-        // string-based HTML assignment with a TypeError. `createElement`
-        // and `appendChild` are policy-free and work everywhere.
-        const card = document.createElement('div');
-        card.className = 'card';
-
-        function el(tag, attrs, text) {
-          const node = document.createElement(tag);
-          if (attrs) {
-            Object.keys(attrs).forEach(function (k) {
-              if (k === 'className') node.className = attrs[k];
-              else node.setAttribute(k, attrs[k]);
-            });
-          }
-          if (text != null) node.textContent = text;
-          return node;
-        }
-
-        const head = el('div', { className: 'head' });
-        const headLeft = el('div');
-        headLeft.appendChild(el('div', { className: 'title' }, 'Choose what to share'));
-        const originEl = el(
-          'div',
-          { className: 'origin' },
-          hostnameOf(origin) + ' wants to share your screen.'
-        );
-        headLeft.appendChild(originEl);
-        head.appendChild(headLeft);
-        const closeBtn = el(
-          'button',
-          { className: 'closebtn', 'data-action': 'cancel', 'aria-label': 'Cancel' },
-          '✕'
-        );
-        head.appendChild(closeBtn);
-        card.appendChild(head);
-
-        const tabs = el('div', { className: 'tabs' });
-        const screenTab = el('button', { className: 'tab', 'data-tab': 'screen' }, 'Entire Screen');
-        const windowTab = el('button', { className: 'tab', 'data-tab': 'window' }, 'Window');
-        tabs.appendChild(screenTab);
-        tabs.appendChild(windowTab);
-        card.appendChild(tabs);
-
-        const bodyEl = el('div', { className: 'body' });
-        const gridEl = el('div', { className: 'grid' });
-        bodyEl.appendChild(gridEl);
-        card.appendChild(bodyEl);
-
-        const foot = el('div', { className: 'foot' });
-        const cancelBtn = el(
-          'button',
-          { className: 'btn btn-secondary', 'data-action': 'cancel' },
-          'Cancel'
-        );
-        const shareBtn = el('button', { className: 'btn btn-primary' }, 'Share');
-        shareBtn.disabled = true;
-        foot.appendChild(cancelBtn);
-        foot.appendChild(shareBtn);
-        card.appendChild(foot);
-
-        shadow.appendChild(card);
-
-        const tabButtons = [screenTab, windowTab];
-
-        function setTab(next) {
-          activeTab = next;
-          tabButtons.forEach(function (btn) {
-            btn.classList.toggle('active', btn.getAttribute('data-tab') === activeTab);
-          });
-          render();
-        }
-
-        function render() {
-          while (gridEl.firstChild) gridEl.removeChild(gridEl.firstChild);
-          const filtered = sources.filter(function (s) { return s.kind === activeTab; });
-          if (filtered.length === 0) {
-            const empty = document.createElement('div');
-            empty.className = 'empty';
-            empty.textContent =
-              'No ' + (activeTab === 'screen' ? 'screens' : 'windows') + ' available.';
-            gridEl.appendChild(empty);
-            shareBtn.disabled = true;
-            return;
-          }
-          filtered.forEach(function (src) {
-            const btn = document.createElement('button');
-            btn.className = 'srcbtn' + (selectedId === src.id ? ' selected' : '');
-            btn.setAttribute('data-source-id', src.id);
-            const thumb = document.createElement('div');
-            thumb.className = 'srcthumb';
-            if (src.thumbnailPngBase64) {
-              const img = document.createElement('img');
-              img.src = 'data:image/png;base64,' + src.thumbnailPngBase64;
-              img.alt = '';
-              img.style.cssText =
-                'width: 100%; height: 100%; object-fit: contain; display: block;';
-              thumb.appendChild(img);
-            } else {
-              // Placeholder glyph until the lazy-loaded thumbnail arrives.
-              thumb.textContent = activeTab === 'screen' ? '□' : '▣';
-              // Dedup in-flight thumbnail IPCs: render() re-runs on every
-              // selection change and tab switch, and without this cache
-              // each pass would re-issue screen_share_thumbnail for every
-              // source that hadn't yet returned (coderabbit #809).
-              function paintThumb(b64) {
-                if (!b64 || typeof b64 !== 'string') return;
-                const liveBtn = gridEl.querySelector(
-                  '[data-source-id="' + src.id.replace(/"/g, '\\"') + '"]'
-                );
-                if (!liveBtn) return;
-                const liveThumb = liveBtn.querySelector('.srcthumb');
-                if (!liveThumb) return;
-                while (liveThumb.firstChild) liveThumb.removeChild(liveThumb.firstChild);
-                const img = document.createElement('img');
-                img.src = 'data:image/png;base64,' + b64;
-                img.alt = '';
-                img.style.cssText =
-                  'width: 100%; height: 100%; object-fit: contain; display: block;';
-                liveThumb.appendChild(img);
-              }
-              if (src.__thumbnailPromise) {
-                src.__thumbnailPromise.then(paintThumb, function () {});
-              } else {
-                src.__thumbnailPromise = rawInvoke('screen_share_thumbnail', {
-                  args: { token: sessionToken, id: src.id },
-                }).then(
-                  function (b64) {
-                    if (b64 && typeof b64 === 'string') {
-                      // Stash on the source so future re-renders keep
-                      // the thumbnail without re-requesting it.
-                      src.thumbnailPngBase64 = b64;
-                    }
-                    paintThumb(b64);
-                    return b64;
-                  },
-                  function () {
-                    /* thumbnail failures degrade gracefully to the glyph */
-                  }
-                );
-              }
-            }
-            const name = document.createElement('div');
-            name.className = 'srcname';
-            name.textContent = src.name;
-            btn.appendChild(thumb);
-            btn.appendChild(name);
-            if (src.appName) {
-              const app = document.createElement('div');
-              app.className = 'srcapp';
-              app.textContent = src.appName;
-              btn.appendChild(app);
-            }
-            btn.addEventListener('click', function () {
-              selectedId = src.id;
-              render();
-            });
-            btn.addEventListener('dblclick', function () {
-              selectedId = src.id;
-              finish(sources.find(function (s) { return s.id === selectedId; }) || null);
-            });
-            gridEl.appendChild(btn);
-          });
-          if (!selectedId || !filtered.some(function (s) { return s.id === selectedId; })) {
-            selectedId = filtered[0].id;
-            gridEl.firstChild && gridEl.firstChild.classList.add('selected');
-          }
-          shareBtn.disabled = !selectedId;
-        }
-
-        tabButtons.forEach(function (btn) {
-          btn.addEventListener('click', function () { setTab(btn.getAttribute('data-tab')); });
-        });
-
-        let settled = false;
-        function finish(pick) {
-          if (settled) return;
-          settled = true;
-          window.removeEventListener('keydown', onKey, true);
-          try { root.remove(); } catch (e) { /* ignore */ }
-          resolveOuter(pick);
-        }
-
-        card.querySelectorAll('[data-action="cancel"]').forEach(function (btn) {
-          btn.addEventListener('click', function () { finish(null); });
-        });
-        shareBtn.addEventListener('click', function () {
-          const pick = sources.find(function (s) { return s.id === selectedId; }) || null;
-          finish(pick);
-        });
-        // Clicks on the backdrop (outside the card) cancel. Clicks inside
-        // the card bubble up to root too, but we stop them there.
-        root.addEventListener('click', function (e) {
-          if (e.target === root || e.composedPath()[0] === root) finish(null);
-        });
-        card.addEventListener('click', function (e) { e.stopPropagation(); });
-
-        function onKey(e) {
-          if (e.key === 'Escape') {
-            e.preventDefault();
-            e.stopPropagation();
-            finish(null);
-          }
-        }
-        window.addEventListener('keydown', onKey, true);
-
-        setTab(activeTab);
-        host().appendChild(root);
-      });
-    }
-
-    let installed = false;
-    try {
-      Object.defineProperty(proto, 'getDisplayMedia', {
-        configurable: true,
-        writable: true,
-        value: shim,
-      });
-      installed = true;
-    } catch (e) {
-      send('log', {
-        level: 'error',
-        msg: '[gdm-shim] defineProperty(proto) failed: ' + (e && e.message ? e.message : String(e)),
-      });
-    }
-    if (!installed) {
+        return origQuery(descriptor);
+      };
       try {
-        Object.defineProperty(navigator.mediaDevices, 'getDisplayMedia', {
+        Object.defineProperty(permProto, 'query', {
           configurable: true,
           writable: true,
-          value: shim,
+          value: spoofedQuery,
         });
-        installed = true;
-      } catch (e2) {
-        send('log', {
-          level: 'error',
-          msg: '[gdm-shim] defineProperty(instance) failed: ' + (e2 && e2.message ? e2.message : String(e2)),
+      } catch (e) {
+        Object.defineProperty(navigator.permissions, 'query', {
+          configurable: true,
+          writable: true,
+          value: spoofedQuery,
         });
       }
+      navigator.permissions.__ohPermissionsShimInstalled = true;
+      send('log', { level: 'info', msg: '[recipe-runtime] media permissions.query shim installed' });
     }
-    navigator.mediaDevices.__ohGdmShimInstalled = installed;
-
-    // Some pages (Meet) also consult `navigator.permissions.query` and
-    // branch on the reported state for `display-capture` /
-    // `camera` / `microphone`. CEF Alloy's Permissions API does not
-    // reflect what our OnRequestMediaAccessPermission callback will
-    // grant dynamically, so it defaults to 'prompt' or even 'denied'
-    // for `display-capture`. A page that sees 'denied' will assume
-    // sharing is structurally blocked and refuse to call
-    // getDisplayMedia — or show the "needs permission" modal on cancel.
-    // We shadow the query for these names so the page sees 'granted'
-    // and relies on our shim for the actual user decision.
-    try {
-      if (
-        navigator.permissions &&
-        typeof navigator.permissions.query === 'function' &&
-        !navigator.permissions.__ohPermissionsShimInstalled
-      ) {
-        const permProto = Object.getPrototypeOf(navigator.permissions);
-        const permDescriptor = Object.getOwnPropertyDescriptor(permProto, 'query');
-        const origQuery = (permDescriptor && permDescriptor.value
-          ? permDescriptor.value
-          : navigator.permissions.query
-        ).bind(navigator.permissions);
-        // CEF Alloy's Permissions API doesn't reflect what our
-        // OnRequestMediaAccessPermission callback will grant dynamically,
-        // so it defaults to 'prompt' or 'denied' for the media permissions
-        // we do handle. Pages that consult the Permissions API up front
-        // (Meet for display-capture; some flows for camera/microphone)
-        // refuse to try the actual getUserMedia call if they see 'denied'
-        // here. Spoof all three to 'granted'; the real grant still goes
-        // through our CEF permission handler where it's scoped per-call.
-        const spoofed = {
-          'display-capture': 'granted',
-          camera: 'granted',
-          microphone: 'granted',
-        };
-        const spoofedQuery = async function (descriptor) {
-          const n = descriptor && descriptor.name;
-          if (n && spoofed[n]) {
-            return {
-              state: spoofed[n],
-              status: spoofed[n],
-              name: n,
-              onchange: null,
-              addEventListener: function () {},
-              removeEventListener: function () {},
-              dispatchEvent: function () { return true; },
-            };
-          }
-          return origQuery(descriptor);
-        };
-        try {
-          Object.defineProperty(permProto, 'query', {
-            configurable: true,
-            writable: true,
-            value: spoofedQuery,
-          });
-        } catch (e) {
-          Object.defineProperty(navigator.permissions, 'query', {
-            configurable: true,
-            writable: true,
-            value: spoofedQuery,
-          });
-        }
-        navigator.permissions.__ohPermissionsShimInstalled = true;
-        send('log', { level: 'info', msg: '[gdm-shim] permissions.query shim installed' });
-      }
-    } catch (e) {
-      send('log', {
-        level: 'warn',
-        msg: '[gdm-shim] permissions.query shim failed: ' + (e && e.message ? e.message : e),
-      });
-    }
-
+  } catch (e) {
     send('log', {
-      level: 'info',
-      msg:
-        '[gdm-shim] install=' + installed +
-        ' on ' + ((typeof location !== 'undefined' && location.origin) || '?'),
+      level: 'warn',
+      msg: '[recipe-runtime] media permissions.query shim failed: ' + (e && e.message ? e.message : e),
     });
-  })();
+  }
 })();
diff --git a/app/src-tauri/vendor/tauri-cef b/app/src-tauri/vendor/tauri-cef
index f09d7e746..455b47deb 160000
--- a/app/src-tauri/vendor/tauri-cef
+++ b/app/src-tauri/vendor/tauri-cef
@@ -1 +1 @@
-Subproject commit f09d7e746a44a5187d2abc116e8a4cd7a9f94a67
+Subproject commit 455b47debb9d1f5d0f1527266e48af1670ad4bc5
diff --git a/app/src/components/intelligence/ScreenIntelligenceDebugPanel.tsx b/app/src/components/intelligence/ScreenIntelligenceDebugPanel.tsx
deleted file mode 100644
index 5e3f72054..000000000
--- a/app/src/components/intelligence/ScreenIntelligenceDebugPanel.tsx
+++ /dev/null
@@ -1,266 +0,0 @@
-import { useCallback } from 'react';
-
-import {
-  type ScreenIntelligenceState,
-  useScreenIntelligenceState,
-} from '../../features/screen-intelligence/useScreenIntelligenceState';
-import { useT } from '../../lib/i18n/I18nContext';
-
-const formatBytes = (bytes: number | null | undefined): string => {
-  if (bytes == null) return '-';
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
-};
-
-interface ScreenIntelligenceDebugPanelProps {
-  state?: Pick<
-    ScreenIntelligenceState,
-    | 'status'
-    | 'captureTestResult'
-    | 'isCaptureTestRunning'
-    | 'recentVisionSummaries'
-    | 'lastError'
-    | 'refreshStatus'
-    | 'refreshVision'
-    | 'runCaptureTest'
-  >;
-}
-
-const ScreenIntelligenceDebugPanelContent = ({
-  state: providedState,
-}: Required<Pick<ScreenIntelligenceDebugPanelProps, 'state'>>) => {
-  const { t } = useT();
-  const {
-    status,
-    captureTestResult,
-    isCaptureTestRunning,
-    recentVisionSummaries,
-    lastError,
-    refreshStatus,
-    refreshVision,
-    runCaptureTest,
-  } = providedState;
-
-  const handleCaptureTest = useCallback(() => {
-    void runCaptureTest();
-  }, [runCaptureTest]);
-
-  const handleRefreshStatus = useCallback(() => {
-    void refreshStatus();
-    void refreshVision(5);
-  }, [refreshStatus, refreshVision]);
-
-  const permissions = status?.permissions;
-  const session = status?.session;
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center justify-between">
-        <h3 className="text-sm font-semibold text-stone-100">
-          {t('intelligence.screenDebug.title')}
-        </h3>
-        <button
-          onClick={handleRefreshStatus}
-          className="rounded-lg border border-stone-700 bg-stone-800/60 px-3 py-1 text-xs text-content-faint dark:text-neutral-600 transition-colors hover:bg-stone-700/60">
-          {t('common.refresh')}
-        </button>
-      </div>
-
-      {/* Permissions */}
-      <div className="rounded-xl border border-stone-700 bg-stone-900/50 p-3">
-        <h4 className="mb-2 text-xs font-medium uppercase tracking-wide text-content-faint">
-          {t('intelligence.screenDebug.permissions')}
-        </h4>
-        {status?.platform_supported === false ? (
-          <p className="text-xs text-content-muted">
-            {t('intelligence.screenDebug.platformNotSupported')}
-          </p>
-        ) : (
-          <div className="grid grid-cols-3 gap-2 text-xs">
-            <PermissionDot
-              label={t('intelligence.screenDebug.permScreen')}
-              value={permissions?.screen_recording}
-            />
-            <PermissionDot
-              label={t('intelligence.screenDebug.permAccessibility')}
-              value={permissions?.accessibility}
-            />
-            <PermissionDot
-              label={t('intelligence.screenDebug.permInput')}
-              value={permissions?.input_monitoring}
-            />
-          </div>
-        )}
-      </div>
-
-      {/* Session Status */}
-      <div className="rounded-xl border border-stone-700 bg-stone-900/50 p-3">
-        <h4 className="mb-2 text-xs font-medium uppercase tracking-wide text-content-faint">
-          {t('intelligence.screenDebug.session')}
-        </h4>
-        <div className="space-y-1 text-xs text-content-faint dark:text-neutral-600">
-          <div className="flex justify-between">
-            <span>{t('intelligence.screenDebug.active')}</span>
-            <span className={session?.active ? 'text-green-400' : 'text-content-muted'}>
-              {session?.active ? t('common.yes') : t('common.no')}
-            </span>
-          </div>
-          <div className="flex justify-between">
-            <span>{t('intelligence.screenDebug.frames')}</span>
-            <span>{session?.frames_in_memory ?? 0}</span>
-          </div>
-          <div className="flex justify-between">
-            <span>{t('intelligence.screenDebug.visionState')}</span>
-            <span>{session?.vision_state ?? t('intelligence.screenDebug.idle')}</span>
-          </div>
-          <div className="flex justify-between">
-            <span>{t('intelligence.screenDebug.visionQueue')}</span>
-            <span>{session?.vision_queue_depth ?? 0}</span>
-          </div>
-          {session?.last_context && (
-            <div className="flex justify-between">
-              <span>{t('intelligence.screenDebug.lastApp')}</span>
-              <span className="max-w-[180px] truncate">{session.last_context}</span>
-            </div>
-          )}
-        </div>
-      </div>
-
-      {/* Capture Test */}
-      <div className="rounded-xl border border-stone-700 bg-stone-900/50 p-3">
-        <h4 className="mb-2 text-xs font-medium uppercase tracking-wide text-content-faint">
-          {t('intelligence.screenDebug.captureTest')}
-        </h4>
-        <button
-          onClick={handleCaptureTest}
-          disabled={isCaptureTestRunning}
-          className="mb-3 w-full rounded-lg border border-primary-600/40 bg-primary-600/20 px-3 py-2 text-sm font-medium text-primary-300 transition-colors hover:bg-primary-600/30 disabled:opacity-50">
-          {isCaptureTestRunning
-            ? t('intelligence.screenDebug.capturing')
-            : t('intelligence.screenDebug.testCapture')}
-        </button>
-
-        {captureTestResult && (
-          <div className="space-y-2">
-            <div className="space-y-1 text-xs text-content-faint dark:text-neutral-600">
-              <div className="flex justify-between">
-                <span>{t('intelligence.screenDebug.status')}</span>
-                <span className={captureTestResult.ok ? 'text-green-400' : 'text-red-400'}>
-                  {captureTestResult.ok
-                    ? t('intelligence.screenDebug.captureSuccess')
-                    : t('intelligence.screenDebug.captureFailed')}
-                </span>
-              </div>
-              <div className="flex justify-between">
-                <span>{t('intelligence.screenDebug.mode')}</span>
-                <span>{captureTestResult.capture_mode}</span>
-              </div>
-              <div className="flex justify-between">
-                <span>{t('intelligence.screenDebug.time')}</span>
-                <span>{captureTestResult.timing_ms}ms</span>
-              </div>
-              {captureTestResult.bytes_estimate != null && (
-                <div className="flex justify-between">
-                  <span>{t('intelligence.screenDebug.size')}</span>
-                  <span>{formatBytes(captureTestResult.bytes_estimate)}</span>
-                </div>
-              )}
-              {captureTestResult.context && (
-                <div className="flex justify-between">
-                  <span>{t('intelligence.screenDebug.app')}</span>
-                  <span className="max-w-[180px] truncate">
-                    {captureTestResult.context.app_name ?? t('intelligence.screenDebug.unknown')}
-                  </span>
-                </div>
-              )}
-              {captureTestResult.context?.bounds_width != null && (
-                <div className="flex justify-between">
-                  <span>{t('intelligence.screenDebug.bounds')}</span>
-                  <span>
-                    {captureTestResult.context.bounds_width}x
-                    {captureTestResult.context.bounds_height} at (
-                    {captureTestResult.context.bounds_x},{captureTestResult.context.bounds_y})
-                  </span>
-                </div>
-              )}
-            </div>
-
-            {captureTestResult.error && (
-              <div className="rounded-lg border border-red-800/50 bg-red-900/20 p-2 text-xs text-red-300">
-                {captureTestResult.error}
-              </div>
-            )}
-
-            {captureTestResult.image_ref && (
-              <div className="overflow-hidden rounded-lg border border-stone-700">
-                <img
-                  src={captureTestResult.image_ref}
-                  alt={t('intelligence.screenDebug.captureAlt')}
-                  className="w-full"
-                />
-              </div>
-            )}
-          </div>
-        )}
-      </div>
-
-      {/* Recent Vision Summaries */}
-      {recentVisionSummaries.length > 0 && (
-        <div className="rounded-xl border border-stone-700 bg-stone-900/50 p-3">
-          <h4 className="mb-2 text-xs font-medium uppercase tracking-wide text-content-faint">
-            {t('intelligence.screenDebug.recentVisionSummaries')}
-          </h4>
-          <div className="space-y-2">
-            {recentVisionSummaries.map(summary => (
-              <div
-                key={summary.id}
-                className="rounded-lg border border-stone-700/50 bg-stone-800/30 p-2 text-xs">
-                <div className="flex justify-between text-content-faint">
-                  <span>{summary.app_name ?? t('intelligence.screenDebug.unknown')}</span>
-                  <span>
-                    {new Date(summary.captured_at_ms).toLocaleTimeString()} &middot;{' '}
-                    {(summary.confidence * 100).toFixed(0)}%
-                  </span>
-                </div>
-                <div className="mt-1 text-stone-200">{summary.actionable_notes}</div>
-              </div>
-            ))}
-          </div>
-        </div>
-      )}
-
-      {/* Error Display */}
-      {lastError && (
-        <div className="rounded-lg border border-red-800/50 bg-red-900/20 p-2 text-xs text-red-300">
-          {lastError}
-        </div>
-      )}
-    </div>
-  );
-};
-
-const OwnedScreenIntelligenceDebugPanel = () => {
-  const state = useScreenIntelligenceState({ loadVision: true, visionLimit: 5, pollMs: 2000 });
-  return <ScreenIntelligenceDebugPanelContent state={state} />;
-};
-
-const ScreenIntelligenceDebugPanel = ({ state }: ScreenIntelligenceDebugPanelProps) => {
-  if (state) {
-    return <ScreenIntelligenceDebugPanelContent state={state} />;
-  }
-  return <OwnedScreenIntelligenceDebugPanel />;
-};
-
-const PermissionDot = ({ label, value }: { label: string; value?: string }) => {
-  const color =
-    value === 'granted' ? 'bg-green-500' : value === 'denied' ? 'bg-red-500' : 'bg-stone-600';
-  return (
-    <div className="flex items-center gap-1.5">
-      <div className={`h-2 w-2 rounded-full ${color}`} />
-      <span className="text-content-faint dark:text-neutral-600">{label}</span>
-    </div>
-  );
-};
-
-export default ScreenIntelligenceDebugPanel;
diff --git a/app/src/components/intelligence/WorkflowsTab.tsx b/app/src/components/intelligence/WorkflowsTab.tsx
index c372d5f2d..c838c4a39 100644
--- a/app/src/components/intelligence/WorkflowsTab.tsx
+++ b/app/src/components/intelligence/WorkflowsTab.tsx
@@ -26,7 +26,6 @@ import type { ToastNotification } from '../../types/intelligence';
 import SettingsPanel from '../settings/layout/SettingsPanel';
 import CreateSkillModal from '../skills/CreateSkillModal';
 import UnifiedSkillCard from '../skills/SkillCard';
-import { BUILT_IN_SKILL_ICONS } from '../skills/skillIcons';
 import UninstallSkillConfirmDialog from '../skills/UninstallSkillConfirmDialog';
 import Button from '../ui/Button';
 import { ToastContainer } from './Toast';
@@ -181,7 +180,7 @@ export default function WorkflowsTab({ asSettingsPanel = false }: WorkflowsTabPr
               return (
                 <UnifiedSkillCard
                   key={wf.id}
-                  icon={BUILT_IN_SKILL_ICONS.screenIntelligence}
+                  icon={null}
                   title={wf.name}
                   description={wf.description}
                   statusLabel={scopeLabel}
diff --git a/app/src/components/intelligence/__tests__/ScreenIntelligenceDebugPanel.test.tsx b/app/src/components/intelligence/__tests__/ScreenIntelligenceDebugPanel.test.tsx
deleted file mode 100644
index f4dd46e26..000000000
--- a/app/src/components/intelligence/__tests__/ScreenIntelligenceDebugPanel.test.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import {
-  type ScreenIntelligenceState,
-  useScreenIntelligenceState,
-} from '../../../features/screen-intelligence/useScreenIntelligenceState';
-import ScreenIntelligenceDebugPanel from '../ScreenIntelligenceDebugPanel';
-
-vi.mock('../../../features/screen-intelligence/useScreenIntelligenceState', () => ({
-  useScreenIntelligenceState: vi.fn(),
-}));
-
-const baseState: ScreenIntelligenceState = {
-  status: {
-    platform_supported: true,
-    permissions: {
-      screen_recording: 'granted',
-      accessibility: 'granted',
-      input_monitoring: 'granted',
-    },
-    features: { screen_monitoring: true },
-    session: {
-      active: false,
-      started_at_ms: null,
-      expires_at_ms: null,
-      remaining_ms: null,
-      ttl_secs: 300,
-      panic_hotkey: 'Cmd+Shift+.',
-      stop_reason: null,
-      frames_in_memory: 0,
-      last_capture_at_ms: null,
-      last_context: null,
-      vision_enabled: true,
-      vision_state: 'idle',
-      vision_queue_depth: 0,
-      last_vision_at_ms: null,
-      last_vision_summary: null,
-    },
-    config: {
-      enabled: true,
-      capture_policy: 'hybrid',
-      policy_mode: 'all_except_blacklist',
-      baseline_fps: 1,
-      vision_enabled: true,
-      session_ttl_secs: 300,
-      panic_stop_hotkey: 'Cmd+Shift+.',
-      autocomplete_enabled: true,
-      use_vision_model: true,
-      keep_screenshots: false,
-      allowlist: [],
-      denylist: [],
-    },
-    denylist: [],
-    is_context_blocked: false,
-  },
-  lastRestartSummary: null,
-  recentVisionSummaries: [],
-  captureTestResult: null,
-  isCaptureTestRunning: false,
-  isLoading: false,
-  isRequestingPermissions: false,
-  isRestartingCore: false,
-  isStartingSession: false,
-  isStoppingSession: false,
-  isLoadingVision: false,
-  isFlushingVision: false,
-  lastError: null,
-  refreshStatus: vi.fn().mockResolvedValue(null),
-  requestPermission: vi.fn().mockResolvedValue(null),
-  refreshPermissionsWithRestart: vi.fn().mockResolvedValue(null),
-  startSession: vi.fn().mockResolvedValue(null),
-  stopSession: vi.fn().mockResolvedValue(null),
-  refreshVision: vi.fn().mockResolvedValue([]),
-  flushVision: vi.fn().mockResolvedValue(undefined),
-  runCaptureTest: vi.fn().mockResolvedValue(undefined),
-  clearError: vi.fn(),
-};
-
-describe('ScreenIntelligenceDebugPanel', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(useScreenIntelligenceState).mockReturnValue(baseState);
-  });
-
-  it('renders successful capture diagnostics and preview image', async () => {
-    const state: ScreenIntelligenceState = {
-      ...baseState,
-      captureTestResult: {
-        ok: true,
-        capture_mode: 'windowed',
-        context: {
-          app_name: 'Safari',
-          window_title: 'GitHub',
-          bounds_x: 10,
-          bounds_y: 20,
-          bounds_width: 1440,
-          bounds_height: 900,
-        },
-        image_ref: 'data:image/png;base64,ZmFrZQ==',
-        bytes_estimate: 2048,
-        error: null,
-        timing_ms: 155,
-      },
-    };
-
-    render(<ScreenIntelligenceDebugPanel state={state} />);
-
-    expect(screen.getByText('Success')).toBeInTheDocument();
-    expect(screen.getByText('windowed')).toBeInTheDocument();
-    expect(screen.getByText('155ms')).toBeInTheDocument();
-    expect(screen.getByText('2.0 KB')).toBeInTheDocument();
-    expect(screen.getByText('Safari')).toBeInTheDocument();
-    expect(screen.getByAltText('Capture test result')).toHaveAttribute(
-      'src',
-      'data:image/png;base64,ZmFrZQ=='
-    );
-  });
-
-  it('shows "Platform not supported" and hides permission dots when platform_supported is false', () => {
-    const state: ScreenIntelligenceState = {
-      ...baseState,
-      status: { ...baseState.status!, platform_supported: false },
-    };
-
-    render(<ScreenIntelligenceDebugPanel state={state} />);
-
-    expect(screen.getByText('Platform not supported')).toBeInTheDocument();
-    expect(screen.queryByText('Screen')).not.toBeInTheDocument();
-    expect(screen.queryByText('Accessibility')).not.toBeInTheDocument();
-    expect(screen.queryByText('Input')).not.toBeInTheDocument();
-  });
-
-  it('renders capture failures without breaking the diagnostics panel', async () => {
-    const state: ScreenIntelligenceState = {
-      ...baseState,
-      captureTestResult: {
-        ok: false,
-        capture_mode: 'fullscreen',
-        context: null,
-        image_ref: null,
-        bytes_estimate: null,
-        error: 'screen recording permission is not granted',
-        timing_ms: 42,
-      },
-    };
-
-    render(<ScreenIntelligenceDebugPanel state={state} />);
-
-    fireEvent.click(screen.getByRole('button', { name: 'Refresh' }));
-
-    expect(screen.getByText('Failed')).toBeInTheDocument();
-    expect(screen.getByText('fullscreen')).toBeInTheDocument();
-    expect(screen.getByText('42ms')).toBeInTheDocument();
-    expect(screen.getByText('screen recording permission is not granted')).toBeInTheDocument();
-    expect(screen.queryByAltText('Capture test result')).not.toBeInTheDocument();
-    expect(screen.getByText('Permissions')).toBeInTheDocument();
-    expect(baseState.refreshStatus).toHaveBeenCalledTimes(1);
-    expect(baseState.refreshVision).toHaveBeenCalledWith(5);
-  });
-});
diff --git a/app/src/components/oauth/__tests__/oauthAuthReadiness.test.ts b/app/src/components/oauth/__tests__/oauthAuthReadiness.test.ts
index d7cbbe1db..6a88d5862 100644
--- a/app/src/components/oauth/__tests__/oauthAuthReadiness.test.ts
+++ b/app/src/components/oauth/__tests__/oauthAuthReadiness.test.ts
@@ -58,7 +58,7 @@ describe('oauthAuthReadiness', () => {
           activeMode: 'os_keyring',
           backendName: 'os',
         },
-        runtime: { screenIntelligence: null, localAi: null, service: null },
+        runtime: { localAi: null, service: null },
       },
       teams: [],
       teamMembersById: {},
@@ -125,7 +125,7 @@ describe('oauthAuthReadiness', () => {
           activeMode: 'os_keyring',
           backendName: 'os',
         },
-        runtime: { screenIntelligence: null, localAi: null, service: null },
+        runtime: { localAi: null, service: null },
       },
       teams: [],
       teamMembersById: {},
diff --git a/app/src/components/settings/hooks/useSettingsNavigation.ts b/app/src/components/settings/hooks/useSettingsNavigation.ts
index 68c77c82c..16f0cf726 100644
--- a/app/src/components/settings/hooks/useSettingsNavigation.ts
+++ b/app/src/components/settings/hooks/useSettingsNavigation.ts
@@ -20,7 +20,6 @@ type SettingsRoute =
   | 'agent-access'
   | 'account'
   | 'cron-jobs'
-  | 'screen-intelligence'
   | 'privacy'
   | 'billing'
   | 'team'
@@ -32,7 +31,6 @@ type SettingsRoute =
   | 'tools'
   | 'recovery-phrase'
   | 'wallet-balances'
-  | 'screen-awareness-debug'
   | 'local-model-debug'
   | 'notifications'
   | 'notification-routing'
diff --git a/app/src/components/settings/layout/settingsNavIcons.tsx b/app/src/components/settings/layout/settingsNavIcons.tsx
index 745e24c4e..756a757a1 100644
--- a/app/src/components/settings/layout/settingsNavIcons.tsx
+++ b/app/src/components/settings/layout/settingsNavIcons.tsx
@@ -116,7 +116,6 @@ export const SETTINGS_NAV_ICONS: Record<string, ReactNode> = {
       'M21 16V8a2 2 0 00-1-1.73l-7-4a2 2 0 00-2 0l-7 4A2 2 0 003 8v8a2 2 0 001 1.73l7 4a2 2 0 002 0l7-4A2 2 0 0021 16z'
     )
   ),
-  'screen-awareness-debug': icon(stroke('M3 5h18v12H3zM8 21h8m-4-4v4')),
   // Automation & Integrations
   tasks: icon(
     stroke(
diff --git a/app/src/components/settings/panels/CompanionPanel.tsx b/app/src/components/settings/panels/CompanionPanel.tsx
index 88496d5d5..fe48023ed 100644
--- a/app/src/components/settings/panels/CompanionPanel.tsx
+++ b/app/src/components/settings/panels/CompanionPanel.tsx
@@ -101,7 +101,7 @@ const CompanionPanel = () => {
   const sessionActive = status?.active ?? false;
 
   return (
-    <SettingsPanel description={t('pages.settings.features.desktopCompanionDesc')}>
+    <SettingsPanel description={t('settings.assistant.desktopCompanionDesc')}>
       {/* Session status + controls */}
       <SettingsSection>
         <SettingsRow
@@ -182,22 +182,6 @@ const CompanionPanel = () => {
             label={t('settings.companion.sessionTtl')}
             control={<span className="text-xs text-content-muted">{config.ttl_secs}s</span>}
           />
-          <SettingsRow
-            label={t('settings.companion.screenCapture')}
-            control={
-              <span className="text-xs text-content-muted">
-                {config.capture_screen ? t('common.enabled') : t('common.disabled')}
-              </span>
-            }
-          />
-          <SettingsRow
-            label={t('settings.companion.appContext')}
-            control={
-              <span className="text-xs text-content-muted">
-                {config.include_app_context ? t('common.enabled') : t('common.disabled')}
-              </span>
-            }
-          />
         </SettingsSection>
       )}
 
diff --git a/app/src/components/settings/panels/DeveloperOptionsPanel.tsx b/app/src/components/settings/panels/DeveloperOptionsPanel.tsx
index c6389cc51..dcaf6d3a5 100644
--- a/app/src/components/settings/panels/DeveloperOptionsPanel.tsx
+++ b/app/src/components/settings/panels/DeveloperOptionsPanel.tsx
@@ -1,6 +1,6 @@
 // [settings] Developer & Diagnostics panel — debug-only entries only.
 // User-facing routes (agents, autonomy, agent-access, sandbox-settings,
-// activity-level, tools, companion, screen-intelligence, voice, embeddings,
+// activity-level, tools, companion, voice, embeddings,
 // heartbeat, ledger-usage, cost-dashboard, task-sources, composio-routing,
 // webhooks-triggers, migration, security) have been moved to their canonical
 // section pages. Only genuine diagnostics remain here.
@@ -46,7 +46,7 @@ interface DevGroup {
 // Removed from all groups (moved to canonical section pages):
 //   agents, autonomy, agent-access, sandbox-settings, activity-level
 //   → Settings → Agents
-//   tools, companion, screen-intelligence
+//   tools, companion
 //   → Settings → Features
 //   voice, embeddings, heartbeat, ledger-usage, cost-dashboard
 //   → Settings → AI & Models
@@ -121,22 +121,6 @@ const modelsDebugGroup: DevGroup = {
         </svg>
       ),
     },
-    {
-      id: 'screen-awareness-debug',
-      titleKey: 'settings.developerMenu.screenAwareness.title',
-      descriptionKey: 'settings.developerMenu.screenAwareness.desc',
-      route: 'screen-awareness-debug',
-      icon: (
-        <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={2}
-            d="M3 5h18v12H3zM8 21h8m-4-4v4"
-          />
-        </svg>
-      ),
-    },
   ],
 };
 
diff --git a/app/src/components/settings/panels/ScreenAwarenessDebugPanel.tsx b/app/src/components/settings/panels/ScreenAwarenessDebugPanel.tsx
deleted file mode 100644
index 6ef89bf82..000000000
--- a/app/src/components/settings/panels/ScreenAwarenessDebugPanel.tsx
+++ /dev/null
@@ -1,292 +0,0 @@
-import { type ComponentProps, useRef, useState } from 'react';
-
-import ScreenIntelligenceDebugPanel from '../../../components/intelligence/ScreenIntelligenceDebugPanel';
-import { useScreenIntelligenceState } from '../../../features/screen-intelligence/useScreenIntelligenceState';
-import { useT } from '../../../lib/i18n/I18nContext';
-import { isTauri, openhumanUpdateScreenIntelligenceSettings } from '../../../utils/tauriCommands';
-import Button from '../../ui/Button';
-import {
-  SettingsCheckbox,
-  SettingsEmptyState,
-  SettingsNumberField,
-  SettingsRow,
-  SettingsSection,
-  SettingsStatusLine,
-  SettingsTextArea,
-} from '../controls';
-import SettingsPanel from '../layout/SettingsPanel';
-
-const DebugSection = ({
-  state,
-  t,
-}: {
-  state: ComponentProps<typeof ScreenIntelligenceDebugPanel>['state'];
-  t: (key: string, fallback?: string) => string;
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  return (
-    <SettingsSection>
-      <div className="px-4 py-3 space-y-3">
-        <button
-          type="button"
-          onClick={() => setIsOpen(prev => !prev)}
-          className="flex w-full items-center justify-between text-sm font-semibold text-content">
-          <span>{t('screenAwareness.debug.debugAndDiagnostics')}</span>
-          <span className="text-xs text-content-muted">
-            {isOpen ? t('screenAwareness.debug.collapse') : t('screenAwareness.debug.expand')}
-          </span>
-        </button>
-        {isOpen && <ScreenIntelligenceDebugPanel state={state} />}
-      </div>
-    </SettingsSection>
-  );
-};
-
-const ScreenAwarenessDebugPanel = () => {
-  const { t } = useT();
-  const {
-    status,
-    lastError,
-    isLoadingVision,
-    recentVisionSummaries,
-    refreshStatus,
-    refreshVision,
-    runCaptureTest,
-    captureTestResult,
-    isCaptureTestRunning,
-  } = useScreenIntelligenceState({ loadVision: true, visionLimit: 10, pollMs: 2000 });
-
-  const [baselineFps, setBaselineFps] = useState<string>('1');
-  const [useVisionModel, setUseVisionModel] = useState<boolean>(true);
-  const [keepScreenshots, setKeepScreenshots] = useState<boolean>(false);
-  const [allowlistText, setAllowlistText] = useState('');
-  const [denylistText, setDenylistText] = useState('');
-  const [isSavingConfig, setIsSavingConfig] = useState(false);
-  const [configError, setConfigError] = useState<string | null>(null);
-
-  // Initialize form state from server config once on first render where config
-  // is available. After initialization, form state is user-controlled until save.
-  // This runs during render (not in useEffect) so it is synchronous and avoids
-  // the set-state-in-effect lint rule.
-  const initializedRef = useRef(false);
-  if (!initializedRef.current && status?.config) {
-    initializedRef.current = true;
-    // One-time assignment — React batches these with the current render.
-    setBaselineFps(String(status.config.baseline_fps ?? 1));
-    setUseVisionModel(status.config.use_vision_model ?? true);
-    setKeepScreenshots(status.config.keep_screenshots ?? false);
-    setAllowlistText((status.config.allowlist ?? []).join('\n'));
-    setDenylistText((status.config.denylist ?? []).join('\n'));
-  }
-
-  const saveConfig = async () => {
-    if (!isTauri()) return;
-    setConfigError(null);
-    setIsSavingConfig(true);
-    try {
-      const fps = Number(baselineFps);
-      await openhumanUpdateScreenIntelligenceSettings({
-        enabled: status?.config.enabled ?? false,
-        policy_mode:
-          status?.config.policy_mode === 'whitelist_only'
-            ? 'whitelist_only'
-            : 'all_except_blacklist',
-        baseline_fps: Number.isFinite(fps) && fps > 0 ? fps : 1,
-        use_vision_model: useVisionModel,
-        keep_screenshots: keepScreenshots,
-        allowlist: allowlistText
-          .split('\n')
-          .map(v => v.trim())
-          .filter(Boolean),
-        denylist: denylistText
-          .split('\n')
-          .map(v => v.trim())
-          .filter(Boolean),
-      });
-      await refreshStatus();
-    } catch (error) {
-      setConfigError(
-        error instanceof Error ? error.message : t('screenAwareness.debug.failedToSave')
-      );
-    } finally {
-      setIsSavingConfig(false);
-    }
-  };
-
-  return (
-    <SettingsPanel description={t('settings.developerMenu.screenAwareness.desc')}>
-      <>
-        {/* Advanced policy settings */}
-        <SettingsSection title={t('screenAwareness.debug.policyTitle')}>
-          <div className="px-4 py-3 space-y-3">
-            <SettingsRow
-              htmlFor="screen-baseline-fps"
-              label={t('screenAwareness.debug.baselineFps')}
-              control={
-                <SettingsNumberField
-                  id="screen-baseline-fps"
-                  min={0.2}
-                  max={30}
-                  step={0.1}
-                  value={baselineFps}
-                  onChange={setBaselineFps}
-                  onCommit={() => {}}
-                  aria-label={t('screenAwareness.debug.baselineFps')}
-                />
-              }
-            />
-
-            <SettingsRow
-              htmlFor="screen-use-vision-model"
-              label={t('screenAwareness.debug.useVisionModel')}
-              description={t('screenAwareness.debug.useVisionModelDesc')}
-              control={
-                <SettingsCheckbox
-                  id="screen-use-vision-model"
-                  checked={useVisionModel}
-                  onCheckedChange={setUseVisionModel}
-                />
-              }
-            />
-
-            <SettingsRow
-              htmlFor="screen-keep-screenshots"
-              label={t('screenAwareness.debug.keepScreenshots')}
-              description={t('screenAwareness.debug.keepScreenshotsDesc')}
-              control={
-                <SettingsCheckbox
-                  id="screen-keep-screenshots"
-                  checked={keepScreenshots}
-                  onCheckedChange={setKeepScreenshots}
-                />
-              }
-            />
-
-            <div className="space-y-1">
-              <div className="text-xs text-content-muted">
-                {t('screenAwareness.debug.allowlist')}
-              </div>
-              <SettingsTextArea
-                value={allowlistText}
-                onChange={event => setAllowlistText(event.target.value)}
-                rows={3}
-                aria-label={t('screenAwareness.debug.allowlist')}
-              />
-            </div>
-
-            <div className="space-y-1">
-              <div className="text-xs text-content-muted">
-                {t('screenAwareness.debug.denylist')}
-              </div>
-              <SettingsTextArea
-                value={denylistText}
-                onChange={event => setDenylistText(event.target.value)}
-                rows={3}
-                aria-label={t('screenAwareness.debug.denylist')}
-              />
-            </div>
-
-            <Button
-              type="button"
-              variant="primary"
-              size="sm"
-              onClick={() => void saveConfig()}
-              disabled={isSavingConfig}>
-              {isSavingConfig ? t('common.loading') : t('screenAwareness.debug.saveSettings')}
-            </Button>
-            <SettingsStatusLine saving={false} error={configError} savingLabel="" />
-          </div>
-        </SettingsSection>
-
-        {/* Session stats */}
-        <SettingsSection title={t('screenAwareness.debug.sessionStats')}>
-          <div className="px-4 py-3 text-sm text-content-muted space-y-1">
-            <div>
-              {t('screenAwareness.debug.framesEphemeral')}: {status?.session.frames_in_memory ?? 0}
-            </div>
-            <div>
-              {t('screenAwareness.debug.panicStop')}:{' '}
-              {status?.session.panic_hotkey ?? t('screenAwareness.debug.defaultPanicHotkey')}
-            </div>
-            <div>
-              {t('screenAwareness.debug.vision')}:{' '}
-              {status?.session.vision_state ?? t('screenAwareness.debug.idle')}
-            </div>
-            <div>
-              {t('screenAwareness.debug.visionQueue')}: {status?.session.vision_queue_depth ?? 0}
-            </div>
-            <div>
-              {t('screenAwareness.debug.lastVision')}:{' '}
-              {status?.session.last_vision_at_ms
-                ? new Date(status.session.last_vision_at_ms).toLocaleTimeString()
-                : t('screenAwareness.debug.notAvailable')}
-            </div>
-          </div>
-        </SettingsSection>
-
-        {/* Vision summaries */}
-        <SettingsSection title={t('screenAwareness.debug.visionSummaries')}>
-          <div className="px-4 py-3 space-y-3">
-            <div className="flex justify-end">
-              <Button
-                type="button"
-                variant="secondary"
-                size="xs"
-                onClick={() => void refreshVision(10)}
-                disabled={isLoadingVision}>
-                {isLoadingVision ? t('screenAwareness.debug.refreshing') : t('common.refresh')}
-              </Button>
-            </div>
-
-            {recentVisionSummaries.length === 0 ? (
-              <SettingsEmptyState label={t('screenAwareness.debug.noSummaries')} />
-            ) : (
-              <div className="space-y-2">
-                {recentVisionSummaries.map(summary => (
-                  <div
-                    key={summary.id}
-                    className="rounded-xl border border-line bg-surface p-3 text-xs">
-                    <div className="text-content-muted">
-                      {new Date(summary.captured_at_ms).toLocaleTimeString()} ·{' '}
-                      {summary.app_name ?? t('screenAwareness.debug.unknownApp')}
-                      {summary.window_title ? ` · ${summary.window_title}` : ''}
-                    </div>
-                    <div className="mt-1 text-content">{summary.actionable_notes}</div>
-                  </div>
-                ))}
-              </div>
-            )}
-          </div>
-        </SettingsSection>
-
-        {/* Debug & Diagnostics (collapsible) */}
-        <DebugSection
-          t={t}
-          state={{
-            status,
-            recentVisionSummaries,
-            lastError,
-            captureTestResult,
-            isCaptureTestRunning,
-            refreshStatus,
-            refreshVision,
-            runCaptureTest,
-          }}
-        />
-
-        {/* Platform unsupported notice */}
-        {status !== null && !status.platform_supported && (
-          <div className="rounded-xl border border-amber-300 dark:border-amber-500/40 bg-amber-50 dark:bg-amber-500/10 p-3 text-sm text-amber-700 dark:text-amber-300">
-            {t('screenAwareness.debug.macosOnly')}
-          </div>
-        )}
-
-        {/* Error notice */}
-        {lastError && <SettingsStatusLine saving={false} error={lastError} savingLabel="" />}
-      </>
-    </SettingsPanel>
-  );
-};
-
-export default ScreenAwarenessDebugPanel;
diff --git a/app/src/components/settings/panels/ScreenIntelligencePanel.tsx b/app/src/components/settings/panels/ScreenIntelligencePanel.tsx
deleted file mode 100644
index 558c05ffe..000000000
--- a/app/src/components/settings/panels/ScreenIntelligencePanel.tsx
+++ /dev/null
@@ -1,281 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
-
-import { useScreenIntelligenceState } from '../../../features/screen-intelligence/useScreenIntelligenceState';
-import { useT } from '../../../lib/i18n/I18nContext';
-import { isTauri, openhumanUpdateScreenIntelligenceSettings } from '../../../utils/tauriCommands';
-import Button from '../../ui/Button';
-import {
-  SettingsRow,
-  SettingsSection,
-  SettingsSelect,
-  SettingsStatusLine,
-  SettingsSwitch,
-} from '../controls';
-import SettingsPanel from '../layout/SettingsPanel';
-import PermissionsSection from './screen-intelligence/PermissionsSection';
-
-const formatRemaining = (remainingMs: number | null): string => {
-  if (remainingMs === null || remainingMs <= 0) {
-    return '00:00';
-  }
-
-  const totalSeconds = Math.floor(remainingMs / 1000);
-  const mins = Math.floor(totalSeconds / 60)
-    .toString()
-    .padStart(2, '0');
-  const secs = (totalSeconds % 60).toString().padStart(2, '0');
-  return `${mins}:${secs}`;
-};
-
-const ScreenIntelligencePanel = () => {
-  const { t } = useT();
-  const {
-    status,
-    lastRestartSummary,
-    isLoading,
-    isRequestingPermissions,
-    isRestartingCore,
-    isStartingSession,
-    isStoppingSession,
-    isFlushingVision,
-    lastError,
-    refreshStatus,
-    startSession,
-    stopSession,
-    flushVision,
-    requestPermission,
-    refreshPermissionsWithRestart,
-  } = useScreenIntelligenceState({ loadVision: false, pollMs: 2000 });
-  const [featureOverrides, setFeatureOverrides] = useState<{ screen_monitoring?: boolean }>({});
-  const [enabled, setEnabled] = useState<boolean>(false);
-  const [policyMode, setPolicyMode] = useState<'all_except_blacklist' | 'whitelist_only'>(
-    'all_except_blacklist'
-  );
-  const [isSavingConfig, setIsSavingConfig] = useState(false);
-  const [configError, setConfigError] = useState<string | null>(null);
-
-  const lastSyncedConfigSigRef = useRef<string | null>(null);
-  useEffect(() => {
-    if (!status?.config) {
-      return;
-    }
-    const sig = JSON.stringify(status.config);
-    if (lastSyncedConfigSigRef.current === sig) {
-      return;
-    }
-    lastSyncedConfigSigRef.current = sig;
-    setEnabled(status.config.enabled ?? false);
-    setPolicyMode(
-      status.config.policy_mode === 'whitelist_only' ? 'whitelist_only' : 'all_except_blacklist'
-    );
-  }, [status?.config]);
-
-  const screenMonitoring =
-    featureOverrides.screen_monitoring ?? status?.features.screen_monitoring ?? true;
-
-  const remaining = useMemo(
-    () => formatRemaining(status?.session.remaining_ms ?? null),
-    [status?.session.remaining_ms]
-  );
-
-  const anyPermissionDenied =
-    status?.permissions.screen_recording === 'denied' ||
-    status?.permissions.accessibility === 'denied' ||
-    status?.permissions.input_monitoring === 'denied';
-
-  const startDisabled =
-    isStartingSession ||
-    isLoading ||
-    !status ||
-    !status.platform_supported ||
-    status.session.active ||
-    status.permissions.accessibility !== 'granted';
-  const stopDisabled = isStoppingSession || !status?.session.active;
-
-  const saveConfig = async () => {
-    if (!isTauri()) return;
-    setConfigError(null);
-    setIsSavingConfig(true);
-    try {
-      await openhumanUpdateScreenIntelligenceSettings({
-        enabled,
-        policy_mode: policyMode,
-        baseline_fps: status?.config.baseline_fps ?? 1,
-        use_vision_model: status?.config.use_vision_model ?? true,
-        keep_screenshots: status?.config.keep_screenshots ?? false,
-        allowlist: status?.config.allowlist ?? [],
-        denylist: status?.config.denylist ?? [],
-      });
-      await refreshStatus();
-    } catch (error) {
-      setConfigError(error instanceof Error ? error.message : 'Failed to save screen intelligence');
-    } finally {
-      setIsSavingConfig(false);
-    }
-  };
-
-  return (
-    <SettingsPanel description={t('pages.settings.features.screenAwarenessDesc')}>
-      <>
-        {(status?.platform_supported ?? true) && (
-          <PermissionsSection
-            screenRecording={status?.permissions.screen_recording ?? 'unknown'}
-            accessibility={status?.permissions.accessibility ?? 'unknown'}
-            inputMonitoring={status?.permissions.input_monitoring ?? 'unknown'}
-            anyPermissionDenied={anyPermissionDenied ?? false}
-            lastRestartSummary={lastRestartSummary}
-            permissionCheckProcessPath={status?.permission_check_process_path}
-            isRequestingPermissions={isRequestingPermissions}
-            isRestartingCore={isRestartingCore}
-            isLoading={isLoading}
-            requestPermission={requestPermission}
-            refreshPermissionsWithRestart={refreshPermissionsWithRestart}
-            refreshStatus={refreshStatus}
-          />
-        )}
-
-        {/* Screen awareness config */}
-        <SettingsSection title={t('settings.features.screenAwareness')}>
-          {/* Enabled toggle */}
-          <SettingsRow
-            htmlFor="screen-intelligence-enabled"
-            label={t('common.enabled')}
-            control={
-              <SettingsSwitch
-                id="screen-intelligence-enabled"
-                checked={enabled}
-                onCheckedChange={setEnabled}
-                aria-label={t('common.enabled')}
-              />
-            }
-          />
-
-          {/* Policy mode */}
-          <SettingsRow
-            htmlFor="select-policy-mode"
-            label={t('settings.screenAwareness.mode')}
-            control={
-              <SettingsSelect
-                id="select-policy-mode"
-                value={policyMode}
-                onChange={event =>
-                  setPolicyMode(
-                    event.target.value === 'whitelist_only'
-                      ? 'whitelist_only'
-                      : 'all_except_blacklist'
-                  )
-                }
-                inputSize="sm">
-                <option value="all_except_blacklist">
-                  {t('settings.screenAwareness.allExceptBlacklist')}
-                </option>
-                <option value="whitelist_only">
-                  {t('settings.screenAwareness.whitelistOnly')}
-                </option>
-              </SettingsSelect>
-            }
-          />
-
-          {/* Screen monitoring toggle */}
-          <SettingsRow
-            htmlFor="screen-intelligence-monitoring"
-            label={t('settings.screenAwareness.screenMonitoring')}
-            control={
-              <SettingsSwitch
-                id="screen-intelligence-monitoring"
-                checked={screenMonitoring}
-                onCheckedChange={next =>
-                  setFeatureOverrides(current => ({ ...current, screen_monitoring: next }))
-                }
-                aria-label={t('settings.screenAwareness.screenMonitoring')}
-              />
-            }
-          />
-
-          {/* Save */}
-          <div className="px-4 py-3 space-y-2">
-            <Button
-              type="button"
-              variant="primary"
-              size="sm"
-              onClick={() => void saveConfig()}
-              disabled={isSavingConfig}>
-              {isSavingConfig ? 'Saving…' : t('settings.screenAwareness.saveSettings')}
-            </Button>
-            <SettingsStatusLine
-              saving={false}
-              savedNote={null}
-              error={configError}
-              savingLabel={t('settings.agentAccess.saving')}
-            />
-          </div>
-        </SettingsSection>
-
-        {/* Session controls */}
-        <SettingsSection title={t('settings.screenAwareness.session')}>
-          <div className="px-4 py-3 space-y-3">
-            <div className="text-sm text-content-secondary space-y-1">
-              <div>
-                {t('settings.screenAwareness.status')}:{' '}
-                {status?.session.active
-                  ? t('settings.screenAwareness.active')
-                  : t('settings.screenAwareness.stopped')}
-              </div>
-              <div>
-                {t('settings.screenAwareness.remaining')}: {remaining}
-              </div>
-            </div>
-
-            <div className="flex gap-2">
-              <Button
-                type="button"
-                variant="secondary"
-                size="sm"
-                onClick={() =>
-                  void startSession({
-                    consent: true,
-                    ttl_secs: status?.config.session_ttl_secs ?? 300,
-                    screen_monitoring: screenMonitoring,
-                  })
-                }
-                disabled={startDisabled}>
-                {isStartingSession ? 'Starting…' : t('settings.screenAwareness.startSession')}
-              </Button>
-              <Button
-                type="button"
-                variant="secondary"
-                tone="danger"
-                size="sm"
-                onClick={() => void stopSession('manual_stop')}
-                disabled={stopDisabled}>
-                {isStoppingSession ? 'Stopping…' : t('settings.screenAwareness.stopSession')}
-              </Button>
-              <Button
-                type="button"
-                variant="secondary"
-                size="sm"
-                onClick={() => void flushVision()}
-                disabled={isFlushingVision || !status?.session.active}>
-                {isFlushingVision ? 'Analyzing…' : t('settings.screenAwareness.analyzeNow')}
-              </Button>
-            </div>
-          </div>
-        </SettingsSection>
-
-        {status !== null && !status.platform_supported && (
-          <div className="rounded-xl border border-amber-300 dark:border-amber-500/40 bg-amber-50 dark:bg-amber-500/10 p-3 text-sm text-amber-700 dark:text-amber-300">
-            {t('settings.screenAwareness.macosOnly')}
-          </div>
-        )}
-
-        {lastError && (
-          <div className="rounded-xl border border-red-300 dark:border-red-500/40 bg-red-50 dark:bg-red-500/10 p-3 text-sm text-red-600 dark:text-red-300">
-            {lastError}
-          </div>
-        )}
-      </>
-    </SettingsPanel>
-  );
-};
-
-export default ScreenIntelligencePanel;
diff --git a/app/src/components/settings/panels/__tests__/CompanionPanel.test.tsx b/app/src/components/settings/panels/__tests__/CompanionPanel.test.tsx
index 0b8f290e7..de4b49838 100644
--- a/app/src/components/settings/panels/__tests__/CompanionPanel.test.tsx
+++ b/app/src/components/settings/panels/__tests__/CompanionPanel.test.tsx
@@ -31,13 +31,7 @@ const mockStatus = {
   last_error: null,
 };
 
-const mockConfig = {
-  hotkey: 'ctrl+space',
-  activation_mode: 'push',
-  ttl_secs: 3600,
-  capture_screen: true,
-  include_app_context: true,
-};
+const mockConfig = { hotkey: 'ctrl+space', activation_mode: 'push', ttl_secs: 3600 };
 
 beforeEach(() => {
   vi.clearAllMocks();
@@ -244,17 +238,12 @@ describe('CompanionPanel', () => {
     });
   });
 
-  it('renders "Disabled" when capture_screen and include_app_context are false', async () => {
-    invokeMock.mockImplementation(async (cmd: string) => {
-      if (cmd === 'companion_status') return mockStatus;
-      if (cmd === 'companion_config_get') {
-        return { ...mockConfig, capture_screen: false, include_app_context: false };
-      }
-      throw new Error(`unmocked command: ${cmd}`);
-    });
+  it('does not render screen capture or app context configuration', async () => {
     renderWithProviders(<CompanionPanel />);
     await waitFor(() => {
-      expect(screen.getAllByText('Disabled').length).toBeGreaterThanOrEqual(2);
+      expect(screen.getByText('ctrl+space')).toBeInTheDocument();
     });
+    expect(screen.queryByText('Screen Capture')).not.toBeInTheDocument();
+    expect(screen.queryByText('App Context')).not.toBeInTheDocument();
   });
 });
diff --git a/app/src/components/settings/panels/__tests__/DeveloperOptionsPanel.test.tsx b/app/src/components/settings/panels/__tests__/DeveloperOptionsPanel.test.tsx
index 3e3756ef9..4d3516efc 100644
--- a/app/src/components/settings/panels/__tests__/DeveloperOptionsPanel.test.tsx
+++ b/app/src/components/settings/panels/__tests__/DeveloperOptionsPanel.test.tsx
@@ -127,9 +127,7 @@ describe('DeveloperOptionsPanel — CoreModeBadge', () => {
     // Knowledge & Memory group was retired. Assert a destination that IS
     // present: 事件日志 (Event Log).
     expect(screen.getByText('事件日志')).toBeInTheDocument();
-    // Two screen-awareness rows now exist (the moved settings row + the debug
-    // panel), which collapse to the same zh-CN label — assert at least one.
-    expect(screen.getAllByText('屏幕感知').length).toBeGreaterThan(0);
+    expect(screen.queryByText('屏幕感知')).not.toBeInTheDocument();
     // Composio triggers moved to the Connections Composio page — assert a
     // destination that IS still present: MCP 服务器 (MCP Server).
     expect(screen.getByText('MCP 服务器')).toBeInTheDocument();
diff --git a/app/src/components/settings/panels/__tests__/EmbeddingsPanel.test.tsx b/app/src/components/settings/panels/__tests__/EmbeddingsPanel.test.tsx
index 352746b16..2a289ec62 100644
--- a/app/src/components/settings/panels/__tests__/EmbeddingsPanel.test.tsx
+++ b/app/src/components/settings/panels/__tests__/EmbeddingsPanel.test.tsx
@@ -97,7 +97,7 @@ const setCoreSession = ({
         activeMode: 'os_keyring',
         backendName: 'os',
       },
-      runtime: { screenIntelligence: null, localAi: null, service: null },
+      runtime: { localAi: null, service: null },
     },
     teams: [],
     teamMembersById: {},
diff --git a/app/src/components/settings/panels/__tests__/ScreenAwarenessDebugPanel.test.tsx b/app/src/components/settings/panels/__tests__/ScreenAwarenessDebugPanel.test.tsx
deleted file mode 100644
index c46763806..000000000
--- a/app/src/components/settings/panels/__tests__/ScreenAwarenessDebugPanel.test.tsx
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * ScreenAwarenessDebugPanel coverage tests.
- *
- * Target uncovered lines (from diff-cover report):
- * 34,38,41,143,181,193,203,205,245,247,251,255-256,261-262,297
- *
- * These cover:
- * - DebugSection toggle (line 34,38,41): expand/collapse
- * - Config form inputs: baselineFps, use-vision-model checkbox, keep-screenshots (143,181,193)
- * - saveConfig handler (line 203,205)
- * - Vision summaries: list rendering, refresh, empty state (245,247,251,255-256,261-262)
- * - lastError display (297)
- */
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-// ------------------------------------------------------------------
-// Module mocks
-// ------------------------------------------------------------------
-
-vi.mock('../../../../lib/i18n/I18nContext', () => ({ useT: () => ({ t: (key: string) => key }) }));
-
-vi.mock('../../hooks/useSettingsNavigation', () => ({
-  useSettingsNavigation: () => ({ navigateBack: vi.fn(), breadcrumbs: [] }),
-}));
-
-vi.mock('../../../../components/intelligence/ScreenIntelligenceDebugPanel', () => ({
-  default: () => <div data-testid="screen-debug-inner">debug-content</div>,
-}));
-
-const { mockIsTauri, mockUpdateScreenIntelligenceSettings, mockUseScreenIntelligenceState } =
-  vi.hoisted(() => ({
-    mockIsTauri: vi.fn(() => true),
-    mockUpdateScreenIntelligenceSettings: vi.fn(),
-    mockUseScreenIntelligenceState: vi.fn(),
-  }));
-
-vi.mock('../../../../utils/tauriCommands', () => ({
-  isTauri: mockIsTauri,
-  openhumanUpdateScreenIntelligenceSettings: mockUpdateScreenIntelligenceSettings,
-}));
-
-vi.mock('../../../../features/screen-intelligence/useScreenIntelligenceState', () => ({
-  useScreenIntelligenceState: mockUseScreenIntelligenceState,
-}));
-
-// ------------------------------------------------------------------
-// Fixture builders
-// ------------------------------------------------------------------
-
-const makeStatus = (overrides: Record<string, unknown> = {}) => ({
-  platform_supported: true,
-  config: {
-    enabled: true,
-    baseline_fps: 1,
-    use_vision_model: true,
-    keep_screenshots: false,
-    allowlist: ['TextEdit', 'Xcode'],
-    denylist: ['Safari'],
-    policy_mode: 'all_except_blacklist',
-    ...((overrides.config as Record<string, unknown>) ?? {}),
-  },
-  session: {
-    frames_in_memory: 5,
-    panic_hotkey: 'Ctrl+Shift+P',
-    vision_state: 'running',
-    vision_queue_depth: 2,
-    last_vision_at_ms: Date.now() - 3000,
-  },
-  ...overrides,
-});
-
-const makeVisionSummary = (overrides: Record<string, unknown> = {}) => ({
-  id: 'vs-001',
-  captured_at_ms: Date.now() - 10000,
-  app_name: 'TextEdit',
-  window_title: 'Untitled',
-  actionable_notes: 'User is editing a document.',
-  ...overrides,
-});
-
-const makeDefaultState = (overrides: Record<string, unknown> = {}) => ({
-  status: makeStatus(),
-  lastError: null,
-  isLoadingVision: false,
-  recentVisionSummaries: [],
-  refreshStatus: vi.fn().mockResolvedValue(null),
-  refreshVision: vi.fn().mockResolvedValue([]),
-  runCaptureTest: vi.fn().mockResolvedValue(undefined),
-  captureTestResult: null,
-  isCaptureTestRunning: false,
-  ...overrides,
-});
-
-async function renderPanel(stateOverrides: Record<string, unknown> = {}) {
-  mockUseScreenIntelligenceState.mockReturnValue(makeDefaultState(stateOverrides));
-  const { default: ScreenAwarenessDebugPanel } = await import('../ScreenAwarenessDebugPanel');
-  return render(<ScreenAwarenessDebugPanel />);
-}
-
-// ------------------------------------------------------------------
-// Tests
-// ------------------------------------------------------------------
-
-describe('ScreenAwarenessDebugPanel', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockIsTauri.mockReturnValue(true);
-    mockUpdateScreenIntelligenceSettings.mockResolvedValue({});
-  });
-
-  // ── DebugSection expand/collapse (lines 34, 38, 41) ───────────────────────
-
-  it('collapses debug section by default and shows expand label (line 34, 38)', async () => {
-    await renderPanel();
-    expect(screen.getByText('screenAwareness.debug.expand')).toBeInTheDocument();
-    expect(screen.queryByTestId('screen-debug-inner')).not.toBeInTheDocument();
-  });
-
-  it('expands debug section when toggle is clicked (line 41)', async () => {
-    await renderPanel();
-
-    fireEvent.click(screen.getByText('screenAwareness.debug.debugAndDiagnostics'));
-
-    expect(screen.getByText('screenAwareness.debug.collapse')).toBeInTheDocument();
-    expect(screen.getByTestId('screen-debug-inner')).toBeInTheDocument();
-  });
-
-  it('collapses debug section after second click', async () => {
-    await renderPanel();
-
-    const toggleBtn = screen.getByText('screenAwareness.debug.debugAndDiagnostics');
-    fireEvent.click(toggleBtn);
-    fireEvent.click(toggleBtn);
-
-    expect(screen.getByText('screenAwareness.debug.expand')).toBeInTheDocument();
-    expect(screen.queryByTestId('screen-debug-inner')).not.toBeInTheDocument();
-  });
-
-  // ── Policy settings form: FPS input (line 143) ───────────────────────────
-
-  it('renders baseline FPS input with config value (line 143)', async () => {
-    await renderPanel({
-      status: makeStatus({
-        config: {
-          baseline_fps: 2,
-          use_vision_model: true,
-          keep_screenshots: false,
-          allowlist: [],
-          denylist: [],
-          policy_mode: 'all_except_blacklist',
-          enabled: true,
-        },
-      }),
-    });
-
-    const fpsInput = screen.getByRole('spinbutton') as HTMLInputElement;
-    expect(fpsInput.value).toBe('2');
-  });
-
-  it('updates baseline FPS on change', async () => {
-    await renderPanel();
-
-    const fpsInput = screen.getByRole('spinbutton');
-    fireEvent.change(fpsInput, { target: { value: '5' } });
-
-    expect((fpsInput as HTMLInputElement).value).toBe('5');
-  });
-
-  // ── Use vision model checkbox (line 181) ──────────────────────────────────
-
-  it('renders use-vision-model checkbox checked (line 181)', async () => {
-    await renderPanel();
-
-    // SettingsCheckbox renders a native <input type="checkbox" id="screen-use-vision-model">.
-    // The panel also has a keep-screenshots checkbox, so query by id.
-    const checkbox = document.getElementById('screen-use-vision-model') as HTMLInputElement;
-    expect(checkbox).toBeInTheDocument();
-    // config.use_vision_model=true → checked=true
-    expect(checkbox.checked).toBe(true);
-    expect(screen.getByText('screenAwareness.debug.useVisionModel')).toBeInTheDocument();
-  });
-
-  // ── saveConfig handler (lines 203, 205) ───────────────────────────────────
-
-  it('calls updateScreenIntelligenceSettings when save is clicked (line 203)', async () => {
-    const refreshStatus = vi.fn().mockResolvedValue(null);
-    mockUseScreenIntelligenceState.mockReturnValue(makeDefaultState({ refreshStatus }));
-
-    const { default: ScreenAwarenessDebugPanel } = await import('../ScreenAwarenessDebugPanel');
-    render(<ScreenAwarenessDebugPanel />);
-
-    fireEvent.click(screen.getByText('screenAwareness.debug.saveSettings'));
-
-    await waitFor(() => expect(mockUpdateScreenIntelligenceSettings).toHaveBeenCalled());
-    expect(mockUpdateScreenIntelligenceSettings).toHaveBeenCalledWith(
-      expect.objectContaining({ enabled: true, use_vision_model: true, keep_screenshots: false })
-    );
-  });
-
-  it('shows error when saveConfig throws (line 205)', async () => {
-    mockUpdateScreenIntelligenceSettings.mockRejectedValue(new Error('permission denied'));
-
-    await renderPanel();
-    fireEvent.click(screen.getByText('screenAwareness.debug.saveSettings'));
-
-    await waitFor(() => expect(screen.getByText('permission denied')).toBeInTheDocument());
-  });
-
-  it('skips saveConfig when not in tauri env (line 203)', async () => {
-    mockIsTauri.mockReturnValue(false);
-    await renderPanel();
-
-    fireEvent.click(screen.getByText('screenAwareness.debug.saveSettings'));
-
-    // Should not call update
-    expect(mockUpdateScreenIntelligenceSettings).not.toHaveBeenCalled();
-  });
-
-  // ── Vision summaries: empty state (line 251) ──────────────────────────────
-
-  it('shows empty state when no vision summaries (line 251)', async () => {
-    await renderPanel({ recentVisionSummaries: [] });
-
-    expect(screen.getByText('screenAwareness.debug.noSummaries')).toBeInTheDocument();
-  });
-
-  // ── Vision summaries: list rendering (lines 245, 247, 255-256, 261-262) ───
-
-  it('renders vision summary rows with app name and notes (lines 255-256, 261-262)', async () => {
-    const summary = makeVisionSummary();
-    await renderPanel({ recentVisionSummaries: [summary] });
-
-    // app_name and window_title are text nodes inside a div that also contains the
-    // timestamp and bullet separators — use body.textContent to avoid split-node issues.
-    expect(document.body.textContent).toContain('TextEdit');
-    expect(document.body.textContent).toContain('User is editing a document.');
-    expect(document.body.textContent).toContain('Untitled');
-  });
-
-  it('renders unknownApp when app_name is null (line 261)', async () => {
-    const summary = makeVisionSummary({ app_name: null, window_title: null });
-    await renderPanel({ recentVisionSummaries: [summary] });
-
-    expect(document.body.textContent).toContain('screenAwareness.debug.unknownApp');
-  });
-
-  it('calls refreshVision when Refresh button is clicked (line 247)', async () => {
-    const refreshVision = vi.fn().mockResolvedValue([]);
-    await renderPanel({ refreshVision });
-
-    fireEvent.click(screen.getByText('common.refresh'));
-
-    await waitFor(() => expect(refreshVision).toHaveBeenCalledWith(10));
-  });
-
-  it('shows refreshing label while vision is loading (line 245)', async () => {
-    await renderPanel({ isLoadingVision: true });
-
-    expect(screen.getByText('screenAwareness.debug.refreshing')).toBeInTheDocument();
-  });
-
-  // ── Platform unsupported notice and lastError (line 297) ─────────────────
-
-  it('shows macosOnly notice when platform not supported (line 290-292)', async () => {
-    const status = makeStatus();
-    status.platform_supported = false;
-    await renderPanel({ status });
-
-    expect(screen.getByText('screenAwareness.debug.macosOnly')).toBeInTheDocument();
-  });
-
-  it('shows lastError status line when lastError is non-null (line 297)', async () => {
-    await renderPanel({ lastError: 'screen recording permission denied' });
-
-    expect(screen.getByText('screen recording permission denied')).toBeInTheDocument();
-  });
-
-  // ── Session stats section (lines 215-235) ────────────────────────────────
-
-  it('renders session stats with live values', async () => {
-    await renderPanel();
-
-    // These keys appear as text nodes inside divs that also hold ': <value>' —
-    // use body.textContent to avoid split-text-node matching failures.
-    expect(document.body.textContent).toContain('screenAwareness.debug.framesEphemeral');
-    expect(document.body.textContent).toContain('screenAwareness.debug.panicStop');
-    expect(document.body.textContent).toContain('screenAwareness.debug.vision');
-  });
-
-  it('shows defaultPanicHotkey when panic_hotkey is null', async () => {
-    const status = makeStatus();
-    // At runtime the JSON from core may return null even though the TypeScript type says string.
-    // Force-cast to test the nullish-coalescing fallback branch.
-    (status.session as unknown as Record<string, unknown>).panic_hotkey = null;
-    await renderPanel({ status });
-
-    expect(document.body.textContent).toContain('screenAwareness.debug.defaultPanicHotkey');
-  });
-
-  it('shows notAvailable for last_vision_at_ms when null', async () => {
-    const status = makeStatus();
-    // last_vision_at_ms is number | null in the real type, but inferred as number in the fixture.
-    // Force-cast to assign null and test the notAvailable branch.
-    (status.session as unknown as Record<string, unknown>).last_vision_at_ms = null;
-    await renderPanel({ status });
-
-    expect(document.body.textContent).toContain('screenAwareness.debug.notAvailable');
-  });
-});
diff --git a/app/src/components/settings/panels/__tests__/ScreenIntelligencePanel.test.tsx b/app/src/components/settings/panels/__tests__/ScreenIntelligencePanel.test.tsx
deleted file mode 100644
index f74b3d70c..000000000
--- a/app/src/components/settings/panels/__tests__/ScreenIntelligencePanel.test.tsx
+++ /dev/null
@@ -1,339 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import {
-  type ScreenIntelligenceState,
-  useScreenIntelligenceState,
-} from '../../../../features/screen-intelligence/useScreenIntelligenceState';
-import {
-  type ConfigSnapshot,
-  isTauri,
-  openhumanUpdateScreenIntelligenceSettings,
-} from '../../../../utils/tauriCommands';
-import ScreenIntelligencePanel from '../ScreenIntelligencePanel';
-
-vi.mock('../../../../features/screen-intelligence/useScreenIntelligenceState', () => ({
-  useScreenIntelligenceState: vi.fn(),
-}));
-
-vi.mock('../../../../utils/tauriCommands', async importOriginal => {
-  const actual = await importOriginal<typeof import('../../../../utils/tauriCommands')>();
-  return {
-    ...actual,
-    isTauri: vi.fn(() => true),
-    openhumanUpdateScreenIntelligenceSettings: vi.fn(),
-  };
-});
-
-const baseState: ScreenIntelligenceState = {
-  status: {
-    platform_supported: true,
-    core_process: { pid: 4242, started_at_ms: 1712700000000 },
-    permissions: {
-      screen_recording: 'granted',
-      accessibility: 'granted',
-      input_monitoring: 'unknown',
-    },
-    features: { screen_monitoring: true },
-    session: {
-      active: false,
-      started_at_ms: null,
-      expires_at_ms: null,
-      remaining_ms: null,
-      ttl_secs: 300,
-      panic_hotkey: 'Cmd+Shift+.',
-      stop_reason: null,
-      frames_in_memory: 0,
-      last_capture_at_ms: null,
-      last_context: null,
-      vision_enabled: true,
-      vision_state: 'idle',
-      vision_queue_depth: 0,
-      last_vision_at_ms: null,
-      last_vision_summary: null,
-    },
-    config: {
-      enabled: false,
-      capture_policy: 'hybrid',
-      policy_mode: 'all_except_blacklist',
-      baseline_fps: 1,
-      vision_enabled: true,
-      session_ttl_secs: 300,
-      panic_stop_hotkey: 'Cmd+Shift+.',
-      autocomplete_enabled: true,
-      use_vision_model: true,
-      keep_screenshots: false,
-      allowlist: ['Code'],
-      denylist: ['1Password'],
-    },
-    denylist: ['1Password'],
-    is_context_blocked: false,
-    permission_check_process_path: '/tmp/openhuman-core',
-  },
-  lastRestartSummary: null,
-  recentVisionSummaries: [],
-  captureTestResult: null,
-  isCaptureTestRunning: false,
-  isLoading: false,
-  isRequestingPermissions: false,
-  isRestartingCore: false,
-  isStartingSession: false,
-  isStoppingSession: false,
-  isLoadingVision: false,
-  isFlushingVision: false,
-  lastError: null,
-  refreshStatus: vi.fn().mockResolvedValue(null),
-  requestPermission: vi.fn().mockResolvedValue(null),
-  refreshPermissionsWithRestart: vi.fn().mockResolvedValue(null),
-  startSession: vi.fn().mockResolvedValue(null),
-  stopSession: vi.fn().mockResolvedValue(null),
-  refreshVision: vi.fn().mockResolvedValue([]),
-  flushVision: vi.fn().mockResolvedValue(undefined),
-  runCaptureTest: vi.fn().mockResolvedValue(undefined),
-  clearError: vi.fn(),
-};
-
-function renderPanel(state: ScreenIntelligenceState = baseState) {
-  vi.mocked(useScreenIntelligenceState).mockReturnValue(state);
-  render(
-    <MemoryRouter initialEntries={['/settings/screen-intelligence']}>
-      <ScreenIntelligencePanel />
-    </MemoryRouter>
-  );
-}
-
-function createDeferred<T>() {
-  let resolve!: (value: T) => void;
-  const promise = new Promise<T>(res => {
-    resolve = res;
-  });
-  return { promise, resolve };
-}
-
-describe('ScreenIntelligencePanel', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.mocked(isTauri).mockReturnValue(true);
-  });
-
-  it('saves screen awareness settings and refreshes core-backed status', async () => {
-    const deferred = createDeferred<{ result: ConfigSnapshot; logs: [] }>();
-    vi.mocked(openhumanUpdateScreenIntelligenceSettings).mockReturnValueOnce(deferred.promise);
-
-    renderPanel();
-
-    // The SettingsHeader renders "Screen Awareness" as the panel heading; wait for it.
-    await waitFor(() => {
-      expect(screen.getAllByText('Screen Awareness').length).toBeGreaterThan(0);
-    });
-
-    const enabledSwitch = screen.getByRole('switch', { name: 'Enabled' });
-    expect(enabledSwitch).toHaveAttribute('aria-checked', 'false');
-
-    fireEvent.click(enabledSwitch);
-    fireEvent.click(screen.getByRole('button', { name: 'Save Settings' }));
-
-    expect(await screen.findByRole('button', { name: 'Saving…' })).toBeInTheDocument();
-    expect(openhumanUpdateScreenIntelligenceSettings).toHaveBeenCalledWith(
-      expect.objectContaining({ enabled: true, policy_mode: 'all_except_blacklist' })
-    );
-
-    deferred.resolve({
-      result: { config: {}, workspace_dir: '/tmp/workspace', config_path: '/tmp/config.toml' },
-      logs: [],
-    });
-
-    await waitFor(() => {
-      expect(screen.getByRole('button', { name: 'Save Settings' })).toBeInTheDocument();
-    });
-    expect(baseState.refreshStatus).toHaveBeenCalledTimes(1);
-  });
-
-  it('hides permissions section and shows unsupported-platform messaging', async () => {
-    renderPanel({
-      ...baseState,
-      status: {
-        ...baseState.status!,
-        platform_supported: false,
-        permissions: {
-          screen_recording: 'denied',
-          accessibility: 'denied',
-          input_monitoring: 'unknown',
-        },
-      },
-    });
-
-    await waitFor(() => {
-      expect(
-        screen.getByText(
-          'Screen Awareness desktop capture and permission controls are currently supported on macOS only.'
-        )
-      ).toBeInTheDocument();
-    });
-    expect(screen.queryByText('Permissions')).not.toBeInTheDocument();
-    expect(screen.queryByText(/After granting in System Settings, click/i)).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('button', { name: 'Restart & Refresh Permissions' })
-    ).not.toBeInTheDocument();
-  });
-
-  it('shows the last successful restart summary', async () => {
-    renderPanel({
-      ...baseState,
-      lastRestartSummary: 'Core restarted: PID 4000 at 9:00:00 AM -> PID 4242 at 9:01:00 AM.',
-    });
-
-    expect(await screen.findByText(/Core restarted: PID 4000/i)).toBeInTheDocument();
-  });
-
-  // ─── Session controls ─────────────────────────────────────────────────────
-
-  it('Start Session button calls startSession with consent=true', async () => {
-    const startSession = vi.fn().mockResolvedValue(null);
-    renderPanel({
-      ...baseState,
-      status: {
-        ...baseState.status!,
-        // accessibility granted so Start is not disabled
-        permissions: { ...baseState.status!.permissions, accessibility: 'granted' },
-        session: { ...baseState.status!.session, active: false },
-      },
-      startSession,
-    });
-
-    await waitFor(() => expect(screen.getAllByText(/start session/i).length).toBeGreaterThan(0));
-
-    fireEvent.click(screen.getByRole('button', { name: /start session/i }));
-
-    await waitFor(() =>
-      expect(startSession).toHaveBeenCalledWith(expect.objectContaining({ consent: true }))
-    );
-  });
-
-  it('Stop Session button calls stopSession', async () => {
-    const stopSession = vi.fn().mockResolvedValue(null);
-    renderPanel({
-      ...baseState,
-      status: { ...baseState.status!, session: { ...baseState.status!.session, active: true } },
-      stopSession,
-    });
-
-    await waitFor(() =>
-      expect(screen.getByRole('button', { name: /stop session/i })).not.toBeDisabled()
-    );
-
-    fireEvent.click(screen.getByRole('button', { name: /stop session/i }));
-
-    await waitFor(() => expect(stopSession).toHaveBeenCalledWith('manual_stop'));
-  });
-
-  it('Analyze Now button calls flushVision when session is active', async () => {
-    const flushVision = vi.fn().mockResolvedValue(undefined);
-    renderPanel({
-      ...baseState,
-      status: { ...baseState.status!, session: { ...baseState.status!.session, active: true } },
-      flushVision,
-    });
-
-    await waitFor(() =>
-      expect(screen.getByRole('button', { name: /analyze now/i })).not.toBeDisabled()
-    );
-
-    fireEvent.click(screen.getByRole('button', { name: /analyze now/i }));
-
-    await waitFor(() => expect(flushVision).toHaveBeenCalled());
-  });
-
-  it('Analyze Now is disabled when session is not active', async () => {
-    renderPanel({
-      ...baseState,
-      status: { ...baseState.status!, session: { ...baseState.status!.session, active: false } },
-    });
-
-    await waitFor(() =>
-      expect(screen.getByRole('button', { name: /analyze now/i })).toBeDisabled()
-    );
-  });
-
-  // ─── Policy mode select ───────────────────────────────────────────────────
-
-  it('changing policy mode select updates the local state', async () => {
-    renderPanel();
-
-    await waitFor(() => expect(screen.getAllByText(/screen awareness/i).length).toBeGreaterThan(0));
-
-    const policySelect = screen.getByRole('combobox', { name: /mode/i }) as HTMLSelectElement;
-
-    fireEvent.change(policySelect, { target: { value: 'whitelist_only' } });
-
-    expect(policySelect.value).toBe('whitelist_only');
-  });
-
-  it('saves with whitelist_only policy when mode is changed', async () => {
-    const deferred = createDeferred<{ result: ConfigSnapshot; logs: [] }>();
-    vi.mocked(openhumanUpdateScreenIntelligenceSettings).mockReturnValueOnce(deferred.promise);
-
-    renderPanel();
-
-    await waitFor(() => expect(screen.getAllByText(/screen awareness/i).length).toBeGreaterThan(0));
-
-    const policySelect = screen.getByRole('combobox', { name: /mode/i });
-    fireEvent.change(policySelect, { target: { value: 'whitelist_only' } });
-
-    fireEvent.click(screen.getByRole('button', { name: 'Save Settings' }));
-
-    expect(vi.mocked(openhumanUpdateScreenIntelligenceSettings)).toHaveBeenCalledWith(
-      expect.objectContaining({ policy_mode: 'whitelist_only' })
-    );
-
-    deferred.resolve({
-      result: { config: {}, workspace_dir: '/tmp/workspace', config_path: '/tmp/config.toml' },
-      logs: [],
-    });
-  });
-
-  // ─── Error display ────────────────────────────────────────────────────────
-
-  it('shows lastError when state has an error', async () => {
-    renderPanel({ ...baseState, lastError: 'Permission denied by OS' });
-
-    expect(await screen.findByText('Permission denied by OS')).toBeInTheDocument();
-  });
-
-  // ─── Screen monitoring toggle ─────────────────────────────────────────────
-
-  it('toggling screen monitoring checkbox updates the override', async () => {
-    renderPanel();
-
-    await waitFor(() => expect(screen.getAllByText(/screen awareness/i).length).toBeGreaterThan(0));
-
-    const monitoringSwitch = screen.getByRole('switch', { name: 'Screen Monitoring' });
-
-    // Initially reflects status value (true in baseState.features)
-    expect(monitoringSwitch).toHaveAttribute('aria-checked', 'true');
-
-    fireEvent.click(monitoringSwitch);
-    expect(monitoringSwitch).toHaveAttribute('aria-checked', 'false');
-  });
-
-  // ─── Session status display ───────────────────────────────────────────────
-
-  it('shows Active session status when session is active', async () => {
-    renderPanel({
-      ...baseState,
-      status: { ...baseState.status!, session: { ...baseState.status!.session, active: true } },
-    });
-
-    await waitFor(() => expect(screen.getByText(/active/i)).toBeInTheDocument());
-  });
-
-  it('shows Stopped session status when session is inactive', async () => {
-    renderPanel({
-      ...baseState,
-      status: { ...baseState.status!, session: { ...baseState.status!.session, active: false } },
-    });
-
-    await waitFor(() => expect(screen.getByText(/stopped/i)).toBeInTheDocument());
-  });
-});
diff --git a/app/src/components/settings/panels/screen-intelligence/PermissionsSection.tsx b/app/src/components/settings/panels/screen-intelligence/PermissionsSection.tsx
deleted file mode 100644
index fad4f6e38..000000000
--- a/app/src/components/settings/panels/screen-intelligence/PermissionsSection.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { useT } from '../../../../lib/i18n/I18nContext';
-import type { AccessibilityPermissionKind } from '../../../../utils/tauriCommands';
-import Button from '../../../ui/Button';
-import {
-  SettingsBadge,
-  type SettingsBadgeVariant,
-  SettingsRow,
-  SettingsSection,
-} from '../../controls';
-
-const badgeVariant = (value: string): SettingsBadgeVariant =>
-  value === 'granted' ? 'success' : value === 'denied' ? 'danger' : 'neutral';
-
-interface PermissionsSectionProps {
-  screenRecording: string;
-  accessibility: string;
-  inputMonitoring: string;
-  anyPermissionDenied: boolean;
-  lastRestartSummary: string | null;
-  permissionCheckProcessPath: string | null | undefined;
-  isRequestingPermissions: boolean;
-  isRestartingCore: boolean;
-  isLoading: boolean;
-  requestPermission: (permission: AccessibilityPermissionKind) => Promise<unknown>;
-  refreshPermissionsWithRestart: () => Promise<unknown>;
-  refreshStatus: () => Promise<unknown>;
-}
-
-const PermissionsSection = ({
-  screenRecording,
-  accessibility,
-  inputMonitoring,
-  anyPermissionDenied,
-  lastRestartSummary,
-  permissionCheckProcessPath,
-  isRequestingPermissions,
-  isRestartingCore,
-  isLoading,
-  requestPermission,
-  refreshPermissionsWithRestart,
-  refreshStatus,
-}: PermissionsSectionProps) => {
-  const { t } = useT();
-  return (
-    <SettingsSection title={t('settings.screenIntel.permissions.title')}>
-      <SettingsRow
-        label={t('settings.screenIntel.permissions.screenRecording')}
-        control={
-          <SettingsBadge variant={badgeVariant(screenRecording)}>{screenRecording}</SettingsBadge>
-        }
-      />
-      <SettingsRow
-        label={t('settings.screenIntel.permissions.accessibility')}
-        control={
-          <SettingsBadge variant={badgeVariant(accessibility)}>{accessibility}</SettingsBadge>
-        }
-      />
-      <SettingsRow
-        label={t('settings.screenIntel.permissions.inputMonitoring')}
-        control={
-          <SettingsBadge variant={badgeVariant(inputMonitoring)}>{inputMonitoring}</SettingsBadge>
-        }
-      />
-
-      {anyPermissionDenied && (
-        <div className="px-4 py-3">
-          <div className="space-y-1 rounded-xl border border-amber-300 dark:border-amber-500/40 bg-amber-50 dark:bg-amber-500/10 p-3 text-sm text-amber-700 dark:text-amber-300">
-            <p>{t('settings.screenIntel.permissions.grantHint')}</p>
-            {permissionCheckProcessPath ? (
-              <p className="text-xs opacity-75">
-                {t('settings.screenIntel.permissions.macosAppliesPrivacy')}{' '}
-                <span className="break-all font-mono text-content-secondary">
-                  {permissionCheckProcessPath}
-                </span>
-              </p>
-            ) : null}
-          </div>
-        </div>
-      )}
-
-      {lastRestartSummary ? (
-        <div className="px-4 py-3">
-          <div className="rounded-xl border border-green-300 dark:border-green-500/40 bg-green-50 dark:bg-green-500/10 p-3 text-sm text-green-700 dark:text-green-300">
-            {lastRestartSummary}
-          </div>
-        </div>
-      ) : null}
-
-      <div className="flex flex-wrap gap-2 px-4 py-3">
-        <Button
-          variant="secondary"
-          size="sm"
-          onClick={() => void requestPermission('screen_recording')}
-          disabled={isRequestingPermissions || isRestartingCore}>
-          {isRequestingPermissions
-            ? t('settings.screenIntel.permissions.requesting')
-            : t('settings.screenIntel.permissions.requestScreenRecording')}
-        </Button>
-        <Button
-          variant="secondary"
-          size="sm"
-          onClick={() => void requestPermission('accessibility')}
-          disabled={isRequestingPermissions || isRestartingCore}>
-          {isRequestingPermissions
-            ? t('settings.screenIntel.permissions.requesting')
-            : t('settings.screenIntel.permissions.requestAccessibility')}
-        </Button>
-        <Button
-          variant="secondary"
-          size="sm"
-          onClick={() => void requestPermission('input_monitoring')}
-          disabled={isRequestingPermissions || isRestartingCore}>
-          {isRequestingPermissions
-            ? t('settings.screenIntel.permissions.requesting')
-            : t('settings.screenIntel.permissions.openInputMonitoring')}
-        </Button>
-        {anyPermissionDenied ? (
-          <Button
-            variant="secondary"
-            tone="danger"
-            size="sm"
-            onClick={() => void refreshPermissionsWithRestart()}
-            disabled={isRestartingCore || isLoading}>
-            {isRestartingCore
-              ? t('settings.screenIntel.permissions.restartingCore')
-              : t('settings.screenIntel.permissions.restartRefresh')}
-          </Button>
-        ) : (
-          <Button
-            variant="secondary"
-            size="sm"
-            onClick={() => void refreshStatus()}
-            disabled={isLoading || isRestartingCore}>
-            {isLoading
-              ? t('settings.screenIntel.permissions.refreshing')
-              : t('settings.screenIntel.permissions.refreshStatus')}
-          </Button>
-        )}
-      </div>
-    </SettingsSection>
-  );
-};
-
-export default PermissionsSection;
diff --git a/app/src/components/settings/panels/screen-intelligence/__tests__/PermissionsSection.test.tsx b/app/src/components/settings/panels/screen-intelligence/__tests__/PermissionsSection.test.tsx
deleted file mode 100644
index 6906e2c39..000000000
--- a/app/src/components/settings/panels/screen-intelligence/__tests__/PermissionsSection.test.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Tests for the Screen Awareness → Permissions section.
- *
- * PermissionsSection is a pure, props-driven presentational component (no
- * hooks/RPC of its own beyond i18n). These tests exercise both the
- * "permission denied" branch (denied alert + macOS process-path hint +
- * Restart & Refresh button) and the "all granted" branch (plain Refresh
- * Status button), plus the per-permission request buttons and the
- * granted/denied/unknown badge variants.
- */
-import { fireEvent, render, screen } from '@testing-library/react';
-import { describe, expect, it, vi } from 'vitest';
-
-import PermissionsSection from '../PermissionsSection';
-
-type Props = React.ComponentProps<typeof PermissionsSection>;
-
-const baseProps = (): Props => ({
-  screenRecording: 'granted',
-  accessibility: 'denied',
-  inputMonitoring: 'unknown',
-  anyPermissionDenied: true,
-  lastRestartSummary: null,
-  permissionCheckProcessPath: null,
-  isRequestingPermissions: false,
-  isRestartingCore: false,
-  isLoading: false,
-  requestPermission: vi.fn().mockResolvedValue(null),
-  refreshPermissionsWithRestart: vi.fn().mockResolvedValue(null),
-  refreshStatus: vi.fn().mockResolvedValue(null),
-});
-
-describe('PermissionsSection', () => {
-  it('renders denied alert with process path, restart summary, and request buttons', () => {
-    const props = {
-      ...baseProps(),
-      anyPermissionDenied: true,
-      permissionCheckProcessPath: '/tmp/openhuman-core',
-      lastRestartSummary: 'Core restarted: PID 4000 -> PID 4242.',
-    };
-    render(<PermissionsSection {...props} />);
-
-    // Mixed badge variants render (granted/denied/unknown).
-    expect(screen.getByText('granted')).toBeInTheDocument();
-    expect(screen.getByText('denied')).toBeInTheDocument();
-    expect(screen.getByText('unknown')).toBeInTheDocument();
-
-    // Denied-alert block surfaces the macOS process path (line ~69).
-    expect(screen.getByText('/tmp/openhuman-core')).toBeInTheDocument();
-
-    // Last restart summary is shown.
-    expect(screen.getByText('Core restarted: PID 4000 -> PID 4242.')).toBeInTheDocument();
-
-    // The three per-permission request buttons render.
-    expect(screen.getByRole('button', { name: 'Request Screen Recording' })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Request Accessibility' })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Open Input Monitoring' })).toBeInTheDocument();
-  });
-
-  it('invokes the request handlers and the restart-with-refresh handler when denied', () => {
-    const props = { ...baseProps(), anyPermissionDenied: true };
-    render(<PermissionsSection {...props} />);
-
-    fireEvent.click(screen.getByRole('button', { name: 'Request Screen Recording' }));
-    expect(props.requestPermission).toHaveBeenCalledWith('screen_recording');
-
-    fireEvent.click(screen.getByRole('button', { name: 'Request Accessibility' }));
-    expect(props.requestPermission).toHaveBeenCalledWith('accessibility');
-
-    fireEvent.click(screen.getByRole('button', { name: 'Open Input Monitoring' }));
-    expect(props.requestPermission).toHaveBeenCalledWith('input_monitoring');
-
-    // When permissions are denied, the danger Restart & Refresh button shows.
-    const restartBtn = screen.getByRole('button', { name: 'Restarting core…' });
-    fireEvent.click(restartBtn);
-    expect(props.refreshPermissionsWithRestart).toHaveBeenCalledTimes(1);
-    expect(props.refreshStatus).not.toHaveBeenCalled();
-  });
-
-  it('shows the plain Refresh Status button when nothing is denied', () => {
-    const props = {
-      ...baseProps(),
-      screenRecording: 'granted',
-      accessibility: 'granted',
-      inputMonitoring: 'granted',
-      anyPermissionDenied: false,
-      permissionCheckProcessPath: null,
-    };
-    render(<PermissionsSection {...props} />);
-
-    // The denied-alert process path is absent when nothing is denied.
-    expect(screen.queryByText('/tmp/openhuman-core')).not.toBeInTheDocument();
-
-    // The restart-with-refresh button is replaced by the plain refresh button.
-    expect(screen.queryByRole('button', { name: 'Restarting core…' })).not.toBeInTheDocument();
-
-    const refreshBtn = screen.getByRole('button', { name: 'Refreshing…' });
-    fireEvent.click(refreshBtn);
-    expect(props.refreshStatus).toHaveBeenCalledTimes(1);
-    expect(props.refreshPermissionsWithRestart).not.toHaveBeenCalled();
-  });
-
-  it('reflects in-flight labels while requesting permissions', () => {
-    const props = { ...baseProps(), isRequestingPermissions: true };
-    render(<PermissionsSection {...props} />);
-
-    // All three request buttons collapse to the "Requesting…" label.
-    expect(screen.getAllByRole('button', { name: 'Requesting…' })).toHaveLength(3);
-  });
-
-  it('shows the restarting-core label and disables the restart button while restarting', () => {
-    // Exercises the `isRestartingCore ? …` branch of the denied restart button.
-    const props = { ...baseProps(), anyPermissionDenied: true, isRestartingCore: true };
-    render(<PermissionsSection {...props} />);
-
-    const restartBtn = screen.getByRole('button', { name: 'Restarting core…' });
-    expect(restartBtn).toBeDisabled();
-    // While restarting, the request buttons are also disabled.
-    expect(screen.getByRole('button', { name: 'Request Screen Recording' })).toBeDisabled();
-  });
-
-  it('shows the refreshing label and disables the refresh button while loading', () => {
-    // Exercises the `isLoading ? …` branch of the not-denied refresh button.
-    const props = { ...baseProps(), anyPermissionDenied: false, isLoading: true };
-    render(<PermissionsSection {...props} />);
-
-    const refreshBtn = screen.getByRole('button', { name: 'Refreshing…' });
-    expect(refreshBtn).toBeDisabled();
-  });
-});
diff --git a/app/src/components/settings/settingsRouteElements.test.tsx b/app/src/components/settings/settingsRouteElements.test.tsx
new file mode 100644
index 000000000..b759ba322
--- /dev/null
+++ b/app/src/components/settings/settingsRouteElements.test.tsx
@@ -0,0 +1,29 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import { HashRouter, Outlet, Route, Routes } from 'react-router-dom';
+import { describe, expect, it } from 'vitest';
+
+import { settingsRouteElements } from './settingsRouteElements';
+
+describe.each([
+  '/settings/features',
+  '/settings/screen-intelligence',
+  '/settings/screen-awareness-debug',
+])('retired screen settings route %s', route => {
+  it('normalizes to the settings index without rendering removed content', async () => {
+    window.location.hash = `#${route}`;
+
+    render(
+      <HashRouter>
+        <Routes>
+          <Route path="/settings" element={<Outlet />}>
+            {settingsRouteElements()}
+          </Route>
+        </Routes>
+      </HashRouter>
+    );
+
+    await waitFor(() => expect(window.location.hash).toBe('#/settings'));
+    expect(screen.queryByText(/screen intelligence/i)).not.toBeInTheDocument();
+    expect(screen.queryByText(/screen awareness debug/i)).not.toBeInTheDocument();
+  });
+});
diff --git a/app/src/components/settings/settingsRouteElements.tsx b/app/src/components/settings/settingsRouteElements.tsx
index 8a5995296..7232e9c61 100644
--- a/app/src/components/settings/settingsRouteElements.tsx
+++ b/app/src/components/settings/settingsRouteElements.tsx
@@ -30,7 +30,6 @@ import ProfileEditorPage from './panels/ProfileEditorPage';
 import ProfilesPanel from './panels/ProfilesPanel';
 import RecoveryPhrasePanel from './panels/RecoveryPhrasePanel';
 import SandboxSettingsPanel from './panels/SandboxSettingsPanel';
-import ScreenAwarenessDebugPanel from './panels/ScreenAwarenessDebugPanel';
 import SecurityPanel from './panels/SecurityPanel';
 import TeamInvitesPanel from './panels/TeamInvitesPanel';
 import TeamManagementPanel from './panels/TeamManagementPanel';
@@ -135,12 +134,6 @@ export function settingsRouteElements(): ReactNode {
       {/* The Integrations settings section was retired; the composio/OAuth grid
           lives on the Connections page. */}
       <Route path="integrations" element={<Navigate to="/connections" replace />} />
-      {/* Screen Awareness / Desktop Agent / Desktop Companion moved to the
-          Connections page (Desktop group). */}
-      <Route
-        path="screen-intelligence"
-        element={<Navigate to="/connections?tab=screen-intelligence" replace />}
-      />
       <Route path="tools" element={wrapSettingsPage(<ToolsPanel />)} />
       <Route path="companion" element={<Navigate to="/connections?tab=companion" replace />} />
       {/* Meeting settings moved to the Connections page (meetings tab). */}
@@ -180,10 +173,6 @@ export function settingsRouteElements(): ReactNode {
       {/* Dev Workflow panel retired — superseded by Workflows (/flows). */}
       <Route path="dev-workflow" element={<Navigate to="/flows" replace />} />
       <Route path="skills-runner" element={wrapSettingsPage(<WorkflowRunnerPanel />)} />
-      <Route
-        path="screen-awareness-debug"
-        element={wrapSettingsPage(<ScreenAwarenessDebugPanel />)}
-      />
       {/* Voice Debug page retired. */}
       <Route path="voice-debug" element={<SettingsRedirect to="/settings/developer-options" />} />
       {/* Local Model Debug is a chip on the Connections → LLM page. */}
@@ -214,10 +203,6 @@ export function settingsRouteElements(): ReactNode {
       {/* Old hub pages */}
       <Route path="ai" element={<Navigate to="/connections?tab=llm" replace />} />
       <Route path="agents-settings" element={<SettingsRedirect to="/settings/agents" />} />
-      <Route
-        path="features"
-        element={<Navigate to="/connections?tab=screen-intelligence" replace />}
-      />
       <Route path="crypto" element={<Navigate to="/connections?tab=wallet" replace />} />
       <Route path="notifications-hub" element={<SettingsRedirect to="/settings/notifications" />} />
       {/* Composio (API key + routing) moved to Connections → API keys. */}
diff --git a/app/src/components/settings/settingsRouteRegistry.ts b/app/src/components/settings/settingsRouteRegistry.ts
index fc09b882b..b1d4b0aee 100644
--- a/app/src/components/settings/settingsRouteRegistry.ts
+++ b/app/src/components/settings/settingsRouteRegistry.ts
@@ -230,8 +230,8 @@ export const SETTINGS_ROUTE_REGISTRY: SettingsRegistryEntry[] = [
   // --- Connections group ---
   // The Integrations settings section was retired — the composio/OAuth grid
   // lives on the Connections page and the task-source/webhook triage surface is
-  // no longer used. Screen Awareness, Desktop Agent and Desktop Companion moved
-  // to the Connections page's Desktop group; their slugs redirect there.
+  // no longer used. Desktop Agent and Desktop Companion moved to the
+  // Connections page's Desktop group; their slugs redirect there.
 
   // Notifications-hub and crypto hub pages are retired — their slugs redirect
   // to /settings/notifications and /settings/wallet-balances.
@@ -450,15 +450,6 @@ export const SETTINGS_ROUTE_REGISTRY: SettingsRegistryEntry[] = [
   // =========================================================================
   // FEATURES section leaf panels
   // =========================================================================
-  {
-    // Surfaced on the Connections page (Desktop group); route redirects there.
-    // Entry kept for search + deep-link compatibility.
-    id: 'screen-intelligence',
-    titleKey: 'pages.settings.features.screenAwareness',
-    descriptionKey: 'pages.settings.features.screenAwarenessDesc',
-    section: 'features',
-    searchKeywords: ['screen', 'awareness', 'vision', 'capture'],
-  },
   {
     id: 'tools',
     titleKey: 'pages.settings.features.tools',
@@ -472,7 +463,7 @@ export const SETTINGS_ROUTE_REGISTRY: SettingsRegistryEntry[] = [
     // Surfaced on the Connections page (Desktop group); route redirects there.
     id: 'companion',
     titleKey: 'pages.settings.features.desktopCompanion',
-    descriptionKey: 'pages.settings.features.desktopCompanionDesc',
+    descriptionKey: 'settings.assistant.desktopCompanionDesc',
     section: 'features',
     searchKeywords: ['desktop', 'overlay', 'companion'],
   },
@@ -538,7 +529,7 @@ export const SETTINGS_ROUTE_REGISTRY: SettingsRegistryEntry[] = [
   // These live ONLY under Settings → Developer & Diagnostics.
   // Items removed from this list compared to the old DeveloperOptionsPanel:
   //   agents, autonomy, agent-access, sandbox-settings, activity-level,
-  //   tools, companion, screen-intelligence, voice, embeddings, heartbeat,
+  //   tools, companion, voice, embeddings, heartbeat,
   //   ledger-usage, cost-dashboard, task-sources, composio-routing,
   //   webhooks-triggers, migration, security
   //   (all moved to their canonical section pages).
@@ -557,14 +548,6 @@ export const SETTINGS_ROUTE_REGISTRY: SettingsRegistryEntry[] = [
   // Knowledge & Memory group retired entirely — memory surfaces live on the
   // Brain page (graph / goals / sources / sync / subconscious).
   // voice-debug retired from the settings UI.
-  {
-    id: 'screen-awareness-debug',
-    titleKey: 'settings.developerMenu.screenAwareness.title',
-    descriptionKey: 'settings.developerMenu.screenAwareness.desc',
-    section: 'developer',
-    devOnly: true,
-    navGroup: 'modelsInference',
-  },
   {
     id: 'event-log',
     titleKey: 'settings.developerMenu.eventLog.title',
diff --git a/app/src/components/skills/ScreenIntelligenceSetupModal.tsx b/app/src/components/skills/ScreenIntelligenceSetupModal.tsx
deleted file mode 100644
index ae6b04b01..000000000
--- a/app/src/components/skills/ScreenIntelligenceSetupModal.tsx
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * Screen Intelligence setup/enable modal.
- *
- * Guides the user through permission grants, enables the feature,
- * and shows a success confirmation — matching the UX of third-party
- * skill setup flows (Gmail, etc.).
- */
-import { useEffect, useMemo, useState } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
-
-import { useScreenIntelligenceState } from '../../features/screen-intelligence/useScreenIntelligenceState';
-import { useT } from '../../lib/i18n/I18nContext';
-import { openhumanUpdateScreenIntelligenceSettings } from '../../utils/tauriCommands';
-import { settingsNavState } from '../settings/modal/settingsOverlay';
-import { CheckIcon } from '../ui';
-import Button from '../ui/Button';
-import {
-  SetupNotice,
-  SetupSettingRow,
-  SetupSuccess,
-  SkillSetupModalShell,
-} from './SkillSetupPrimitives';
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-type Step = 'permissions' | 'enable' | 'success';
-
-interface Props {
-  onClose: () => void;
-  /** Skip straight to manage mode when permissions are already granted. */
-  initialStep?: Step;
-}
-
-// ─── Permission badge (reusable) ──────────────────────────────────────────────
-
-const PermissionRow = ({
-  label,
-  value,
-  onRequest,
-  isRequesting,
-}: {
-  label: string;
-  value: string;
-  onRequest: () => void;
-  isRequesting: boolean;
-}) => {
-  const { t } = useT();
-  const granted = value === 'granted';
-  const badgeColor = granted
-    ? 'bg-sage-50 text-sage-700 border-sage-200'
-    : value === 'denied'
-      ? 'bg-coral-50 text-coral-700 border-coral-200'
-      : 'bg-surface-subtle text-content-secondary border-line';
-
-  return (
-    <div className="flex items-center justify-between rounded-xl border border-line bg-surface px-3 py-2.5">
-      <div className="flex items-center gap-2">
-        {granted ? (
-          <CheckIcon className="w-4 h-4 text-sage-500" />
-        ) : (
-          <svg
-            className="w-4 h-4 text-content-faint"
-            fill="none"
-            stroke="currentColor"
-            viewBox="0 0 24 24">
-            <circle cx="12" cy="12" r="10" strokeWidth={2} />
-          </svg>
-        )}
-        <span className="text-sm text-content-secondary">{label}</span>
-      </div>
-      {granted ? (
-        <span
-          className={`rounded-md border px-2 py-0.5 text-[10px] uppercase tracking-wide ${badgeColor}`}>
-          {t('skills.setup.screenIntel.granted')}
-        </span>
-      ) : (
-        <Button variant="secondary" size="xs" disabled={isRequesting} onClick={onRequest}>
-          {isRequesting
-            ? t('skills.setup.screenIntel.opening')
-            : t('skills.setup.screenIntel.grant')}
-        </Button>
-      )}
-    </div>
-  );
-};
-
-// ─── Modal ────────────────────────────────────────────────────────────────────
-
-export default function ScreenIntelligenceSetupModal({ onClose, initialStep }: Props) {
-  const navigate = useNavigate();
-  const location = useLocation();
-  const { t } = useT();
-  const {
-    status,
-    isRequestingPermissions,
-    isRestartingCore,
-    lastRestartSummary,
-    lastError,
-    requestPermission,
-    refreshPermissionsWithRestart,
-    refreshStatus,
-  } = useScreenIntelligenceState({ loadVision: false });
-
-  const [isEnabling, setIsEnabling] = useState(false);
-  const [enableError, setEnableError] = useState<string | null>(null);
-
-  const allGranted = useMemo(() => {
-    if (!status) return false;
-    return (
-      status.permissions.screen_recording === 'granted' &&
-      status.permissions.accessibility === 'granted' &&
-      status.permissions.input_monitoring === 'granted'
-    );
-  }, [status]);
-
-  const anyDenied = useMemo(() => {
-    if (!status) return false;
-    return (
-      status.permissions.screen_recording === 'denied' ||
-      status.permissions.accessibility === 'denied' ||
-      status.permissions.input_monitoring === 'denied'
-    );
-  }, [status]);
-
-  // Derive current step
-  const [step, setStep] = useState<Step>(initialStep ?? 'permissions');
-
-  // Auto-advance: when permissions are all granted, move past the permissions step
-  useEffect(() => {
-    if (step === 'permissions' && allGranted) {
-      setStep('enable');
-    }
-  }, [step, allGranted]);
-
-  const handleEnable = async () => {
-    setIsEnabling(true);
-    setEnableError(null);
-    try {
-      await openhumanUpdateScreenIntelligenceSettings({ enabled: true });
-      await refreshStatus();
-      setStep('success');
-    } catch (error) {
-      setEnableError(
-        error instanceof Error ? error.message : t('skills.setup.screenIntel.enableError')
-      );
-    } finally {
-      setIsEnabling(false);
-    }
-  };
-
-  const handleGoToSettings = () => {
-    onClose();
-    navigate('/settings/screen-intelligence', settingsNavState(location));
-  };
-
-  if (status?.platform_supported === false) {
-    return (
-      <SkillSetupModalShell
-        onClose={onClose}
-        title={t('skills.setup.screenIntel.title')}
-        titleId="si-setup-title"
-        icon={
-          <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={1.8}
-              d="M3 5h18v12H3zM8 21h8m-4-4v4"
-            />
-          </svg>
-        }>
-        <div className="space-y-4 py-2">
-          <p className="text-sm text-content-secondary leading-relaxed">
-            {t('skills.setup.screenIntel.macosOnly')}
-          </p>
-          <Button variant="secondary" size="lg" onClick={onClose} className="w-full">
-            {t('common.close')}
-          </Button>
-        </div>
-      </SkillSetupModalShell>
-    );
-  }
-
-  return (
-    <SkillSetupModalShell
-      onClose={onClose}
-      title={t('skills.setup.screenIntel.title')}
-      titleId="si-setup-title"
-      subtitle={
-        <>
-          {step === 'permissions' && t('skills.setup.screenIntel.stepPermissions')}
-          {step === 'enable' && t('skills.setup.screenIntel.stepEnable')}
-          {step === 'success' && t('skills.setup.screenIntel.stepSuccess')}
-        </>
-      }
-      icon={
-        <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={1.8}
-            d="M3 5h18v12H3zM8 21h8m-4-4v4"
-          />
-        </svg>
-      }>
-      {/* ─── Step 1: Permissions ─── */}
-      {step === 'permissions' && (
-        <div className="space-y-3">
-          <p className="text-xs text-content-muted leading-relaxed">
-            {t('skills.setup.screenIntel.permissionsDesc')}
-          </p>
-
-          <div className="space-y-2">
-            <PermissionRow
-              label={t('skills.setup.screenIntel.permScreenRecording')}
-              value={status?.permissions.screen_recording ?? 'unknown'}
-              onRequest={() => void requestPermission('screen_recording')}
-              isRequesting={isRequestingPermissions}
-            />
-            <PermissionRow
-              label={t('skills.setup.screenIntel.permAccessibility')}
-              value={status?.permissions.accessibility ?? 'unknown'}
-              onRequest={() => void requestPermission('accessibility')}
-              isRequesting={isRequestingPermissions}
-            />
-            <PermissionRow
-              label={t('skills.setup.screenIntel.permInputMonitoring')}
-              value={status?.permissions.input_monitoring ?? 'unknown'}
-              onRequest={() => void requestPermission('input_monitoring')}
-              isRequesting={isRequestingPermissions}
-            />
-          </div>
-
-          {anyDenied && (
-            <SetupNotice tone="amber" className="leading-relaxed">
-              <p>{t('skills.setup.screenIntel.deniedHint')}</p>
-              {status?.permission_check_process_path && (
-                <p className="mt-1 opacity-75 text-[10px]">
-                  {t('skills.setup.screenIntel.permissionPathLabel')}{' '}
-                  <span className="font-mono break-all text-content-secondary">
-                    {status.permission_check_process_path}
-                  </span>
-                </p>
-              )}
-            </SetupNotice>
-          )}
-
-          {lastRestartSummary && <SetupNotice tone="sage">{lastRestartSummary}</SetupNotice>}
-
-          {lastError && <SetupNotice tone="coral">{lastError}</SetupNotice>}
-
-          <div className="flex items-center gap-2 pt-1">
-            {anyDenied ? (
-              <button
-                type="button"
-                onClick={() => void refreshPermissionsWithRestart()}
-                disabled={isRestartingCore}
-                className="flex-1 rounded-xl border border-amber-300 bg-amber-50 px-3 py-2.5 text-sm font-medium text-amber-700 hover:bg-amber-100 disabled:opacity-50 transition-colors">
-                {isRestartingCore
-                  ? t('skills.setup.screenIntel.restarting')
-                  : t('skills.setup.screenIntel.restartRefresh')}
-              </button>
-            ) : (
-              <Button
-                variant="secondary"
-                size="lg"
-                onClick={() => void refreshStatus()}
-                disabled={isRestartingCore}
-                className="flex-1">
-                {t('skills.setup.screenIntel.refreshStatus')}
-              </Button>
-            )}
-          </div>
-        </div>
-      )}
-
-      {/* ─── Step 2: Enable ─── */}
-      {step === 'enable' && (
-        <div className="space-y-4">
-          <SetupNotice tone="sage" icon={<CheckIcon className="w-4 h-4 text-sage-500" />}>
-            {t('skills.setup.screenIntel.allGranted')}
-          </SetupNotice>
-
-          <p className="text-xs text-content-muted leading-relaxed">
-            {t('skills.setup.screenIntel.enableDesc')}
-          </p>
-
-          <div className="space-y-2">
-            <SetupSettingRow
-              label={t('skills.setup.screenIntel.captureMode')}
-              value={t('skills.setup.screenIntel.captureModeValue')}
-            />
-            <SetupSettingRow
-              label={t('skills.setup.screenIntel.visionModel')}
-              value={t('common.enabled')}
-            />
-            <SetupSettingRow
-              label={t('skills.setup.screenIntel.panicHotkey')}
-              value={status?.session.panic_hotkey ?? 'Cmd+Shift+.'}
-              mono
-            />
-          </div>
-
-          {enableError && <SetupNotice tone="coral">{enableError}</SetupNotice>}
-
-          <Button
-            variant="primary"
-            size="lg"
-            onClick={() => void handleEnable()}
-            disabled={isEnabling}
-            className="w-full">
-            {isEnabling
-              ? t('skills.setup.screenIntel.enabling')
-              : t('skills.setup.screenIntel.enableBtn')}
-          </Button>
-        </div>
-      )}
-
-      {/* ─── Step 3: Success ─── */}
-      {step === 'success' && (
-        <SetupSuccess
-          title={t('skills.setup.screenIntel.activeTitle')}
-          description={t('skills.setup.screenIntel.activeDesc')}
-          settingsLabel={t('skills.setup.screenIntel.advancedSettings')}
-          finishLabel={t('common.finish')}
-          onSettings={handleGoToSettings}
-          onFinish={onClose}
-        />
-      )}
-    </SkillSetupModalShell>
-  );
-}
diff --git a/app/src/components/skills/__tests__/ScreenIntelligenceSetupModal.test.tsx b/app/src/components/skills/__tests__/ScreenIntelligenceSetupModal.test.tsx
deleted file mode 100644
index fc890819f..000000000
--- a/app/src/components/skills/__tests__/ScreenIntelligenceSetupModal.test.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import {
-  type ScreenIntelligenceState,
-  useScreenIntelligenceState,
-} from '../../../features/screen-intelligence/useScreenIntelligenceState';
-import ScreenIntelligenceSetupModal from '../ScreenIntelligenceSetupModal';
-
-vi.mock('../../../features/screen-intelligence/useScreenIntelligenceState', () => ({
-  useScreenIntelligenceState: vi.fn(),
-}));
-
-vi.mock('react-router-dom', async () => {
-  const actual = await vi.importActual<Record<string, unknown>>('react-router-dom');
-  return {
-    ...actual,
-    useNavigate: vi.fn(() => vi.fn()),
-    useLocation: () => ({
-      pathname: '/connections',
-      search: '',
-      hash: '',
-      state: null,
-      key: 'test',
-    }),
-  };
-});
-
-vi.mock('../../../utils/tauriCommands', async () => {
-  const actual = await vi.importActual<Record<string, unknown>>('../../../utils/tauriCommands');
-  return {
-    ...actual,
-    openhumanUpdateScreenIntelligenceSettings: vi.fn().mockResolvedValue(undefined),
-  };
-});
-
-const baseState: ScreenIntelligenceState = {
-  status: {
-    platform_supported: true,
-    permissions: {
-      screen_recording: 'unknown',
-      accessibility: 'unknown',
-      input_monitoring: 'unknown',
-    },
-    features: { screen_monitoring: false },
-    session: {
-      active: false,
-      started_at_ms: null,
-      expires_at_ms: null,
-      remaining_ms: null,
-      ttl_secs: 300,
-      panic_hotkey: 'Cmd+Shift+.',
-      stop_reason: null,
-      frames_in_memory: 0,
-      last_capture_at_ms: null,
-      last_context: null,
-      vision_enabled: true,
-      vision_state: 'idle',
-      vision_queue_depth: 0,
-      last_vision_at_ms: null,
-      last_vision_summary: null,
-    },
-    config: {
-      enabled: false,
-      capture_policy: 'hybrid',
-      policy_mode: 'all_except_blacklist',
-      baseline_fps: 1,
-      vision_enabled: true,
-      session_ttl_secs: 300,
-      panic_stop_hotkey: 'Cmd+Shift+.',
-      autocomplete_enabled: true,
-      use_vision_model: true,
-      keep_screenshots: false,
-      allowlist: [],
-      denylist: [],
-    },
-    denylist: [],
-    is_context_blocked: false,
-  },
-  lastRestartSummary: null,
-  recentVisionSummaries: [],
-  captureTestResult: null,
-  isCaptureTestRunning: false,
-  isLoading: false,
-  isRequestingPermissions: false,
-  isRestartingCore: false,
-  isStartingSession: false,
-  isStoppingSession: false,
-  isLoadingVision: false,
-  isFlushingVision: false,
-  lastError: null,
-  refreshStatus: vi.fn().mockResolvedValue(null),
-  requestPermission: vi.fn().mockResolvedValue(null),
-  refreshPermissionsWithRestart: vi.fn().mockResolvedValue(null),
-  startSession: vi.fn().mockResolvedValue(null),
-  stopSession: vi.fn().mockResolvedValue(null),
-  refreshVision: vi.fn().mockResolvedValue([]),
-  flushVision: vi.fn().mockResolvedValue(undefined),
-  runCaptureTest: vi.fn().mockResolvedValue(undefined),
-  clearError: vi.fn(),
-};
-
-describe('ScreenIntelligenceSetupModal', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('shows macOS-only message and a Close button when platform_supported is false', () => {
-    vi.mocked(useScreenIntelligenceState).mockReturnValue({
-      ...baseState,
-      status: { ...baseState.status!, platform_supported: false },
-    });
-
-    render(<ScreenIntelligenceSetupModal onClose={vi.fn()} />);
-
-    expect(screen.getByText(/macOS only/i)).toBeInTheDocument();
-    expect(screen.getByText('Close', { selector: 'button' })).toBeInTheDocument();
-    expect(screen.queryByText('Grant permissions')).not.toBeInTheDocument();
-    expect(screen.queryByText('Screen Recording')).not.toBeInTheDocument();
-  });
-
-  it('calls onClose when the Close button is clicked on the unsupported-platform screen', () => {
-    const onClose = vi.fn();
-    vi.mocked(useScreenIntelligenceState).mockReturnValue({
-      ...baseState,
-      status: { ...baseState.status!, platform_supported: false },
-    });
-
-    render(<ScreenIntelligenceSetupModal onClose={onClose} />);
-
-    screen.getByText('Close', { selector: 'button' }).click();
-
-    expect(onClose).toHaveBeenCalledTimes(1);
-  });
-
-  it('renders the permissions setup flow when platform_supported is true', () => {
-    vi.mocked(useScreenIntelligenceState).mockReturnValue(baseState);
-
-    render(<ScreenIntelligenceSetupModal onClose={vi.fn()} />);
-
-    expect(screen.getByText('Grant permissions')).toBeInTheDocument();
-    expect(screen.getByText('Screen Recording')).toBeInTheDocument();
-    expect(screen.getByText('Accessibility')).toBeInTheDocument();
-    expect(screen.getByText('Input Monitoring')).toBeInTheDocument();
-    expect(screen.queryByText(/macOS only/i)).not.toBeInTheDocument();
-  });
-});
diff --git a/app/src/components/skills/skillIcons.tsx b/app/src/components/skills/skillIcons.tsx
index 4f4d6b4eb..137843706 100644
--- a/app/src/components/skills/skillIcons.tsx
+++ b/app/src/components/skills/skillIcons.tsx
@@ -8,7 +8,6 @@ import {
   LuKeyboard,
   LuMessageSquareMore,
   LuMic,
-  LuMonitor,
   LuPlugZap,
   LuShare2,
   LuSparkles,
@@ -180,7 +179,6 @@ export function skillCategoryHeadingClassName(category: SkillCategory): string {
 }
 
 export const BUILT_IN_SKILL_ICONS = {
-  screenIntelligence: <LuMonitor className="h-5 w-5" aria-hidden="true" />,
   textAutocomplete: <LuKeyboard className="h-5 w-5" aria-hidden="true" />,
   voiceStt: <LuMic className="h-5 w-5" aria-hidden="true" />,
 };
diff --git a/app/src/features/human/Mascot/Ghosty.tsx b/app/src/features/human/Mascot/Ghosty.tsx
index e83a24cb4..8eb9013c5 100644
--- a/app/src/features/human/Mascot/Ghosty.tsx
+++ b/app/src/features/human/Mascot/Ghosty.tsx
@@ -26,7 +26,6 @@ import { visemePath, VISEMES, type VisemeShape } from './visemes';
  * - `celebrating` — success animation after meaningful work.
  * - `writing` — agent is editing/creating files.
  * - `reading` — agent is browsing or reading content.
- * - `recording` — agent is capturing screen or recording.
  * - `waving` — greeting or hello gesture.
  * - `dancing` — celebratory/playful animation.
  * - `drinking_coffee` — agent is processing / long-running task.
@@ -50,7 +49,6 @@ export type MascotFace =
   | 'celebrating'
   | 'writing'
   | 'reading'
-  | 'recording'
   | 'waving'
   | 'dancing'
   | 'drinking_coffee'
@@ -216,14 +214,6 @@ const FACE_PRESETS: Record<Exclude<MascotFace, 'normal'>, FacePreset> = {
     showBrows: true,
     blushOpacity: 0.75,
   },
-  recording: {
-    eyeScaleY: 1,
-    eyeScaleX: 1,
-    browTilt: 0,
-    browDy: 0,
-    showBrows: false,
-    blushOpacity: 0.9,
-  },
   waving: {
     eyeScaleY: 0.5,
     eyeScaleX: 1.1,
@@ -489,8 +479,6 @@ function restMouthPath(face: MascotFace): string {
     case 'writing':
     case 'reading':
       return 'M488,585 Q520,595 552,585 Q520,592 488,585 Z';
-    case 'recording':
-      return 'M495,580 Q520,600 545,580 Q520,615 495,580 Z';
     case 'drinking_coffee':
     case 'drinking_boba':
       return 'M500,578 Q520,598 540,578 Q520,610 500,578 Z';
diff --git a/app/src/features/human/Mascot/riveMaps.ts b/app/src/features/human/Mascot/riveMaps.ts
index 527e2c6d2..7ec33fb3f 100644
--- a/app/src/features/human/Mascot/riveMaps.ts
+++ b/app/src/features/human/Mascot/riveMaps.ts
@@ -28,7 +28,6 @@ export const RIVE_POSES = [
   'coffeedrink',
   'writing',
   'bobbateadrink',
-  'recording',
   'hand_wave',
   'dancing',
 ] as const;
@@ -53,7 +52,6 @@ export const FACE_TO_POSE: Record<MascotFace, RivePose> = {
   celebrating: 'celebration',
   writing: 'writing',
   reading: 'bookreading',
-  recording: 'recording',
   waving: 'hand_wave',
   dancing: 'dancing',
   drinking_coffee: 'coffeedrink',
@@ -159,8 +157,8 @@ export function toRiveVisemeCode(code: string): RiveVisemeCode {
 
 /**
  * Poses the mascot drifts through on its own while otherwise idle, to keep it
- * feeling alive. Deliberately excludes `idle` (the resting state it returns to
- * between picks) and `recording` (reads as an active screen-capture cue).
+ * feeling alive. Deliberately excludes `idle`, the resting state it returns to
+ * between picks.
  */
 export const AMBIENT_POSES: readonly RivePose[] = [
   'thinking',
diff --git a/app/src/features/human/useHumanMascot.test.ts b/app/src/features/human/useHumanMascot.test.ts
index 303b95968..d58b95a93 100644
--- a/app/src/features/human/useHumanMascot.test.ts
+++ b/app/src/features/human/useHumanMascot.test.ts
@@ -336,6 +336,17 @@ describe('useHumanMascot state machine', () => {
     expect(result.current.face).toBe('thinking');
   });
 
+  it('does not expose a capture-specific activity face', () => {
+    const { result } = renderHook(() => useHumanMascot());
+    act(() => {
+      capturedListeners?.onInferenceStart?.(fakeEvent({}));
+      capturedListeners?.onToolCall?.(
+        fakeEvent({ tool_name: 'memory_capture', skill_id: 's', args: {}, round: 1 })
+      );
+    });
+    expect(result.current.face).toBe('thinking');
+  });
+
   it('maps reading tools to reading face', () => {
     const { result } = renderHook(() => useHumanMascot());
     act(() => {
diff --git a/app/src/features/human/useHumanMascot.ts b/app/src/features/human/useHumanMascot.ts
index 6b8b6fef5..b27a4a654 100644
--- a/app/src/features/human/useHumanMascot.ts
+++ b/app/src/features/human/useHumanMascot.ts
@@ -254,10 +254,6 @@ function toolToActivityFace(toolName: string): MascotFace | null {
     return 'reading';
   }
 
-  if (name.includes('screen') || name.includes('screenshot') || name.includes('capture')) {
-    return 'recording';
-  }
-
   return null;
 }
 
@@ -284,7 +280,7 @@ interface UseHumanMascotResult {
  *
  * - `inference_start` → `thinking`
  * - `iteration_start` round > 1 or `tool_call` → activity pose based on tool
- *   name (writing/reading/recording) or `confused` as fallback
+ *   name (writing/reading) or `confused` as fallback
  * - `tool_result success=false` → `concerned` (held briefly)
  * - `text_delta` → `speaking`, pseudo-lipsync from the trailing letter
  * - `chat_done` (no TTS) → message-aware ack face (held briefly), then `idle`
diff --git a/app/src/features/screen-intelligence/api.ts b/app/src/features/screen-intelligence/api.ts
deleted file mode 100644
index 4e73cb115..000000000
--- a/app/src/features/screen-intelligence/api.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import {
-  type AccessibilityPermissionKind,
-  type AccessibilityStartSessionParams,
-  type AccessibilityStatus,
-  openhumanAccessibilityRequestPermission,
-  openhumanAccessibilityStartSession,
-  openhumanAccessibilityStatus,
-  openhumanAccessibilityStopSession,
-  openhumanAccessibilityVisionFlush,
-  openhumanAccessibilityVisionRecent,
-  openhumanScreenIntelligenceCaptureTest,
-  openhumanServiceRestart,
-} from '../../utils/tauriCommands';
-
-const ACCESSIBILITY_ERROR_PREFIX = '[screen-intelligence]';
-
-const extractError = (error: unknown, fallback: string): string => {
-  if (error instanceof Error && error.message.trim()) {
-    return error.message;
-  }
-  if (typeof error === 'string' && error.trim()) {
-    return error;
-  }
-  if (error && typeof error === 'object') {
-    const msg = (error as { message?: unknown }).message;
-    if (typeof msg === 'string' && msg.trim()) {
-      return msg;
-    }
-  }
-  return fallback;
-};
-
-const formatCoreIdentity = (status: AccessibilityStatus | null | undefined): string | null => {
-  const process = status?.core_process;
-  if (!process) {
-    return null;
-  }
-  const startedAt = Number.isFinite(process.started_at_ms)
-    ? new Date(process.started_at_ms).toLocaleTimeString()
-    : null;
-  return startedAt ? `PID ${process.pid} at ${startedAt}` : `PID ${process.pid}`;
-};
-
-interface RefreshPermissionsResult {
-  status: AccessibilityStatus;
-  restartSummary: string;
-}
-
-async function fetchScreenIntelligenceStatus(): Promise<AccessibilityStatus> {
-  const response = await openhumanAccessibilityStatus();
-  return response.result;
-}
-
-export async function requestScreenIntelligencePermission(
-  permission: AccessibilityPermissionKind
-): Promise<AccessibilityStatus> {
-  await openhumanAccessibilityRequestPermission(permission);
-  return await fetchScreenIntelligenceStatus();
-}
-
-export async function refreshScreenIntelligencePermissionsWithRestart(
-  previousStatus: AccessibilityStatus | null
-): Promise<RefreshPermissionsResult> {
-  try {
-    const previousProcess = previousStatus?.core_process;
-    console.debug(
-      `${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: requesting core self-restart`
-    );
-    await openhumanServiceRestart('screen-intelligence-ui', 'refresh_permissions');
-    console.debug(
-      `${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: waiting for sidecar ready`
-    );
-    await new Promise<void>(resolve => setTimeout(resolve, 400));
-    console.debug(
-      `${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: fetching updated status`
-    );
-
-    for (let attempt = 1; attempt <= 5; attempt += 1) {
-      try {
-        const status = await fetchScreenIntelligenceStatus();
-        console.debug(
-          `${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: done screen_recording=%s accessibility=%s input_monitoring=%s`,
-          status.permissions.screen_recording,
-          status.permissions.accessibility,
-          status.permissions.input_monitoring
-        );
-        const currentProcess = status.core_process;
-        if (
-          previousProcess &&
-          currentProcess &&
-          previousProcess.pid === currentProcess.pid &&
-          previousProcess.started_at_ms === currentProcess.started_at_ms
-        ) {
-          throw new Error(
-            `Core restart command completed, but the same core instance is still serving requests (${formatCoreIdentity(status)}).`
-          );
-        }
-
-        const previousLabel = formatCoreIdentity(previousStatus);
-        const currentLabel = formatCoreIdentity(status);
-        const restartSummary =
-          previousLabel && currentLabel
-            ? `Core restarted: ${previousLabel} -> ${currentLabel}.`
-            : currentLabel
-              ? `Core restarted. Now serving from ${currentLabel}.`
-              : 'Core restarted and permissions refreshed.';
-
-        return { status, restartSummary };
-      } catch (error) {
-        if (attempt === 5) {
-          throw error;
-        }
-        console.debug(
-          `${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: status fetch failed (attempt %s), retrying`,
-          attempt
-        );
-        await new Promise<void>(resolve => setTimeout(resolve, 350 * attempt));
-      }
-    }
-
-    throw new Error('Failed to fetch accessibility status after core restart');
-  } catch (error) {
-    const message = extractError(error, 'Failed to restart core and refresh permissions');
-    console.error(`${ACCESSIBILITY_ERROR_PREFIX} refreshPermissionsWithRestart: error`, message);
-    throw new Error(message);
-  }
-}
-
-export async function startScreenIntelligenceSession(
-  params: AccessibilityStartSessionParams
-): Promise<AccessibilityStatus> {
-  await openhumanAccessibilityStartSession(params);
-  return await fetchScreenIntelligenceStatus();
-}
-
-export async function stopScreenIntelligenceSession(reason?: string): Promise<AccessibilityStatus> {
-  await openhumanAccessibilityStopSession(reason ? { reason } : undefined);
-  return await fetchScreenIntelligenceStatus();
-}
-
-export async function fetchScreenIntelligenceVisionRecent(limit?: number) {
-  const response = await openhumanAccessibilityVisionRecent(limit);
-  return response.result.summaries;
-}
-
-export async function flushScreenIntelligenceVision() {
-  const response = await openhumanAccessibilityVisionFlush();
-  return response.result.summary;
-}
-
-export async function runScreenIntelligenceCaptureTest() {
-  const response = await openhumanScreenIntelligenceCaptureTest();
-  return response.result;
-}
-
-export { extractError };
diff --git a/app/src/features/screen-intelligence/useScreenIntelligenceSkillStatus.ts b/app/src/features/screen-intelligence/useScreenIntelligenceSkillStatus.ts
deleted file mode 100644
index cb217f2ef..000000000
--- a/app/src/features/screen-intelligence/useScreenIntelligenceSkillStatus.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Derives a skill-card-friendly status for Screen Intelligence,
- * matching the state vocabulary used by third-party skills (Gmail, etc.).
- */
-import { useMemo } from 'react';
-
-import { useCoreState } from '../../providers/CoreStateProvider';
-import {
-  activeStatus,
-  enabledStatus,
-  offlineStatus,
-  setupRequiredStatus,
-  type SkillCardStatusDescriptor,
-  unsupportedStatus,
-} from '../skills/skillCardStatus';
-
-interface ScreenIntelligenceSkillStatus extends SkillCardStatusDescriptor {
-  /** True when all three macOS permissions are granted. */
-  allPermissionsGranted: boolean;
-  /** True when the platform doesn't support screen intelligence. */
-  platformUnsupported: boolean;
-}
-
-export function useScreenIntelligenceSkillStatus(): ScreenIntelligenceSkillStatus {
-  const { snapshot } = useCoreState();
-  const status = snapshot.runtime.screenIntelligence;
-
-  return useMemo(() => {
-    // No status yet (core not ready or not in Tauri)
-    if (!status) {
-      return { ...offlineStatus(), allPermissionsGranted: false, platformUnsupported: false };
-    }
-
-    if (!status.platform_supported) {
-      return { ...unsupportedStatus(), allPermissionsGranted: false, platformUnsupported: true };
-    }
-
-    const { permissions, session, config } = status;
-    const allGranted =
-      permissions.screen_recording === 'granted' &&
-      permissions.accessibility === 'granted' &&
-      permissions.input_monitoring === 'granted';
-
-    // Permissions missing — needs setup
-    if (!allGranted) {
-      return { ...setupRequiredStatus(), allPermissionsGranted: false, platformUnsupported: false };
-    }
-
-    // Session active — fully connected
-    if (session.active) {
-      return { ...activeStatus(), allPermissionsGranted: true, platformUnsupported: false };
-    }
-
-    // Permissions granted, enabled in config, but session not active
-    if (config.enabled) {
-      return { ...enabledStatus(), allPermissionsGranted: true, platformUnsupported: false };
-    }
-
-    // Permissions granted but not enabled
-    return {
-      ...offlineStatus('Disabled'),
-      allPermissionsGranted: true,
-      platformUnsupported: false,
-    };
-  }, [status]);
-}
diff --git a/app/src/features/screen-intelligence/useScreenIntelligenceState.ts b/app/src/features/screen-intelligence/useScreenIntelligenceState.ts
deleted file mode 100644
index 656d69b68..000000000
--- a/app/src/features/screen-intelligence/useScreenIntelligenceState.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-import { getCoreStateSnapshot } from '../../lib/coreState/store';
-import { useCoreState } from '../../providers/CoreStateProvider';
-import type {
-  AccessibilityPermissionKind,
-  AccessibilityStartSessionParams,
-  AccessibilityStatus,
-  AccessibilityVisionSummary,
-  CaptureTestResult,
-} from '../../utils/tauriCommands';
-import {
-  extractError,
-  fetchScreenIntelligenceVisionRecent,
-  flushScreenIntelligenceVision,
-  refreshScreenIntelligencePermissionsWithRestart,
-  requestScreenIntelligencePermission,
-  runScreenIntelligenceCaptureTest,
-  startScreenIntelligenceSession,
-  stopScreenIntelligenceSession,
-} from './api';
-
-export interface ScreenIntelligenceState {
-  status: AccessibilityStatus | null;
-  lastRestartSummary: string | null;
-  recentVisionSummaries: AccessibilityVisionSummary[];
-  captureTestResult: CaptureTestResult | null;
-  isCaptureTestRunning: boolean;
-  isLoading: boolean;
-  isRequestingPermissions: boolean;
-  isRestartingCore: boolean;
-  isStartingSession: boolean;
-  isStoppingSession: boolean;
-  isLoadingVision: boolean;
-  isFlushingVision: boolean;
-  lastError: string | null;
-  refreshStatus: () => Promise<AccessibilityStatus | null>;
-  requestPermission: (
-    permission: AccessibilityPermissionKind
-  ) => Promise<AccessibilityStatus | null>;
-  refreshPermissionsWithRestart: () => Promise<AccessibilityStatus | null>;
-  startSession: (params: AccessibilityStartSessionParams) => Promise<AccessibilityStatus | null>;
-  stopSession: (reason?: string) => Promise<AccessibilityStatus | null>;
-  refreshVision: (limit?: number) => Promise<AccessibilityVisionSummary[]>;
-  flushVision: () => Promise<void>;
-  runCaptureTest: () => Promise<void>;
-  clearError: () => void;
-}
-
-interface UseScreenIntelligenceStateOptions {
-  pollMs?: number;
-  visionLimit?: number;
-  loadVision?: boolean;
-}
-
-export function useScreenIntelligenceState(
-  options: UseScreenIntelligenceStateOptions = {}
-): ScreenIntelligenceState {
-  const { pollMs = 2000, visionLimit = 10, loadVision = false } = options;
-  const { refresh: refreshCoreState, snapshot } = useCoreState();
-  const status = snapshot.runtime.screenIntelligence;
-  const [lastRestartSummary, setLastRestartSummary] = useState<string | null>(null);
-  const [recentVisionSummaries, setRecentVisionSummaries] = useState<AccessibilityVisionSummary[]>(
-    []
-  );
-  const [captureTestResult, setCaptureTestResult] = useState<CaptureTestResult | null>(null);
-  const [isCaptureTestRunning, setIsCaptureTestRunning] = useState(false);
-  const [isLoading, setIsLoading] = useState(false);
-  const [isRequestingPermissions, setIsRequestingPermissions] = useState(false);
-  const [isRestartingCore, setIsRestartingCore] = useState(false);
-  const [isStartingSession, setIsStartingSession] = useState(false);
-  const [isStoppingSession, setIsStoppingSession] = useState(false);
-  const [isLoadingVision, setIsLoadingVision] = useState(false);
-  const [isFlushingVision, setIsFlushingVision] = useState(false);
-  const [lastError, setLastError] = useState<string | null>(null);
-
-  const latestScreenIntelligenceStatus = useCallback(
-    (): AccessibilityStatus | null => getCoreStateSnapshot().snapshot.runtime.screenIntelligence,
-    []
-  );
-
-  const refreshStatus = useCallback(async () => {
-    setIsLoading(true);
-    setLastError(null);
-    try {
-      await refreshCoreState();
-      return latestScreenIntelligenceStatus();
-    } catch (error) {
-      setLastError(extractError(error, 'Failed to fetch accessibility status'));
-      return null;
-    } finally {
-      setIsLoading(false);
-    }
-  }, [latestScreenIntelligenceStatus, refreshCoreState]);
-
-  const refreshVision = useCallback(
-    async (limit = visionLimit) => {
-      setIsLoadingVision(true);
-      try {
-        const summaries = await fetchScreenIntelligenceVisionRecent(limit);
-        setRecentVisionSummaries(summaries);
-        return summaries;
-      } catch (error) {
-        setLastError(extractError(error, 'Failed to fetch accessibility vision summaries'));
-        return [];
-      } finally {
-        setIsLoadingVision(false);
-      }
-    },
-    [visionLimit]
-  );
-
-  const requestPermission = useCallback(
-    async (permission: AccessibilityPermissionKind) => {
-      setIsRequestingPermissions(true);
-      setLastError(null);
-      setLastRestartSummary(null);
-      try {
-        await requestScreenIntelligencePermission(permission);
-        await refreshCoreState();
-        return latestScreenIntelligenceStatus();
-      } catch (error) {
-        setLastError(extractError(error, 'Failed to request accessibility permission'));
-        return null;
-      } finally {
-        setIsRequestingPermissions(false);
-      }
-    },
-    [latestScreenIntelligenceStatus, refreshCoreState]
-  );
-
-  const refreshPermissionsWithRestart = useCallback(async () => {
-    setIsRestartingCore(true);
-    setLastError(null);
-    setLastRestartSummary(null);
-    try {
-      const result = await refreshScreenIntelligencePermissionsWithRestart(status);
-      setLastRestartSummary(result.restartSummary);
-      await refreshCoreState();
-      return latestScreenIntelligenceStatus() ?? result.status;
-    } catch (error) {
-      setLastError(extractError(error, 'Failed to restart core and refresh permissions'));
-      return null;
-    } finally {
-      setIsRestartingCore(false);
-    }
-  }, [latestScreenIntelligenceStatus, refreshCoreState, status]);
-
-  const startSession = useCallback(
-    async (params: AccessibilityStartSessionParams) => {
-      setIsStartingSession(true);
-      setLastError(null);
-      try {
-        await startScreenIntelligenceSession(params);
-        await refreshCoreState();
-        return latestScreenIntelligenceStatus();
-      } catch (error) {
-        setLastError(extractError(error, 'Failed to start accessibility session'));
-        return null;
-      } finally {
-        setIsStartingSession(false);
-      }
-    },
-    [latestScreenIntelligenceStatus, refreshCoreState]
-  );
-
-  const stopSession = useCallback(
-    async (reason?: string) => {
-      setIsStoppingSession(true);
-      setLastError(null);
-      try {
-        await stopScreenIntelligenceSession(reason);
-        await refreshCoreState();
-        return latestScreenIntelligenceStatus();
-      } catch (error) {
-        setLastError(extractError(error, 'Failed to stop accessibility session'));
-        return null;
-      } finally {
-        setIsStoppingSession(false);
-      }
-    },
-    [latestScreenIntelligenceStatus, refreshCoreState]
-  );
-
-  const flushVision = useCallback(async () => {
-    setIsFlushingVision(true);
-    try {
-      const summary = await flushScreenIntelligenceVision();
-      if (summary) {
-        setRecentVisionSummaries(current => [summary, ...current].slice(0, 30));
-      }
-    } catch (error) {
-      setLastError(extractError(error, 'Failed to flush accessibility vision'));
-    } finally {
-      setIsFlushingVision(false);
-    }
-  }, []);
-
-  const runCaptureTest = useCallback(async () => {
-    setIsCaptureTestRunning(true);
-    setCaptureTestResult(null);
-    setLastError(null);
-    try {
-      const result = await runScreenIntelligenceCaptureTest();
-      setCaptureTestResult(result);
-    } catch (error) {
-      setLastError(extractError(error, 'Failed to run capture test'));
-    } finally {
-      setIsCaptureTestRunning(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (loadVision) {
-      void refreshVision(visionLimit);
-    }
-  }, [loadVision, refreshVision, visionLimit]);
-
-  useEffect(() => {
-    if (!loadVision) {
-      return;
-    }
-
-    const intervalId = window.setInterval(() => {
-      void refreshVision(visionLimit);
-    }, pollMs);
-
-    return () => window.clearInterval(intervalId);
-  }, [loadVision, pollMs, refreshVision, visionLimit]);
-
-  return {
-    status,
-    lastRestartSummary,
-    recentVisionSummaries,
-    captureTestResult,
-    isCaptureTestRunning,
-    isLoading,
-    isRequestingPermissions,
-    isRestartingCore,
-    isStartingSession,
-    isStoppingSession,
-    isLoadingVision,
-    isFlushingVision,
-    lastError,
-    refreshStatus,
-    requestPermission,
-    refreshPermissionsWithRestart,
-    startSession,
-    stopSession,
-    refreshVision,
-    flushVision,
-    runCaptureTest,
-    clearError: () => setLastError(null),
-  };
-}
diff --git a/app/src/lib/coreState/__tests__/store.test.ts b/app/src/lib/coreState/__tests__/store.test.ts
index 6223d18c6..804a73028 100644
--- a/app/src/lib/coreState/__tests__/store.test.ts
+++ b/app/src/lib/coreState/__tests__/store.test.ts
@@ -18,7 +18,7 @@ function makeSnapshot(overrides: Partial<CoreAppSnapshot> = {}): CoreAppSnapshot
       activeMode: 'os_keyring',
       backendName: 'os',
     },
-    runtime: { screenIntelligence: null, localAi: null, service: null },
+    runtime: { localAi: null, service: null },
     ...overrides,
   };
 }
diff --git a/app/src/lib/coreState/store.ts b/app/src/lib/coreState/store.ts
index 8c851718d..e50a24613 100644
--- a/app/src/lib/coreState/store.ts
+++ b/app/src/lib/coreState/store.ts
@@ -1,6 +1,5 @@
 import type { User } from '../../types/api';
 import type { TeamInvite, TeamMember, TeamWithRole } from '../../types/team';
-import type { AccessibilityStatus } from '../../utils/tauriCommands/accessibility';
 import type { LocalAiStatus } from '../../utils/tauriCommands/localAi';
 import type { ServiceStatus } from '../../utils/tauriCommands/service';
 
@@ -32,7 +31,6 @@ export interface CoreLocalState {
 }
 
 export interface CoreRuntimeSnapshot {
-  screenIntelligence: AccessibilityStatus | null;
   localAi: LocalAiStatus | null;
   service: ServiceStatus | null;
 }
@@ -94,7 +92,7 @@ const emptySnapshot: CoreAppSnapshot = {
     activeMode: 'os_keyring',
     backendName: 'os',
   },
-  runtime: { screenIntelligence: null, localAi: null, service: null },
+  runtime: { localAi: null, service: null },
 };
 
 let currentState: CoreState = {
diff --git a/app/src/lib/i18n/ar.ts b/app/src/lib/i18n/ar.ts
index e22e91c39..688641ac8 100644
--- a/app/src/lib/i18n/ar.ts
+++ b/app/src/lib/i18n/ar.ts
@@ -7,7 +7,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanion': 'المرافق لسطح المكتب',
   'settings.assistant.desktopCompanionDesc': 'وضع المرافق الدائم مع اختصار شريط النظام',
   'pages.settings.features.desktopCompanion': 'الرفيق المكتبي',
-  'pages.settings.features.desktopCompanionDesc': 'مساعد صوتي يدرك الشاشة: يستمع ويرى ويتحدث ويشير',
   'settings.companion.title': 'رفيق سطح المكتب',
   'settings.companion.session': 'الجلسة',
   'settings.companion.activeLabel': 'نشط',
@@ -23,8 +22,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'مفتاح التشغيل السريع',
   'settings.companion.activationMode': 'وضع التنشيط',
   'settings.companion.sessionTtl': 'مدة صلاحية الجلسة',
-  'settings.companion.screenCapture': 'لقطة الشاشة',
-  'settings.companion.appContext': 'سياق التطبيق',
   // Share cards (#5006).
   'share.button': 'مشاركة',
   'share.modalTitle': 'شارك هذه اللحظة',
@@ -109,7 +106,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'اختر نموذج التضمين المستخدم في البحث في الذاكرة.',
   'connections.header.search': 'اضبط البحث على الويب لوكيلك.',
   'connections.header.wallet': 'رصيد محفظتك المحلية وعبارة الاسترداد الخاصة بك.',
-  'connections.header.screen': 'دع وكيلك يرى شاشتك ليقدم مساعدة سياقية في الوقت المناسب.',
   'connections.header.composioKey': 'أضف مفتاح API الخاص بـ Composio لفتح مئات تكاملات التطبيقات.',
   'connections.llm.apiKeys': 'مفاتيح API والتوجيه',
   'connections.welcome.nav': 'مرحبًا',
@@ -741,8 +737,6 @@ const messages: TranslationMap = {
   'settings.assistant.faceMascot': 'الوجه / الشخصية',
   'settings.assistant.backgroundActivity': 'اللاوعي',
   'settings.assistant.backgroundActivityDesc': 'تحكم في مدى نشاط مساعدك في الخلفية',
-  'settings.assistant.screenAwareness': 'الوعي بالشاشة',
-  'settings.assistant.screenAwarenessDesc': 'اسمح للمساعد برؤية النافذة النشطة',
   'settings.assistant.permissions': 'الأذونات',
   'settings.assistant.permissionsDesc': 'اختر ما يمكن للمساعد فعله والمكان الذي يمكنه العمل فيه',
   'settings.privacySecurity.privacy': 'الخصوصية',
@@ -822,7 +816,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'التفضيلات',
   'settings.notifications.tabs.routing': 'التوجيه',
   'settings.features': 'الميزات',
-  'settings.featuresDesc': 'وعي الشاشة والمراسلة والأدوات',
   'settings.aiModels': 'الذكاء الاصطناعي والنماذج',
   'settings.aiModelsDesc': 'إعداد نموذج الذكاء الاصطناعي المحلي وتنزيلاته ومزود LLM',
   'settings.ai': 'إعداد الذكاء الاصطناعي',
@@ -914,8 +907,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': 'إيقاف جميع الإشعارات مؤقتًا لفترة محددة',
   'settings.notifications.channelControls': 'ضوابط لكل قناة',
   'settings.notifications.channelControlsDesc': 'ضبط تفضيلات الإشعارات لكل قناة',
-  'settings.features.screenAwareness': 'وعي الشاشة',
-  'settings.features.screenAwarenessDesc': 'السماح للمساعد برؤية نافذتك النشطة',
   'settings.features.messaging': 'المراسلة',
   'settings.features.messagingDesc': 'إعدادات تكامل القنوات والمراسلة',
   'settings.features.tools': 'الأدوات',
@@ -2157,21 +2148,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'حفظ التغييرات',
   'settings.tools.preferencesSaved': 'تم حفظ التفضيلات',
   'settings.tools.saveFailed': 'فشل حفظ التفضيلات. حاول مرة أخرى.',
-  'settings.screenAwareness.mode': 'الوضع',
-  'settings.screenAwareness.allExceptBlacklist': 'الكل باستثناء القائمة السوداء',
-  'settings.screenAwareness.whitelistOnly': 'القائمة البيضاء فقط',
-  'settings.screenAwareness.screenMonitoring': 'مراقبة الشاشة',
-  'settings.screenAwareness.saveSettings': 'حفظ الإعدادات',
-  'settings.screenAwareness.session': 'الجلسة',
-  'settings.screenAwareness.status': 'الحالة',
-  'settings.screenAwareness.active': 'نشط',
-  'settings.screenAwareness.stopped': 'متوقف',
-  'settings.screenAwareness.remaining': 'المتبقي',
-  'settings.screenAwareness.startSession': 'بدء الجلسة',
-  'settings.screenAwareness.stopSession': 'إيقاف الجلسة',
-  'settings.screenAwareness.analyzeNow': 'تحليل الآن',
-  'settings.screenAwareness.macosOnly':
-    'التقاط سطح المكتب لوعي الشاشة وضوابط الأذونات مدعومة حاليًا على macOS فقط.',
   'connections.comingSoon': 'قريبًا',
   'connections.setUp': 'إعداد',
   'connections.configured': 'مضبوط',
@@ -2518,36 +2494,6 @@ const messages: TranslationMap = {
     'مفتاح رئيسي. معطّل افتراضيًا: Ollama يبقى خاملاً. عند التشغيل، يستخدم ملخّص الشجرة وذكاء الشاشة والإكمال التلقائي النموذجَ المحلي دائمًا.',
   'localModel.advancedSettings': 'إعدادات متقدمة',
   'localModel.debugTitle': 'تصحيح النموذج المحلي',
-  'screenAwareness.debugTitle': 'تصحيح وعي الشاشة',
-  'screenAwareness.debug.debugAndDiagnostics': 'التصحيح والتشخيص',
-  'screenAwareness.debug.collapse': 'طي',
-  'screenAwareness.debug.expand': 'توسيع',
-  'screenAwareness.debug.failedToSave': 'فشل حفظ ذكاء الشاشة',
-  'screenAwareness.debug.policyTitle': 'سياسة ذكاء الشاشة',
-  'screenAwareness.debug.baselineFps': 'FPS الأساسي',
-  'screenAwareness.debug.useVisionModel': 'استخدام نموذج الرؤية',
-  'screenAwareness.debug.useVisionModelDesc':
-    'أرسل لقطات الشاشة إلى نموذج رؤية LLM للحصول على سياق أغنى. عند التعطيل، يُستخدم نص OCR فقط مع نموذج نصي: أسرع ولا يتطلب نموذج رؤية.',
-  'screenAwareness.debug.keepScreenshots': 'الاحتفاظ بلقطات الشاشة',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'احفظ لقطات الشاشة الملتقطة في مساحة العمل بدلاً من حذفها بعد المعالجة',
-  'screenAwareness.debug.allowlist': 'القائمة المسموح بها (قاعدة واحدة لكل سطر)',
-  'screenAwareness.debug.denylist': 'قائمة الرفض (قاعدة واحدة لكل سطر)',
-  'screenAwareness.debug.saveSettings': 'حفظ إعدادات ذكاء الشاشة',
-  'screenAwareness.debug.sessionStats': 'إحصائيات الجلسة',
-  'screenAwareness.debug.framesEphemeral': 'الإطارات (عابرة)',
-  'screenAwareness.debug.panicStop': 'توقف الذعر',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'الرؤية',
-  'screenAwareness.debug.idle': 'خاملة',
-  'screenAwareness.debug.visionQueue': 'قائمة انتظار الرؤية',
-  'screenAwareness.debug.lastVision': 'الرؤية الأخيرة',
-  'screenAwareness.debug.notAvailable': 'غير متوفر',
-  'screenAwareness.debug.visionSummaries': 'الرؤية الملخصات',
-  'screenAwareness.debug.refreshing': 'تحديث...',
-  'screenAwareness.debug.noSummaries': 'لا توجد ملخصات حتى الآن.',
-  'screenAwareness.debug.unknownApp': 'تطبيق غير معروف',
-  'screenAwareness.debug.macosOnly': 'ذكاء الشاشة V1 مدعوم على macOS فقط حالياً.',
   'memory.debugTitle': 'تصحيح الذاكرة',
   'memory.documents': 'المستندات',
   'memory.filterByNamespace': 'التصفية حسب مساحة الاسم...',
@@ -3777,33 +3723,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'أحدث مخطط بنية OpenHuman المُولَّد',
   'intelligence.diagram.refreshesEvery': 'يتجدد كل {seconds} ثانية',
   'intelligence.memoryText.entityTypePrefix': 'نوع الكيان',
-  'intelligence.screenDebug.active': 'نشط',
-  'intelligence.screenDebug.app': 'التطبيق',
-  'intelligence.screenDebug.bounds': 'الحدود',
-  'intelligence.screenDebug.captureAlt': 'نتيجة اختبار التقاط',
-  'intelligence.screenDebug.captureFailed': 'فشل',
-  'intelligence.screenDebug.captureSuccess': 'نجاح',
-  'intelligence.screenDebug.captureTest': 'اختبار الالتقاط',
-  'intelligence.screenDebug.capturing': 'جارٍ الالتقاط',
-  'intelligence.screenDebug.frames': 'الإطارات',
-  'intelligence.screenDebug.idle': 'خامل',
-  'intelligence.screenDebug.lastApp': 'آخر تطبيق',
-  'intelligence.screenDebug.mode': 'الوضع',
-  'intelligence.screenDebug.permAccessibility': 'إذن إمكانية الوصول',
-  'intelligence.screenDebug.permInput': 'إذن الإدخال',
-  'intelligence.screenDebug.permScreen': 'إمكانية الوصول',
-  'intelligence.screenDebug.permissions': 'الأذونات',
-  'intelligence.screenDebug.platformNotSupported': 'المنصة غير مدعومة',
-  'intelligence.screenDebug.recentVisionSummaries': 'ملخصات الرؤية الأخيرة',
-  'intelligence.screenDebug.session': 'الجلسة',
-  'intelligence.screenDebug.size': 'الحجم',
-  'intelligence.screenDebug.status': 'الحالة',
-  'intelligence.screenDebug.testCapture': 'اختبار الالتقاط',
-  'intelligence.screenDebug.time': 'الوقت',
-  'intelligence.screenDebug.title': 'العنوان',
-  'intelligence.screenDebug.unknown': 'غير معروف',
-  'intelligence.screenDebug.visionQueue': 'قائمة انتظار الرؤية',
-  'intelligence.screenDebug.visionState': 'حالة الرؤية',
   'intelligence.tasks.activeBoardOne': 'لوحة نشطة واحدة عبر المحادثات',
   'intelligence.tasks.activeBoardOther': '{count} لوحات نشطة عبر المحادثات',
   'intelligence.tasks.empty': 'لا توجد لوحات مهام للوكيل بعد',
@@ -4363,7 +4282,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'إدخال الصوت نشط',
   'overlay.companion.error': 'خطأ',
   'overlay.companion.listening': 'يستمع…',
-  'overlay.companion.pointing': 'يشير…',
   'overlay.companion.speaking': 'يتحدث…',
   'overlay.companion.thinking': 'يفكر…',
   'overlay.orbTitle': 'اسحب للتحريك · انقر مرتين لإعادة الضبط',
@@ -4393,12 +4311,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'وصف قنوات المراسلة',
   'pages.settings.features.notifications': 'الإشعارات',
   'pages.settings.features.notificationsDesc': 'وصف الإشعارات',
-  'pages.settings.features.screenAwareness': 'وعي الشاشة',
-  'pages.settings.features.screenAwarenessDesc':
-    'دع وكيلك يرى شاشتك ليقدم مساعدة سياقية في الوقت المناسب.',
   'pages.settings.features.tools': 'الأدوات',
   'pages.settings.features.toolsDesc': 'وصف الأدوات',
-  'pages.settings.featuresSection.description': 'وعي الشاشة والمراسلة والأدوات.',
   'pages.settings.featuresSection.title': 'الميزات',
   'privacy.dataKind.credentials': 'بيانات الاعتماد',
   'privacy.dataKind.derived': 'مشتقة',
@@ -5145,9 +5059,6 @@ const messages: TranslationMap = {
   'settings.localModel.status.working': 'جارٍ العمل...',
   'settings.developerMenu.ai.title': 'إعدادات الذكاء الاصطناعي',
   'settings.developerMenu.ai.desc': 'مزودو السحابة، ونماذج Ollama المحلية، والتوجيه لكل عبء عمل',
-  'settings.developerMenu.screenAwareness.title': 'الوعي بالشاشة',
-  'settings.developerMenu.screenAwareness.desc':
-    'أذونات التقاط الشاشة، وسياسة المراقبة، وعناصر التحكم في الجلسة',
   'settings.developerMenu.messagingChannels.title': 'قنوات المراسلة',
   'settings.developerMenu.messagingChannels.desc':
     'تكوين أوضاع مصادقة Telegram/Discord وتوجيه القناة الافتراضي',
@@ -5776,20 +5687,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'استبدال التطبيق',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'إمكانية الوصول',
-  'settings.screenIntel.permissions.grantHint': 'تلميح المنح',
-  'settings.screenIntel.permissions.inputMonitoring': 'مراقبة الإدخال',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS يطبّق الخصوصية',
-  'settings.screenIntel.permissions.openInputMonitoring': 'جارٍ الطلب…',
-  'settings.screenIntel.permissions.refreshStatus': 'جارٍ التحديث…',
-  'settings.screenIntel.permissions.refreshing': 'جارٍ التحديث…',
-  'settings.screenIntel.permissions.requestAccessibility': 'جارٍ الطلب…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'جارٍ الطلب…',
-  'settings.screenIntel.permissions.requesting': 'جارٍ الطلب…',
-  'settings.screenIntel.permissions.restartRefresh': 'جارٍ إعادة تشغيل النواة…',
-  'settings.screenIntel.permissions.restartingCore': 'جارٍ إعادة تشغيل النواة…',
-  'settings.screenIntel.permissions.screenRecording': 'تسجيل الشاشة',
-  'settings.screenIntel.permissions.title': 'الأذونات',
   'skills.card.moreActions': 'مزيد من الإجراءات',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6046,36 +5943,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'القوالب',
   'skills.resource.tree.empty': 'لا توجد موارد مجمّعة.',
   'skills.search.placeholder': 'بحث',
-  'skills.setup.screenIntel.activeDesc': 'وصف النشاط',
-  'skills.setup.screenIntel.activeTitle': 'ذكاء الشاشة مفعّل',
-  'skills.setup.screenIntel.advancedSettings': 'إعدادات متقدمة',
-  'skills.setup.screenIntel.allGranted': 'تم منح جميع الأذونات',
-  'skills.setup.screenIntel.captureMode': 'وضع الالتقاط',
-  'skills.setup.screenIntel.captureModeValue': 'جميع النوافذ (قابل للضبط لاحقًا)',
-  'skills.setup.screenIntel.deniedHint':
-    'بعد منح الأذونات في إعدادات النظام، انقر أدناه لإعادة التشغيل وتطبيق التغييرات.',
-  'skills.setup.screenIntel.enableBtn': 'جارٍ التفعيل...',
-  'skills.setup.screenIntel.enableDesc': 'على شاشتك وتغذية سياق مفيد في وكيلك',
-  'skills.setup.screenIntel.enableError': 'فشل تفعيل ذكاء الشاشة',
-  'skills.setup.screenIntel.enabling': 'جارٍ التفعيل...',
-  'skills.setup.screenIntel.grant': 'جارٍ الفتح...',
-  'skills.setup.screenIntel.granted': 'تم المنح',
-  'skills.setup.screenIntel.macosOnly': 'macOS فقط',
-  'skills.setup.screenIntel.opening': 'جارٍ الفتح...',
-  'skills.setup.screenIntel.panicHotkey': 'مفتاح ساخن للطوارئ',
-  'skills.setup.screenIntel.permAccessibility': 'إمكانية الوصول',
-  'skills.setup.screenIntel.permInputMonitoring': 'مراقبة الإدخال',
-  'skills.setup.screenIntel.permScreenRecording': 'تسجيل الشاشة',
-  'skills.setup.screenIntel.permissionsDesc': 'وصف الأذونات',
-  'skills.setup.screenIntel.permissionPathLabel': 'يطبق macOS الخصوصية على:',
-  'skills.setup.screenIntel.refreshStatus': 'تحديث الحالة',
-  'skills.setup.screenIntel.restartRefresh': 'جارٍ إعادة التشغيل...',
-  'skills.setup.screenIntel.restarting': 'جارٍ إعادة التشغيل...',
-  'skills.setup.screenIntel.stepEnable': 'تفعيل المهارة',
-  'skills.setup.screenIntel.stepPermissions': 'منح الأذونات',
-  'skills.setup.screenIntel.stepSuccess': 'جاهز للانطلاق',
-  'skills.setup.screenIntel.title': 'ذكاء الشاشة',
-  'skills.setup.screenIntel.visionModel': 'نموذج الرؤية',
   'skills.setup.voice.activation': 'التفعيل',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6233,9 +6100,6 @@ const messages: TranslationMap = {
     'للحصول على تعليمات الإعداد، ثم أعد المحاولة عندما يصبح وقت التشغيل قابلاً للوصول.',
   'devOptions.menuAi': 'تكوين الذكاء الاصطناعي',
   'devOptions.menuAiDesc': 'موفرو السحابة، ونماذج Ollama المحلية، والتوجيه لكل حمل عمل',
-  'devOptions.menuScreenAware': 'التعرف على الشاشة',
-  'devOptions.menuScreenAwareDesc':
-    'أذونات التقاط الشاشة، وسياسة المراقبة، وعناصر التحكم في الجلسة',
   'devOptions.menuMessaging': 'قنوات المراسلة',
   'devOptions.menuMessagingDesc': 'تكوين أوضاع المصادقة Telegram/Discord وتوجيه القناة الافتراضية',
   'devOptions.menuTools': 'الأدوات',
diff --git a/app/src/lib/i18n/bn.ts b/app/src/lib/i18n/bn.ts
index a29cd1289..c9ab8981f 100644
--- a/app/src/lib/i18n/bn.ts
+++ b/app/src/lib/i18n/bn.ts
@@ -7,8 +7,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanion': 'ডেস্কটপ সঙ্গী',
   'settings.assistant.desktopCompanionDesc': 'সিস্টেম ট্রে শর্টকাট সহ সর্বদা-চালু সঙ্গী মোড',
   'pages.settings.features.desktopCompanion': 'ডেস্কটপ কম্প্যানিয়ন',
-  'pages.settings.features.desktopCompanionDesc':
-    'স্ক্রিন সচেতনতা সহ ভয়েস সহকারী: শোনে, দেখে, কথা বলে, নির্দেশ করে',
   'settings.companion.title': 'ডেস্কটপ সঙ্গী',
   'settings.companion.session': 'সেশন',
   'settings.companion.activeLabel': 'সক্রিয়',
@@ -24,8 +22,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'হটকি',
   'settings.companion.activationMode': 'সক্রিয়করণ মোড',
   'settings.companion.sessionTtl': 'সেশন TTL',
-  'settings.companion.screenCapture': 'স্ক্রিন ক্যাপচার',
-  'settings.companion.appContext': 'অ্যাপ প্রসঙ্গ',
   // Share cards (#5006).
   'share.button': 'শেয়ার',
   'share.modalTitle': 'এই মুহূর্তটি শেয়ার করুন',
@@ -111,8 +107,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'মেমরি অনুসন্ধানে ব্যবহৃত এমবেডিং মডেল বেছে নিন।',
   'connections.header.search': 'আপনার এজেন্টের জন্য ওয়েব অনুসন্ধান কনফিগার করুন।',
   'connections.header.wallet': 'আপনার স্থানীয় ওয়ালেটের ব্যালেন্স এবং পুনরুদ্ধার বাক্যাংশ।',
-  'connections.header.screen':
-    'সময়োপযোগী, প্রাসঙ্গিক সহায়তা দিতে আপনার এজেন্টকে আপনার স্ক্রিন দেখতে দিন।',
   'connections.header.composioKey':
     'শত শত অ্যাপ ইন্টিগ্রেশন আনলক করতে একটি Composio API কী যোগ করুন।',
   'connections.llm.apiKeys': 'API কী ও রাউটিং',
@@ -760,8 +754,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'সাবকনশাস',
   'settings.assistant.backgroundActivityDesc':
     'আপনার সহকারী পটভূমিতে কতটা সক্রিয় তা নিয়ন্ত্রণ করুন',
-  'settings.assistant.screenAwareness': 'স্ক্রিন সচেতনতা',
-  'settings.assistant.screenAwarenessDesc': 'সহকারীকে আপনার সক্রিয় উইন্ডো দেখতে দিন',
   'settings.assistant.permissions': 'অনুমতি',
   'settings.assistant.permissionsDesc': 'সহকারী কী করতে পারে এবং কোথায় কাজ করতে পারে তা বেছে নিন',
   'settings.privacySecurity.privacy': 'গোপনীয়তা',
@@ -842,7 +834,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'পছন্দ',
   'settings.notifications.tabs.routing': 'রাউটিং',
   'settings.features': 'ফিচার',
-  'settings.featuresDesc': 'স্ক্রিন সচেতনতা, মেসেজিং এবং টুলস',
   'settings.aiModels': 'AI ও মডেল',
   'settings.aiModelsDesc': 'লোকাল AI মডেল সেটআপ, ডাউনলোড এবং LLM প্রোভাইডার',
   'settings.ai': 'AI কনফিগারেশন',
@@ -934,8 +925,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': 'নির্দিষ্ট সময়ের জন্য সব বিজ্ঞপ্তি বন্ধ রাখুন',
   'settings.notifications.channelControls': 'চ্যানেল-ভিত্তিক নিয়ন্ত্রণ',
   'settings.notifications.channelControlsDesc': 'প্রতিটি চ্যানেলের জন্য বিজ্ঞপ্তি পছন্দ সেট করুন',
-  'settings.features.screenAwareness': 'স্ক্রিন সচেতনতা',
-  'settings.features.screenAwarenessDesc': 'অ্যাসিস্ট্যান্টকে আপনার সক্রিয় উইন্ডো দেখতে দিন',
   'settings.features.messaging': 'মেসেজিং',
   'settings.features.messagingDesc': 'চ্যানেল ও মেসেজিং ইন্টিগ্রেশন সেটিংস',
   'settings.features.tools': 'টুলস',
@@ -2205,21 +2194,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'পরিবর্তন সংরক্ষণ করুন',
   'settings.tools.preferencesSaved': 'পছন্দ সংরক্ষিত',
   'settings.tools.saveFailed': 'পছন্দ সংরক্ষণ ব্যর্থ। আবার চেষ্টা করুন।',
-  'settings.screenAwareness.mode': 'মোড',
-  'settings.screenAwareness.allExceptBlacklist': 'ব্ল্যাকলিস্ট ছাড়া সব',
-  'settings.screenAwareness.whitelistOnly': 'শুধু হোয়াইটলিস্ট',
-  'settings.screenAwareness.screenMonitoring': 'স্ক্রিন মনিটরিং',
-  'settings.screenAwareness.saveSettings': 'সেটিংস সংরক্ষণ করুন',
-  'settings.screenAwareness.session': 'সেশন',
-  'settings.screenAwareness.status': 'স্ট্যাটাস',
-  'settings.screenAwareness.active': 'সক্রিয়',
-  'settings.screenAwareness.stopped': 'বন্ধ',
-  'settings.screenAwareness.remaining': 'অবশিষ্ট',
-  'settings.screenAwareness.startSession': 'সেশন শুরু করুন',
-  'settings.screenAwareness.stopSession': 'সেশন বন্ধ করুন',
-  'settings.screenAwareness.analyzeNow': 'এখনই বিশ্লেষণ করুন',
-  'settings.screenAwareness.macosOnly':
-    'স্ক্রিন সচেতনতা ডেস্কটপ ক্যাপচার এবং অনুমতি নিয়ন্ত্রণ বর্তমানে শুধু macOS-এ সমর্থিত।',
   'connections.comingSoon': 'শীঘ্রই আসছে',
   'connections.setUp': 'সেটআপ করুন',
   'connections.configured': 'কনফিগার করা হয়েছে',
@@ -2582,36 +2556,6 @@ const messages: TranslationMap = {
     'মাস্টার সুইচ। ডিফল্টে বন্ধ: Ollama নিষ্ক্রিয় থাকে। চালু হলে, ট্রি সামারাইজার, স্ক্রিন ইন্টেলিজেন্স এবং অটোকমপ্লিট সর্বদা লোকাল মডেল ব্যবহার করে।',
   'localModel.advancedSettings': 'অ্যাডভান্সড সেটিংস',
   'localModel.debugTitle': 'লোকাল মডেল ডিবাগ',
-  'screenAwareness.debugTitle': 'স্ক্রিন সচেতনতা ডিবাগ',
-  'screenAwareness.debug.debugAndDiagnostics': 'ডিবাগ এবং ডায়াগনস্টিকস',
-  'screenAwareness.debug.collapse': 'সঙ্কুচিত',
-  'screenAwareness.debug.expand': 'প্রসারিত করুন',
-  'screenAwareness.debug.failedToSave': 'স্ক্রীন ইন্টেলিজেন্স সংরক্ষণ করতে ব্যর্থ',
-  'screenAwareness.debug.policyTitle': 'স্ক্রীন ইন্টেলিজেন্স নীতি',
-  'screenAwareness.debug.baselineFps': 'বেসলাইন FPS',
-  'screenAwareness.debug.useVisionModel': 'ভিআইপি ব্যবহার করুন',
-  'screenAwareness.debug.useVisionModelDesc':
-    'আরও সমৃদ্ধ প্রেক্ষাপটের জন্য একটি ভিশন LLM-এ স্ক্রিনশট পাঠান। বন্ধ থাকলে, শুধুমাত্র OCR টেক্সট একটি টেক্সট LLM-এর সাথে ব্যবহার করা হয়: দ্রুততর এবং কোনো ভিশন মডেল প্রয়োজন নেই।',
-  'screenAwareness.debug.keepScreenshots': 'স্ক্রিনশটগুলি রাখুন',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'প্রক্রিয়াকরণের পরে মুছে না দিয়ে ক্যাপচার করা স্ক্রিনশটগুলি ওয়ার্কস্পেসে সংরক্ষণ করুন',
-  'screenAwareness.debug.allowlist': 'অনুমতি তালিকা (প্রতি লাইনে একটি নিয়ম)',
-  'screenAwareness.debug.denylist': 'অস্বীকারকারী (প্রতি লাইনে একটি নিয়ম)',
-  'screenAwareness.debug.saveSettings': 'স্ক্রীন ইন্টেলিজেন্স সেটিংস সংরক্ষণ করুন',
-  'screenAwareness.debug.sessionStats': 'সেশন পরিসংখ্যান',
-  'screenAwareness.debug.framesEphemeral': 'ফ্রেম (ক্ষণস্থায়ী)',
-  'screenAwareness.debug.panicStop': 'প্যানিক স্টপ',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'দৃষ্টি',
-  'screenAwareness.debug.idle': 'নিষ্ক্রিয়',
-  'screenAwareness.debug.visionQueue': 'দৃষ্টি সারি',
-  'screenAwareness.debug.lastVision': 'শেষ দর্শন',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'ভিশন সারাংশ',
-  'screenAwareness.debug.refreshing': 'রিফ্রেশ করা হচ্ছে...',
-  'screenAwareness.debug.noSummaries': 'এখনও কোনো সারসংক্ষেপ নেই।',
-  'screenAwareness.debug.unknownApp': 'অজানা অ্যাপ',
-  'screenAwareness.debug.macosOnly': 'স্ক্রীন ইন্টেলিজেন্স V1 বর্তমানে শুধুমাত্র macOS-এ সমর্থিত।',
   'memory.debugTitle': 'মেমোরি ডিবাগ',
   'memory.documents': 'নথি',
   'memory.filterByNamespace': 'নামস্থান দ্বারা ফিল্টার করুন...',
@@ -3863,33 +3807,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'সর্বশেষ তৈরি OpenHuman আর্কিটেকচার ডায়াগ্রাম',
   'intelligence.diagram.refreshesEvery': 'প্রতি {seconds}s-এ রিফ্রেশ হয়',
   'intelligence.memoryText.entityTypePrefix': 'এনটিটি ধরন',
-  'intelligence.screenDebug.active': 'সক্রিয়',
-  'intelligence.screenDebug.app': 'অ্যাপ',
-  'intelligence.screenDebug.bounds': 'সীমানা',
-  'intelligence.screenDebug.captureAlt': 'ক্যাপচার পরীক্ষার ফলাফল',
-  'intelligence.screenDebug.captureFailed': 'ব্যর্থ',
-  'intelligence.screenDebug.captureSuccess': 'সফল',
-  'intelligence.screenDebug.captureTest': 'ক্যাপচার পরীক্ষা',
-  'intelligence.screenDebug.capturing': 'ক্যাপচার হচ্ছে',
-  'intelligence.screenDebug.frames': 'ফ্রেম',
-  'intelligence.screenDebug.idle': 'নিষ্ক্রিয়',
-  'intelligence.screenDebug.lastApp': 'শেষ অ্যাপ',
-  'intelligence.screenDebug.mode': 'মোড',
-  'intelligence.screenDebug.permAccessibility': 'অ্যাক্সেসিবিলিটি অনুমতি',
-  'intelligence.screenDebug.permInput': 'ইনপুট অনুমতি',
-  'intelligence.screenDebug.permScreen': 'অ্যাক্সেসিবিলিটি',
-  'intelligence.screenDebug.permissions': 'অনুমতি',
-  'intelligence.screenDebug.platformNotSupported': 'প্ল্যাটফর্ম সমর্থিত নয়',
-  'intelligence.screenDebug.recentVisionSummaries': 'সাম্প্রতিক ভিশন সারসংক্ষেপ',
-  'intelligence.screenDebug.session': 'সেশন',
-  'intelligence.screenDebug.size': 'আকার',
-  'intelligence.screenDebug.status': 'স্ট্যাটাস',
-  'intelligence.screenDebug.testCapture': 'ক্যাপচার পরীক্ষা করুন',
-  'intelligence.screenDebug.time': 'সময়',
-  'intelligence.screenDebug.title': 'শিরোনাম',
-  'intelligence.screenDebug.unknown': 'অজানা',
-  'intelligence.screenDebug.visionQueue': 'ভিশন কিউ',
-  'intelligence.screenDebug.visionState': 'ভিশন স্টেট',
   'intelligence.tasks.activeBoardOne': 'কথোপকথনজুড়ে ১টি সক্রিয় বোর্ড',
   'intelligence.tasks.activeBoardOther': 'কথোপকথনজুড়ে {count}টি সক্রিয় বোর্ড',
   'intelligence.tasks.empty': 'এখনো কোনো এজেন্ট টাস্ক বোর্ড নেই',
@@ -4476,7 +4393,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'ভয়েস ইনপুট সক্রিয়',
   'overlay.companion.error': 'ত্রুটি',
   'overlay.companion.listening': 'শুনছে…',
-  'overlay.companion.pointing': 'নির্দেশ করছে…',
   'overlay.companion.speaking': 'বলছে…',
   'overlay.companion.thinking': 'ভাবছে…',
   'overlay.orbTitle': 'সরাতে টেনে আনুন · পজিশন রিসেট করতে ডাবল-ক্লিক করুন',
@@ -4506,12 +4422,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'মেসেজিং চ্যানেলের বিবরণ',
   'pages.settings.features.notifications': 'বিজ্ঞপ্তি',
   'pages.settings.features.notificationsDesc': 'বিজ্ঞপ্তির বিবরণ',
-  'pages.settings.features.screenAwareness': 'স্ক্রিন সচেতনতা',
-  'pages.settings.features.screenAwarenessDesc':
-    'সময়োপযোগী, প্রাসঙ্গিক সহায়তা দিতে আপনার এজেন্টকে আপনার স্ক্রিন দেখতে দিন।',
   'pages.settings.features.tools': 'টুলস',
   'pages.settings.features.toolsDesc': 'টুলসের বিবরণ',
-  'pages.settings.featuresSection.description': 'স্ক্রিন সচেতনতা, মেসেজিং এবং টুলস।',
   'pages.settings.featuresSection.title': 'ফিচার',
   'privacy.dataKind.credentials': 'ক্রেডেনশিয়াল',
   'privacy.dataKind.derived': 'ডেরাইভড',
@@ -5263,9 +5175,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'AI কনফিগারেশন',
   'settings.developerMenu.ai.desc':
     'ক্লাউড প্রদানকারী, স্থানীয় Ollama মডেল এবং প্রতি-ওয়ার্কলোড রাউটিং',
-  'settings.developerMenu.screenAwareness.title': 'স্ক্রিন সচেতনতা',
-  'settings.developerMenu.screenAwareness.desc':
-    'স্ক্রিন ক্যাপচার অনুমতি, মনিটরিং নীতি এবং সেশন নিয়ন্ত্রণ',
   'settings.developerMenu.messagingChannels.title': 'মেসেজিং চ্যানেল',
   'settings.developerMenu.messagingChannels.desc':
     'Telegram/Discord অথেন্টিকেশন মোড এবং ডিফল্ট চ্যানেল রাউটিং কনফিগার করুন',
@@ -5910,20 +5819,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': '& বদলাও',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'অ্যাক্সেসিবিলিটি',
-  'settings.screenIntel.permissions.grantHint': 'গ্রান্ট হিন্ট',
-  'settings.screenIntel.permissions.inputMonitoring': 'ইনপুট মনিটরিং',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS গোপনীয়তা প্রয়োগ করে',
-  'settings.screenIntel.permissions.openInputMonitoring': 'অনুরোধ করা হচ্ছে…',
-  'settings.screenIntel.permissions.refreshStatus': 'রিফ্রেশ হচ্ছে…',
-  'settings.screenIntel.permissions.refreshing': 'রিফ্রেশ হচ্ছে…',
-  'settings.screenIntel.permissions.requestAccessibility': 'অনুরোধ করা হচ্ছে…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'অনুরোধ করা হচ্ছে…',
-  'settings.screenIntel.permissions.requesting': 'অনুরোধ করা হচ্ছে…',
-  'settings.screenIntel.permissions.restartRefresh': 'কোর রিস্টার্ট হচ্ছে…',
-  'settings.screenIntel.permissions.restartingCore': 'কোর রিস্টার্ট হচ্ছে…',
-  'settings.screenIntel.permissions.screenRecording': 'স্ক্রিন রেকর্ডিং',
-  'settings.screenIntel.permissions.title': 'অনুমতি',
   'skills.card.moreActions': 'আরও কাজ',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6185,36 +6080,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'টেমপ্লেট',
   'skills.resource.tree.empty': 'কোনো বান্ডেলড রিসোর্স নেই।',
   'skills.search.placeholder': 'প্লেসহোল্ডার',
-  'skills.setup.screenIntel.activeDesc': 'সক্রিয় বিবরণ',
-  'skills.setup.screenIntel.activeTitle': 'স্ক্রিন ইন্টেলিজেন্স সক্রিয়',
-  'skills.setup.screenIntel.advancedSettings': 'অ্যাডভান্সড সেটিংস',
-  'skills.setup.screenIntel.allGranted': 'সব অনুমতি দেওয়া হয়েছে',
-  'skills.setup.screenIntel.captureMode': 'ক্যাপচার মোড',
-  'skills.setup.screenIntel.captureModeValue': 'সব উইন্ডো (পরে কনফিগারযোগ্য)',
-  'skills.setup.screenIntel.deniedHint':
-    'সিস্টেম সেটিংসে অনুমতি দেওয়ার পর, পরিবর্তন নিতে নিচে ক্লিক করে রিস্টার্ট করুন।',
-  'skills.setup.screenIntel.enableBtn': 'সক্রিয় হচ্ছে...',
-  'skills.setup.screenIntel.enableDesc': 'আপনার স্ক্রিনে এবং এজেন্টে দরকারী কন্টেক্সট ফিড করুন',
-  'skills.setup.screenIntel.enableError': 'স্ক্রিন ইন্টেলিজেন্স সক্রিয় করতে ব্যর্থ',
-  'skills.setup.screenIntel.enabling': 'সক্রিয় হচ্ছে...',
-  'skills.setup.screenIntel.grant': 'খোলা হচ্ছে...',
-  'skills.setup.screenIntel.granted': 'দেওয়া হয়েছে',
-  'skills.setup.screenIntel.macosOnly': 'শুধু macOS',
-  'skills.setup.screenIntel.opening': 'খোলা হচ্ছে...',
-  'skills.setup.screenIntel.panicHotkey': 'প্যানিক হটকি',
-  'skills.setup.screenIntel.permAccessibility': 'অ্যাক্সেসিবিলিটি',
-  'skills.setup.screenIntel.permInputMonitoring': 'ইনপুট মনিটরিং',
-  'skills.setup.screenIntel.permScreenRecording': 'স্ক্রিন রেকর্ডিং',
-  'skills.setup.screenIntel.permissionsDesc': 'অনুমতির বিবরণ',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS গোপনীয়তা প্রযোজ্য:',
-  'skills.setup.screenIntel.refreshStatus': 'স্ট্যাটাস রিফ্রেশ করুন',
-  'skills.setup.screenIntel.restartRefresh': 'রিস্টার্ট হচ্ছে...',
-  'skills.setup.screenIntel.restarting': 'রিস্টার্ট হচ্ছে...',
-  'skills.setup.screenIntel.stepEnable': 'স্কিল সক্রিয় করুন',
-  'skills.setup.screenIntel.stepPermissions': 'অনুমতি দিন',
-  'skills.setup.screenIntel.stepSuccess': 'যেতে প্রস্তুত',
-  'skills.setup.screenIntel.title': 'স্ক্রিন ইন্টেলিজেন্স',
-  'skills.setup.screenIntel.visionModel': 'ভিশন মডেল',
   'skills.setup.voice.activation': 'অ্যাক্টিভেশন',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6373,8 +6238,6 @@ const messages: TranslationMap = {
     'সেটআপ নির্দেশনার জন্য, তারপর আপনার রানটাইম পৌঁছানো গেলে পুনরায় চেষ্টা করুন।',
   'devOptions.menuAi': 'AI কনফিগারেশন',
   'devOptions.menuAiDesc': 'ক্লাউড প্রদানকারী, স্থানীয় Ollama মডেল, এবং প্রতি-ওয়ার্কলোড রাউটিং',
-  'devOptions.menuScreenAware': 'স্ক্রীন সচেতনতা',
-  'devOptions.menuScreenAwareDesc': 'স্ক্রীন ক্যাপচার অনুমতি এবং সেশন নিয়ন্ত্রণ, নিরীক্ষণ নীতি',
   'devOptions.menuMessaging': 'মেসেজিং চ্যানেলগুলি',
   'devOptions.menuMessagingDesc':
     'কনফিগার করুন Telegram/Discord প্রমাণীকরণ মোড এবং ডিফল্ট চ্যানেল রাউটিং',
diff --git a/app/src/lib/i18n/de.ts b/app/src/lib/i18n/de.ts
index 8e0ea2587..69db11e60 100644
--- a/app/src/lib/i18n/de.ts
+++ b/app/src/lib/i18n/de.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Immer aktiver Begleiter-Modus mit System-Tray-Shortcut',
   'pages.settings.features.desktopCompanion': 'Desktop-Begleiter',
-  'pages.settings.features.desktopCompanionDesc':
-    'Sprachassistent mit Bildschirmerkennung – hört zu, sieht, spricht, zeigt',
   'settings.companion.title': 'Desktop-Begleiter',
   'settings.companion.session': 'Sitzung',
   'settings.companion.activeLabel': 'Aktiv',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Hotkey',
   'settings.companion.activationMode': 'Aktivierungsmodus',
   'settings.companion.sessionTtl': 'Sitzungs-TTL',
-  'settings.companion.screenCapture': 'Bildschirmaufnahme',
-  'settings.companion.appContext': 'App-Kontext',
   // Share cards (#5006).
   'share.button': 'Teilen',
   'share.modalTitle': 'Diesen Moment teilen',
@@ -124,8 +120,6 @@ const messages: TranslationMap = {
   'connections.header.search': 'Konfigurieren Sie die Websuche für Ihren Agenten.',
   'connections.header.wallet':
     'Das Guthaben Ihrer lokalen Wallet und Ihre Wiederherstellungsphrase.',
-  'connections.header.screen':
-    'Lassen Sie Ihren Agenten Ihren Bildschirm sehen, um zeitnahe, kontextbezogene Hilfe zu bieten.',
   'connections.header.composioKey':
     'Fügen Sie einen Composio-API-Schlüssel hinzu, um Hunderte von App-Integrationen freizuschalten.',
   'connections.llm.apiKeys': 'API-Schlüssel & Routing',
@@ -792,8 +786,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Unterbewusstsein',
   'settings.assistant.backgroundActivityDesc':
     'Steuern, wie aktiv Ihr Assistent im Hintergrund arbeitet',
-  'settings.assistant.screenAwareness': 'Bildschirmbewusstsein',
-  'settings.assistant.screenAwarenessDesc': 'Dem Assistenten das aktive Fenster zeigen',
   'settings.assistant.permissions': 'Berechtigungen',
   'settings.assistant.permissionsDesc': 'Wähle, was der Assistent tun darf und wo er arbeiten kann',
   'settings.privacySecurity.privacy': 'Datenschutz',
@@ -875,7 +867,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Einstellungen',
   'settings.notifications.tabs.routing': 'Routenführung',
   'settings.features': 'Funktionen',
-  'settings.featuresDesc': 'Bildschirmbewusstsein, Nachrichten und Tools',
   'settings.aiModels': 'KI & Modelle',
   'settings.aiModelsDesc': 'Lokales KI-Modell-Setup, Downloads und LLM-Anbieter',
   'settings.ai': 'KI-Konfiguration',
@@ -973,8 +964,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Steuerung pro Kanal',
   'settings.notifications.channelControlsDesc':
     'Konfiguriere Benachrichtigungseinstellungen für jeden Kanal',
-  'settings.features.screenAwareness': 'Bildschirmbewusstsein',
-  'settings.features.screenAwarenessDesc': 'Lass den Assistenten dein aktives Fenster sehen',
   'settings.features.messaging': 'Nachrichten',
   'settings.features.messagingDesc': 'Einstellungen für die Kanal- und Messaging-Integration',
   'settings.features.tools': 'Werkzeuge',
@@ -2277,21 +2266,6 @@ const messages: TranslationMap = {
   'settings.tools.preferencesSaved': 'Einstellungen gespeichert',
   'settings.tools.saveFailed':
     'Einstellungen konnten nicht gespeichert werden. Versuche es erneut.',
-  'settings.screenAwareness.mode': 'Modus',
-  'settings.screenAwareness.allExceptBlacklist': 'Alle außer Blacklist',
-  'settings.screenAwareness.whitelistOnly': 'Nur Whitelist',
-  'settings.screenAwareness.screenMonitoring': 'Bildschirmüberwachung',
-  'settings.screenAwareness.saveSettings': 'Einstellungen speichern',
-  'settings.screenAwareness.session': 'Sitzung',
-  'settings.screenAwareness.status': 'Status',
-  'settings.screenAwareness.active': 'Aktiv',
-  'settings.screenAwareness.stopped': 'Angehalten',
-  'settings.screenAwareness.remaining': 'Übrig',
-  'settings.screenAwareness.startSession': 'Sitzung starten',
-  'settings.screenAwareness.stopSession': 'Sitzung beenden',
-  'settings.screenAwareness.analyzeNow': 'Jetzt analysieren',
-  'settings.screenAwareness.macosOnly':
-    'Die Desktop-Erfassung und Berechtigungssteuerung von Screen Awareness wird derzeit nur auf macOS unterstützt.',
   'connections.comingSoon': 'Kommt bald',
   'connections.setUp': 'Einrichten',
   'connections.configured': 'Konfiguriert',
@@ -2657,37 +2631,6 @@ const messages: TranslationMap = {
     'Hauptschalter. Standardmäßig deaktiviert – Ollama bleibt inaktiv. Wenn diese Option aktiviert ist, verwenden die Baumzusammenfassung, die Bildschirmintelligenz und die automatische Vervollständigung immer das lokale Modell.',
   'localModel.advancedSettings': 'Erweiterte Einstellungen',
   'localModel.debugTitle': 'Lokales Modell-Debug',
-  'screenAwareness.debugTitle': 'Debuggen der Bildschirmerkennung',
-  'screenAwareness.debug.debugAndDiagnostics': 'Debug & Diagnose',
-  'screenAwareness.debug.collapse': 'Reduzieren',
-  'screenAwareness.debug.expand': 'Erweitern',
-  'screenAwareness.debug.failedToSave': 'Bildschirmintelligenz konnte nicht gespeichert werden.',
-  'screenAwareness.debug.policyTitle': 'Bildschirmintelligenzrichtlinie',
-  'screenAwareness.debug.baselineFps': 'Basis-FPS',
-  'screenAwareness.debug.useVisionModel': 'Vision-Modell verwenden',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Screenshots an ein Vision-LLM senden, um reichhaltigeren Kontext zu erhalten. Wenn deaktiviert, wird nur OCR-Text mit einem Text-LLM verwendet – schneller und ohne Vision-Modell.',
-  'screenAwareness.debug.keepScreenshots': 'Screenshots behalten',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Aufgenommene Screenshots im Arbeitsbereich speichern, anstatt sie nach der Verarbeitung zu löschen',
-  'screenAwareness.debug.allowlist': 'Zulassungsliste (eine Regel pro Zeile)',
-  'screenAwareness.debug.denylist': 'Sperrliste (eine Regel pro Zeile)',
-  'screenAwareness.debug.saveSettings': 'Bildschirmintelligenzeinstellungen speichern',
-  'screenAwareness.debug.sessionStats': 'Sitzungsstatistiken',
-  'screenAwareness.debug.framesEphemeral': 'Frames (flüchtig)',
-  'screenAwareness.debug.panicStop': 'Panikstopp',
-  'screenAwareness.debug.defaultPanicHotkey': 'Befehl+Umschalt+.',
-  'screenAwareness.debug.vision': 'Vision',
-  'screenAwareness.debug.idle': 'inaktiv',
-  'screenAwareness.debug.visionQueue': 'Vision-Warteschlange',
-  'screenAwareness.debug.lastVision': 'Letzte Vision',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Vision-Zusammenfassungen',
-  'screenAwareness.debug.refreshing': 'Erfrischend…',
-  'screenAwareness.debug.noSummaries': 'Noch keine Zusammenfassungen.',
-  'screenAwareness.debug.unknownApp': 'Unbekannte App',
-  'screenAwareness.debug.macosOnly':
-    'Screen Intelligence V1 wird derzeit nur unter macOS unterstützt.',
   'memory.debugTitle': 'Speicher-Debug',
   'memory.documents': 'Dokumente',
   'memory.filterByNamespace': 'Nach Namespace filtern...',
@@ -3970,33 +3913,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Zuletzt generiertes OpenHuman-Architekturdiagramm',
   'intelligence.diagram.refreshesEvery': 'Aktualisiert alle {seconds} s',
   'intelligence.memoryText.entityTypePrefix': 'Entitätstyp',
-  'intelligence.screenDebug.active': 'Aktiv',
-  'intelligence.screenDebug.app': 'App',
-  'intelligence.screenDebug.bounds': 'Grenzen',
-  'intelligence.screenDebug.captureAlt': 'Testergebnis erfassen',
-  'intelligence.screenDebug.captureFailed': 'Fehlgeschlagen',
-  'intelligence.screenDebug.captureSuccess': 'Erfolg',
-  'intelligence.screenDebug.captureTest': 'Capture-Test',
-  'intelligence.screenDebug.capturing': 'Erfassen',
-  'intelligence.screenDebug.frames': 'Rahmen',
-  'intelligence.screenDebug.idle': 'Leerlauf',
-  'intelligence.screenDebug.lastApp': 'Letzte App',
-  'intelligence.screenDebug.mode': 'Modus',
-  'intelligence.screenDebug.permAccessibility': 'Zugänglichkeit aufrechterhalten',
-  'intelligence.screenDebug.permInput': 'Perm-Eingabe',
-  'intelligence.screenDebug.permScreen': 'Barrierefreiheit',
-  'intelligence.screenDebug.permissions': 'Berechtigungen',
-  'intelligence.screenDebug.platformNotSupported': 'Plattform nicht unterstützt',
-  'intelligence.screenDebug.recentVisionSummaries': 'Aktuelle Visionszusammenfassungen',
-  'intelligence.screenDebug.session': 'Sitzung',
-  'intelligence.screenDebug.size': 'Größe',
-  'intelligence.screenDebug.status': 'Status',
-  'intelligence.screenDebug.testCapture': 'Testaufnahme',
-  'intelligence.screenDebug.time': 'Zeit',
-  'intelligence.screenDebug.title': 'Titel',
-  'intelligence.screenDebug.unknown': 'Unbekannt',
-  'intelligence.screenDebug.visionQueue': 'Vision-Warteschlange',
-  'intelligence.screenDebug.visionState': 'Visionszustand',
   'intelligence.tasks.activeBoardOne': '1 aktives Forum für alle Gespräche',
   'intelligence.tasks.activeBoardOther': '{count} aktive Boards in allen Gesprächen',
   'intelligence.tasks.empty': 'Noch keine Agenten-Taskboards',
@@ -4599,7 +4515,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Spracheingabe aktiv',
   'overlay.companion.error': 'Fehler',
   'overlay.companion.listening': 'Zuhören…',
-  'overlay.companion.pointing': 'Zeigen…',
   'overlay.companion.speaking': 'Apropos…',
   'overlay.companion.thinking': 'Denken…',
   'overlay.orbTitle': 'Zum Verschieben ziehen · Doppelklicken, um die Position zurückzusetzen',
@@ -4633,12 +4548,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Nachrichtenkanäle, Abschn',
   'pages.settings.features.notifications': 'Benachrichtigungen',
   'pages.settings.features.notificationsDesc': 'Benachrichtigungen absch',
-  'pages.settings.features.screenAwareness': 'Bildschirmbewusstsein',
-  'pages.settings.features.screenAwarenessDesc':
-    'Lassen Sie Ihren Agenten Ihren Bildschirm sehen, um zeitnahe, kontextbezogene Hilfe zu bieten.',
   'pages.settings.features.tools': 'Werkzeuge',
   'pages.settings.features.toolsDesc': 'Werkzeugbeschr',
-  'pages.settings.featuresSection.description': 'Bildschirmbewusstsein, Nachrichten und Tools.',
   'pages.settings.featuresSection.title': 'Funktionen',
   'privacy.dataKind.credentials': 'Anmeldeinformationen',
   'privacy.dataKind.derived': 'Abgeleitet',
@@ -5410,9 +5321,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'KI-Konfiguration',
   'settings.developerMenu.ai.desc':
     'Cloud-Anbieter, lokale Ollama-Modelle und Routing pro Workload',
-  'settings.developerMenu.screenAwareness.title': 'Bildschirmbewusstsein',
-  'settings.developerMenu.screenAwareness.desc':
-    'Bildschirmaufnahmeberechtigungen, Überwachungsrichtlinien und Sitzungskontrollen',
   'settings.developerMenu.messagingChannels.title': 'Messaging-Kanäle',
   'settings.developerMenu.messagingChannels.desc':
     'Konfiguriere die Authentifizierungsmodi Telegram/Discord und das Standardkanalrouting',
@@ -6075,21 +5983,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Ersatz anwenden',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Barrierefreiheit',
-  'settings.screenIntel.permissions.grantHint': 'Grant-Hinweis',
-  'settings.screenIntel.permissions.inputMonitoring': 'Eingabeüberwachung',
-  'settings.screenIntel.permissions.macosAppliesPrivacy':
-    'macOS verwaltet diese Berechtigungen unter Systemeinstellungen → Datenschutz & Sicherheit.',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Bitte um …',
-  'settings.screenIntel.permissions.refreshStatus': 'Erfrischend…',
-  'settings.screenIntel.permissions.refreshing': 'Erfrischend…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Bitte um …',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Bitte um …',
-  'settings.screenIntel.permissions.requesting': 'Bitte um …',
-  'settings.screenIntel.permissions.restartRefresh': 'Kern wird neu gestartet...',
-  'settings.screenIntel.permissions.restartingCore': 'Kern wird neu gestartet...',
-  'settings.screenIntel.permissions.screenRecording': 'Bildschirmaufzeichnung',
-  'settings.screenIntel.permissions.title': 'Berechtigungen',
   'skills.card.moreActions': 'Weitere Aktionen',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6353,39 +6246,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Vorlagen',
   'skills.resource.tree.empty': 'Keine gebündelten Ressourcen.',
   'skills.search.placeholder': 'Platzhalter',
-  'skills.setup.screenIntel.activeDesc':
-    'Screen Intelligence läuft und liest dein aktives Fenster.',
-  'skills.setup.screenIntel.activeTitle': 'Bildschirmintelligenz ist aktiviert',
-  'skills.setup.screenIntel.advancedSettings': 'Erweiterte Einstellungen',
-  'skills.setup.screenIntel.allGranted': 'Alle Berechtigungen erteilt',
-  'skills.setup.screenIntel.captureMode': 'Aufnahmemodus',
-  'skills.setup.screenIntel.captureModeValue': 'Alle Fenster (später konfigurierbar)',
-  'skills.setup.screenIntel.deniedHint':
-    'Nachdem du in den Systemeinstellungen Berechtigungen erteilt hast, klicke unten, um neu zu starten und die Änderungen zu übernehmen.',
-  'skills.setup.screenIntel.enableBtn': 'Aktivieren...',
-  'skills.setup.screenIntel.enableDesc':
-    'Liest, was auf deinem Bildschirm ist, und gibt deinem Agenten nützlichen Kontext.',
-  'skills.setup.screenIntel.enableError': 'Screen Intelligence konnte nicht aktiviert werden',
-  'skills.setup.screenIntel.enabling': 'Aktivieren...',
-  'skills.setup.screenIntel.grant': 'Öffnen...',
-  'skills.setup.screenIntel.granted': 'Erteilt',
-  'skills.setup.screenIntel.macosOnly': 'Nur macOS',
-  'skills.setup.screenIntel.opening': 'Öffnen...',
-  'skills.setup.screenIntel.panicHotkey': 'Panik-Hotkey',
-  'skills.setup.screenIntel.permAccessibility': 'Barrierefreiheit',
-  'skills.setup.screenIntel.permInputMonitoring': 'Eingabeüberwachung',
-  'skills.setup.screenIntel.permScreenRecording': 'Bildschirmaufzeichnung',
-  'skills.setup.screenIntel.permissionsDesc':
-    'Screen Intelligence benötigt Berechtigungen für Bedienungshilfen, Eingabeüberwachung und Bildschirmaufnahme.',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS wendet Datenschutz an:',
-  'skills.setup.screenIntel.refreshStatus': 'Status aktualisieren',
-  'skills.setup.screenIntel.restartRefresh': 'Neustart...',
-  'skills.setup.screenIntel.restarting': 'Neustart...',
-  'skills.setup.screenIntel.stepEnable': 'Aktiviere den Skill',
-  'skills.setup.screenIntel.stepPermissions': 'Berechtigungen erteilen',
-  'skills.setup.screenIntel.stepSuccess': 'Bereit zu gehen',
-  'skills.setup.screenIntel.title': 'Bildschirmintelligenz',
-  'skills.setup.screenIntel.visionModel': 'Vision-Modell',
   'skills.setup.voice.activation': 'Aktivierung',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6547,9 +6407,6 @@ const messages: TranslationMap = {
     'für Setup-Anweisungen, dann versuche es erneut, sobald deine Laufzeit erreichbar ist.',
   'devOptions.menuAi': 'KI-Konfiguration',
   'devOptions.menuAiDesc': 'Cloud-Anbieter, lokale Ollama-Modelle und Routing pro Workload',
-  'devOptions.menuScreenAware': 'Bildschirmbewusstsein',
-  'devOptions.menuScreenAwareDesc':
-    'Bildschirmaufnahmeberechtigungen, Überwachungsrichtlinien und Sitzungskontrollen',
   'devOptions.menuMessaging': 'Messaging-Kanäle',
   'devOptions.menuMessagingDesc':
     'Konfiguriere die Authentifizierungsmodi Telegram/Discord und das Standardkanalrouting',
diff --git a/app/src/lib/i18n/en.ts b/app/src/lib/i18n/en.ts
index 18a98459f..074d30abb 100644
--- a/app/src/lib/i18n/en.ts
+++ b/app/src/lib/i18n/en.ts
@@ -5,8 +5,6 @@ const en: TranslationMap = {
   'settings.assistant.desktopCompanionDesc': 'Always-on companion mode with a system-tray shortcut',
   'connections.header.companion': 'A floating desktop companion for quick, always-on help.',
   'pages.settings.features.desktopCompanion': 'Desktop Companion',
-  'pages.settings.features.desktopCompanionDesc':
-    'Voice assistant with screen awareness: listens, sees, speaks, points',
   'settings.companion.title': 'Desktop Companion',
   'settings.companion.session': 'Session',
   'settings.companion.activeLabel': 'Active',
@@ -22,8 +20,6 @@ const en: TranslationMap = {
   'settings.companion.hotkey': 'Hotkey',
   'settings.companion.activationMode': 'Activation Mode',
   'settings.companion.sessionTtl': 'Session TTL',
-  'settings.companion.screenCapture': 'Screen Capture',
-  'settings.companion.appContext': 'App Context',
   'skills.recallCalendar.title': 'Google Calendar',
   'skills.recallCalendar.description': 'Auto-join Google Meet calls via Recall.ai',
   // Navigation
@@ -520,8 +516,6 @@ const en: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Subconscious',
   'settings.assistant.backgroundActivityDesc':
     'Control how actively your assistant works in the background',
-  'settings.assistant.screenAwareness': 'Screen awareness',
-  'settings.assistant.screenAwarenessDesc': 'Let the assistant see your active window',
   'settings.assistant.permissions': 'Permissions',
   'settings.assistant.permissionsDesc': 'Choose what the assistant can do and where it can work',
 
@@ -599,7 +593,6 @@ const en: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferences',
   'settings.notifications.tabs.routing': 'Routing',
   'settings.features': 'Features',
-  'settings.featuresDesc': 'Screen awareness, messaging, and tools',
   'settings.aiModels': 'AI & Models',
   'settings.aiModelsDesc': 'Local AI model setup, downloads, and LLM provider',
   'settings.ai': 'AI Configuration',
@@ -703,8 +696,6 @@ const en: TranslationMap = {
     'Configure notification preferences for each channel',
 
   // Settings: Features
-  'settings.features.screenAwareness': 'Screen Awareness',
-  'settings.features.screenAwarenessDesc': 'Let the assistant see your active window',
   'settings.features.messaging': 'Messaging',
   'settings.features.messagingDesc': 'Channel and messaging integration settings',
   'settings.features.tools': 'Tools',
@@ -930,7 +921,6 @@ const en: TranslationMap = {
   'connections.header.embeddings': 'Choose the embedding model used for memory search.',
   'connections.header.search': 'Configure web search for your agent.',
   'connections.header.wallet': 'Your local wallet balance and recovery phrase.',
-  'connections.header.screen': 'Let your agent see your screen to offer timely, in-context help.',
   'connections.header.composioKey':
     'Add a Composio API key to unlock hundreds of app integrations.',
   'connections.llm.apiKeys': 'API keys & routing',
@@ -2306,23 +2296,6 @@ const en: TranslationMap = {
   'settings.tools.preferencesSaved': 'Preferences saved',
   'settings.tools.saveFailed': 'Failed to save preferences. Try again.',
 
-  // Settings: Screen Awareness
-  'settings.screenAwareness.mode': 'Mode',
-  'settings.screenAwareness.allExceptBlacklist': 'All Except Blacklist',
-  'settings.screenAwareness.whitelistOnly': 'Whitelist Only',
-  'settings.screenAwareness.screenMonitoring': 'Screen Monitoring',
-  'settings.screenAwareness.saveSettings': 'Save Settings',
-  'settings.screenAwareness.session': 'Session',
-  'settings.screenAwareness.status': 'Status',
-  'settings.screenAwareness.active': 'Active',
-  'settings.screenAwareness.stopped': 'Stopped',
-  'settings.screenAwareness.remaining': 'Remaining',
-  'settings.screenAwareness.startSession': 'Start Session',
-  'settings.screenAwareness.stopSession': 'Stop Session',
-  'settings.screenAwareness.analyzeNow': 'Analyze Now',
-  'settings.screenAwareness.macosOnly':
-    'Screen Awareness desktop capture and permission controls are currently supported on macOS only.',
-
   // Connections
   'connections.comingSoon': 'Coming soon',
   'connections.setUp': 'Set up',
@@ -2706,42 +2679,10 @@ const en: TranslationMap = {
     'Choose which subsystems run on the local model. Anything off uses the cloud.',
   'localModel.enableRuntime': 'Enable local AI runtime',
   'localModel.enableRuntimeDesc':
-    'Master switch. Off by default: Ollama stays idle. When on, the tree summarizer, screen intelligence, and autocomplete always use the local model.',
+    'Master switch. Off by default: Ollama stays idle. When on, the tree summarizer and autocomplete always use the local model.',
   'localModel.advancedSettings': 'Advanced settings',
   'localModel.debugTitle': 'Local Model Debug',
 
-  // Screen Awareness
-  'screenAwareness.debugTitle': 'Screen Awareness Debug',
-  'screenAwareness.debug.debugAndDiagnostics': 'Debug & Diagnostics',
-  'screenAwareness.debug.collapse': 'Collapse',
-  'screenAwareness.debug.expand': 'Expand',
-  'screenAwareness.debug.failedToSave': 'Failed to save screen intelligence',
-  'screenAwareness.debug.policyTitle': 'Screen Intelligence Policy',
-  'screenAwareness.debug.baselineFps': 'Baseline FPS',
-  'screenAwareness.debug.useVisionModel': 'Use Vision Model',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Send screenshots to a vision LLM for richer context. When off, only OCR text is used with a text LLM: faster and no vision model required.',
-  'screenAwareness.debug.keepScreenshots': 'Keep Screenshots',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Save captured screenshots to the workspace instead of deleting after processing',
-  'screenAwareness.debug.allowlist': 'Allowlist (one rule per line)',
-  'screenAwareness.debug.denylist': 'Denylist (one rule per line)',
-  'screenAwareness.debug.saveSettings': 'Save Screen Intelligence Settings',
-  'screenAwareness.debug.sessionStats': 'Session Stats',
-  'screenAwareness.debug.framesEphemeral': 'Frames (ephemeral)',
-  'screenAwareness.debug.panicStop': 'Panic stop',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Vision',
-  'screenAwareness.debug.idle': 'idle',
-  'screenAwareness.debug.visionQueue': 'Vision queue',
-  'screenAwareness.debug.lastVision': 'Last vision',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Vision Summaries',
-  'screenAwareness.debug.refreshing': 'Refreshing…',
-  'screenAwareness.debug.noSummaries': 'No summaries yet.',
-  'screenAwareness.debug.unknownApp': 'Unknown App',
-  'screenAwareness.debug.macosOnly': 'Screen Intelligence V1 is currently supported on macOS only.',
-
   // Memory
   'memory.debugTitle': 'Memory Debug',
   'memory.documents': 'Documents',
@@ -4252,33 +4193,6 @@ const en: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Latest generated OpenHuman architecture diagram',
   'intelligence.diagram.refreshesEvery': 'Refreshes every {seconds}s',
   'intelligence.memoryText.entityTypePrefix': 'Entity type',
-  'intelligence.screenDebug.active': 'Active',
-  'intelligence.screenDebug.app': 'App',
-  'intelligence.screenDebug.bounds': 'Bounds',
-  'intelligence.screenDebug.captureAlt': 'Capture test result',
-  'intelligence.screenDebug.captureFailed': 'Failed',
-  'intelligence.screenDebug.captureSuccess': 'Success',
-  'intelligence.screenDebug.captureTest': 'Capture test',
-  'intelligence.screenDebug.capturing': 'Capturing',
-  'intelligence.screenDebug.frames': 'Frames',
-  'intelligence.screenDebug.idle': 'Idle',
-  'intelligence.screenDebug.lastApp': 'Last App',
-  'intelligence.screenDebug.mode': 'Mode',
-  'intelligence.screenDebug.permAccessibility': 'Perm accessibility',
-  'intelligence.screenDebug.permInput': 'Perm input',
-  'intelligence.screenDebug.permScreen': 'Accessibility',
-  'intelligence.screenDebug.permissions': 'Permissions',
-  'intelligence.screenDebug.platformNotSupported': 'Platform not supported',
-  'intelligence.screenDebug.recentVisionSummaries': 'Recent vision summaries',
-  'intelligence.screenDebug.session': 'Session',
-  'intelligence.screenDebug.size': 'Size',
-  'intelligence.screenDebug.status': 'Status',
-  'intelligence.screenDebug.testCapture': 'Test capture',
-  'intelligence.screenDebug.time': 'Time',
-  'intelligence.screenDebug.title': 'Title',
-  'intelligence.screenDebug.unknown': 'Unknown',
-  'intelligence.screenDebug.visionQueue': 'Vision Queue',
-  'intelligence.screenDebug.visionState': 'Vision State',
   'intelligence.tasks.activeBoardOne': '1 active board across conversations',
   'intelligence.tasks.activeBoardOther': '{count} active boards across conversations',
   'intelligence.tasks.empty': 'No agent task boards yet',
@@ -5063,7 +4977,6 @@ const en: TranslationMap = {
   'overlay.ariaVoiceActive': 'Voice input active',
   'overlay.companion.error': 'Error',
   'overlay.companion.listening': 'Listening…',
-  'overlay.companion.pointing': 'Pointing…',
   'overlay.companion.speaking': 'Speaking…',
   'overlay.companion.thinking': 'Thinking…',
   'overlay.orbTitle': 'Drag to move · Double-click to reset position',
@@ -5095,12 +5008,8 @@ const en: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Messaging channels desc',
   'pages.settings.features.notifications': 'Notifications',
   'pages.settings.features.notificationsDesc': 'Notifications desc',
-  'pages.settings.features.screenAwareness': 'Screen awareness',
-  'pages.settings.features.screenAwarenessDesc':
-    'Let your agent see your screen to offer timely, in-context help.',
   'pages.settings.features.tools': 'Tools',
   'pages.settings.features.toolsDesc': 'Tools desc',
-  'pages.settings.featuresSection.description': 'Screen awareness, messaging, and tools.',
   'pages.settings.featuresSection.title': 'Features',
   'privacy.dataKind.credentials': 'Credentials',
   'privacy.dataKind.derived': 'Derived',
@@ -5856,9 +5765,6 @@ const en: TranslationMap = {
   'settings.developerMenu.ai.title': 'AI Configuration',
   'settings.developerMenu.ai.desc':
     'Cloud providers, local Ollama models, and per-workload routing',
-  'settings.developerMenu.screenAwareness.title': 'Screen Awareness',
-  'settings.developerMenu.screenAwareness.desc':
-    'Screen capture permissions, monitoring policy, and session controls',
   'settings.developerMenu.messagingChannels.title': 'Messaging Channels',
   'settings.developerMenu.messagingChannels.desc':
     'Configure Telegram/Discord auth modes and default channel routing',
@@ -6502,22 +6408,6 @@ const en: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Apply Replacement',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Accessibility',
-  'settings.screenIntel.permissions.grantHint':
-    'Grant these permissions in System Settings, then restart the core.',
-  'settings.screenIntel.permissions.inputMonitoring': 'Input Monitoring',
-  'settings.screenIntel.permissions.macosAppliesPrivacy':
-    'macOS controls these under System Settings → Privacy & Security.',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Open Input Monitoring',
-  'settings.screenIntel.permissions.refreshStatus': 'Refreshing…',
-  'settings.screenIntel.permissions.refreshing': 'Refreshing…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Request Accessibility',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Request Screen Recording',
-  'settings.screenIntel.permissions.requesting': 'Requesting…',
-  'settings.screenIntel.permissions.restartRefresh': 'Restarting core…',
-  'settings.screenIntel.permissions.restartingCore': 'Restarting core…',
-  'settings.screenIntel.permissions.screenRecording': 'Screen Recording',
-  'settings.screenIntel.permissions.title': 'Permissions',
   'skills.card.moreActions': 'More actions',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6787,39 +6677,6 @@ const en: TranslationMap = {
   'skills.resource.tree.scripts': 'Scripts',
   'skills.resource.tree.templates': 'Templates',
   'skills.search.placeholder': 'Search skills…',
-  'skills.setup.screenIntel.activeDesc':
-    'Screen Intelligence is running and reading your active window.',
-  'skills.setup.screenIntel.activeTitle': 'Screen Intelligence is Enabled',
-  'skills.setup.screenIntel.advancedSettings': 'Advanced settings',
-  'skills.setup.screenIntel.allGranted': 'All permissions granted',
-  'skills.setup.screenIntel.captureMode': 'Capture mode',
-  'skills.setup.screenIntel.captureModeValue': 'All windows (configurable later)',
-  'skills.setup.screenIntel.deniedHint':
-    'After granting permissions in System Settings, click below to restart and pick up the changes.',
-  'skills.setup.screenIntel.enableBtn': 'Enabling...',
-  'skills.setup.screenIntel.enableDesc':
-    'Reads what is on your screen and feeds useful context into your agent.',
-  'skills.setup.screenIntel.enableError': 'Failed to enable Screen Intelligence',
-  'skills.setup.screenIntel.enabling': 'Enabling...',
-  'skills.setup.screenIntel.grant': 'Opening...',
-  'skills.setup.screenIntel.granted': 'Granted',
-  'skills.setup.screenIntel.macosOnly': 'macOS only',
-  'skills.setup.screenIntel.opening': 'Opening...',
-  'skills.setup.screenIntel.panicHotkey': 'Panic hotkey',
-  'skills.setup.screenIntel.permAccessibility': 'Accessibility',
-  'skills.setup.screenIntel.permInputMonitoring': 'Input Monitoring',
-  'skills.setup.screenIntel.permScreenRecording': 'Screen Recording',
-  'skills.setup.screenIntel.permissionsDesc':
-    'Screen Intelligence requires accessibility, input monitoring, and screen recording permissions.',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS applies privacy to:',
-  'skills.setup.screenIntel.refreshStatus': 'Refresh status',
-  'skills.setup.screenIntel.restartRefresh': 'Restarting...',
-  'skills.setup.screenIntel.restarting': 'Restarting...',
-  'skills.setup.screenIntel.stepEnable': 'Enable the skill',
-  'skills.setup.screenIntel.stepPermissions': 'Grant permissions',
-  'skills.setup.screenIntel.stepSuccess': 'Ready to go',
-  'skills.setup.screenIntel.title': 'Screen Intelligence',
-  'skills.setup.screenIntel.visionModel': 'Vision model',
   'skills.setup.voice.activation': 'Activation',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6978,9 +6835,6 @@ const en: TranslationMap = {
   // Developer options menu items (#2225)
   'devOptions.menuAi': 'AI Configuration',
   'devOptions.menuAiDesc': 'Cloud providers, local Ollama models, and per-workload routing',
-  'devOptions.menuScreenAware': 'Screen Awareness',
-  'devOptions.menuScreenAwareDesc':
-    'Screen capture permissions, monitoring policy, and session controls',
   'devOptions.menuMessaging': 'Messaging Channels',
   'devOptions.menuMessagingDesc':
     'Configure Telegram/Discord auth modes and default channel routing',
diff --git a/app/src/lib/i18n/es.ts b/app/src/lib/i18n/es.ts
index d7579fc06..f7b277866 100644
--- a/app/src/lib/i18n/es.ts
+++ b/app/src/lib/i18n/es.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Modo compañero siempre activo con acceso directo en la bandeja del sistema',
   'pages.settings.features.desktopCompanion': 'Acompañante de escritorio',
-  'pages.settings.features.desktopCompanionDesc':
-    'Asistente de voz con conciencia de pantalla: escucha, ve, habla, señala',
   'settings.companion.title': 'Compañero de escritorio',
   'settings.companion.session': 'Sesión',
   'settings.companion.activeLabel': 'Activo',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Atajo de teclado',
   'settings.companion.activationMode': 'Modo de activación',
   'settings.companion.sessionTtl': 'TTL de sesión',
-  'settings.companion.screenCapture': 'Captura de pantalla',
-  'settings.companion.appContext': 'Contexto de la aplicación',
   // Share cards (#5006).
   'share.button': 'Compartir',
   'share.modalTitle': 'Comparte este momento',
@@ -116,8 +112,6 @@ const messages: TranslationMap = {
     'Elige el modelo de embeddings usado para la búsqueda en la memoria.',
   'connections.header.search': 'Configura la búsqueda web para tu agente.',
   'connections.header.wallet': 'El saldo de tu monedero local y tu frase de recuperación.',
-  'connections.header.screen':
-    'Deja que tu agente vea tu pantalla para ofrecerte ayuda oportuna y en contexto.',
   'connections.header.composioKey':
     'Añade una clave de API de Composio para desbloquear cientos de integraciones de apps.',
   'connections.llm.apiKeys': 'Claves de API y enrutamiento',
@@ -774,8 +768,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Subconsciente',
   'settings.assistant.backgroundActivityDesc':
     'Controla qué tan activo trabaja tu asistente en segundo plano',
-  'settings.assistant.screenAwareness': 'Conciencia de pantalla',
-  'settings.assistant.screenAwarenessDesc': 'Permite al asistente ver tu ventana activa',
   'settings.assistant.permissions': 'Permisos',
   'settings.assistant.permissionsDesc': 'Elige qué puede hacer el asistente y dónde puede trabajar',
   'settings.privacySecurity.privacy': 'Privacidad',
@@ -856,7 +848,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferencias',
   'settings.notifications.tabs.routing': 'Enrutamiento',
   'settings.features': 'Funciones',
-  'settings.featuresDesc': 'Conciencia de pantalla, mensajería y herramientas',
   'settings.aiModels': 'IA y modelos',
   'settings.aiModelsDesc': 'Configuración de modelos de IA locales, descargas y proveedor LLM',
   'settings.ai': 'Configuración de IA',
@@ -956,8 +947,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Controles por canal',
   'settings.notifications.channelControlsDesc':
     'Configura las preferencias de notificación para cada canal',
-  'settings.features.screenAwareness': 'Conciencia de pantalla',
-  'settings.features.screenAwarenessDesc': 'Permite que el asistente vea tu ventana activa',
   'settings.features.messaging': 'Mensajería',
   'settings.features.messagingDesc': 'Configuración de integración de canales y mensajería',
   'settings.features.tools': 'Herramientas',
@@ -2249,21 +2238,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Guardar cambios',
   'settings.tools.preferencesSaved': 'Preferencias guardadas',
   'settings.tools.saveFailed': 'No se pudieron guardar las preferencias. Inténtalo de nuevo.',
-  'settings.screenAwareness.mode': 'Modo',
-  'settings.screenAwareness.allExceptBlacklist': 'Todo excepto lista negra',
-  'settings.screenAwareness.whitelistOnly': 'Solo lista blanca',
-  'settings.screenAwareness.screenMonitoring': 'Monitoreo de pantalla',
-  'settings.screenAwareness.saveSettings': 'Guardar configuración',
-  'settings.screenAwareness.session': 'Sesión',
-  'settings.screenAwareness.status': 'Estado',
-  'settings.screenAwareness.active': 'Activo',
-  'settings.screenAwareness.stopped': 'Detenido',
-  'settings.screenAwareness.remaining': 'Restante',
-  'settings.screenAwareness.startSession': 'Iniciar sesión',
-  'settings.screenAwareness.stopSession': 'Detener sesión',
-  'settings.screenAwareness.analyzeNow': 'Analizar ahora',
-  'settings.screenAwareness.macosOnly':
-    'La captura de pantalla y los controles de permisos de Conciencia de pantalla actualmente solo son compatibles con macOS.',
   'connections.comingSoon': 'Próximamente',
   'connections.setUp': 'Configurar',
   'connections.configured': 'Configurado',
@@ -2629,37 +2603,6 @@ const messages: TranslationMap = {
     'Interruptor principal. Desactivado por defecto: Ollama permanece inactivo. Cuando está activado, el resumidor de árbol, la inteligencia de pantalla y el autocompletado siempre usan el modelo local.',
   'localModel.advancedSettings': 'Configuración avanzada',
   'localModel.debugTitle': 'Depuración de modelo local',
-  'screenAwareness.debugTitle': 'Depuración de Conciencia de pantalla',
-  'screenAwareness.debug.debugAndDiagnostics': 'Depuración y diagnóstico',
-  'screenAwareness.debug.collapse': 'Colapso',
-  'screenAwareness.debug.expand': 'Expandir',
-  'screenAwareness.debug.failedToSave': 'No se pudo guardar la inteligencia de pantalla',
-  'screenAwareness.debug.policyTitle': 'Política de inteligencia de pantalla',
-  'screenAwareness.debug.baselineFps': 'FPS de referencia',
-  'screenAwareness.debug.useVisionModel': 'Usar modelo de visión',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Envía capturas de pantalla a un LLM de visión para obtener más contexto. Cuando está desactivado, solo se usa texto OCR con un LLM de texto, lo que es más rápido y no requiere modelo de visión.',
-  'screenAwareness.debug.keepScreenshots': 'Mantener capturas de pantalla',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Guarda las capturas de pantalla en el espacio de trabajo en lugar de eliminarlas tras el procesamiento',
-  'screenAwareness.debug.allowlist': 'Lista de permitidos (una regla por línea)',
-  'screenAwareness.debug.denylist': 'Lista de rechazados (una regla por línea)',
-  'screenAwareness.debug.saveSettings': 'Guardar configuración de inteligencia de pantalla',
-  'screenAwareness.debug.sessionStats': 'Estadísticas de sesión',
-  'screenAwareness.debug.framesEphemeral': 'Marcos (efímeros)',
-  'screenAwareness.debug.panicStop': 'parada de pánico',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Mayús+.',
-  'screenAwareness.debug.vision': 'Visión',
-  'screenAwareness.debug.idle': 'inactivo',
-  'screenAwareness.debug.visionQueue': 'Cola de visión',
-  'screenAwareness.debug.lastVision': 'ultima vision',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Resúmenes de visión',
-  'screenAwareness.debug.refreshing': 'Refrescante…',
-  'screenAwareness.debug.noSummaries': 'Aún no hay resúmenes.',
-  'screenAwareness.debug.unknownApp': 'Aplicación desconocida',
-  'screenAwareness.debug.macosOnly':
-    'Screen Intelligence V1 actualmente solo es compatible con macOS.',
   'memory.debugTitle': 'Depuración de memoria',
   'memory.documents': 'Documentos',
   'memory.filterByNamespace': 'Filtrar por espacio de nombres...',
@@ -3929,33 +3872,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Último diagrama de arquitectura de OpenHuman generado',
   'intelligence.diagram.refreshesEvery': 'Se actualiza cada {seconds}s',
   'intelligence.memoryText.entityTypePrefix': 'Tipo de entidad',
-  'intelligence.screenDebug.active': 'Activo',
-  'intelligence.screenDebug.app': 'Aplicación',
-  'intelligence.screenDebug.bounds': 'Límites',
-  'intelligence.screenDebug.captureAlt': 'Resultado de prueba de captura',
-  'intelligence.screenDebug.captureFailed': 'Falló',
-  'intelligence.screenDebug.captureSuccess': 'Éxito',
-  'intelligence.screenDebug.captureTest': 'Prueba de captura',
-  'intelligence.screenDebug.capturing': 'Capturando',
-  'intelligence.screenDebug.frames': 'Fotogramas',
-  'intelligence.screenDebug.idle': 'Inactivo',
-  'intelligence.screenDebug.lastApp': 'Última app',
-  'intelligence.screenDebug.mode': 'Modo',
-  'intelligence.screenDebug.permAccessibility': 'Permiso de accesibilidad',
-  'intelligence.screenDebug.permInput': 'Permiso de entrada',
-  'intelligence.screenDebug.permScreen': 'Accesibilidad',
-  'intelligence.screenDebug.permissions': 'Permisos',
-  'intelligence.screenDebug.platformNotSupported': 'Plataforma no compatible',
-  'intelligence.screenDebug.recentVisionSummaries': 'Resúmenes de visión recientes',
-  'intelligence.screenDebug.session': 'Sesión',
-  'intelligence.screenDebug.size': 'Tamaño',
-  'intelligence.screenDebug.status': 'Estado',
-  'intelligence.screenDebug.testCapture': 'Prueba de captura',
-  'intelligence.screenDebug.time': 'Tiempo',
-  'intelligence.screenDebug.title': 'Título',
-  'intelligence.screenDebug.unknown': 'Desconocido',
-  'intelligence.screenDebug.visionQueue': 'Cola de visión',
-  'intelligence.screenDebug.visionState': 'Estado de visión',
   'intelligence.tasks.activeBoardOne': '1 tablero activo entre conversaciones',
   'intelligence.tasks.activeBoardOther': '{count} tableros activos entre conversaciones',
   'intelligence.tasks.empty': 'Sin tableros de tareas de agente aún',
@@ -4550,7 +4466,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Entrada de voz activa',
   'overlay.companion.error': 'error',
   'overlay.companion.listening': 'Escuchando…',
-  'overlay.companion.pointing': 'Señalando…',
   'overlay.companion.speaking': 'Hablando…',
   'overlay.companion.thinking': 'Pensando…',
   'overlay.orbTitle': 'Arrastra para mover · Doble clic para restablecer posición',
@@ -4582,13 +4497,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Descripción de canales de mensajería',
   'pages.settings.features.notifications': 'Notificaciones',
   'pages.settings.features.notificationsDesc': 'Descripción de notificaciones',
-  'pages.settings.features.screenAwareness': 'Conciencia de pantalla',
-  'pages.settings.features.screenAwarenessDesc':
-    'Deja que tu agente vea tu pantalla para ofrecerte ayuda oportuna y en contexto.',
   'pages.settings.features.tools': 'Herramientas',
   'pages.settings.features.toolsDesc': 'Descripción de herramientas',
-  'pages.settings.featuresSection.description':
-    'Conciencia de pantalla, mensajería y herramientas.',
   'pages.settings.featuresSection.title': 'Funciones',
   'privacy.dataKind.credentials': 'Credenciales',
   'privacy.dataKind.derived': 'Derivado',
@@ -5355,9 +5265,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Configuración de IA',
   'settings.developerMenu.ai.desc':
     'Proveedores en la nube, modelos locales de Ollama y enrutamiento por carga de trabajo',
-  'settings.developerMenu.screenAwareness.title': 'Conciencia de pantalla',
-  'settings.developerMenu.screenAwareness.desc':
-    'Permisos de captura de pantalla, política de supervisión y controles de sesión',
   'settings.developerMenu.messagingChannels.title': 'Canales de mensajería',
   'settings.developerMenu.messagingChannels.desc':
     'Configura los modos de autenticación de Telegram/Discord y el enrutamiento de canal predeterminado',
@@ -6022,20 +5929,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Aplicar reemplazo',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Accesibilidad',
-  'settings.screenIntel.permissions.grantHint': 'Sugerencia de permiso',
-  'settings.screenIntel.permissions.inputMonitoring': 'Monitoreo de entrada',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS aplica privacidad',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Solicitando…',
-  'settings.screenIntel.permissions.refreshStatus': 'Actualizando…',
-  'settings.screenIntel.permissions.refreshing': 'Actualizando…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Solicitando…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Solicitando…',
-  'settings.screenIntel.permissions.requesting': 'Solicitando…',
-  'settings.screenIntel.permissions.restartRefresh': 'Reiniciando core…',
-  'settings.screenIntel.permissions.restartingCore': 'Reiniciando core…',
-  'settings.screenIntel.permissions.screenRecording': 'Grabación de pantalla',
-  'settings.screenIntel.permissions.title': 'Permisos',
   'skills.card.moreActions': 'Más acciones',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6300,36 +6193,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Plantillas',
   'skills.resource.tree.empty': 'Sin recursos incluidos.',
   'skills.search.placeholder': 'Marcador de posición',
-  'skills.setup.screenIntel.activeDesc': 'Descripción activa',
-  'skills.setup.screenIntel.activeTitle': 'Inteligencia de pantalla está activada',
-  'skills.setup.screenIntel.advancedSettings': 'Configuración avanzada',
-  'skills.setup.screenIntel.allGranted': 'Todos los permisos otorgados',
-  'skills.setup.screenIntel.captureMode': 'Modo de captura',
-  'skills.setup.screenIntel.captureModeValue': 'Todas las ventanas (configurable después)',
-  'skills.setup.screenIntel.deniedHint':
-    'Después de otorgar permisos en Configuración del sistema, haz clic abajo para reiniciar y aplicar los cambios.',
-  'skills.setup.screenIntel.enableBtn': 'Activando...',
-  'skills.setup.screenIntel.enableDesc': 's en tu pantalla y añade contexto útil a tu agente',
-  'skills.setup.screenIntel.enableError': 'No se pudo activar la Inteligencia de pantalla',
-  'skills.setup.screenIntel.enabling': 'Activando...',
-  'skills.setup.screenIntel.grant': 'Abriendo...',
-  'skills.setup.screenIntel.granted': 'Otorgado',
-  'skills.setup.screenIntel.macosOnly': 'Solo macOS',
-  'skills.setup.screenIntel.opening': 'Abriendo...',
-  'skills.setup.screenIntel.panicHotkey': 'Tecla de pánico',
-  'skills.setup.screenIntel.permAccessibility': 'Accesibilidad',
-  'skills.setup.screenIntel.permInputMonitoring': 'Monitoreo de entrada',
-  'skills.setup.screenIntel.permScreenRecording': 'Grabación de pantalla',
-  'skills.setup.screenIntel.permissionsDesc': 'Descripción de permisos',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS aplica la privacidad a:',
-  'skills.setup.screenIntel.refreshStatus': 'Actualizar estado',
-  'skills.setup.screenIntel.restartRefresh': 'Reiniciando...',
-  'skills.setup.screenIntel.restarting': 'Reiniciando...',
-  'skills.setup.screenIntel.stepEnable': 'Activar el skill',
-  'skills.setup.screenIntel.stepPermissions': 'Otorgar permisos',
-  'skills.setup.screenIntel.stepSuccess': 'Listo para usar',
-  'skills.setup.screenIntel.title': 'Inteligencia de pantalla',
-  'skills.setup.screenIntel.visionModel': 'Modelo de visión',
   'skills.setup.voice.activation': 'Activación',
   'skills.setup.voice.activeDescPrefix': 'fn',
   'skills.setup.voice.activeDescSuffix': 'fn',
@@ -6491,9 +6354,6 @@ const messages: TranslationMap = {
   'devOptions.menuAi': 'Configuración de IA',
   'devOptions.menuAiDesc':
     'Proveedores de nube, modelos Ollama locales y enrutamiento por carga de trabajo',
-  'devOptions.menuScreenAware': 'Conciencia de pantalla',
-  'devOptions.menuScreenAwareDesc':
-    'Permisos de captura de pantalla, política de monitoreo y controles de sesión',
   'devOptions.menuMessaging': 'Canales de mensajería',
   'devOptions.menuMessagingDesc':
     'Configurar los modos de autenticación Telegram/Discord y el enrutamiento de canales predeterminado',
diff --git a/app/src/lib/i18n/fr.ts b/app/src/lib/i18n/fr.ts
index 622f66058..f047d440a 100644
--- a/app/src/lib/i18n/fr.ts
+++ b/app/src/lib/i18n/fr.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Mode compagnon toujours actif avec raccourci dans la barre système',
   'pages.settings.features.desktopCompanion': 'Compagnon de bureau',
-  'pages.settings.features.desktopCompanionDesc':
-    "Assistant vocal avec conscience de l'écran: écoute, voit, parle, pointe",
   'settings.companion.title': 'Compagnon de bureau',
   'settings.companion.session': 'Session',
   'settings.companion.activeLabel': 'Actif',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Raccourci clavier',
   'settings.companion.activationMode': "Mode d'activation",
   'settings.companion.sessionTtl': 'Durée de vie de la session',
-  'settings.companion.screenCapture': "Capture d'écran",
-  'settings.companion.appContext': "Contexte de l'application",
   // Share cards (#5006).
   'share.button': 'Partager',
   'share.modalTitle': 'Partagez ce moment',
@@ -122,8 +118,6 @@ const messages: TranslationMap = {
   'connections.header.search': 'Configurez la recherche web pour votre agent.',
   'connections.header.wallet':
     'Le solde de votre portefeuille local et votre phrase de récupération.',
-  'connections.header.screen':
-    'Laissez votre agent voir votre écran pour offrir une aide opportune et contextuelle.',
   'connections.header.composioKey':
     'Ajoutez une clé API Composio pour débloquer des centaines d’intégrations d’applications.',
   'connections.llm.apiKeys': 'Clés API et routage',
@@ -784,8 +778,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Subconscient',
   'settings.assistant.backgroundActivityDesc':
     "Contrôler l'activité en arrière-plan de votre assistant",
-  'settings.assistant.screenAwareness': "Conscience de l'écran",
-  'settings.assistant.screenAwarenessDesc': "Permettre à l'assistant de voir votre fenêtre active",
   'settings.assistant.permissions': 'Autorisations',
   'settings.assistant.permissionsDesc':
     "Choisissez ce que l'assistant peut faire et où il peut travailler",
@@ -869,7 +861,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Préférences',
   'settings.notifications.tabs.routing': 'Routage',
   'settings.features': 'Fonctionnalités',
-  'settings.featuresDesc': "Surveillance de l'écran, messagerie et outils",
   'settings.aiModels': 'IA & Modèles',
   'settings.aiModelsDesc':
     'Configuration des modèles IA locaux, téléchargements et fournisseur LLM',
@@ -968,8 +959,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Contrôles par canal',
   'settings.notifications.channelControlsDesc':
     'Configurer les préférences de notifications pour chaque canal',
-  'settings.features.screenAwareness': "Surveillance de l'écran",
-  'settings.features.screenAwarenessDesc': "Permettre à l'assistant de voir ta fenêtre active",
   'settings.features.messaging': 'Messagerie',
   'settings.features.messagingDesc': "Paramètres d'intégration des canaux et de la messagerie",
   'settings.features.tools': 'Outils',
@@ -2271,21 +2260,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Enregistrer les modifications',
   'settings.tools.preferencesSaved': 'Préférences enregistrées',
   'settings.tools.saveFailed': "Échec de l'enregistrement des préférences. Réessaie.",
-  'settings.screenAwareness.mode': 'Mode',
-  'settings.screenAwareness.allExceptBlacklist': 'Tout sauf la liste noire',
-  'settings.screenAwareness.whitelistOnly': 'Liste blanche uniquement',
-  'settings.screenAwareness.screenMonitoring': "Surveillance de l'écran",
-  'settings.screenAwareness.saveSettings': 'Enregistrer les paramètres',
-  'settings.screenAwareness.session': 'Session',
-  'settings.screenAwareness.status': 'État',
-  'settings.screenAwareness.active': 'Actif',
-  'settings.screenAwareness.stopped': 'Arrêté',
-  'settings.screenAwareness.remaining': 'Restant',
-  'settings.screenAwareness.startSession': 'Démarrer la session',
-  'settings.screenAwareness.stopSession': 'Arrêter la session',
-  'settings.screenAwareness.analyzeNow': 'Analyser maintenant',
-  'settings.screenAwareness.macosOnly':
-    "La capture d'écran et les contrôles d'autorisation de la surveillance de l'écran sont actuellement pris en charge sur macOS uniquement.",
   'connections.comingSoon': 'Bientôt disponible',
   'connections.setUp': 'Configurer',
   'connections.configured': 'Configuré',
@@ -2652,37 +2626,6 @@ const messages: TranslationMap = {
     "Interrupteur principal. Désactivé par défaut: Ollama reste en veille. Quand activé, le résumeur d'arbre, l'intelligence d'écran et l'autocomplétion utilisent toujours le modèle local.",
   'localModel.advancedSettings': 'Paramètres avancés',
   'localModel.debugTitle': 'Débogage du modèle local',
-  'screenAwareness.debugTitle': "Débogage de la surveillance de l'écran",
-  'screenAwareness.debug.debugAndDiagnostics': 'Débogage et diagnostics',
-  'screenAwareness.debug.collapse': 'Réduire',
-  'screenAwareness.debug.expand': 'Développer',
-  'screenAwareness.debug.failedToSave': "Échec de la sauvegarde de l'intelligence écran",
-  'screenAwareness.debug.policyTitle': "Politique d'intelligence écran",
-  'screenAwareness.debug.baselineFps': 'FPS de référence',
-  'screenAwareness.debug.useVisionModel': 'Utiliser le modèle de vision',
-  'screenAwareness.debug.useVisionModelDesc':
-    "Envoyer les captures d'écran à un LLM vision pour un contexte plus riche. Désactivé, seul le texte OCR est utilisé avec un LLM texte: plus rapide et sans modèle vision requis.",
-  'screenAwareness.debug.keepScreenshots': "Conserver les captures d'écran",
-  'screenAwareness.debug.keepScreenshotsDesc':
-    "Enregistrer les captures dans l'espace de travail au lieu de les supprimer après traitement",
-  'screenAwareness.debug.allowlist': "Liste d'autorisation (une règle par ligne)",
-  'screenAwareness.debug.denylist': 'Liste de refus (une règle par ligne)',
-  'screenAwareness.debug.saveSettings': "Enregistrer les paramètres d'intelligence écran",
-  'screenAwareness.debug.sessionStats': 'Statistiques de session',
-  'screenAwareness.debug.framesEphemeral': 'Trames (éphémères)',
-  'screenAwareness.debug.panicStop': 'Arrêt de panique',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Vision',
-  'screenAwareness.debug.idle': 'inactif',
-  'screenAwareness.debug.visionQueue': "File d'attente vision",
-  'screenAwareness.debug.lastVision': 'Dernière vision',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Résumés de vision',
-  'screenAwareness.debug.refreshing': 'Actualisation…',
-  'screenAwareness.debug.noSummaries': "Aucun résumé pour l'instant.",
-  'screenAwareness.debug.unknownApp': 'Application inconnue',
-  'screenAwareness.debug.macosOnly':
-    'Screen Intelligence V1 est actuellement pris en charge sur macOS uniquement.',
   'memory.debugTitle': 'Débogage de la mémoire',
   'memory.documents': 'Documents',
   'memory.filterByNamespace': 'Filtrer par espace de noms...',
@@ -3956,33 +3899,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': "Dernier diagramme d'architecture OpenHuman généré",
   'intelligence.diagram.refreshesEvery': 'Actualise toutes les {seconds}s',
   'intelligence.memoryText.entityTypePrefix': "Type d'entité",
-  'intelligence.screenDebug.active': 'Actif',
-  'intelligence.screenDebug.app': 'Application',
-  'intelligence.screenDebug.bounds': 'Limites',
-  'intelligence.screenDebug.captureAlt': 'Résultat du test de capture',
-  'intelligence.screenDebug.captureFailed': 'Échec',
-  'intelligence.screenDebug.captureSuccess': 'Succès',
-  'intelligence.screenDebug.captureTest': 'Test de capture',
-  'intelligence.screenDebug.capturing': 'Capture en cours',
-  'intelligence.screenDebug.frames': 'Images',
-  'intelligence.screenDebug.idle': 'En veille',
-  'intelligence.screenDebug.lastApp': 'Dernière app',
-  'intelligence.screenDebug.mode': 'Mode',
-  'intelligence.screenDebug.permAccessibility': 'Permission accessibilité',
-  'intelligence.screenDebug.permInput': 'Permission saisie',
-  'intelligence.screenDebug.permScreen': 'Accessibilité',
-  'intelligence.screenDebug.permissions': 'Autorisations',
-  'intelligence.screenDebug.platformNotSupported': 'Plateforme non prise en charge',
-  'intelligence.screenDebug.recentVisionSummaries': 'Résumés de vision récents',
-  'intelligence.screenDebug.session': 'Session',
-  'intelligence.screenDebug.size': 'Taille',
-  'intelligence.screenDebug.status': 'État',
-  'intelligence.screenDebug.testCapture': 'Test de capture',
-  'intelligence.screenDebug.time': 'Temps',
-  'intelligence.screenDebug.title': 'Titre',
-  'intelligence.screenDebug.unknown': 'Inconnu',
-  'intelligence.screenDebug.visionQueue': 'File de vision',
-  'intelligence.screenDebug.visionState': 'État de la vision',
   'intelligence.tasks.activeBoardOne': '1 tableau actif dans les conversations',
   'intelligence.tasks.activeBoardOther': '{count} tableaux actifs dans les conversations',
   'intelligence.tasks.empty': "Aucun tableau de tâches agent pour l'instant",
@@ -4579,7 +4495,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Saisie vocale active',
   'overlay.companion.error': 'Erreur',
   'overlay.companion.listening': 'À l’écoute…',
-  'overlay.companion.pointing': 'En train de pointer…',
   'overlay.companion.speaking': 'En train de parler…',
   'overlay.companion.thinking': 'Réflexion…',
   'overlay.orbTitle': 'Glisse pour déplacer · Double-clique pour réinitialiser la position',
@@ -4611,12 +4526,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Description des canaux de messagerie',
   'pages.settings.features.notifications': 'Notifications',
   'pages.settings.features.notificationsDesc': 'Description des notifications',
-  'pages.settings.features.screenAwareness': "Surveillance de l'écran",
-  'pages.settings.features.screenAwarenessDesc':
-    'Laissez votre agent voir votre écran pour offrir une aide opportune et contextuelle.',
   'pages.settings.features.tools': 'Outils',
   'pages.settings.features.toolsDesc': 'Description des outils',
-  'pages.settings.featuresSection.description': "Surveillance de l'écran, messagerie et outils.",
   'pages.settings.featuresSection.title': 'Fonctionnalités',
   'privacy.dataKind.credentials': 'Identifiants',
   'privacy.dataKind.derived': 'Dérivé',
@@ -5387,9 +5298,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Configuration IA',
   'settings.developerMenu.ai.desc':
     'Fournisseurs cloud, modèles Ollama locaux et routage par charge de travail',
-  'settings.developerMenu.screenAwareness.title': "Conscience de l'écran",
-  'settings.developerMenu.screenAwareness.desc':
-    "Autorisations de capture d'écran, politique de surveillance et contrôles de session",
   'settings.developerMenu.messagingChannels.title': 'Canaux de messagerie',
   'settings.developerMenu.messagingChannels.desc':
     "Configure les modes d'authentification Telegram/Discord et le routage de canal par défaut",
@@ -6054,20 +5962,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Appliquer le remplacement',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Accessibilité',
-  'settings.screenIntel.permissions.grantHint': "Indice d'autorisation",
-  'settings.screenIntel.permissions.inputMonitoring': 'Surveillance des entrées',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS applique la confidentialité',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Demande en cours…',
-  'settings.screenIntel.permissions.refreshStatus': 'Actualisation…',
-  'settings.screenIntel.permissions.refreshing': 'Actualisation…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Demande en cours…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Demande en cours…',
-  'settings.screenIntel.permissions.requesting': 'Demande en cours…',
-  'settings.screenIntel.permissions.restartRefresh': 'Redémarrage du core…',
-  'settings.screenIntel.permissions.restartingCore': 'Redémarrage du core…',
-  'settings.screenIntel.permissions.screenRecording': "Enregistrement d'écran",
-  'settings.screenIntel.permissions.title': 'Autorisations',
   'skills.card.moreActions': "Plus d'actions",
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6332,37 +6226,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Modèles',
   'skills.resource.tree.empty': 'Aucune ressource groupée.',
   'skills.search.placeholder': 'Espace réservé',
-  'skills.setup.screenIntel.activeDesc': 'Description active',
-  'skills.setup.screenIntel.activeTitle': "L'intelligence d'écran est activée",
-  'skills.setup.screenIntel.advancedSettings': 'Paramètres avancés',
-  'skills.setup.screenIntel.allGranted': 'Toutes les permissions accordées',
-  'skills.setup.screenIntel.captureMode': 'Mode de capture',
-  'skills.setup.screenIntel.captureModeValue': 'Toutes les fenêtres (configurable plus tard)',
-  'skills.setup.screenIntel.deniedHint':
-    'Après avoir accordé les permissions dans les Paramètres système, clique ci-dessous pour redémarrer et prendre en compte les modifications.',
-  'skills.setup.screenIntel.enableBtn': 'Activation…',
-  'skills.setup.screenIntel.enableDesc':
-    's sur ton écran et injecte du contexte utile dans ton agent',
-  'skills.setup.screenIntel.enableError': "Échec de l'activation de l'intelligence d'écran",
-  'skills.setup.screenIntel.enabling': 'Activation…',
-  'skills.setup.screenIntel.grant': 'Ouverture…',
-  'skills.setup.screenIntel.granted': 'Accordé',
-  'skills.setup.screenIntel.macosOnly': 'macOS uniquement',
-  'skills.setup.screenIntel.opening': 'Ouverture…',
-  'skills.setup.screenIntel.panicHotkey': 'Raccourci de panique',
-  'skills.setup.screenIntel.permAccessibility': 'Accessibilité',
-  'skills.setup.screenIntel.permInputMonitoring': 'Surveillance des entrées',
-  'skills.setup.screenIntel.permScreenRecording': "Enregistrement d'écran",
-  'skills.setup.screenIntel.permissionsDesc': 'Description des permissions',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS applique la confidentialité à :',
-  'skills.setup.screenIntel.refreshStatus': 'Actualiser le statut',
-  'skills.setup.screenIntel.restartRefresh': 'Redémarrage…',
-  'skills.setup.screenIntel.restarting': 'Redémarrage…',
-  'skills.setup.screenIntel.stepEnable': 'Activer la compétence',
-  'skills.setup.screenIntel.stepPermissions': 'Accorder les permissions',
-  'skills.setup.screenIntel.stepSuccess': "Prêt à l'emploi",
-  'skills.setup.screenIntel.title': "Intelligence d'écran",
-  'skills.setup.screenIntel.visionModel': 'Modèle de vision',
   'skills.setup.voice.activation': 'Activation',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6524,9 +6387,6 @@ const messages: TranslationMap = {
   'devOptions.menuAi': "Configuration de l'IA",
   'devOptions.menuAiDesc':
     'Fournisseurs de cloud, modèles Ollama locaux et routage par charge de travail',
-  'devOptions.menuScreenAware': "Connaissance de l'écran",
-  'devOptions.menuScreenAwareDesc':
-    "Autorisations de capture d'écran, stratégie de surveillance et contrôles de session",
   'devOptions.menuMessaging': 'Canaux de messagerie',
   'devOptions.menuMessagingDesc':
     "Configurer les modes d'authentification Telegram/Discord et le routage des canaux par défaut",
diff --git a/app/src/lib/i18n/hi.ts b/app/src/lib/i18n/hi.ts
index cdd10b790..f3c14c16f 100644
--- a/app/src/lib/i18n/hi.ts
+++ b/app/src/lib/i18n/hi.ts
@@ -7,8 +7,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanion': 'डेस्कटॉप साथी',
   'settings.assistant.desktopCompanionDesc': 'सिस्टम ट्रे शॉर्टकट के साथ हमेशा-चालू साथी मोड',
   'pages.settings.features.desktopCompanion': 'डेस्कटॉप कंपैनियन',
-  'pages.settings.features.desktopCompanionDesc':
-    'स्क्रीन जागरूकता के साथ वॉयस सहायक: सुनता है, देखता है, बोलता है, इशारा करता है',
   'settings.companion.title': 'डेस्कटॉप साथी',
   'settings.companion.session': 'सत्र',
   'settings.companion.activeLabel': 'सक्रिय',
@@ -24,8 +22,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'हॉटकी',
   'settings.companion.activationMode': 'सक्रियण मोड',
   'settings.companion.sessionTtl': 'सत्र टीटीएल',
-  'settings.companion.screenCapture': 'स्क्रीन कैप्चर',
-  'settings.companion.appContext': 'ऐप संदर्भ',
   // Share cards (#5006).
   'share.button': 'साझा करें',
   'share.modalTitle': 'इस पल को साझा करें',
@@ -111,8 +107,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'मेमोरी खोज के लिए उपयोग किया जाने वाला एम्बेडिंग मॉडल चुनें।',
   'connections.header.search': 'अपने एजेंट के लिए वेब खोज कॉन्फ़िगर करें।',
   'connections.header.wallet': 'आपके स्थानीय वॉलेट का बैलेंस और रिकवरी वाक्यांश।',
-  'connections.header.screen':
-    'समय पर, संदर्भ के अनुरूप मदद देने के लिए अपने एजेंट को अपनी स्क्रीन देखने दें।',
   'connections.header.composioKey':
     'सैकड़ों ऐप एकीकरण अनलॉक करने के लिए एक Composio API कुंजी जोड़ें।',
   'connections.llm.apiKeys': 'API कुंजियाँ और रूटिंग',
@@ -760,8 +754,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'सबकॉन्शस',
   'settings.assistant.backgroundActivityDesc':
     'नियंत्रित करें कि आपका सहायक पृष्ठभूमि में कितना सक्रिय काम करे',
-  'settings.assistant.screenAwareness': 'स्क्रीन जागरूकता',
-  'settings.assistant.screenAwarenessDesc': 'सहायक को आपकी सक्रिय विंडो देखने दें',
   'settings.assistant.permissions': 'अनुमतियाँ',
   'settings.assistant.permissionsDesc': 'चुनें कि सहायक क्या कर सकता है और कहाँ काम कर सकता है',
   'settings.privacySecurity.privacy': 'गोपनीयता',
@@ -841,7 +833,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'प्राथमिकताएँ',
   'settings.notifications.tabs.routing': 'रूटिंग',
   'settings.features': 'फीचर्स',
-  'settings.featuresDesc': 'स्क्रीन अवेयरनेस, मैसेजिंग और टूल्स',
   'settings.aiModels': 'AI और मॉडल्स',
   'settings.aiModelsDesc': 'लोकल AI मॉडल सेटअप, डाउनलोड और LLM प्रोवाइडर',
   'settings.ai': 'AI कॉन्फिगरेशन',
@@ -933,8 +924,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': 'तय समय के लिए सभी नोटिफिकेशन रोकें',
   'settings.notifications.channelControls': 'चैनल-वाइज़ कंट्रोल',
   'settings.notifications.channelControlsDesc': 'हर चैनल के लिए नोटिफिकेशन प्रेफरेंस सेट करें',
-  'settings.features.screenAwareness': 'स्क्रीन अवेयरनेस',
-  'settings.features.screenAwarenessDesc': 'असिस्टेंट को आपकी एक्टिव विंडो देखने दें',
   'settings.features.messaging': 'मैसेजिंग',
   'settings.features.messagingDesc': 'चैनल और मैसेजिंग इंटीग्रेशन सेटिंग्स',
   'settings.features.tools': 'टूल्स',
@@ -2203,21 +2192,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'बदलाव सेव करें',
   'settings.tools.preferencesSaved': 'प्रेफरेंस सेव हो गई',
   'settings.tools.saveFailed': 'प्रेफरेंस सेव नहीं हो पाई। दोबारा कोशिश करें।',
-  'settings.screenAwareness.mode': 'मोड',
-  'settings.screenAwareness.allExceptBlacklist': 'ब्लैकलिस्ट छोड़कर सब',
-  'settings.screenAwareness.whitelistOnly': 'केवल व्हाइटलिस्ट',
-  'settings.screenAwareness.screenMonitoring': 'स्क्रीन मॉनिटरिंग',
-  'settings.screenAwareness.saveSettings': 'सेटिंग्स सेव करें',
-  'settings.screenAwareness.session': 'सेशन',
-  'settings.screenAwareness.status': 'स्टेटस',
-  'settings.screenAwareness.active': 'एक्टिव',
-  'settings.screenAwareness.stopped': 'रुका हुआ',
-  'settings.screenAwareness.remaining': 'बचा हुआ',
-  'settings.screenAwareness.startSession': 'सेशन शुरू करें',
-  'settings.screenAwareness.stopSession': 'सेशन रोकें',
-  'settings.screenAwareness.analyzeNow': 'अभी एनालाइज़ करें',
-  'settings.screenAwareness.macosOnly':
-    'स्क्रीन अवेयरनेस डेस्कटॉप कैप्चर और परमिशन कंट्रोल अभी केवल macOS पर सपोर्ट हैं।',
   'connections.comingSoon': 'जल्द आ रहा है',
   'connections.setUp': 'सेट अप करें',
   'connections.configured': 'कॉन्फिगर हो गया',
@@ -2574,39 +2548,9 @@ const messages: TranslationMap = {
     'चुनें कि कौन से सबसिस्टम लोकल मॉडल पर चलें। बंद होने पर क्लाउड इस्तेमाल होगा।',
   'localModel.enableRuntime': 'लोकल AI रनटाइम चालू करें',
   'localModel.enableRuntimeDesc':
-    'मास्टर स्विच। डिफ़ॉल्ट रूप से बंद: Ollama आइडल रहता है। चालू होने पर tree summarizer, screen intelligence और autocomplete हमेशा लोकल मॉडल इस्तेमाल करते हैं।',
+    'मास्टर स्विच। डिफ़ॉल्ट रूप से बंद: Ollama आइडल रहता है। चालू होने पर tree summarizer और autocomplete हमेशा लोकल मॉडल इस्तेमाल करते हैं।',
   'localModel.advancedSettings': 'एडवांस्ड सेटिंग्स',
   'localModel.debugTitle': 'लोकल मॉडल डिबग',
-  'screenAwareness.debugTitle': 'स्क्रीन अवेयरनेस डिबग',
-  'screenAwareness.debug.debugAndDiagnostics': 'डिबग और डायग्नोस्टिक्स',
-  'screenAwareness.debug.collapse': 'पतन',
-  'screenAwareness.debug.expand': 'विस्तार करें',
-  'screenAwareness.debug.failedToSave': 'स्क्रीन इंटेलिजेंस सहेजने में विफल',
-  'screenAwareness.debug.policyTitle': 'स्क्रीन इंटेलिजेंस नीति',
-  'screenAwareness.debug.baselineFps': 'बेसलाइन एफपीएस',
-  'screenAwareness.debug.useVisionModel': 'विज़न मॉडल का उपयोग करें',
-  'screenAwareness.debug.useVisionModelDesc':
-    'समृद्ध संदर्भ के लिए स्क्रीनशॉट को विज़न LLM को भेजें। बंद होने पर केवल OCR टेक्स्ट का उपयोग टेक्स्ट LLM के साथ किया जाता है: तेज़ और विज़न मॉडल की आवश्यकता नहीं।',
-  'screenAwareness.debug.keepScreenshots': 'स्क्रीनशॉट रखें',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'प्रोसेसिंग के बाद हटाने की बजाय कैप्चर किए गए स्क्रीनशॉट वर्कस्पेस में सहेजें',
-  'screenAwareness.debug.allowlist': 'अनुमति सूची (प्रति पंक्ति एक नियम)',
-  'screenAwareness.debug.denylist': 'अस्वीकृत सूची (प्रति पंक्ति एक नियम)',
-  'screenAwareness.debug.saveSettings': 'स्क्रीन इंटेलिजेंस सेटिंग्स सहेजें',
-  'screenAwareness.debug.sessionStats': 'सत्र आँकड़े',
-  'screenAwareness.debug.framesEphemeral': 'फ़्रेम (क्षणिक)',
-  'screenAwareness.debug.panicStop': 'घबराना बंद करो',
-  'screenAwareness.debug.defaultPanicHotkey': 'सीएमडी+शिफ्ट+.',
-  'screenAwareness.debug.vision': 'दृष्टि',
-  'screenAwareness.debug.idle': 'निष्क्रिय',
-  'screenAwareness.debug.visionQueue': 'दृष्टि कतार',
-  'screenAwareness.debug.lastVision': 'अंतिम दर्शन',
-  'screenAwareness.debug.notAvailable': 'एन/ए',
-  'screenAwareness.debug.visionSummaries': 'दृष्टि सारांश',
-  'screenAwareness.debug.refreshing': 'ताज़ा...',
-  'screenAwareness.debug.noSummaries': 'अभी तक कोई सारांश नहीं.',
-  'screenAwareness.debug.unknownApp': 'अज्ञात ऐप',
-  'screenAwareness.debug.macosOnly': 'स्क्रीन इंटेलिजेंस V1 वर्तमान में केवल macOS पर समर्थित है।',
   'memory.debugTitle': 'मेमोरी डिबग',
   'memory.documents': 'दस्तावेज़',
   'memory.filterByNamespace': 'नामस्थान के अनुसार फ़िल्टर करें...',
@@ -3862,33 +3806,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'OpenHuman का नवीनतम जेनरेटेड आर्किटेक्चर डायग्राम',
   'intelligence.diagram.refreshesEvery': 'हर {seconds}s पर रीफ्रेश होता है',
   'intelligence.memoryText.entityTypePrefix': 'इकाई प्रकार',
-  'intelligence.screenDebug.active': 'एक्टिव',
-  'intelligence.screenDebug.app': 'ऐप',
-  'intelligence.screenDebug.bounds': 'बाउंड्स',
-  'intelligence.screenDebug.captureAlt': 'कैप्चर टेस्ट रिज़ल्ट',
-  'intelligence.screenDebug.captureFailed': 'विफल',
-  'intelligence.screenDebug.captureSuccess': 'सफल',
-  'intelligence.screenDebug.captureTest': 'कैप्चर टेस्ट',
-  'intelligence.screenDebug.capturing': 'कैप्चर हो रहा है',
-  'intelligence.screenDebug.frames': 'फ्रेम',
-  'intelligence.screenDebug.idle': 'आइडल',
-  'intelligence.screenDebug.lastApp': 'आखिरी ऐप',
-  'intelligence.screenDebug.mode': 'मोड',
-  'intelligence.screenDebug.permAccessibility': 'Accessibility परमिशन',
-  'intelligence.screenDebug.permInput': 'इनपुट परमिशन',
-  'intelligence.screenDebug.permScreen': 'स्क्रीन रिकॉर्डिंग अनुमति',
-  'intelligence.screenDebug.permissions': 'परमिशन',
-  'intelligence.screenDebug.platformNotSupported': 'प्लेटफॉर्म सपोर्टेड नहीं',
-  'intelligence.screenDebug.recentVisionSummaries': 'हाल के विज़न समरीज़',
-  'intelligence.screenDebug.session': 'सेशन',
-  'intelligence.screenDebug.size': 'साइज़',
-  'intelligence.screenDebug.status': 'स्टेटस',
-  'intelligence.screenDebug.testCapture': 'टेस्ट कैप्चर',
-  'intelligence.screenDebug.time': 'समय',
-  'intelligence.screenDebug.title': 'टाइटल',
-  'intelligence.screenDebug.unknown': 'अज्ञात',
-  'intelligence.screenDebug.visionQueue': 'विज़न क्यू',
-  'intelligence.screenDebug.visionState': 'विज़न स्टेट',
   'intelligence.tasks.activeBoardOne': 'बातचीतों में 1 सक्रिय बोर्ड',
   'intelligence.tasks.activeBoardOther': 'बातचीतों में {count} सक्रिय बोर्ड',
   'intelligence.tasks.empty': 'अभी कोई एजेंट टास्क बोर्ड नहीं',
@@ -4472,7 +4389,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'वॉइस इनपुट एक्टिव',
   'overlay.companion.error': 'त्रुटि',
   'overlay.companion.listening': 'सुन रहा है…',
-  'overlay.companion.pointing': 'इशारा कर रहा है…',
   'overlay.companion.speaking': 'बोल रहा है…',
   'overlay.companion.thinking': 'सोच रहा है…',
   'overlay.orbTitle': 'मूव करने के लिए खींचें · पोज़िशन रीसेट के लिए डबल-क्लिक करें',
@@ -4502,12 +4418,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'मैसेजिंग चैनल विवरण',
   'pages.settings.features.notifications': 'नोटिफिकेशन',
   'pages.settings.features.notificationsDesc': 'नोटिफ़िकेशन विवरण',
-  'pages.settings.features.screenAwareness': 'स्क्रीन अवेयरनेस',
-  'pages.settings.features.screenAwarenessDesc':
-    'समय पर, संदर्भ के अनुरूप मदद देने के लिए अपने एजेंट को अपनी स्क्रीन देखने दें।',
   'pages.settings.features.tools': 'टूल्स',
   'pages.settings.features.toolsDesc': 'टूल्स विवरण',
-  'pages.settings.featuresSection.description': 'स्क्रीन अवेयरनेस, मैसेजिंग और टूल्स।',
   'pages.settings.featuresSection.title': 'फीचर्स',
   'privacy.dataKind.credentials': 'क्रेडेंशियल',
   'privacy.dataKind.derived': 'डिराइव्ड',
@@ -5263,9 +5175,6 @@ const messages: TranslationMap = {
   'settings.localModel.status.working': 'काम हो रहा है...',
   'settings.developerMenu.ai.title': 'AI कॉन्फ़िगरेशन',
   'settings.developerMenu.ai.desc': 'क्लाउड प्रदाता, स्थानीय Ollama मॉडल, और प्रति-वर्कलोड रूटिंग',
-  'settings.developerMenu.screenAwareness.title': 'स्क्रीन अवेयरनेस',
-  'settings.developerMenu.screenAwareness.desc':
-    'स्क्रीन कैप्चर अनुमतियां, मॉनिटरिंग नीति, और सत्र नियंत्रण',
   'settings.developerMenu.messagingChannels.title': 'मैसेजिंग चैनल',
   'settings.developerMenu.messagingChannels.desc':
     'Telegram/Discord प्रमाणीकरण मोड और डिफ़ॉल्ट चैनल रूटिंग कॉन्फ़िगर करें',
@@ -5908,20 +5817,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'प्रतिस्थापन लागू करें',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'एक्सेसिबिलिटी',
-  'settings.screenIntel.permissions.grantHint': 'स्वीकृति संकेत',
-  'settings.screenIntel.permissions.inputMonitoring': 'इनपुट मॉनिटरिंग',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS गोपनीयता लागू करता है',
-  'settings.screenIntel.permissions.openInputMonitoring': 'रिक्वेस्ट हो रही है…',
-  'settings.screenIntel.permissions.refreshStatus': 'रिफ्रेश हो रहा है…',
-  'settings.screenIntel.permissions.refreshing': 'रिफ्रेश हो रहा है…',
-  'settings.screenIntel.permissions.requestAccessibility': 'रिक्वेस्ट हो रही है…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'रिक्वेस्ट हो रही है…',
-  'settings.screenIntel.permissions.requesting': 'रिक्वेस्ट हो रही है…',
-  'settings.screenIntel.permissions.restartRefresh': 'कोर रीस्टार्ट हो रहा है…',
-  'settings.screenIntel.permissions.restartingCore': 'कोर रीस्टार्ट हो रहा है…',
-  'settings.screenIntel.permissions.screenRecording': 'स्क्रीन रिकॉर्डिंग',
-  'settings.screenIntel.permissions.title': 'परमिशन',
   'skills.card.moreActions': 'और एक्शन',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6183,36 +6078,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'टेम्पलेट',
   'skills.resource.tree.empty': 'कोई बंडल्ड रिसोर्स नहीं।',
   'skills.search.placeholder': 'प्लेसहोल्डर',
-  'skills.setup.screenIntel.activeDesc': 'सक्रिय विवरण',
-  'skills.setup.screenIntel.activeTitle': 'Screen Intelligence चालू है',
-  'skills.setup.screenIntel.advancedSettings': 'एडवांस्ड सेटिंग्स',
-  'skills.setup.screenIntel.allGranted': 'सभी परमिशन मिल गईं',
-  'skills.setup.screenIntel.captureMode': 'कैप्चर मोड',
-  'skills.setup.screenIntel.captureModeValue': 'सभी विंडो (बाद में बदल सकते हैं)',
-  'skills.setup.screenIntel.deniedHint':
-    'System Settings में परमिशन देने के बाद, बदलाव लागू करने के लिए नीचे क्लिक करके रीस्टार्ट करें।',
-  'skills.setup.screenIntel.enableBtn': 'चालू हो रहा है...',
-  'skills.setup.screenIntel.enableDesc': 'आपकी स्क्रीन पर और एजेंट को उपयोगी कॉन्टेक्स्ट दें',
-  'skills.setup.screenIntel.enableError': 'Screen Intelligence चालू नहीं हो पाई',
-  'skills.setup.screenIntel.enabling': 'चालू हो रहा है...',
-  'skills.setup.screenIntel.grant': 'खुल रहा है...',
-  'skills.setup.screenIntel.granted': 'मिल गई',
-  'skills.setup.screenIntel.macosOnly': 'केवल macOS',
-  'skills.setup.screenIntel.opening': 'खुल रहा है...',
-  'skills.setup.screenIntel.panicHotkey': 'पैनिक हॉटकी',
-  'skills.setup.screenIntel.permAccessibility': 'एक्सेसिबिलिटी',
-  'skills.setup.screenIntel.permInputMonitoring': 'इनपुट मॉनिटरिंग',
-  'skills.setup.screenIntel.permScreenRecording': 'स्क्रीन रिकॉर्डिंग',
-  'skills.setup.screenIntel.permissionsDesc': 'अनुमतियाँ विवरण',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS निम्नलिखित पर गोपनीयता लागू करता है:',
-  'skills.setup.screenIntel.refreshStatus': 'स्टेटस रिफ्रेश करें',
-  'skills.setup.screenIntel.restartRefresh': 'रीस्टार्ट हो रहा है...',
-  'skills.setup.screenIntel.restarting': 'रीस्टार्ट हो रहा है...',
-  'skills.setup.screenIntel.stepEnable': 'स्किल चालू करें',
-  'skills.setup.screenIntel.stepPermissions': 'परमिशन दें',
-  'skills.setup.screenIntel.stepSuccess': 'तैयार है',
-  'skills.setup.screenIntel.title': 'स्क्रीन इंटेलिजेंस',
-  'skills.setup.screenIntel.visionModel': 'विज़न मॉडल',
   'skills.setup.voice.activation': 'एक्टिवेशन',
   'skills.setup.voice.activeDescPrefix': 'एफ.एन',
   'skills.setup.voice.activeDescSuffix': 'एफ.एन',
@@ -6372,8 +6237,6 @@ const messages: TranslationMap = {
     'सेटअप निर्देशों के लिए, फिर आपका रनटाइम पहुँच योग्य होने के बाद पुनः प्रयास करें।',
   'devOptions.menuAi': 'एआई कॉन्फ़िगरेशन',
   'devOptions.menuAiDesc': 'क्लाउड प्रदाता, स्थानीय Ollama मॉडल, और प्रति-वर्कलोड रूटिंग',
-  'devOptions.menuScreenAware': 'स्क्रीन जागरूकता',
-  'devOptions.menuScreenAwareDesc': 'स्क्रीन कैप्चर अनुमतियाँ, निगरानी नीति और सत्र नियंत्रण',
   'devOptions.menuMessaging': 'मैसेजिंग चैनल',
   'devOptions.menuMessagingDesc':
     'Telegram/Discord प्रमाणीकरण मोड और डिफ़ॉल्ट चैनल रूटिंग कॉन्फ़िगर करें',
diff --git a/app/src/lib/i18n/id.ts b/app/src/lib/i18n/id.ts
index 8ca438427..ec76f5252 100644
--- a/app/src/lib/i18n/id.ts
+++ b/app/src/lib/i18n/id.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Mode pendamping selalu aktif dengan pintasan baki sistem',
   'pages.settings.features.desktopCompanion': 'Pendamping Desktop',
-  'pages.settings.features.desktopCompanionDesc':
-    'Asisten suara dengan kesadaran layar: mendengar, melihat, berbicara, menunjuk',
   'settings.companion.title': 'Pendamping Desktop',
   'settings.companion.session': 'Sesi',
   'settings.companion.activeLabel': 'Aktif',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Tombol Pintas',
   'settings.companion.activationMode': 'Mode Aktivasi',
   'settings.companion.sessionTtl': 'TTL Sesi',
-  'settings.companion.screenCapture': 'Tangkapan Layar',
-  'settings.companion.appContext': 'Konteks Aplikasi',
   // Share cards (#5006).
   'share.button': 'Bagikan',
   'share.modalTitle': 'Bagikan momen ini',
@@ -116,8 +112,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'Pilih model embedding yang digunakan untuk pencarian memori.',
   'connections.header.search': 'Konfigurasikan pencarian web untuk agen Anda.',
   'connections.header.wallet': 'Saldo dompet lokal Anda dan frasa pemulihan Anda.',
-  'connections.header.screen':
-    'Biarkan agen Anda melihat layar Anda untuk memberikan bantuan tepat waktu dan sesuai konteks.',
   'connections.header.composioKey':
     'Tambahkan kunci API Composio untuk membuka ratusan integrasi aplikasi.',
   'connections.llm.apiKeys': 'Kunci API & perutean',
@@ -767,8 +761,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Bawah sadar',
   'settings.assistant.backgroundActivityDesc':
     'Kontrol seberapa aktif asisten Anda bekerja di latar belakang',
-  'settings.assistant.screenAwareness': 'Kesadaran layar',
-  'settings.assistant.screenAwarenessDesc': 'Biarkan asisten melihat jendela aktif Anda',
   'settings.assistant.permissions': 'Izin',
   'settings.assistant.permissionsDesc':
     'Pilih apa yang dapat dilakukan asisten dan di mana ia dapat bekerja',
@@ -851,7 +843,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferensi',
   'settings.notifications.tabs.routing': 'Perutean',
   'settings.features': 'Fitur',
-  'settings.featuresDesc': 'Kesadaran layar, pesan, dan alat',
   'settings.aiModels': 'AI & Model',
   'settings.aiModelsDesc': 'Pengaturan model AI lokal, unduhan, dan penyedia LLM',
   'settings.ai': 'AI',
@@ -944,8 +935,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': 'Jeda semua notifikasi selama periode tertentu',
   'settings.notifications.channelControls': 'Kontrol Per Kanal',
   'settings.notifications.channelControlsDesc': 'Atur preferensi notifikasi untuk setiap kanal',
-  'settings.features.screenAwareness': 'Kesadaran Layar',
-  'settings.features.screenAwarenessDesc': 'Izinkan asisten melihat jendela aktif Anda',
   'settings.features.messaging': 'Pesan',
   'settings.features.messagingDesc': 'Pengaturan kanal dan integrasi pesan',
   'settings.features.tools': 'Alat',
@@ -2219,21 +2208,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Simpan Perubahan',
   'settings.tools.preferencesSaved': 'Preferensi tersimpan',
   'settings.tools.saveFailed': 'Gagal menyimpan preferensi. Coba lagi.',
-  'settings.screenAwareness.mode': 'Mode',
-  'settings.screenAwareness.allExceptBlacklist': 'Semua Kecuali Blacklist',
-  'settings.screenAwareness.whitelistOnly': 'Whitelist Saja',
-  'settings.screenAwareness.screenMonitoring': 'Pemantauan Layar',
-  'settings.screenAwareness.saveSettings': 'Simpan Pengaturan',
-  'settings.screenAwareness.session': 'Sesi',
-  'settings.screenAwareness.status': 'Status',
-  'settings.screenAwareness.active': 'Aktif',
-  'settings.screenAwareness.stopped': 'Berhenti',
-  'settings.screenAwareness.remaining': 'Tersisa',
-  'settings.screenAwareness.startSession': 'Mulai Sesi',
-  'settings.screenAwareness.stopSession': 'Hentikan Sesi',
-  'settings.screenAwareness.analyzeNow': 'Analisis Sekarang',
-  'settings.screenAwareness.macosOnly':
-    'Tangkapan layar desktop dan kontrol izin Screen Awareness saat ini hanya didukung di macOS.',
   'connections.comingSoon': 'Segera hadir',
   'connections.setUp': 'Atur',
   'connections.configured': 'Dikonfigurasi',
@@ -2591,36 +2565,6 @@ const messages: TranslationMap = {
     'Sakelar utama. Nonaktif secara default; Ollama tetap idle. Saat aktif, peringkas tree, kecerdasan layar, dan autocomplete selalu memakai model lokal.',
   'localModel.advancedSettings': 'Pengaturan lanjutan',
   'localModel.debugTitle': 'Debug Model Lokal',
-  'screenAwareness.debugTitle': 'Debug Kesadaran Layar',
-  'screenAwareness.debug.debugAndDiagnostics': 'Debug & Diagnostik',
-  'screenAwareness.debug.collapse': 'Ciutkan',
-  'screenAwareness.debug.expand': 'Perluas',
-  'screenAwareness.debug.failedToSave': 'Gagal menyimpan kecerdasan layar',
-  'screenAwareness.debug.policyTitle': 'Kebijakan Intelijen Layar',
-  'screenAwareness.debug.baselineFps': 'FPS Dasar',
-  'screenAwareness.debug.useVisionModel': 'Gunakan Model Visi',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Kirim tangkapan layar ke LLM vision untuk konteks yang lebih kaya. Jika dinonaktifkan, hanya teks OCR yang digunakan dengan LLM teks: lebih cepat dan tidak memerlukan model vision.',
-  'screenAwareness.debug.keepScreenshots': 'Simpan Tangkapan Layar',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Simpan tangkapan layar yang diambil ke workspace alih-alih menghapusnya setelah diproses',
-  'screenAwareness.debug.allowlist': 'Daftar yang diizinkan (satu aturan per baris)',
-  'screenAwareness.debug.denylist': 'Daftar Tolak (satu aturan per baris)',
-  'screenAwareness.debug.saveSettings': 'Simpan Pengaturan Kecerdasan Layar',
-  'screenAwareness.debug.sessionStats': 'Statistik Sesi',
-  'screenAwareness.debug.framesEphemeral': 'Bingkai (sementara)',
-  'screenAwareness.debug.panicStop': 'Berhenti panik',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Vision',
-  'screenAwareness.debug.idle': 'idle',
-  'screenAwareness.debug.visionQueue': 'Antrean vision',
-  'screenAwareness.debug.lastVision': 'Vision terakhir',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Ringkasan Vision',
-  'screenAwareness.debug.refreshing': 'Menyegarkan…',
-  'screenAwareness.debug.noSummaries': 'Belum ada ringkasan.',
-  'screenAwareness.debug.unknownApp': 'Aplikasi Tidak Dikenal',
-  'screenAwareness.debug.macosOnly': 'Screen Intelligence V1 saat ini hanya didukung di macOS.',
   'memory.debugTitle': 'Debug Memori',
   'memory.documents': 'Dokumen',
   'memory.filterByNamespace': 'Filter berdasarkan namespace...',
@@ -3878,33 +3822,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Diagram arsitektur OpenHuman terbaru yang dihasilkan',
   'intelligence.diagram.refreshesEvery': 'Diperbarui setiap {seconds}d',
   'intelligence.memoryText.entityTypePrefix': 'Tipe entitas',
-  'intelligence.screenDebug.active': 'Aktif',
-  'intelligence.screenDebug.app': 'Aplikasi',
-  'intelligence.screenDebug.bounds': 'Batas',
-  'intelligence.screenDebug.captureAlt': 'Hasil tes tangkapan',
-  'intelligence.screenDebug.captureFailed': 'Gagal',
-  'intelligence.screenDebug.captureSuccess': 'Berhasil',
-  'intelligence.screenDebug.captureTest': 'Tes tangkapan',
-  'intelligence.screenDebug.capturing': 'Menangkap',
-  'intelligence.screenDebug.frames': 'Frame',
-  'intelligence.screenDebug.idle': 'Siaga',
-  'intelligence.screenDebug.lastApp': 'Aplikasi Terakhir',
-  'intelligence.screenDebug.mode': 'Mode',
-  'intelligence.screenDebug.permAccessibility': 'Izin aksesibilitas',
-  'intelligence.screenDebug.permInput': 'Izin input',
-  'intelligence.screenDebug.permScreen': 'Aksesibilitas',
-  'intelligence.screenDebug.permissions': 'Izin',
-  'intelligence.screenDebug.platformNotSupported': 'Platform tidak didukung',
-  'intelligence.screenDebug.recentVisionSummaries': 'Ringkasan visi terbaru',
-  'intelligence.screenDebug.session': 'Sesi',
-  'intelligence.screenDebug.size': 'Ukuran',
-  'intelligence.screenDebug.status': 'Status',
-  'intelligence.screenDebug.testCapture': 'Tes tangkapan',
-  'intelligence.screenDebug.time': 'Waktu',
-  'intelligence.screenDebug.title': 'Judul',
-  'intelligence.screenDebug.unknown': 'Tidak diketahui',
-  'intelligence.screenDebug.visionQueue': 'Antrean Visi',
-  'intelligence.screenDebug.visionState': 'Status Visi',
   'intelligence.tasks.activeBoardOne': '1 board aktif di seluruh percakapan',
   'intelligence.tasks.activeBoardOther': '{count} board aktif di seluruh percakapan',
   'intelligence.tasks.empty': 'Belum ada papan tugas agen',
@@ -4489,7 +4406,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Input suara aktif',
   'overlay.companion.error': 'Kesalahan',
   'overlay.companion.listening': 'Mendengarkan…',
-  'overlay.companion.pointing': 'Menunjuk…',
   'overlay.companion.speaking': 'Berbicara…',
   'overlay.companion.thinking': 'Berpikir…',
   'overlay.orbTitle': 'Seret untuk memindahkan · Klik dua kali untuk mereset posisi',
@@ -4521,12 +4437,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Deskripsi kanal pesan',
   'pages.settings.features.notifications': 'Notifikasi',
   'pages.settings.features.notificationsDesc': 'Deskripsi notifikasi',
-  'pages.settings.features.screenAwareness': 'Kesadaran layar',
-  'pages.settings.features.screenAwarenessDesc':
-    'Biarkan agen Anda melihat layar Anda untuk memberikan bantuan tepat waktu dan sesuai konteks.',
   'pages.settings.features.tools': 'Alat',
   'pages.settings.features.toolsDesc': 'Deskripsi alat',
-  'pages.settings.featuresSection.description': 'Kesadaran layar, pesan, dan alat.',
   'pages.settings.featuresSection.title': 'Fitur',
   'privacy.dataKind.credentials': 'Kredensial',
   'privacy.dataKind.derived': 'Turunan',
@@ -5287,9 +5199,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Konfigurasi AI',
   'settings.developerMenu.ai.desc':
     'Penyedia cloud, model Ollama lokal, dan routing per beban kerja',
-  'settings.developerMenu.screenAwareness.title': 'Kesadaran Layar',
-  'settings.developerMenu.screenAwareness.desc':
-    'Izin tangkapan layar, kebijakan pemantauan, dan kontrol sesi',
   'settings.developerMenu.messagingChannels.title': 'Kanal Pesan',
   'settings.developerMenu.messagingChannels.desc':
     'Atur mode autentikasi Telegram/Discord dan routing kanal default',
@@ -5937,20 +5846,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Terapkan Penggantian',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Aksesibilitas',
-  'settings.screenIntel.permissions.grantHint': 'Petunjuk izin',
-  'settings.screenIntel.permissions.inputMonitoring': 'Pemantauan Input',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS menerapkan privasi',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Meminta...',
-  'settings.screenIntel.permissions.refreshStatus': 'Menyegarkan...',
-  'settings.screenIntel.permissions.refreshing': 'Menyegarkan...',
-  'settings.screenIntel.permissions.requestAccessibility': 'Meminta...',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Meminta...',
-  'settings.screenIntel.permissions.requesting': 'Meminta...',
-  'settings.screenIntel.permissions.restartRefresh': 'Memulai ulang core...',
-  'settings.screenIntel.permissions.restartingCore': 'Memulai ulang core...',
-  'settings.screenIntel.permissions.screenRecording': 'Perekaman Layar',
-  'settings.screenIntel.permissions.title': 'Izin',
   'skills.card.moreActions': 'Tindakan lainnya',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6212,37 +6107,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Templat',
   'skills.resource.tree.empty': 'Tidak ada sumber daya bundel.',
   'skills.search.placeholder': 'Teks placeholder',
-  'skills.setup.screenIntel.activeDesc': 'Deskripsi aktif',
-  'skills.setup.screenIntel.activeTitle': 'Kecerdasan Layar Diaktifkan',
-  'skills.setup.screenIntel.advancedSettings': 'Pengaturan lanjutan',
-  'skills.setup.screenIntel.allGranted': 'Semua izin diberikan',
-  'skills.setup.screenIntel.captureMode': 'Mode tangkap',
-  'skills.setup.screenIntel.captureModeValue': 'Semua jendela (dapat dikonfigurasi nanti)',
-  'skills.setup.screenIntel.deniedHint':
-    'Setelah memberikan izin di Pengaturan Sistem, klik di bawah untuk memulai ulang dan mengambil perubahan.',
-  'skills.setup.screenIntel.enableBtn': 'Mengaktifkan...',
-  'skills.setup.screenIntel.enableDesc':
-    's di layar Anda dan memberikan konteks berguna ke agen Anda',
-  'skills.setup.screenIntel.enableError': 'Gagal mengaktifkan Kecerdasan Layar',
-  'skills.setup.screenIntel.enabling': 'Mengaktifkan...',
-  'skills.setup.screenIntel.grant': 'Membuka...',
-  'skills.setup.screenIntel.granted': 'Diberikan',
-  'skills.setup.screenIntel.macosOnly': 'Hanya macOS',
-  'skills.setup.screenIntel.opening': 'Membuka...',
-  'skills.setup.screenIntel.panicHotkey': 'Hotkey panik',
-  'skills.setup.screenIntel.permAccessibility': 'Aksesibilitas',
-  'skills.setup.screenIntel.permInputMonitoring': 'Pemantauan Input',
-  'skills.setup.screenIntel.permScreenRecording': 'Perekaman Layar',
-  'skills.setup.screenIntel.permissionsDesc': 'Deskripsi izin',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS menerapkan privasi ke:',
-  'skills.setup.screenIntel.refreshStatus': 'Segarkan status',
-  'skills.setup.screenIntel.restartRefresh': 'Memulai ulang...',
-  'skills.setup.screenIntel.restarting': 'Memulai ulang...',
-  'skills.setup.screenIntel.stepEnable': 'Aktifkan skill',
-  'skills.setup.screenIntel.stepPermissions': 'Berikan izin',
-  'skills.setup.screenIntel.stepSuccess': 'Siap digunakan',
-  'skills.setup.screenIntel.title': 'Kecerdasan Layar',
-  'skills.setup.screenIntel.visionModel': 'Model visi',
   'skills.setup.voice.activation': 'Aktivasi',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6403,8 +6267,6 @@ const messages: TranslationMap = {
     'untuk instruksi pengaturan, lalu coba lagi setelah runtime Anda dapat dijangkau.',
   'devOptions.menuAi': 'Konfigurasi AI',
   'devOptions.menuAiDesc': 'Penyedia cloud, model Ollama lokal, dan routing per beban kerja',
-  'devOptions.menuScreenAware': 'Kesadaran Layar',
-  'devOptions.menuScreenAwareDesc': 'Izin tangkapan layar, kebijakan pemantauan, dan kontrol sesi',
   'devOptions.menuMessaging': 'Channel Pesan',
   'devOptions.menuMessagingDesc':
     'Konfigurasikan mode autentikasi Telegram/Discord dan routing channel bawaan',
diff --git a/app/src/lib/i18n/it.ts b/app/src/lib/i18n/it.ts
index 79161cede..b2a8b7734 100644
--- a/app/src/lib/i18n/it.ts
+++ b/app/src/lib/i18n/it.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Modalità compagno sempre attiva con scorciatoia nella barra di sistema',
   'pages.settings.features.desktopCompanion': 'Companion Desktop',
-  'pages.settings.features.desktopCompanionDesc':
-    'Assistente vocale con consapevolezza dello schermo: ascolta, vede, parla, indica',
   'settings.companion.title': 'Compagno da scrivania',
   'settings.companion.session': 'Sessione',
   'settings.companion.activeLabel': 'Attivo',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Tasto di scelta rapida',
   'settings.companion.activationMode': 'Modalità di attivazione',
   'settings.companion.sessionTtl': 'Sessione TTL',
-  'settings.companion.screenCapture': 'Acquisizione schermata',
-  'settings.companion.appContext': 'Contesto app',
   // Share cards (#5006).
   'share.button': 'Condividi',
   'share.modalTitle': 'Condividi questo momento',
@@ -117,8 +113,6 @@ const messages: TranslationMap = {
     'Scegli il modello di embedding usato per la ricerca nella memoria.',
   'connections.header.search': 'Configura la ricerca web per il tuo agente.',
   'connections.header.wallet': 'Il saldo del tuo wallet locale e la tua frase di recupero.',
-  'connections.header.screen':
-    'Lascia che il tuo agente veda il tuo schermo per offrire un aiuto tempestivo e contestuale.',
   'connections.header.composioKey':
     'Aggiungi una chiave API Composio per sbloccare centinaia di integrazioni di app.',
   'connections.llm.apiKeys': 'Chiavi API e instradamento',
@@ -778,8 +772,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Subconscio',
   'settings.assistant.backgroundActivityDesc':
     'Controlla quanto attivamente il tuo assistente lavora in background',
-  'settings.assistant.screenAwareness': 'Consapevolezza dello schermo',
-  'settings.assistant.screenAwarenessDesc': "Consenti all'assistente di vedere la finestra attiva",
   'settings.assistant.permissions': 'Autorizzazioni',
   'settings.assistant.permissionsDesc': "Scegli cosa può fare l'assistente e dove può lavorare",
   'settings.privacySecurity.privacy': 'Privacy',
@@ -862,7 +854,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferenze',
   'settings.notifications.tabs.routing': 'Instradamento',
   'settings.features': 'Funzionalità',
-  'settings.featuresDesc': 'Consapevolezza schermo, messaggistica e strumenti',
   'settings.aiModels': 'AI e modelli',
   'settings.aiModelsDesc': 'Configurazione modello AI locale, download e provider LLM',
   'settings.ai': 'Configurazione AI',
@@ -959,8 +950,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Controlli per canale',
   'settings.notifications.channelControlsDesc':
     'Configura le preferenze di notifica per ogni canale',
-  'settings.features.screenAwareness': 'Consapevolezza schermo',
-  'settings.features.screenAwarenessDesc': "Consenti all'assistente di vedere la finestra attiva",
   'settings.features.messaging': 'Messaggistica',
   'settings.features.messagingDesc': 'Impostazioni canale e integrazione messaggistica',
   'settings.features.tools': 'Strumenti',
@@ -2250,21 +2239,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Salva modifiche',
   'settings.tools.preferencesSaved': 'Preferenze salvate',
   'settings.tools.saveFailed': 'Salvataggio preferenze fallito. Riprova.',
-  'settings.screenAwareness.mode': 'Modalità',
-  'settings.screenAwareness.allExceptBlacklist': 'Tutti tranne blacklist',
-  'settings.screenAwareness.whitelistOnly': 'Solo whitelist',
-  'settings.screenAwareness.screenMonitoring': 'Monitoraggio schermo',
-  'settings.screenAwareness.saveSettings': 'Salva impostazioni',
-  'settings.screenAwareness.session': 'Sessione',
-  'settings.screenAwareness.status': 'Stato',
-  'settings.screenAwareness.active': 'Attivo',
-  'settings.screenAwareness.stopped': 'Fermato',
-  'settings.screenAwareness.remaining': 'Rimanente',
-  'settings.screenAwareness.startSession': 'Avvia sessione',
-  'settings.screenAwareness.stopSession': 'Ferma sessione',
-  'settings.screenAwareness.analyzeNow': 'Analizza ora',
-  'settings.screenAwareness.macosOnly':
-    'La cattura desktop di Consapevolezza schermo e i controlli dei permessi sono attualmente supportati solo su macOS.',
   'connections.comingSoon': 'In arrivo',
   'connections.setUp': 'Configura',
   'connections.configured': 'Configurato',
@@ -2625,40 +2599,9 @@ const messages: TranslationMap = {
     'Scegli quali sottosistemi girano sul modello locale. Quelli disattivati usano il cloud.',
   'localModel.enableRuntime': 'Abilita runtime AI locale',
   'localModel.enableRuntimeDesc':
-    "Interruttore principale. Disattivato di default: Ollama resta inattivo. Quando attivo, il tree summarizer, lo screen intelligence e l'autocompletamento usano sempre il modello locale.",
+    "Interruttore principale. Disattivato di default: Ollama resta inattivo. Quando attivo, il tree summarizer e l'autocompletamento usano sempre il modello locale.",
   'localModel.advancedSettings': 'Impostazioni avanzate',
   'localModel.debugTitle': 'Debug modello locale',
-  'screenAwareness.debugTitle': 'Debug consapevolezza schermo',
-  'screenAwareness.debug.debugAndDiagnostics': 'Debug e diagnostica',
-  'screenAwareness.debug.collapse': 'Comprimi',
-  'screenAwareness.debug.expand': 'Espandi',
-  'screenAwareness.debug.failedToSave': 'Impossibile salvare i dati di Screen Intelligence',
-  'screenAwareness.debug.policyTitle': 'Policy di Screen Intelligence',
-  'screenAwareness.debug.baselineFps': 'FPS di base',
-  'screenAwareness.debug.useVisionModel': 'Utilizza modello di visione',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Invia gli screenshot a un LLM con visione per un contesto più ricco. Se disattivato, viene utilizzato solo il testo OCR con un LLM testuale: più veloce e senza modello visivo.',
-  'screenAwareness.debug.keepScreenshots': 'Conserva screenshot',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    "Salva gli screenshot acquisiti nell'area di lavoro invece di eliminarli dopo l'elaborazione",
-  'screenAwareness.debug.allowlist': 'Lista consentita (una regola per riga)',
-  'screenAwareness.debug.denylist': 'Lista vietata (una regola per riga)',
-  'screenAwareness.debug.saveSettings': 'Salva impostazioni di Screen Intelligence',
-  'screenAwareness.debug.sessionStats': 'Statistiche sessione',
-  'screenAwareness.debug.framesEphemeral': 'Frame (effimeri)',
-  'screenAwareness.debug.panicStop': 'Arresto antipanico',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Maiusc+.',
-  'screenAwareness.debug.vision': 'Visione',
-  'screenAwareness.debug.idle': 'inattiva',
-  'screenAwareness.debug.visionQueue': 'Coda visioni',
-  'screenAwareness.debug.lastVision': 'Ultima visione',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Riepiloghi visione',
-  'screenAwareness.debug.refreshing': 'Aggiornamento in corso…',
-  'screenAwareness.debug.noSummaries': 'Ancora nessun riepilogo.',
-  'screenAwareness.debug.unknownApp': 'App sconosciuta',
-  'screenAwareness.debug.macosOnly':
-    'Screen Intelligence V1 è attualmente supportato solo su macOS.',
   'memory.debugTitle': 'Debug memoria',
   'memory.documents': 'Documenti',
   'memory.filterByNamespace': 'Filtra per spazio dei nomi...',
@@ -3928,33 +3871,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': "Ultimo diagramma dell'architettura OpenHuman generato",
   'intelligence.diagram.refreshesEvery': 'Si aggiorna ogni {seconds}s',
   'intelligence.memoryText.entityTypePrefix': 'Tipo di entità',
-  'intelligence.screenDebug.active': 'Attivo',
-  'intelligence.screenDebug.app': 'App',
-  'intelligence.screenDebug.bounds': 'Limiti',
-  'intelligence.screenDebug.captureAlt': 'Risultato test di cattura',
-  'intelligence.screenDebug.captureFailed': 'Fallito',
-  'intelligence.screenDebug.captureSuccess': 'Successo',
-  'intelligence.screenDebug.captureTest': 'Test di cattura',
-  'intelligence.screenDebug.capturing': 'Cattura in corso',
-  'intelligence.screenDebug.frames': 'Frame',
-  'intelligence.screenDebug.idle': 'Inattivo',
-  'intelligence.screenDebug.lastApp': 'Ultima app',
-  'intelligence.screenDebug.mode': 'Modalità',
-  'intelligence.screenDebug.permAccessibility': 'Permesso accessibilità',
-  'intelligence.screenDebug.permInput': 'Permesso input',
-  'intelligence.screenDebug.permScreen': 'Accessibilità',
-  'intelligence.screenDebug.permissions': 'Permessi',
-  'intelligence.screenDebug.platformNotSupported': 'Piattaforma non supportata',
-  'intelligence.screenDebug.recentVisionSummaries': 'Riassunti vision recenti',
-  'intelligence.screenDebug.session': 'Sessione',
-  'intelligence.screenDebug.size': 'Dimensione',
-  'intelligence.screenDebug.status': 'Stato',
-  'intelligence.screenDebug.testCapture': 'Test cattura',
-  'intelligence.screenDebug.time': 'Ora',
-  'intelligence.screenDebug.title': 'Titolo',
-  'intelligence.screenDebug.unknown': 'Sconosciuto',
-  'intelligence.screenDebug.visionQueue': 'Coda vision',
-  'intelligence.screenDebug.visionState': 'Stato vision',
   'intelligence.tasks.activeBoardOne': '1 board attiva tra le conversazioni',
   'intelligence.tasks.activeBoardOther': '{count} board attive tra le conversazioni',
   'intelligence.tasks.empty': "Nessuna board di attività dell'agente",
@@ -4547,7 +4463,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Input vocale attivo',
   'overlay.companion.error': 'Errore',
   'overlay.companion.listening': 'In ascolto…',
-  'overlay.companion.pointing': 'Sta puntando…',
   'overlay.companion.speaking': 'Sta parlando…',
   'overlay.companion.thinking': 'Sta pensando…',
   'overlay.orbTitle': 'Trascina per spostare · Doppio clic per ripristinare la posizione',
@@ -4579,13 +4494,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Descrizione canali di messaggistica',
   'pages.settings.features.notifications': 'Notifiche',
   'pages.settings.features.notificationsDesc': 'Descrizione notifiche',
-  'pages.settings.features.screenAwareness': 'Consapevolezza schermo',
-  'pages.settings.features.screenAwarenessDesc':
-    'Lascia che il tuo agente veda il tuo schermo per offrire un aiuto tempestivo e contestuale.',
   'pages.settings.features.tools': 'Strumenti',
   'pages.settings.features.toolsDesc': 'Descrizione strumenti',
-  'pages.settings.featuresSection.description':
-    'Consapevolezza schermo, messaggistica e strumenti.',
   'pages.settings.featuresSection.title': 'Funzionalità',
   'privacy.dataKind.credentials': 'Credenziali',
   'privacy.dataKind.derived': 'Derivati',
@@ -5348,9 +5258,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Configurazione IA',
   'settings.developerMenu.ai.desc':
     'Provider cloud, modelli Ollama locali e routing per carico di lavoro',
-  'settings.developerMenu.screenAwareness.title': 'Consapevolezza schermo',
-  'settings.developerMenu.screenAwareness.desc':
-    'Permessi di cattura schermo, criteri di monitoraggio e controlli di sessione',
   'settings.developerMenu.messagingChannels.title': 'Canali di messaggistica',
   'settings.developerMenu.messagingChannels.desc':
     'Configura le modalità di autenticazione Telegram/Discord e il routing predefinito del canale',
@@ -6012,20 +5919,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Applica sostituzione',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Accessibilità',
-  'settings.screenIntel.permissions.grantHint': 'Suggerimento concessione',
-  'settings.screenIntel.permissions.inputMonitoring': 'Monitoraggio input',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS applica privacy',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Richiesta…',
-  'settings.screenIntel.permissions.refreshStatus': 'Aggiornamento…',
-  'settings.screenIntel.permissions.refreshing': 'Aggiornamento…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Richiesta…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Richiesta…',
-  'settings.screenIntel.permissions.requesting': 'Richiesta…',
-  'settings.screenIntel.permissions.restartRefresh': 'Riavvio core…',
-  'settings.screenIntel.permissions.restartingCore': 'Riavvio core…',
-  'settings.screenIntel.permissions.screenRecording': 'Registrazione schermo',
-  'settings.screenIntel.permissions.title': 'Permessi',
   'skills.card.moreActions': 'Altre azioni',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6288,37 +6181,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Modelli',
   'skills.resource.tree.empty': 'Nessuna risorsa inclusa.',
   'skills.search.placeholder': 'Segnaposto',
-  'skills.setup.screenIntel.activeDesc': 'Descrizione attivo',
-  'skills.setup.screenIntel.activeTitle': 'Screen Intelligence abilitato',
-  'skills.setup.screenIntel.advancedSettings': 'Impostazioni avanzate',
-  'skills.setup.screenIntel.allGranted': 'Tutti i permessi concessi',
-  'skills.setup.screenIntel.captureMode': 'Modalità di cattura',
-  'skills.setup.screenIntel.captureModeValue': 'Tutte le finestre (configurabile in seguito)',
-  'skills.setup.screenIntel.deniedHint':
-    'Dopo aver concesso i permessi in Impostazioni di sistema, clicca sotto per riavviare e raccogliere le modifiche.',
-  'skills.setup.screenIntel.enableBtn': 'Abilitazione...',
-  'skills.setup.screenIntel.enableDesc':
-    's sul tuo schermo e fornisce contesto utile al tuo agente',
-  'skills.setup.screenIntel.enableError': 'Abilitazione Screen Intelligence fallita',
-  'skills.setup.screenIntel.enabling': 'Abilitazione...',
-  'skills.setup.screenIntel.grant': 'Apertura...',
-  'skills.setup.screenIntel.granted': 'Concesso',
-  'skills.setup.screenIntel.macosOnly': 'Solo macOS',
-  'skills.setup.screenIntel.opening': 'Apertura...',
-  'skills.setup.screenIntel.panicHotkey': 'Hotkey panico',
-  'skills.setup.screenIntel.permAccessibility': 'Accessibilità',
-  'skills.setup.screenIntel.permInputMonitoring': 'Monitoraggio input',
-  'skills.setup.screenIntel.permScreenRecording': 'Registrazione schermo',
-  'skills.setup.screenIntel.permissionsDesc': 'Descrizione permessi',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS applica la privacy a:',
-  'skills.setup.screenIntel.refreshStatus': 'Aggiorna stato',
-  'skills.setup.screenIntel.restartRefresh': 'Riavvio...',
-  'skills.setup.screenIntel.restarting': 'Riavvio...',
-  'skills.setup.screenIntel.stepEnable': 'Abilita la skill',
-  'skills.setup.screenIntel.stepPermissions': 'Concedi permessi',
-  'skills.setup.screenIntel.stepSuccess': 'Pronto',
-  'skills.setup.screenIntel.title': 'Intelligenza dello schermo',
-  'skills.setup.screenIntel.visionModel': 'Modello vision',
   'skills.setup.voice.activation': 'Attivazione',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6478,9 +6340,6 @@ const messages: TranslationMap = {
     'per le istruzioni di configurazione, poi riprova quando il runtime è raggiungibile.',
   'devOptions.menuAi': 'Configurazione AI',
   'devOptions.menuAiDesc': 'Provider cloud, modelli Ollama locali e routing per carico di lavoro',
-  'devOptions.menuScreenAware': 'Riconoscimento schermo',
-  'devOptions.menuScreenAwareDesc':
-    "Autorizzazioni per l'acquisizione dello schermo, policy di monitoraggio e controlli della sessione",
   'devOptions.menuMessaging': 'Canali di messaggistica',
   'devOptions.menuMessagingDesc':
     'Configura le modalità di autenticazione Telegram/Discord e il routing del canale predefinito',
diff --git a/app/src/lib/i18n/ko.ts b/app/src/lib/i18n/ko.ts
index 638702741..16c9425ca 100644
--- a/app/src/lib/i18n/ko.ts
+++ b/app/src/lib/i18n/ko.ts
@@ -8,8 +8,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     '시스템 트레이 단축키가 있는 항상 활성화된 동반자 모드',
   'pages.settings.features.desktopCompanion': '데스크탑 동반자',
-  'pages.settings.features.desktopCompanionDesc':
-    '화면 인식 기능이 있는 음성 도우미: 듣고, 보고, 말하고, 가리킵니다.',
   'settings.companion.title': '데스크톱 컴패니언',
   'settings.companion.session': '세션',
   'settings.companion.activeLabel': '활성',
@@ -25,8 +23,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': '단축키',
   'settings.companion.activationMode': '활성화 모드',
   'settings.companion.sessionTtl': '세션 TTL',
-  'settings.companion.screenCapture': '화면 캡처',
-  'settings.companion.appContext': '앱 컨텍스트',
   // Share cards (#5006).
   'share.button': '공유',
   'share.modalTitle': '이 순간을 공유하세요',
@@ -111,8 +107,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': '메모리 검색에 사용할 임베딩 모델을 선택하세요.',
   'connections.header.search': '에이전트를 위한 웹 검색을 구성하세요.',
   'connections.header.wallet': '로컬 지갑 잔액과 복구 문구입니다.',
-  'connections.header.screen':
-    '에이전트가 화면을 볼 수 있게 하여 시의적절하고 맥락에 맞는 도움을 제공하세요.',
   'connections.header.composioKey':
     'Composio API 키를 추가하여 수백 개의 앱 통합을 잠금 해제하세요.',
   'connections.llm.apiKeys': 'API 키 및 라우팅',
@@ -754,8 +748,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': '잠재의식',
   'settings.assistant.backgroundActivityDesc':
     '어시스턴트가 백그라운드에서 얼마나 활발히 작동하는지 제어',
-  'settings.assistant.screenAwareness': '화면 인식',
-  'settings.assistant.screenAwarenessDesc': '어시스턴트가 활성 창을 볼 수 있도록 허용',
   'settings.assistant.permissions': '권한',
   'settings.assistant.permissionsDesc':
     '어시스턴트가 무엇을 할 수 있고 어디서 작업할 수 있는지 선택하세요',
@@ -835,7 +827,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': '기본 설정',
   'settings.notifications.tabs.routing': '라우팅',
   'settings.features': '기능',
-  'settings.featuresDesc': '화면 인식, 메시징 및 도구',
   'settings.aiModels': 'AI 및 모델',
   'settings.aiModelsDesc': '로컬 AI 모델 설정, 다운로드 및 LLM 제공업체',
   'settings.ai': 'AI 구성',
@@ -926,8 +917,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': '정해진 시간 동안 모든 알림을 일시 중지합니다',
   'settings.notifications.channelControls': '채널별 설정',
   'settings.notifications.channelControlsDesc': '각 채널의 알림 기본 설정을 구성합니다',
-  'settings.features.screenAwareness': '화면 인식',
-  'settings.features.screenAwarenessDesc': '어시스턴트가 현재 활성 창을 볼 수 있게 합니다',
   'settings.features.messaging': '메시징',
   'settings.features.messagingDesc': '채널 및 메시징 통합 설정',
   'settings.features.tools': '도구',
@@ -2184,21 +2173,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': '변경 사항 저장',
   'settings.tools.preferencesSaved': '기본 설정이 저장되었습니다',
   'settings.tools.saveFailed': '기본 설정 저장에 실패했습니다. 다시 시도하세요.',
-  'settings.screenAwareness.mode': '모드',
-  'settings.screenAwareness.allExceptBlacklist': '블랙리스트 제외 모두',
-  'settings.screenAwareness.whitelistOnly': '화이트리스트만',
-  'settings.screenAwareness.screenMonitoring': '화면 모니터링',
-  'settings.screenAwareness.saveSettings': '설정 저장',
-  'settings.screenAwareness.session': '세션',
-  'settings.screenAwareness.status': '상태',
-  'settings.screenAwareness.active': '활성',
-  'settings.screenAwareness.stopped': '중지됨',
-  'settings.screenAwareness.remaining': '남은 시간',
-  'settings.screenAwareness.startSession': '세션 시작',
-  'settings.screenAwareness.stopSession': '세션 중지',
-  'settings.screenAwareness.analyzeNow': '지금 분석',
-  'settings.screenAwareness.macosOnly':
-    '화면 인식 데스크톱 캡처 및 권한 제어는 현재 macOS에서만 지원됩니다.',
   'connections.comingSoon': '곧 제공 예정',
   'connections.setUp': '설정',
   'connections.configured': '구성됨',
@@ -2551,36 +2525,6 @@ const messages: TranslationMap = {
     '마스터 스위치입니다. 기본값은 꺼짐이며 Ollama는 유휴 상태로 유지됩니다. 켜면 트리 요약기, 화면 인텔리전스, 자동 완성이 항상 로컬 모델을 사용합니다.',
   'localModel.advancedSettings': '고급 설정',
   'localModel.debugTitle': '로컬 모델 디버그',
-  'screenAwareness.debugTitle': '화면 인식 디버그',
-  'screenAwareness.debug.debugAndDiagnostics': '디버그 및 진단',
-  'screenAwareness.debug.collapse': '축소',
-  'screenAwareness.debug.expand': '확장',
-  'screenAwareness.debug.failedToSave': '화면 인텔리전스 저장 실패',
-  'screenAwareness.debug.policyTitle': '화면 인텔리전스 정책',
-  'screenAwareness.debug.baselineFps': '기준 FPS',
-  'screenAwareness.debug.useVisionModel': '비전 모델 사용',
-  'screenAwareness.debug.useVisionModelDesc':
-    '더 풍부한 컨텍스트를 위해 비전 LLM에 스크린샷을 전송합니다. 꺼져 있으면 텍스트 LLM에서 OCR 텍스트만 사용하므로 더 빠르고 비전 모델이 필요 없습니다.',
-  'screenAwareness.debug.keepScreenshots': '스크린샷 유지',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    '처리 후 삭제하지 않고 캡처한 스크린샷을 워크스페이스에 저장합니다',
-  'screenAwareness.debug.allowlist': '허용 목록(한 줄에 하나의 규칙)',
-  'screenAwareness.debug.denylist': '차단 목록(한 줄에 하나의 규칙)',
-  'screenAwareness.debug.saveSettings': '화면 인텔리전스 설정 저장',
-  'screenAwareness.debug.sessionStats': '세션 통계',
-  'screenAwareness.debug.framesEphemeral': '프레임(임시)',
-  'screenAwareness.debug.panicStop': '패닉 중지',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': '비전',
-  'screenAwareness.debug.idle': '유휴',
-  'screenAwareness.debug.visionQueue': '비전 대기열',
-  'screenAwareness.debug.lastVision': '마지막 비전',
-  'screenAwareness.debug.notAvailable': '해당 없음',
-  'screenAwareness.debug.visionSummaries': '비전 요약',
-  'screenAwareness.debug.refreshing': '새로 고침…',
-  'screenAwareness.debug.noSummaries': '아직 요약이 없습니다.',
-  'screenAwareness.debug.unknownApp': '알 수 없는 앱',
-  'screenAwareness.debug.macosOnly': 'Screen Intelligence V1은 현재 macOS에서만 지원됩니다.',
   'memory.debugTitle': '메모리 디버그',
   'memory.documents': '문서',
   'memory.filterByNamespace': '네임스페이스로 필터링...',
@@ -3827,33 +3771,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': '최신 생성된 OpenHuman 아키텍처 다이어그램',
   'intelligence.diagram.refreshesEvery': '{seconds}초마다 새로 고침',
   'intelligence.memoryText.entityTypePrefix': '엔터티 유형',
-  'intelligence.screenDebug.active': '활성',
-  'intelligence.screenDebug.app': '앱',
-  'intelligence.screenDebug.bounds': '경계',
-  'intelligence.screenDebug.captureAlt': '캡처 테스트 결과',
-  'intelligence.screenDebug.captureFailed': '실패',
-  'intelligence.screenDebug.captureSuccess': '성공',
-  'intelligence.screenDebug.captureTest': '캡처 테스트',
-  'intelligence.screenDebug.capturing': '캡처 중',
-  'intelligence.screenDebug.frames': '프레임',
-  'intelligence.screenDebug.idle': '유휴',
-  'intelligence.screenDebug.lastApp': '마지막 앱',
-  'intelligence.screenDebug.mode': '모드',
-  'intelligence.screenDebug.permAccessibility': '접근성 권한',
-  'intelligence.screenDebug.permInput': '입력 권한',
-  'intelligence.screenDebug.permScreen': '접근성',
-  'intelligence.screenDebug.permissions': '권한',
-  'intelligence.screenDebug.platformNotSupported': '플랫폼이 지원되지 않음',
-  'intelligence.screenDebug.recentVisionSummaries': '최근 비전 요약',
-  'intelligence.screenDebug.session': '세션',
-  'intelligence.screenDebug.size': '크기',
-  'intelligence.screenDebug.status': '상태',
-  'intelligence.screenDebug.testCapture': '테스트 캡처',
-  'intelligence.screenDebug.time': '시간',
-  'intelligence.screenDebug.title': '제목',
-  'intelligence.screenDebug.unknown': '알 수 없음',
-  'intelligence.screenDebug.visionQueue': '비전 대기열',
-  'intelligence.screenDebug.visionState': '비전 상태',
   'intelligence.tasks.activeBoardOne': '대화 전반에 활성 보드 1개',
   'intelligence.tasks.activeBoardOther': '대화 전반에 활성 보드 {count}개',
   'intelligence.tasks.empty': '아직 에이전트 작업 보드가 없습니다',
@@ -4422,7 +4339,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': '음성 입력 활성',
   'overlay.companion.error': '오류',
   'overlay.companion.listening': '듣는 중…',
-  'overlay.companion.pointing': '가리키는 중…',
   'overlay.companion.speaking': '말하는 중…',
   'overlay.companion.thinking': '생각 중...',
   'overlay.orbTitle': '드래그하여 이동 · 두 번 클릭하여 위치 초기화',
@@ -4452,12 +4368,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': '메시징 채널 설명',
   'pages.settings.features.notifications': '알림',
   'pages.settings.features.notificationsDesc': '알림 설명',
-  'pages.settings.features.screenAwareness': '화면 인식',
-  'pages.settings.features.screenAwarenessDesc':
-    '에이전트가 화면을 볼 수 있게 하여 시의적절하고 맥락에 맞는 도움을 제공하세요.',
   'pages.settings.features.tools': '도구',
   'pages.settings.features.toolsDesc': '도구 설명',
-  'pages.settings.featuresSection.description': '화면 인식, 메시징 및 도구.',
   'pages.settings.featuresSection.title': '기능',
   'privacy.dataKind.credentials': '자격 증명',
   'privacy.dataKind.derived': '파생됨',
@@ -5206,8 +5118,6 @@ const messages: TranslationMap = {
   'settings.localModel.status.working': '작업 중...',
   'settings.developerMenu.ai.title': 'AI 구성',
   'settings.developerMenu.ai.desc': '클라우드 공급자, 로컬 Ollama 모델 및 워크로드별 라우팅',
-  'settings.developerMenu.screenAwareness.title': '화면 인식',
-  'settings.developerMenu.screenAwareness.desc': '화면 캡처 권한, 모니터링 정책 및 세션 제어',
   'settings.developerMenu.messagingChannels.title': '메시징 채널',
   'settings.developerMenu.messagingChannels.desc':
     'Telegram/Discord 인증 모드 및 기본 채널 라우팅 구성',
@@ -5840,20 +5750,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': '교체 적용',
   'settings.modelHealth.tag.cheaper': '더 저렴함',
   'settings.modelHealth.tag.better': '더 좋음',
-  'settings.screenIntel.permissions.accessibility': '접근성',
-  'settings.screenIntel.permissions.grantHint': '권한 허용 안내',
-  'settings.screenIntel.permissions.inputMonitoring': '입력 모니터링',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS 개인정보 보호 적용',
-  'settings.screenIntel.permissions.openInputMonitoring': '요청 중…',
-  'settings.screenIntel.permissions.refreshStatus': '새로고침 중…',
-  'settings.screenIntel.permissions.refreshing': '새로고침 중…',
-  'settings.screenIntel.permissions.requestAccessibility': '요청 중…',
-  'settings.screenIntel.permissions.requestScreenRecording': '요청 중…',
-  'settings.screenIntel.permissions.requesting': '요청 중…',
-  'settings.screenIntel.permissions.restartRefresh': '코어 다시 시작 중…',
-  'settings.screenIntel.permissions.restartingCore': '코어 다시 시작 중…',
-  'settings.screenIntel.permissions.screenRecording': '화면 녹화',
-  'settings.screenIntel.permissions.title': '권한',
   'skills.card.moreActions': '추가 작업',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6112,37 +6008,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': '템플릿',
   'skills.resource.tree.empty': '번들 리소스가 없습니다.',
   'skills.search.placeholder': '플레이스홀더',
-  'skills.setup.screenIntel.activeDesc': '활성 설명',
-  'skills.setup.screenIntel.activeTitle': '화면 인텔리전스가 활성화됨',
-  'skills.setup.screenIntel.advancedSettings': '고급 설정',
-  'skills.setup.screenIntel.allGranted': '모든 권한 허용됨',
-  'skills.setup.screenIntel.captureMode': '캡처 모드',
-  'skills.setup.screenIntel.captureModeValue': '모든 창(나중에 구성 가능)',
-  'skills.setup.screenIntel.deniedHint':
-    '시스템 설정에서 권한을 허용한 후 아래를 클릭하여 다시 시작하고 변경 사항을 적용하세요.',
-  'skills.setup.screenIntel.enableBtn': '활성화 중...',
-  'skills.setup.screenIntel.enableDesc':
-    '화면의 내용을 읽고 유용한 컨텍스트를 에이전트에 제공합니다',
-  'skills.setup.screenIntel.enableError': '화면 인텔리전스를 활성화하지 못했습니다',
-  'skills.setup.screenIntel.enabling': '활성화 중...',
-  'skills.setup.screenIntel.grant': '여는 중...',
-  'skills.setup.screenIntel.granted': '허용됨',
-  'skills.setup.screenIntel.macosOnly': 'macOS 전용',
-  'skills.setup.screenIntel.opening': '여는 중...',
-  'skills.setup.screenIntel.panicHotkey': '패닉 핫키',
-  'skills.setup.screenIntel.permAccessibility': '접근성',
-  'skills.setup.screenIntel.permInputMonitoring': '입력 모니터링',
-  'skills.setup.screenIntel.permScreenRecording': '화면 녹화',
-  'skills.setup.screenIntel.permissionsDesc': '권한 설명',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS는 다음에 개인 정보 보호를 적용합니다.',
-  'skills.setup.screenIntel.refreshStatus': '상태 새로고침',
-  'skills.setup.screenIntel.restartRefresh': '다시 시작 중...',
-  'skills.setup.screenIntel.restarting': '다시 시작 중...',
-  'skills.setup.screenIntel.stepEnable': '스킬 활성화',
-  'skills.setup.screenIntel.stepPermissions': '권한 허용',
-  'skills.setup.screenIntel.stepSuccess': '사용 준비 완료',
-  'skills.setup.screenIntel.title': '화면 인텔리전스',
-  'skills.setup.screenIntel.visionModel': '비전 모델',
   'skills.setup.voice.activation': '활성화',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6301,8 +6166,6 @@ const messages: TranslationMap = {
     '설정 지침을 확인한 다음 런타임에 연결할 수 있게 되면 다시 시도하세요.',
   'devOptions.menuAi': 'AI 구성',
   'devOptions.menuAiDesc': '클라우드 공급자, 로컬 Ollama 모델 및 워크로드별 라우팅',
-  'devOptions.menuScreenAware': '화면 인식',
-  'devOptions.menuScreenAwareDesc': '화면 캡처 권한, 모니터링 정책 및 세션 제어',
   'devOptions.menuMessaging': '메시징 채널',
   'devOptions.menuMessagingDesc': 'Telegram/Discord 인증 모드 및 기본 채널 라우팅 구성',
   'devOptions.menuTools': '도구',
diff --git a/app/src/lib/i18n/pl.ts b/app/src/lib/i18n/pl.ts
index 6b4b519bf..b599a2c31 100644
--- a/app/src/lib/i18n/pl.ts
+++ b/app/src/lib/i18n/pl.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Tryb towarzyski zawsze aktywny ze skrótem w zasobniku systemowym',
   'pages.settings.features.desktopCompanion': 'Towarzysz pulpitu',
-  'pages.settings.features.desktopCompanionDesc':
-    'Asystent głosowy ze świadomością ekranu: słucha, widzi, mówi, wskazuje',
   'settings.companion.title': 'Towarzysz komputerowy',
   'settings.companion.session': 'Sesja',
   'settings.companion.activeLabel': 'Aktywna',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Skrót klawiszowy',
   'settings.companion.activationMode': 'Tryb aktywacji',
   'settings.companion.sessionTtl': 'TTL sesji',
-  'settings.companion.screenCapture': 'Przechwytywanie ekranu',
-  'settings.companion.appContext': 'Kontekst aplikacji',
   // Share cards (#5006).
   'share.button': 'Udostępnij',
   'share.modalTitle': 'Udostępnij tę chwilę',
@@ -115,8 +111,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'Wybierz model osadzeń używany do wyszukiwania w pamięci.',
   'connections.header.search': 'Skonfiguruj wyszukiwanie internetowe dla swojego agenta.',
   'connections.header.wallet': 'Saldo Twojego lokalnego portfela i fraza odzyskiwania.',
-  'connections.header.screen':
-    'Pozwól agentowi widzieć Twój ekran, aby oferować pomoc w odpowiednim czasie i kontekście.',
   'connections.header.composioKey':
     'Dodaj klucz API Composio, aby odblokować setki integracji aplikacji.',
   'connections.llm.apiKeys': 'Klucze API i routing',
@@ -773,8 +767,6 @@ const messages: TranslationMap = {
   'settings.assistant.faceMascot': 'Twarz / Maskotka',
   'settings.assistant.backgroundActivity': 'Podświadomość',
   'settings.assistant.backgroundActivityDesc': 'Kontroluj, jak aktywnie asystent pracuje w tle',
-  'settings.assistant.screenAwareness': 'Świadomość ekranu',
-  'settings.assistant.screenAwarenessDesc': 'Pozwól asystentowi widzieć aktywne okno',
   'settings.assistant.permissions': 'Uprawnienia',
   'settings.assistant.permissionsDesc': 'Wybierz, co może robić asystent i gdzie może pracować',
   'settings.privacySecurity.privacy': 'Prywatność',
@@ -856,7 +848,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferencje',
   'settings.notifications.tabs.routing': 'Reguły routingu',
   'settings.features': 'Funkcje',
-  'settings.featuresDesc': 'Świadomość ekranu, wiadomości i narzędzia',
   'settings.aiModels': 'AI i modele',
   'settings.aiModelsDesc': 'Konfiguracja lokalnych modeli AI, pobierania i dostawcy LLM',
   'settings.ai': 'Konfiguracja AI',
@@ -952,8 +943,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Sterowanie per kanał',
   'settings.notifications.channelControlsDesc':
     'Skonfiguruj preferencje powiadomień dla każdego kanału',
-  'settings.features.screenAwareness': 'Świadomość ekranu',
-  'settings.features.screenAwarenessDesc': 'Pozwól asystentowi widzieć Twoje aktywne okno',
   'settings.features.messaging': 'Wiadomości',
   'settings.features.messagingDesc': 'Ustawienia kanałów i integracji wiadomości',
   'settings.features.tools': 'Narzędzia',
@@ -2239,21 +2228,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Zapisz zmiany',
   'settings.tools.preferencesSaved': 'Preferencje zapisane',
   'settings.tools.saveFailed': 'Nie udało się zapisać preferencji. Spróbuj ponownie.',
-  'settings.screenAwareness.mode': 'Tryb',
-  'settings.screenAwareness.allExceptBlacklist': 'Wszystko oprócz czarnej listy',
-  'settings.screenAwareness.whitelistOnly': 'Tylko biała lista',
-  'settings.screenAwareness.screenMonitoring': 'Monitorowanie ekranu',
-  'settings.screenAwareness.saveSettings': 'Zapisz ustawienia',
-  'settings.screenAwareness.session': 'Sesja',
-  'settings.screenAwareness.status': 'Stan',
-  'settings.screenAwareness.active': 'Aktywna',
-  'settings.screenAwareness.stopped': 'Zatrzymana',
-  'settings.screenAwareness.remaining': 'Pozostało',
-  'settings.screenAwareness.startSession': 'Rozpocznij sesję',
-  'settings.screenAwareness.stopSession': 'Zatrzymaj sesję',
-  'settings.screenAwareness.analyzeNow': 'Analizuj teraz',
-  'settings.screenAwareness.macosOnly':
-    'Przechwytywanie ekranu i zarządzanie uprawnieniami są obecnie obsługiwane tylko na macOS.',
   'connections.comingSoon': 'Wkrótce',
   'connections.setUp': 'Skonfiguruj',
   'connections.configured': 'Skonfigurowano',
@@ -2614,37 +2588,6 @@ const messages: TranslationMap = {
     'Główny przełącznik. Domyślnie wyłączony: Ollama pozostaje bezczynna. Gdy włączony, podsumowywanie drzewa, inteligencja ekranu i autouzupełnianie zawsze korzystają z modelu lokalnego.',
   'localModel.advancedSettings': 'Ustawienia zaawansowane',
   'localModel.debugTitle': 'Debug modelu lokalnego',
-  'screenAwareness.debugTitle': 'Debug świadomości ekranu',
-  'screenAwareness.debug.debugAndDiagnostics': 'Debug i diagnostyka',
-  'screenAwareness.debug.collapse': 'Zwiń',
-  'screenAwareness.debug.expand': 'Rozwiń',
-  'screenAwareness.debug.failedToSave': 'Nie udało się zapisać świadomości ekranu',
-  'screenAwareness.debug.policyTitle': 'Polityka świadomości ekranu',
-  'screenAwareness.debug.baselineFps': 'Bazowe FPS',
-  'screenAwareness.debug.useVisionModel': 'Użyj modelu wizji',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Wysyłaj zrzuty ekranu do LLM wizyjnego po bogatszy kontekst. Gdy wyłączone, używany jest tylko tekst OCR z LLM tekstowym: szybciej i bez modelu wizji.',
-  'screenAwareness.debug.keepScreenshots': 'Zachowuj zrzuty ekranu',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Zapisuj zrzuty ekranu w przestrzeni roboczej zamiast usuwać po przetworzeniu',
-  'screenAwareness.debug.allowlist': 'Lista dozwolonych (jedna reguła na linię)',
-  'screenAwareness.debug.denylist': 'Lista blokowanych (jedna reguła na linię)',
-  'screenAwareness.debug.saveSettings': 'Zapisz ustawienia świadomości ekranu',
-  'screenAwareness.debug.sessionStats': 'Statystyki sesji',
-  'screenAwareness.debug.framesEphemeral': 'Klatki (ulotne)',
-  'screenAwareness.debug.panicStop': 'Awaryjne zatrzymanie',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Wizja',
-  'screenAwareness.debug.idle': 'bezczynne',
-  'screenAwareness.debug.visionQueue': 'Kolejka wizji',
-  'screenAwareness.debug.lastVision': 'Ostatnia wizja',
-  'screenAwareness.debug.notAvailable': 'n/d',
-  'screenAwareness.debug.visionSummaries': 'Podsumowania wizji',
-  'screenAwareness.debug.refreshing': 'Odświeżanie…',
-  'screenAwareness.debug.noSummaries': 'Brak podsumowań.',
-  'screenAwareness.debug.unknownApp': 'Nieznana aplikacja',
-  'screenAwareness.debug.macosOnly':
-    'Świadomość ekranu V1 jest obecnie obsługiwana tylko na macOS.',
   'memory.debugTitle': 'Debug pamięci',
   'memory.documents': 'Dokumenty',
   'memory.filterByNamespace': 'Filtruj po przestrzeni nazw...',
@@ -3911,33 +3854,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Najnowszy wygenerowany diagram architektury OpenHuman',
   'intelligence.diagram.refreshesEvery': 'Odświeża co {seconds}s',
   'intelligence.memoryText.entityTypePrefix': 'Typ encji',
-  'intelligence.screenDebug.active': 'Aktywne',
-  'intelligence.screenDebug.app': 'Aplikacja',
-  'intelligence.screenDebug.bounds': 'Granice',
-  'intelligence.screenDebug.captureAlt': 'Wynik testu przechwytywania',
-  'intelligence.screenDebug.captureFailed': 'Niepowodzenie',
-  'intelligence.screenDebug.captureSuccess': 'Powodzenie',
-  'intelligence.screenDebug.captureTest': 'Test przechwytywania',
-  'intelligence.screenDebug.capturing': 'Przechwytywanie',
-  'intelligence.screenDebug.frames': 'Klatki',
-  'intelligence.screenDebug.idle': 'Bezczynne',
-  'intelligence.screenDebug.lastApp': 'Ostatnia aplikacja',
-  'intelligence.screenDebug.mode': 'Tryb',
-  'intelligence.screenDebug.permAccessibility': 'Uprawnienie: dostępność',
-  'intelligence.screenDebug.permInput': 'Uprawnienie: wejście',
-  'intelligence.screenDebug.permScreen': 'Dostępność',
-  'intelligence.screenDebug.permissions': 'Uprawnienia',
-  'intelligence.screenDebug.platformNotSupported': 'Platforma nieobsługiwana',
-  'intelligence.screenDebug.recentVisionSummaries': 'Ostatnie podsumowania wizji',
-  'intelligence.screenDebug.session': 'Sesja',
-  'intelligence.screenDebug.size': 'Rozmiar',
-  'intelligence.screenDebug.status': 'Stan',
-  'intelligence.screenDebug.testCapture': 'Testuj przechwytywanie',
-  'intelligence.screenDebug.time': 'Czas',
-  'intelligence.screenDebug.title': 'Tytuł',
-  'intelligence.screenDebug.unknown': 'Nieznane',
-  'intelligence.screenDebug.visionQueue': 'Kolejka wizji',
-  'intelligence.screenDebug.visionState': 'Stan wizji',
   'intelligence.tasks.activeBoardOne': '1 aktywna tablica w rozmowach',
   'intelligence.tasks.activeBoardOther': '{count} aktywnych tablic w rozmowach',
   'intelligence.tasks.empty': 'Brak tablic zadań agenta',
@@ -4534,7 +4450,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Wejście głosowe aktywne',
   'overlay.companion.error': 'Błąd',
   'overlay.companion.listening': 'Słucham…',
-  'overlay.companion.pointing': 'Wskazuję…',
   'overlay.companion.speaking': 'Mówię…',
   'overlay.companion.thinking': 'Myślę…',
   'overlay.orbTitle': 'Przeciągnij, aby przesunąć · Kliknij dwukrotnie, aby zresetować pozycję',
@@ -4570,12 +4485,8 @@ const messages: TranslationMap = {
   'pages.settings.features.notifications': 'Powiadomienia',
   'pages.settings.features.notificationsDesc':
     'Steruj alertami systemowymi i kategoriami powiadomień',
-  'pages.settings.features.screenAwareness': 'Świadomość ekranu',
-  'pages.settings.features.screenAwarenessDesc':
-    'Pozwól agentowi widzieć Twój ekran, aby oferować pomoc w odpowiednim czasie i kontekście.',
   'pages.settings.features.tools': 'Narzędzia',
   'pages.settings.features.toolsDesc': 'Wybierz, z jakich możliwości OpenHuman może korzystać',
-  'pages.settings.featuresSection.description': 'Świadomość ekranu, komunikacja i narzędzia.',
   'pages.settings.featuresSection.title': 'Funkcje',
   'privacy.dataKind.credentials': 'Poświadczenia',
   'privacy.dataKind.derived': 'Wyprowadzone',
@@ -5344,9 +5255,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Konfiguracja AI',
   'settings.developerMenu.ai.desc':
     'Dostawcy chmurowi, lokalne modele Ollama i trasowanie per workload',
-  'settings.developerMenu.screenAwareness.title': 'Świadomość ekranu',
-  'settings.developerMenu.screenAwareness.desc':
-    'Uprawnienia do przechwytywania ekranu, polityka monitorowania i kontrola sesji',
   'settings.developerMenu.messagingChannels.title': 'Kanały komunikacji',
   'settings.developerMenu.messagingChannels.desc':
     'Konfiguruj tryby uwierzytelniania Telegram/Discord i domyślne trasowanie',
@@ -5998,20 +5906,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Zastosuj zamianę',
   'settings.modelHealth.tag.cheaper': 'TAŃSZY',
   'settings.modelHealth.tag.better': 'LEPSZY',
-  'settings.screenIntel.permissions.accessibility': 'Dostępność',
-  'settings.screenIntel.permissions.grantHint': 'System otworzy okno żądania uprawnień.',
-  'settings.screenIntel.permissions.inputMonitoring': 'Monitorowanie wejścia',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS stosuje politykę prywatności do:',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Żądanie…',
-  'settings.screenIntel.permissions.refreshStatus': 'Odświeżanie…',
-  'settings.screenIntel.permissions.refreshing': 'Odświeżanie…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Żądanie…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Żądanie…',
-  'settings.screenIntel.permissions.requesting': 'Żądanie…',
-  'settings.screenIntel.permissions.restartRefresh': 'Restartowanie rdzenia…',
-  'settings.screenIntel.permissions.restartingCore': 'Restartowanie rdzenia…',
-  'settings.screenIntel.permissions.screenRecording': 'Nagrywanie ekranu',
-  'settings.screenIntel.permissions.title': 'Uprawnienia',
   'skills.card.moreActions': 'Więcej akcji',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6274,37 +6168,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Szablony',
   'skills.resource.tree.empty': 'Brak dołączonych zasobów.',
   'skills.search.placeholder': 'Szukaj umiejętności...',
-  'skills.setup.screenIntel.activeDesc': 'Inteligencja ekranu działa. Wybrane okna są obserwowane.',
-  'skills.setup.screenIntel.activeTitle': 'Inteligencja ekranu jest włączona',
-  'skills.setup.screenIntel.advancedSettings': 'Ustawienia zaawansowane',
-  'skills.setup.screenIntel.allGranted': 'Wszystkie uprawnienia przyznane',
-  'skills.setup.screenIntel.captureMode': 'Tryb przechwytywania',
-  'skills.setup.screenIntel.captureModeValue': 'Wszystkie okna (konfigurowalne później)',
-  'skills.setup.screenIntel.deniedHint':
-    'Po przyznaniu uprawnień w Ustawieniach systemowych kliknij poniżej, aby zrestartować i odświeżyć zmiany.',
-  'skills.setup.screenIntel.enableBtn': 'Włączanie...',
-  'skills.setup.screenIntel.enableDesc':
-    's na Twoim ekranie i dostarczają użytecznego kontekstu agentowi',
-  'skills.setup.screenIntel.enableError': 'Nie udało się włączyć inteligencji ekranu',
-  'skills.setup.screenIntel.enabling': 'Włączanie...',
-  'skills.setup.screenIntel.grant': 'Otwieranie...',
-  'skills.setup.screenIntel.granted': 'Przyznano',
-  'skills.setup.screenIntel.macosOnly': 'Tylko macOS',
-  'skills.setup.screenIntel.opening': 'Otwieranie...',
-  'skills.setup.screenIntel.panicHotkey': 'Skrót awaryjny',
-  'skills.setup.screenIntel.permAccessibility': 'Dostępność',
-  'skills.setup.screenIntel.permInputMonitoring': 'Monitorowanie wejścia',
-  'skills.setup.screenIntel.permScreenRecording': 'Nagrywanie ekranu',
-  'skills.setup.screenIntel.permissionsDesc': 'Inteligencja ekranu wymaga uprawnień systemowych:',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS stosuje politykę prywatności do:',
-  'skills.setup.screenIntel.refreshStatus': 'Odśwież status',
-  'skills.setup.screenIntel.restartRefresh': 'Restartowanie...',
-  'skills.setup.screenIntel.restarting': 'Restartowanie...',
-  'skills.setup.screenIntel.stepEnable': 'Włącz umiejętność',
-  'skills.setup.screenIntel.stepPermissions': 'Przyznaj uprawnienia',
-  'skills.setup.screenIntel.stepSuccess': 'Gotowe',
-  'skills.setup.screenIntel.title': 'Inteligencja ekranu',
-  'skills.setup.screenIntel.visionModel': 'Model wizji',
   'skills.setup.voice.activation': 'Aktywacja',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6465,9 +6328,6 @@ const messages: TranslationMap = {
     'po instrukcje konfiguracji, a następnie spróbuj ponownie, gdy środowisko będzie osiągalne.',
   'devOptions.menuAi': 'Konfiguracja AI',
   'devOptions.menuAiDesc': 'Dostawcy chmurowi, lokalne modele Ollama i trasowanie per workload',
-  'devOptions.menuScreenAware': 'Świadomość ekranu',
-  'devOptions.menuScreenAwareDesc':
-    'Uprawnienia do przechwytywania ekranu, polityka monitorowania i kontrola sesji',
   'devOptions.menuMessaging': 'Kanały komunikacji',
   'devOptions.menuMessagingDesc':
     'Konfiguruj tryby uwierzytelniania Telegram/Discord i domyślne trasowanie',
diff --git a/app/src/lib/i18n/pt.ts b/app/src/lib/i18n/pt.ts
index 6e110468f..76c1f5269 100644
--- a/app/src/lib/i18n/pt.ts
+++ b/app/src/lib/i18n/pt.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Modo companheiro sempre ativo com atalho na bandeja do sistema',
   'pages.settings.features.desktopCompanion': 'Companion Desktop',
-  'pages.settings.features.desktopCompanionDesc':
-    'Assistente de voz com consciência da tela: escuta, vê, fala, aponta',
   'settings.companion.title': 'Companheiro de Área de Trabalho',
   'settings.companion.session': 'Sessão',
   'settings.companion.activeLabel': 'Ativo',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Tecla de atalho',
   'settings.companion.activationMode': 'Modo de ativação',
   'settings.companion.sessionTtl': 'Sessão TTL',
-  'settings.companion.screenCapture': 'Captura de tela',
-  'settings.companion.appContext': 'Contexto do aplicativo',
   // Share cards (#5006).
   'share.button': 'Partilhar',
   'share.modalTitle': 'Partilhe este momento',
@@ -114,8 +110,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'Escolha o modelo de embeddings usado na pesquisa da memória.',
   'connections.header.search': 'Configure a pesquisa na web para o seu agente.',
   'connections.header.wallet': 'O saldo da sua carteira local e a sua frase de recuperação.',
-  'connections.header.screen':
-    'Deixe o seu agente ver o seu ecrã para oferecer ajuda oportuna e contextual.',
   'connections.header.composioKey':
     'Adicione uma chave de API do Composio para desbloquear centenas de integrações de aplicações.',
   'connections.llm.apiKeys': 'Chaves de API e encaminhamento',
@@ -769,8 +763,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Subconsciente',
   'settings.assistant.backgroundActivityDesc':
     'Controle o quão ativamente seu assistente trabalha em segundo plano',
-  'settings.assistant.screenAwareness': 'Consciência de tela',
-  'settings.assistant.screenAwarenessDesc': 'Permitir que o assistente veja sua janela ativa',
   'settings.assistant.permissions': 'Permissões',
   'settings.assistant.permissionsDesc':
     'Escolha o que o assistente pode fazer e onde pode trabalhar',
@@ -853,7 +845,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Preferências',
   'settings.notifications.tabs.routing': 'Roteamento',
   'settings.features': 'Recursos',
-  'settings.featuresDesc': 'Reconhecimento de tela, mensagens e ferramentas',
   'settings.aiModels': 'IA e Modelos',
   'settings.aiModelsDesc': 'Configuração de modelos de IA local, downloads e provedor LLM',
   'settings.ai': 'Configuração de IA',
@@ -951,8 +942,6 @@ const messages: TranslationMap = {
   'settings.notifications.channelControls': 'Controles por Canal',
   'settings.notifications.channelControlsDesc':
     'Configurar preferências de notificação para cada canal',
-  'settings.features.screenAwareness': 'Reconhecimento de Tela',
-  'settings.features.screenAwarenessDesc': 'Deixar o assistente ver sua janela ativa',
   'settings.features.messaging': 'Mensagens',
   'settings.features.messagingDesc': 'Configurações de integração de canais e mensagens',
   'settings.features.tools': 'Ferramentas',
@@ -2248,21 +2237,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Salvar Alterações',
   'settings.tools.preferencesSaved': 'Preferências salvas',
   'settings.tools.saveFailed': 'Falha ao salvar preferências. Tente novamente.',
-  'settings.screenAwareness.mode': 'Modo',
-  'settings.screenAwareness.allExceptBlacklist': 'Todos Exceto Lista Negra',
-  'settings.screenAwareness.whitelistOnly': 'Somente Lista Branca',
-  'settings.screenAwareness.screenMonitoring': 'Monitoramento de Tela',
-  'settings.screenAwareness.saveSettings': 'Salvar Configurações',
-  'settings.screenAwareness.session': 'Sessão',
-  'settings.screenAwareness.status': 'Status',
-  'settings.screenAwareness.active': 'Ativo',
-  'settings.screenAwareness.stopped': 'Parado',
-  'settings.screenAwareness.remaining': 'Restante',
-  'settings.screenAwareness.startSession': 'Iniciar Sessão',
-  'settings.screenAwareness.stopSession': 'Encerrar Sessão',
-  'settings.screenAwareness.analyzeNow': 'Analisar Agora',
-  'settings.screenAwareness.macosOnly':
-    'A captura de tela e os controles de permissão do Reconhecimento de Tela são suportados atualmente apenas no macOS.',
   'connections.comingSoon': 'Em breve',
   'connections.setUp': 'Configurar',
   'connections.configured': 'Configurado',
@@ -2626,37 +2600,6 @@ const messages: TranslationMap = {
     'Chave mestre. Desligado por padrão: Ollama fica inativo. Quando ligado, o sumarizador de árvore, inteligência de tela e autocompletar sempre usam o modelo local.',
   'localModel.advancedSettings': 'Configurações avançadas',
   'localModel.debugTitle': 'Depuração de Modelo Local',
-  'screenAwareness.debugTitle': 'Depuração de Reconhecimento de Tela',
-  'screenAwareness.debug.debugAndDiagnostics': 'Depuração e diagnóstico',
-  'screenAwareness.debug.collapse': 'Collapse',
-  'screenAwareness.debug.expand': 'Expandir',
-  'screenAwareness.debug.failedToSave': 'Falha ao salvar inteligência de tela',
-  'screenAwareness.debug.policyTitle': 'Política de inteligência de tela',
-  'screenAwareness.debug.baselineFps': 'FPS de linha de base',
-  'screenAwareness.debug.useVisionModel': 'Usar modelo de visão',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Enviar capturas de tela para um LLM de visão para contexto mais rico. Quando desativado, apenas o texto de OCR é usado com um LLM de texto: mais rápido e sem necessidade de modelo de visão.',
-  'screenAwareness.debug.keepScreenshots': 'Manter capturas de tela',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Salvar capturas de tela no workspace em vez de excluí-las após o processamento',
-  'screenAwareness.debug.allowlist': 'Lista de permissões (uma regra por linha)',
-  'screenAwareness.debug.denylist': 'Lista de bloqueios (uma regra por linha)',
-  'screenAwareness.debug.saveSettings': 'Salvar configurações de inteligência de tela',
-  'screenAwareness.debug.sessionStats': 'Estatísticas de sessão',
-  'screenAwareness.debug.framesEphemeral': 'Quadros (efêmeros)',
-  'screenAwareness.debug.panicStop': 'Parada de pânico',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Visão',
-  'screenAwareness.debug.idle': 'inativa',
-  'screenAwareness.debug.visionQueue': 'Fila de visão',
-  'screenAwareness.debug.lastVision': 'Última visão',
-  'screenAwareness.debug.notAvailable': 'n/a',
-  'screenAwareness.debug.visionSummaries': 'Resumos de visão',
-  'screenAwareness.debug.refreshing': 'Atualizando…',
-  'screenAwareness.debug.noSummaries': 'Ainda não há resumos.',
-  'screenAwareness.debug.unknownApp': 'Aplicativo desconhecido',
-  'screenAwareness.debug.macosOnly':
-    'O Screen Intelligence V1 é suportado apenas no macOS no momento.',
   'memory.debugTitle': 'Depuração de Memória',
   'memory.documents': 'Documentos',
   'memory.filterByNamespace': 'Filtrar por namespace...',
@@ -3921,33 +3864,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Último diagrama de arquitetura OpenHuman gerado',
   'intelligence.diagram.refreshesEvery': 'Atualiza a cada {seconds}s',
   'intelligence.memoryText.entityTypePrefix': 'Tipo de entidade',
-  'intelligence.screenDebug.active': 'Ativo',
-  'intelligence.screenDebug.app': 'Aplicativo',
-  'intelligence.screenDebug.bounds': 'Limites',
-  'intelligence.screenDebug.captureAlt': 'Resultado do teste de captura',
-  'intelligence.screenDebug.captureFailed': 'Falhou',
-  'intelligence.screenDebug.captureSuccess': 'Sucesso',
-  'intelligence.screenDebug.captureTest': 'Teste de captura',
-  'intelligence.screenDebug.capturing': 'Capturando',
-  'intelligence.screenDebug.frames': 'Quadros',
-  'intelligence.screenDebug.idle': 'Inativo',
-  'intelligence.screenDebug.lastApp': 'Último App',
-  'intelligence.screenDebug.mode': 'Modo',
-  'intelligence.screenDebug.permAccessibility': 'Permissão de acessibilidade',
-  'intelligence.screenDebug.permInput': 'Permissão de entrada',
-  'intelligence.screenDebug.permScreen': 'Acessibilidade',
-  'intelligence.screenDebug.permissions': 'Permissões',
-  'intelligence.screenDebug.platformNotSupported': 'Plataforma não suportada',
-  'intelligence.screenDebug.recentVisionSummaries': 'Resumos de visão recentes',
-  'intelligence.screenDebug.session': 'Sessão',
-  'intelligence.screenDebug.size': 'Tamanho',
-  'intelligence.screenDebug.status': 'Status',
-  'intelligence.screenDebug.testCapture': 'Testar captura',
-  'intelligence.screenDebug.time': 'Tempo',
-  'intelligence.screenDebug.title': 'Título',
-  'intelligence.screenDebug.unknown': 'Desconhecido',
-  'intelligence.screenDebug.visionQueue': 'Fila de Visão',
-  'intelligence.screenDebug.visionState': 'Estado de Visão',
   'intelligence.tasks.activeBoardOne': '1 quadro ativo entre conversas',
   'intelligence.tasks.activeBoardOther': '{count} quadros ativos entre conversas',
   'intelligence.tasks.empty': 'Nenhum quadro de tarefas de agente ainda',
@@ -4537,7 +4453,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Entrada de voz ativa',
   'overlay.companion.error': 'Erro',
   'overlay.companion.listening': 'Ouvindo…',
-  'overlay.companion.pointing': 'Apontando…',
   'overlay.companion.speaking': 'Falando…',
   'overlay.companion.thinking': 'Pensando…',
   'overlay.orbTitle': 'Arraste para mover · Clique duplo para redefinir posição',
@@ -4569,12 +4484,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Descrição dos canais de mensagens',
   'pages.settings.features.notifications': 'Notificações',
   'pages.settings.features.notificationsDesc': 'Descrição de notificações',
-  'pages.settings.features.screenAwareness': 'Reconhecimento de tela',
-  'pages.settings.features.screenAwarenessDesc':
-    'Deixe o seu agente ver o seu ecrã para oferecer ajuda oportuna e contextual.',
   'pages.settings.features.tools': 'Ferramentas',
   'pages.settings.features.toolsDesc': 'Descrição de ferramentas',
-  'pages.settings.featuresSection.description': 'Reconhecimento de tela, mensagens e ferramentas.',
   'pages.settings.featuresSection.title': 'Recursos',
   'privacy.dataKind.credentials': 'Credenciais',
   'privacy.dataKind.derived': 'Derivado',
@@ -5339,9 +5250,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Configuração de IA',
   'settings.developerMenu.ai.desc':
     'Provedores em nuvem, modelos Ollama locais e roteamento por carga de trabalho',
-  'settings.developerMenu.screenAwareness.title': 'Consciência de tela',
-  'settings.developerMenu.screenAwareness.desc':
-    'Permissões de captura de tela, política de monitoramento e controles de sessão',
   'settings.developerMenu.messagingChannels.title': 'Canais de mensagens',
   'settings.developerMenu.messagingChannels.desc':
     'Configure modos de autenticação Telegram/Discord e o roteamento de canal padrão',
@@ -6004,20 +5912,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Aplicar Substituição',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Acessibilidade',
-  'settings.screenIntel.permissions.grantHint': 'Dica de concessão',
-  'settings.screenIntel.permissions.inputMonitoring': 'Monitoramento de Entrada',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS aplica privacidade',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Solicitando…',
-  'settings.screenIntel.permissions.refreshStatus': 'Atualizando…',
-  'settings.screenIntel.permissions.refreshing': 'Atualizando…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Solicitando…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Solicitando…',
-  'settings.screenIntel.permissions.requesting': 'Solicitando…',
-  'settings.screenIntel.permissions.restartRefresh': 'Reiniciando o core…',
-  'settings.screenIntel.permissions.restartingCore': 'Reiniciando o core…',
-  'settings.screenIntel.permissions.screenRecording': 'Gravação de Tela',
-  'settings.screenIntel.permissions.title': 'Permissões',
   'skills.card.moreActions': 'Mais ações',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6279,36 +6173,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Modelos',
   'skills.resource.tree.empty': 'Sem recursos incluídos.',
   'skills.search.placeholder': 'Espaço reservado',
-  'skills.setup.screenIntel.activeDesc': 'Descrição ativo',
-  'skills.setup.screenIntel.activeTitle': 'Inteligência de Tela está Ativada',
-  'skills.setup.screenIntel.advancedSettings': 'Configurações avançadas',
-  'skills.setup.screenIntel.allGranted': 'Todas as permissões concedidas',
-  'skills.setup.screenIntel.captureMode': 'Modo de captura',
-  'skills.setup.screenIntel.captureModeValue': 'Todas as janelas (configurável depois)',
-  'skills.setup.screenIntel.deniedHint':
-    'Após conceder permissões nas Configurações do Sistema, clique abaixo para reiniciar e aplicar as alterações.',
-  'skills.setup.screenIntel.enableBtn': 'Ativando...',
-  'skills.setup.screenIntel.enableDesc': 's na sua tela e alimentar contexto útil no seu agente',
-  'skills.setup.screenIntel.enableError': 'Falha ao ativar Inteligência de Tela',
-  'skills.setup.screenIntel.enabling': 'Ativando...',
-  'skills.setup.screenIntel.grant': 'Abrindo...',
-  'skills.setup.screenIntel.granted': 'Concedido',
-  'skills.setup.screenIntel.macosOnly': 'Apenas macOS',
-  'skills.setup.screenIntel.opening': 'Abrindo...',
-  'skills.setup.screenIntel.panicHotkey': 'Tecla de pânico',
-  'skills.setup.screenIntel.permAccessibility': 'Acessibilidade',
-  'skills.setup.screenIntel.permInputMonitoring': 'Monitoramento de Entrada',
-  'skills.setup.screenIntel.permScreenRecording': 'Gravação de Tela',
-  'skills.setup.screenIntel.permissionsDesc': 'Descrição de permissões',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS aplica privacidade a:',
-  'skills.setup.screenIntel.refreshStatus': 'Atualizar status',
-  'skills.setup.screenIntel.restartRefresh': 'Reiniciando...',
-  'skills.setup.screenIntel.restarting': 'Reiniciando...',
-  'skills.setup.screenIntel.stepEnable': 'Ativar a habilidade',
-  'skills.setup.screenIntel.stepPermissions': 'Conceder permissões',
-  'skills.setup.screenIntel.stepSuccess': 'Pronto para usar',
-  'skills.setup.screenIntel.title': 'Inteligência de Tela',
-  'skills.setup.screenIntel.visionModel': 'Modelo de visão',
   'skills.setup.voice.activation': 'Ativação',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6469,9 +6333,6 @@ const messages: TranslationMap = {
   'devOptions.menuAi': 'Configuração de IA',
   'devOptions.menuAiDesc':
     'Provedores de nuvem, modelos Ollama locais e roteamento por carga de trabalho',
-  'devOptions.menuScreenAware': 'Reconhecimento de tela',
-  'devOptions.menuScreenAwareDesc':
-    'Permissões de captura de tela, política de monitoramento e controles de sessão',
   'devOptions.menuMessaging': 'Canais de mensagens',
   'devOptions.menuMessagingDesc':
     'Configurar modos de autenticação Telegram/Discord e roteamento de canal padrão',
diff --git a/app/src/lib/i18n/ru.ts b/app/src/lib/i18n/ru.ts
index e05673276..38434d9ae 100644
--- a/app/src/lib/i18n/ru.ts
+++ b/app/src/lib/i18n/ru.ts
@@ -9,8 +9,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanionDesc':
     'Режим постоянного компаньона с ярлыком в системном лотке',
   'pages.settings.features.desktopCompanion': 'Десктоп-спутник',
-  'pages.settings.features.desktopCompanionDesc':
-    'Голосовой ассистент с распознаванием экрана: слушает, видит, говорит, указывает',
   'settings.companion.title': 'Помощник на рабочем столе',
   'settings.companion.session': 'Сеанс',
   'settings.companion.activeLabel': 'Активен',
@@ -26,8 +24,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': 'Горячая клавиша',
   'settings.companion.activationMode': 'Режим активации',
   'settings.companion.sessionTtl': 'TTL сеанса',
-  'settings.companion.screenCapture': 'Снимок экрана',
-  'settings.companion.appContext': 'Контекст приложения',
   // Share cards (#5006).
   'share.button': 'Поделиться',
   'share.modalTitle': 'Поделитесь этим моментом',
@@ -112,8 +108,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': 'Выберите модель эмбеддингов для поиска в памяти.',
   'connections.header.search': 'Настройте веб-поиск для вашего агента.',
   'connections.header.wallet': 'Баланс вашего локального кошелька и фраза восстановления.',
-  'connections.header.screen':
-    'Позвольте агенту видеть ваш экран, чтобы предлагать своевременную контекстную помощь.',
   'connections.header.composioKey':
     'Добавьте ключ API Composio, чтобы разблокировать сотни интеграций приложений.',
   'connections.llm.apiKeys': 'Ключи API и маршрутизация',
@@ -767,8 +761,6 @@ const messages: TranslationMap = {
   'settings.assistant.backgroundActivity': 'Подсознание',
   'settings.assistant.backgroundActivityDesc':
     'Управление тем, насколько активно ассистент работает в фоне',
-  'settings.assistant.screenAwareness': 'Осведомлённость об экране',
-  'settings.assistant.screenAwarenessDesc': 'Разрешить ассистенту видеть активное окно',
   'settings.assistant.permissions': 'Разрешения',
   'settings.assistant.permissionsDesc':
     'Выберите, что может делать помощник и где он может работать',
@@ -851,7 +843,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': 'Настройки',
   'settings.notifications.tabs.routing': 'Маршрутизация',
   'settings.features': 'Функции',
-  'settings.featuresDesc': 'Слежение за экраном, мессенджеры и инструменты',
   'settings.aiModels': 'AI и модели',
   'settings.aiModelsDesc': 'Настройка локальных AI-моделей, загрузки и LLM-провайдер',
   'settings.ai': 'Настройки AI',
@@ -946,8 +937,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': 'Отключить все уведомления на заданный период',
   'settings.notifications.channelControls': 'По каналам',
   'settings.notifications.channelControlsDesc': 'Настройка уведомлений для каждого канала',
-  'settings.features.screenAwareness': 'Слежение за экраном',
-  'settings.features.screenAwarenessDesc': 'Разреши ассистенту видеть активное окно',
   'settings.features.messaging': 'Мессенджеры',
   'settings.features.messagingDesc': 'Настройки каналов и интеграции мессенджеров',
   'settings.features.tools': 'Инструменты',
@@ -2226,21 +2215,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': 'Сохранить изменения',
   'settings.tools.preferencesSaved': 'Настройки сохранены',
   'settings.tools.saveFailed': 'Не удалось сохранить настройки. Попробуй ещё раз.',
-  'settings.screenAwareness.mode': 'Режим',
-  'settings.screenAwareness.allExceptBlacklist': 'Всё, кроме исключений',
-  'settings.screenAwareness.whitelistOnly': 'Только разрешённые',
-  'settings.screenAwareness.screenMonitoring': 'Мониторинг экрана',
-  'settings.screenAwareness.saveSettings': 'Сохранить настройки',
-  'settings.screenAwareness.session': 'Сессия',
-  'settings.screenAwareness.status': 'Статус',
-  'settings.screenAwareness.active': 'Активно',
-  'settings.screenAwareness.stopped': 'Остановлено',
-  'settings.screenAwareness.remaining': 'Осталось',
-  'settings.screenAwareness.startSession': 'Начать сессию',
-  'settings.screenAwareness.stopSession': 'Завершить сессию',
-  'settings.screenAwareness.analyzeNow': 'Анализировать сейчас',
-  'settings.screenAwareness.macosOnly':
-    'Захват экрана и управление разрешениями поддерживаются только на macOS.',
   'connections.comingSoon': 'Скоро',
   'connections.setUp': 'Настроить',
   'connections.configured': 'Настроено',
@@ -2601,37 +2575,6 @@ const messages: TranslationMap = {
     'Главный переключатель. По умолчанию выключен: Ollama простаивает. При включении суммаризатор деревьев, интеллект экрана и автодополнение всегда используют локальную модель.',
   'localModel.advancedSettings': 'Дополнительные настройки',
   'localModel.debugTitle': 'Отладка локальной модели',
-  'screenAwareness.debugTitle': 'Отладка слежения за экраном',
-  'screenAwareness.debug.debugAndDiagnostics': 'Отладка и диагностика',
-  'screenAwareness.debug.collapse': 'Свернуть',
-  'screenAwareness.debug.expand': 'Развернуть',
-  'screenAwareness.debug.failedToSave': 'Не удалось сохранить интеллект экрана.',
-  'screenAwareness.debug.policyTitle': 'Политика интеллекта экрана',
-  'screenAwareness.debug.baselineFps': 'Базовый показатель FPS',
-  'screenAwareness.debug.useVisionModel': 'Использовать модель концепции.',
-  'screenAwareness.debug.useVisionModelDesc':
-    'Отправлять снимки экрана в визуальную языковую модель для более богатого контекста. Если отключено, используется только OCR-текст с текстовой моделью: быстрее и без требований к визуальной модели.',
-  'screenAwareness.debug.keepScreenshots': 'Сохранять снимки экрана.',
-  'screenAwareness.debug.keepScreenshotsDesc':
-    'Сохранять снимки экрана в рабочей области вместо удаления после обработки',
-  'screenAwareness.debug.allowlist': 'Список разрешенных (одно правило в строке)',
-  'screenAwareness.debug.denylist': 'Список запрещенных (одно правило в строке)',
-  'screenAwareness.debug.saveSettings': 'Сохранить настройки интеллекта экрана',
-  'screenAwareness.debug.sessionStats': 'Статистика сеанса',
-  'screenAwareness.debug.framesEphemeral': 'Кадры (эфемерные)',
-  'screenAwareness.debug.panicStop': 'Паника-стоп',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+.',
-  'screenAwareness.debug.vision': 'Видение',
-  'screenAwareness.debug.idle': 'бездействующее',
-  'screenAwareness.debug.visionQueue': 'Очередь видений',
-  'screenAwareness.debug.lastVision': 'Последнее видение',
-  'screenAwareness.debug.notAvailable': 'н/д',
-  'screenAwareness.debug.visionSummaries': 'Сводки видений',
-  'screenAwareness.debug.refreshing': 'Обновление…',
-  'screenAwareness.debug.noSummaries': 'Сводок пока нет.',
-  'screenAwareness.debug.unknownApp': 'Неизвестное приложение.',
-  'screenAwareness.debug.macosOnly':
-    'Screen Intelligence V1 в настоящее время поддерживается только на macOS.',
   'memory.debugTitle': 'Отладка памяти',
   'memory.documents': 'Документы',
   'memory.filterByNamespace': 'Фильтровать по пространству имен...',
@@ -3893,33 +3836,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': 'Последняя сгенерированная архитектурная диаграмма OpenHuman',
   'intelligence.diagram.refreshesEvery': 'Обновляется каждые {seconds} с',
   'intelligence.memoryText.entityTypePrefix': 'Тип сущности',
-  'intelligence.screenDebug.active': 'Активно',
-  'intelligence.screenDebug.app': 'Приложение',
-  'intelligence.screenDebug.bounds': 'Границы',
-  'intelligence.screenDebug.captureAlt': 'Результат тестового захвата',
-  'intelligence.screenDebug.captureFailed': 'Ошибка',
-  'intelligence.screenDebug.captureSuccess': 'Успех',
-  'intelligence.screenDebug.captureTest': 'Тест захвата',
-  'intelligence.screenDebug.capturing': 'Захват',
-  'intelligence.screenDebug.frames': 'Кадры',
-  'intelligence.screenDebug.idle': 'Ожидание',
-  'intelligence.screenDebug.lastApp': 'Последнее приложение',
-  'intelligence.screenDebug.mode': 'Режим',
-  'intelligence.screenDebug.permAccessibility': 'Доступность',
-  'intelligence.screenDebug.permInput': 'Ввод',
-  'intelligence.screenDebug.permScreen': 'Доступность',
-  'intelligence.screenDebug.permissions': 'Разрешения',
-  'intelligence.screenDebug.platformNotSupported': 'Платформа не поддерживается',
-  'intelligence.screenDebug.recentVisionSummaries': 'Недавние визуальные резюме',
-  'intelligence.screenDebug.session': 'Сессия',
-  'intelligence.screenDebug.size': 'Размер',
-  'intelligence.screenDebug.status': 'Статус',
-  'intelligence.screenDebug.testCapture': 'Тестовый захват',
-  'intelligence.screenDebug.time': 'Время',
-  'intelligence.screenDebug.title': 'Заголовок',
-  'intelligence.screenDebug.unknown': 'Неизвестно',
-  'intelligence.screenDebug.visionQueue': 'Очередь обработки изображений',
-  'intelligence.screenDebug.visionState': 'Состояние обработки изображений',
   'intelligence.tasks.activeBoardOne': '1 активная доска в разговорах',
   'intelligence.tasks.activeBoardOther': '{count} активных досок в разговорах',
   'intelligence.tasks.empty': 'Досок задач агента пока нет',
@@ -4516,7 +4432,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': 'Голосовой ввод активен',
   'overlay.companion.error': 'Ошибка',
   'overlay.companion.listening': 'Слушает…',
-  'overlay.companion.pointing': 'Указывает…',
   'overlay.companion.speaking': 'Говорит…',
   'overlay.companion.thinking': 'Думает…',
   'overlay.orbTitle': 'Перетащи для перемещения · Двойной клик для сброса позиции',
@@ -4547,12 +4462,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': 'Описание каналов сообщений',
   'pages.settings.features.notifications': 'Уведомления',
   'pages.settings.features.notificationsDesc': 'Описание уведомлений',
-  'pages.settings.features.screenAwareness': 'Слежение за экраном',
-  'pages.settings.features.screenAwarenessDesc':
-    'Позвольте агенту видеть ваш экран, чтобы предлагать своевременную контекстную помощь.',
   'pages.settings.features.tools': 'Инструменты',
   'pages.settings.features.toolsDesc': 'Описание инструментов',
-  'pages.settings.featuresSection.description': 'Слежение за экраном, мессенджеры и инструменты.',
   'pages.settings.featuresSection.title': 'Функции',
   'privacy.dataKind.credentials': 'Учётные данные',
   'privacy.dataKind.derived': 'Производные данные',
@@ -5314,9 +5225,6 @@ const messages: TranslationMap = {
   'settings.developerMenu.ai.title': 'Конфигурация ИИ',
   'settings.developerMenu.ai.desc':
     'Облачные провайдеры, локальные модели Ollama и маршрутизация по типам нагрузки',
-  'settings.developerMenu.screenAwareness.title': 'Осведомленность об экране',
-  'settings.developerMenu.screenAwareness.desc':
-    'Разрешения на захват экрана, политика мониторинга и управление сессиями',
   'settings.developerMenu.messagingChannels.title': 'Каналы сообщений',
   'settings.developerMenu.messagingChannels.desc':
     'Настройка режимов аутентификации Telegram/Discord и маршрутизации канала по умолчанию',
@@ -5971,20 +5879,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': 'Применить замену',
   'settings.modelHealth.tag.cheaper': 'CHEAPER',
   'settings.modelHealth.tag.better': 'BETTER',
-  'settings.screenIntel.permissions.accessibility': 'Доступность',
-  'settings.screenIntel.permissions.grantHint': 'Подсказка по предоставлению',
-  'settings.screenIntel.permissions.inputMonitoring': 'Мониторинг ввода',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS применяет конфиденциальность',
-  'settings.screenIntel.permissions.openInputMonitoring': 'Запрос…',
-  'settings.screenIntel.permissions.refreshStatus': 'Обновление…',
-  'settings.screenIntel.permissions.refreshing': 'Обновление…',
-  'settings.screenIntel.permissions.requestAccessibility': 'Запрос…',
-  'settings.screenIntel.permissions.requestScreenRecording': 'Запрос…',
-  'settings.screenIntel.permissions.requesting': 'Запрос…',
-  'settings.screenIntel.permissions.restartRefresh': 'Перезапуск ядра…',
-  'settings.screenIntel.permissions.restartingCore': 'Перезапуск ядра…',
-  'settings.screenIntel.permissions.screenRecording': 'Запись экрана',
-  'settings.screenIntel.permissions.title': 'Разрешения',
   'skills.card.moreActions': 'Ещё действия',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -6243,37 +6137,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': 'Шаблоны',
   'skills.resource.tree.empty': 'Встроенных ресурсов нет.',
   'skills.search.placeholder': 'Поиск',
-  'skills.setup.screenIntel.activeDesc': 'Активно',
-  'skills.setup.screenIntel.activeTitle': 'Интеллект экрана включён',
-  'skills.setup.screenIntel.advancedSettings': 'Дополнительные настройки',
-  'skills.setup.screenIntel.allGranted': 'Все разрешения предоставлены',
-  'skills.setup.screenIntel.captureMode': 'Режим захвата',
-  'skills.setup.screenIntel.captureModeValue': 'Все окна (можно изменить позже)',
-  'skills.setup.screenIntel.deniedHint':
-    'После предоставления разрешений в Системных настройках нажми ниже для перезапуска и применения изменений.',
-  'skills.setup.screenIntel.enableBtn': 'Включение...',
-  'skills.setup.screenIntel.enableDesc':
-    'Видеть, что происходит на вашем экране, и передавать полезный контекст вашему агенту',
-  'skills.setup.screenIntel.enableError': 'Не удалось включить интеллект экрана',
-  'skills.setup.screenIntel.enabling': 'Включение...',
-  'skills.setup.screenIntel.grant': 'Открытие...',
-  'skills.setup.screenIntel.granted': 'Предоставлено',
-  'skills.setup.screenIntel.macosOnly': 'Только macOS',
-  'skills.setup.screenIntel.opening': 'Открытие...',
-  'skills.setup.screenIntel.panicHotkey': 'Экстренная горячая клавиша',
-  'skills.setup.screenIntel.permAccessibility': 'Доступность',
-  'skills.setup.screenIntel.permInputMonitoring': 'Мониторинг ввода',
-  'skills.setup.screenIntel.permScreenRecording': 'Запись экрана',
-  'skills.setup.screenIntel.permissionsDesc': 'Описание разрешений',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS применяет конфиденциальность к:',
-  'skills.setup.screenIntel.refreshStatus': 'Обновить статус',
-  'skills.setup.screenIntel.restartRefresh': 'Перезапуск...',
-  'skills.setup.screenIntel.restarting': 'Перезапуск...',
-  'skills.setup.screenIntel.stepEnable': 'Включить навык',
-  'skills.setup.screenIntel.stepPermissions': 'Предоставить разрешения',
-  'skills.setup.screenIntel.stepSuccess': 'Готово к работе',
-  'skills.setup.screenIntel.title': 'Интеллект экрана',
-  'skills.setup.screenIntel.visionModel': 'Визуальная модель',
   'skills.setup.voice.activation': 'Активация',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6435,9 +6298,6 @@ const messages: TranslationMap = {
   'devOptions.menuAi': 'Конфигурация AI',
   'devOptions.menuAiDesc':
     'Облачные поставщики, локальные модели Ollama и маршрутизация для каждой рабочей нагрузки',
-  'devOptions.menuScreenAware': 'Функция Screen Aware',
-  'devOptions.menuScreenAwareDesc':
-    'Разрешения на захват экрана, мониторинг политика и элементы управления сеансом',
   'devOptions.menuMessaging': 'Каналы обмена сообщениями',
   'devOptions.menuMessagingDesc':
     'Настройка режимов аутентификации Telegram/Discord и маршрутизации каналов по умолчанию',
diff --git a/app/src/lib/i18n/zh-CN.ts b/app/src/lib/i18n/zh-CN.ts
index dce9338c5..f961f5d66 100644
--- a/app/src/lib/i18n/zh-CN.ts
+++ b/app/src/lib/i18n/zh-CN.ts
@@ -7,8 +7,6 @@ const messages: TranslationMap = {
   'settings.assistant.desktopCompanion': '桌面伴侣',
   'settings.assistant.desktopCompanionDesc': '带有系统托盘快捷方式的常驻伴侣模式',
   'pages.settings.features.desktopCompanion': '桌面伴侣',
-  'pages.settings.features.desktopCompanionDesc':
-    '具有屏幕感知能力的语音助手：倾听、观看、说话、指向',
   'settings.companion.title': '桌面伴侣',
   'settings.companion.session': '会话',
   'settings.companion.activeLabel': '活跃',
@@ -24,8 +22,6 @@ const messages: TranslationMap = {
   'settings.companion.hotkey': '热键',
   'settings.companion.activationMode': '激活模式',
   'settings.companion.sessionTtl': '会话有效期',
-  'settings.companion.screenCapture': '屏幕截图',
-  'settings.companion.appContext': '应用程序上下文',
   // Share cards (#5006).
   'share.button': '分享',
   'share.modalTitle': '分享这一刻',
@@ -108,7 +104,6 @@ const messages: TranslationMap = {
   'connections.header.embeddings': '选择用于记忆搜索的嵌入模型。',
   'connections.header.search': '为你的智能体配置网络搜索。',
   'connections.header.wallet': '你的本地钱包余额和恢复短语。',
-  'connections.header.screen': '让你的智能体查看你的屏幕，以便提供及时、贴合上下文的帮助。',
   'connections.header.composioKey': '添加 Composio API 密钥，解锁数百个应用集成。',
   'connections.llm.apiKeys': 'API 密钥与路由',
   'connections.welcome.nav': '欢迎',
@@ -723,8 +718,6 @@ const messages: TranslationMap = {
   'settings.assistant.faceMascot': '面孔 / 吉祥物',
   'settings.assistant.backgroundActivity': '潜意识',
   'settings.assistant.backgroundActivityDesc': '控制助手在后台工作的活跃程度',
-  'settings.assistant.screenAwareness': '屏幕感知',
-  'settings.assistant.screenAwarenessDesc': '允许助手查看您的活动窗口',
   'settings.assistant.permissions': '权限',
   'settings.assistant.permissionsDesc': '选择助手可以做什么以及可以在哪里工作',
   'settings.privacySecurity.privacy': '隐私',
@@ -798,7 +791,6 @@ const messages: TranslationMap = {
   'settings.notifications.tabs.preferences': '偏好设置',
   'settings.notifications.tabs.routing': '路由',
   'settings.features': '功能',
-  'settings.featuresDesc': '屏幕感知、消息与工具',
   'settings.aiModels': 'AI 与模型',
   'settings.aiModelsDesc': '本地 AI 模型设置、下载与 LLM 提供商',
   'settings.ai': 'AI',
@@ -886,8 +878,6 @@ const messages: TranslationMap = {
   'settings.notifications.doNotDisturbDesc': '在一定时间内暂停所有通知',
   'settings.notifications.channelControls': '各渠道控制',
   'settings.notifications.channelControlsDesc': '为每个渠道配置通知偏好',
-  'settings.features.screenAwareness': '屏幕感知',
-  'settings.features.screenAwarenessDesc': '让助手看到你的活动窗口',
   'settings.features.messaging': '消息',
   'settings.features.messagingDesc': '渠道与消息集成设置',
   'settings.features.tools': '工具',
@@ -2085,20 +2075,6 @@ const messages: TranslationMap = {
   'settings.tools.saveChanges': '保存更改',
   'settings.tools.preferencesSaved': '偏好设置已保存',
   'settings.tools.saveFailed': '保存偏好失败，请重试。',
-  'settings.screenAwareness.mode': '模式',
-  'settings.screenAwareness.allExceptBlacklist': '除黑名单外全部',
-  'settings.screenAwareness.whitelistOnly': '仅白名单',
-  'settings.screenAwareness.screenMonitoring': '屏幕监控',
-  'settings.screenAwareness.saveSettings': '保存设置',
-  'settings.screenAwareness.session': '会话',
-  'settings.screenAwareness.status': '状态',
-  'settings.screenAwareness.active': '活跃',
-  'settings.screenAwareness.stopped': '已停止',
-  'settings.screenAwareness.remaining': '剩余',
-  'settings.screenAwareness.startSession': '开始会话',
-  'settings.screenAwareness.stopSession': '停止会话',
-  'settings.screenAwareness.analyzeNow': '立即分析',
-  'settings.screenAwareness.macosOnly': '屏幕感知桌面捕获和权限控制目前仅在 macOS 上受支持。',
   'connections.comingSoon': '即将推出',
   'connections.setUp': '设置',
   'connections.configured': '已配置',
@@ -2434,35 +2410,6 @@ const messages: TranslationMap = {
     '总开关。默认关闭：Ollama 保持空闲。启用后，树摘要器、屏幕智能和自动补全始终使用本地模型。',
   'localModel.advancedSettings': '高级设置',
   'localModel.debugTitle': '本地模型调试',
-  'screenAwareness.debugTitle': '屏幕感知调试',
-  'screenAwareness.debug.debugAndDiagnostics': '调试与诊断',
-  'screenAwareness.debug.collapse': '崩溃',
-  'screenAwareness.debug.expand': '展开',
-  'screenAwareness.debug.failedToSave': '保存屏幕情报失败',
-  'screenAwareness.debug.policyTitle': '屏幕情报政策',
-  'screenAwareness.debug.baselineFps': '基线 FPS',
-  'screenAwareness.debug.useVisionModel': '使用视觉模型',
-  'screenAwareness.debug.useVisionModelDesc':
-    '将截图发送给视觉 LLM 以获取更丰富的上下文。关闭时，仅使用 OCR 文本配合纯文本 LLM：速度更快且无需视觉模型。',
-  'screenAwareness.debug.keepScreenshots': '保留截图',
-  'screenAwareness.debug.keepScreenshotsDesc': '将捕获的截图保存到工作区，而非处理后删除',
-  'screenAwareness.debug.allowlist': '允许列表（每行一条规则）',
-  'screenAwareness.debug.denylist': '拒绝名单（每行一条规则）',
-  'screenAwareness.debug.saveSettings': '保存屏幕智能设置',
-  'screenAwareness.debug.sessionStats': '会话统计',
-  'screenAwareness.debug.framesEphemeral': '框架（临时）',
-  'screenAwareness.debug.panicStop': '紧急停止',
-  'screenAwareness.debug.defaultPanicHotkey': 'Cmd+Shift+。',
-  'screenAwareness.debug.vision': '愿景',
-  'screenAwareness.debug.idle': '空闲',
-  'screenAwareness.debug.visionQueue': '视觉队列',
-  'screenAwareness.debug.lastVision': '最后的愿景',
-  'screenAwareness.debug.notAvailable': '不适用',
-  'screenAwareness.debug.visionSummaries': '愿景摘要',
-  'screenAwareness.debug.refreshing': '清爽…',
-  'screenAwareness.debug.noSummaries': '还没有总结。',
-  'screenAwareness.debug.unknownApp': '未知应用程序',
-  'screenAwareness.debug.macosOnly': 'Screen Intelligence V1 目前仅在 macOS 上受支持。',
   'memory.debugTitle': '记忆调试',
   'memory.documents': '文件',
   'memory.filterByNamespace': '按名称空间过滤...',
@@ -3662,33 +3609,6 @@ const messages: TranslationMap = {
   'intelligence.diagram.imageAlt': '最新生成的 OpenHuman 架构图',
   'intelligence.diagram.refreshesEvery': '每 {seconds} 秒刷新',
   'intelligence.memoryText.entityTypePrefix': '实体类型',
-  'intelligence.screenDebug.active': '活跃',
-  'intelligence.screenDebug.app': '应用',
-  'intelligence.screenDebug.bounds': '边界',
-  'intelligence.screenDebug.captureAlt': '捕获测试结果',
-  'intelligence.screenDebug.captureFailed': '失败',
-  'intelligence.screenDebug.captureSuccess': '成功',
-  'intelligence.screenDebug.captureTest': '捕获测试',
-  'intelligence.screenDebug.capturing': '捕获中',
-  'intelligence.screenDebug.frames': '帧数',
-  'intelligence.screenDebug.idle': '空闲',
-  'intelligence.screenDebug.lastApp': '上一个应用',
-  'intelligence.screenDebug.mode': '模式',
-  'intelligence.screenDebug.permAccessibility': '辅助功能权限',
-  'intelligence.screenDebug.permInput': '输入监控权限',
-  'intelligence.screenDebug.permScreen': '辅助功能',
-  'intelligence.screenDebug.permissions': '权限',
-  'intelligence.screenDebug.platformNotSupported': '平台不支持',
-  'intelligence.screenDebug.recentVisionSummaries': '最近视觉摘要',
-  'intelligence.screenDebug.session': '会话',
-  'intelligence.screenDebug.size': '大小',
-  'intelligence.screenDebug.status': '状态',
-  'intelligence.screenDebug.testCapture': '测试捕获',
-  'intelligence.screenDebug.time': '时间',
-  'intelligence.screenDebug.title': '标题',
-  'intelligence.screenDebug.unknown': '未知',
-  'intelligence.screenDebug.visionQueue': '视觉队列',
-  'intelligence.screenDebug.visionState': '视觉状态',
   'intelligence.tasks.activeBoardOne': '1 个跨对话的活跃看板',
   'intelligence.tasks.activeBoardOther': '{count} 个跨对话的活跃看板',
   'intelligence.tasks.empty': '暂无智能体任务看板',
@@ -4231,7 +4151,6 @@ const messages: TranslationMap = {
   'overlay.ariaVoiceActive': '语音输入已激活',
   'overlay.companion.error': '错误',
   'overlay.companion.listening': '正在聆听…',
-  'overlay.companion.pointing': '正在指向…',
   'overlay.companion.speaking': '正在说话…',
   'overlay.companion.thinking': '正在思考…',
   'overlay.orbTitle': '拖动以移动 · 双击重置位置',
@@ -4260,12 +4179,8 @@ const messages: TranslationMap = {
   'pages.settings.features.messagingChannelsDesc': '配置消息渠道和集成',
   'pages.settings.features.notifications': '通知',
   'pages.settings.features.notificationsDesc': '管理通知偏好',
-  'pages.settings.features.screenAwareness': '屏幕感知',
-  'pages.settings.features.screenAwarenessDesc':
-    '让你的智能体查看你的屏幕，以便提供及时、贴合上下文的帮助。',
   'pages.settings.features.tools': '工具',
   'pages.settings.features.toolsDesc': '管理已连接的工具和集成',
-  'pages.settings.featuresSection.description': '屏幕感知、消息和工具。',
   'pages.settings.featuresSection.title': '功能',
   'privacy.dataKind.credentials': '凭据',
   'privacy.dataKind.derived': '派生数据',
@@ -4988,8 +4903,6 @@ const messages: TranslationMap = {
   'settings.localModel.status.working': '处理中...',
   'settings.developerMenu.ai.title': 'AI 配置',
   'settings.developerMenu.ai.desc': '云端提供商、本地 Ollama 模型和按工作负载路由',
-  'settings.developerMenu.screenAwareness.title': '屏幕感知',
-  'settings.developerMenu.screenAwareness.desc': '屏幕捕获权限、监控策略和会话控制',
   'settings.developerMenu.messagingChannels.title': '消息渠道',
   'settings.developerMenu.messagingChannels.desc': '配置 Telegram/Discord 认证模式和默认渠道路由',
   'settings.developerMenu.tools.title': '工具',
@@ -5591,20 +5504,6 @@ const messages: TranslationMap = {
   'settings.modelHealth.modal.apply': '应用替换',
   'settings.modelHealth.tag.cheaper': '更便宜',
   'settings.modelHealth.tag.better': '更好',
-  'settings.screenIntel.permissions.accessibility': '辅助功能',
-  'settings.screenIntel.permissions.grantHint': '在系统设置中授权后，点击下方刷新',
-  'settings.screenIntel.permissions.inputMonitoring': '输入监控',
-  'settings.screenIntel.permissions.macosAppliesPrivacy': 'macOS 会在所有窗口中应用隐私保护',
-  'settings.screenIntel.permissions.openInputMonitoring': '请求中…',
-  'settings.screenIntel.permissions.refreshStatus': '刷新中…',
-  'settings.screenIntel.permissions.refreshing': '刷新中…',
-  'settings.screenIntel.permissions.requestAccessibility': '请求中…',
-  'settings.screenIntel.permissions.requestScreenRecording': '请求中…',
-  'settings.screenIntel.permissions.requesting': '请求中…',
-  'settings.screenIntel.permissions.restartRefresh': '正在重启核心…',
-  'settings.screenIntel.permissions.restartingCore': '正在重启核心…',
-  'settings.screenIntel.permissions.screenRecording': '屏幕录制',
-  'settings.screenIntel.permissions.title': '权限',
   'skills.card.moreActions': '更多操作',
   'skills.channelIcon.discord': 'Discord',
   'skills.channelIcon.imessage': 'iMessage',
@@ -5853,35 +5752,6 @@ const messages: TranslationMap = {
   'skills.resource.tree.templates': '模板',
   'skills.resource.tree.empty': '无捆绑资源。',
   'skills.search.placeholder': '搜索技能...',
-  'skills.setup.screenIntel.activeDesc': '屏幕智能已激活，正在感知你的屏幕',
-  'skills.setup.screenIntel.activeTitle': '屏幕智能已启用',
-  'skills.setup.screenIntel.advancedSettings': '高级设置',
-  'skills.setup.screenIntel.allGranted': '所有权限已授予',
-  'skills.setup.screenIntel.captureMode': '捕获模式',
-  'skills.setup.screenIntel.captureModeValue': '所有窗口（稍后可配置）',
-  'skills.setup.screenIntel.deniedHint': '在系统设置中授权后，点击下方重启以应用更改。',
-  'skills.setup.screenIntel.enableBtn': '启用中...',
-  'skills.setup.screenIntel.enableDesc': '检测屏幕上的内容并将有用的上下文提供给助手',
-  'skills.setup.screenIntel.enableError': '启用屏幕智能失败',
-  'skills.setup.screenIntel.enabling': '启用中...',
-  'skills.setup.screenIntel.grant': '打开中...',
-  'skills.setup.screenIntel.granted': '已授予',
-  'skills.setup.screenIntel.macosOnly': '仅支持 macOS',
-  'skills.setup.screenIntel.opening': '打开中...',
-  'skills.setup.screenIntel.panicHotkey': '紧急热键',
-  'skills.setup.screenIntel.permAccessibility': '辅助功能',
-  'skills.setup.screenIntel.permInputMonitoring': '输入监控',
-  'skills.setup.screenIntel.permScreenRecording': '屏幕录制',
-  'skills.setup.screenIntel.permissionsDesc': '屏幕智能需要以下权限才能正常工作',
-  'skills.setup.screenIntel.permissionPathLabel': 'macOS 将隐私应用于：',
-  'skills.setup.screenIntel.refreshStatus': '刷新状态',
-  'skills.setup.screenIntel.restartRefresh': '重启中...',
-  'skills.setup.screenIntel.restarting': '重启中...',
-  'skills.setup.screenIntel.stepEnable': '启用技能',
-  'skills.setup.screenIntel.stepPermissions': '授予权限',
-  'skills.setup.screenIntel.stepSuccess': '准备就绪',
-  'skills.setup.screenIntel.title': '屏幕智能',
-  'skills.setup.screenIntel.visionModel': '视觉模型',
   'skills.setup.voice.activation': '激活方式',
   'skills.setup.voice.activeDescPrefix': 'Fn',
   'skills.setup.voice.activeDescSuffix': 'Fn',
@@ -6031,8 +5901,6 @@ const messages: TranslationMap = {
   'settings.localModel.status.thenRetry': '获取设置说明，待你的运行时可达后再重试。',
   'devOptions.menuAi': 'AI 配置',
   'devOptions.menuAiDesc': '云端提供商、本地 Ollama 模型与按工作负载路由',
-  'devOptions.menuScreenAware': '屏幕感知',
-  'devOptions.menuScreenAwareDesc': '屏幕捕获权限、监控策略与会话控制',
   'devOptions.menuMessaging': '消息通道',
   'devOptions.menuMessagingDesc': '配置 Telegram/Discord 认证模式与默认通道路由',
   'devOptions.menuTools': '工具',
diff --git a/app/src/overlay/CompanionPointer.tsx b/app/src/overlay/CompanionPointer.tsx
deleted file mode 100644
index 38bbbc40e..000000000
--- a/app/src/overlay/CompanionPointer.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * CompanionPointer — renders point-target labels inside the overlay bubble area.
- */
-import { useEffect, useState } from 'react';
-
-export interface PointTarget {
-  absolute_x: number;
-  absolute_y: number;
-  label: string;
-}
-
-interface CompanionPointerProps {
-  targets: PointTarget[];
-  /** Auto-dismiss each target after this many ms. Default: 2000 */
-  dismissMs?: number;
-}
-
-export default function CompanionPointer({ targets, dismissMs = 2000 }: CompanionPointerProps) {
-  const [visible, setVisible] = useState(true);
-
-  useEffect(() => {
-    if (targets.length === 0) return;
-    const showFrame = window.requestAnimationFrame(() => setVisible(true));
-    const dismissTimer = window.setTimeout(() => setVisible(false), dismissMs);
-    return () => {
-      window.cancelAnimationFrame(showFrame);
-      window.clearTimeout(dismissTimer);
-    };
-  }, [targets, dismissMs]);
-
-  if (!visible || targets.length === 0) return null;
-
-  return (
-    <div className="flex flex-col items-end gap-1">
-      {targets.map((t, i) => (
-        <div
-          key={`${t.label}-${i}`}
-          className="animate-[overlay-bubble-in_220ms_ease-out] rounded-lg bg-blue-600 px-2 py-1 text-xs text-white shadow-md">
-          <span className="mr-1 inline-block h-2 w-2 rounded-full bg-blue-300 animate-pulse" />
-          {t.label}
-        </div>
-      ))}
-    </div>
-  );
-}
diff --git a/app/src/overlay/OverlayApp.tsx b/app/src/overlay/OverlayApp.tsx
index 407f77b73..2c82fcfe1 100644
--- a/app/src/overlay/OverlayApp.tsx
+++ b/app/src/overlay/OverlayApp.tsx
@@ -119,8 +119,6 @@ export function companionStateLabel(state: string, t: (key: string) => string):
         return t('overlay.companion.thinking');
       case 'speaking':
         return t('overlay.companion.speaking');
-      case 'pointing':
-        return t('overlay.companion.pointing');
       default:
         return state;
     }
diff --git a/app/src/overlay/__tests__/CompanionPointer.test.tsx b/app/src/overlay/__tests__/CompanionPointer.test.tsx
deleted file mode 100644
index 2f70a9846..000000000
--- a/app/src/overlay/__tests__/CompanionPointer.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { act, render, screen } from '@testing-library/react';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import CompanionPointer, { type PointTarget } from '../CompanionPointer';
-
-describe('CompanionPointer', () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    // Make rAF fire synchronously so we can observe the visible→true transition
-    // without juggling async/await boundaries in every case.
-    vi.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => {
-      cb(0);
-      return 1;
-    });
-    vi.spyOn(window, 'cancelAnimationFrame').mockImplementation(() => undefined);
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-  });
-
-  it('renders nothing when targets is empty', () => {
-    const { container } = render(<CompanionPointer targets={[]} />);
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('renders one label per target with the label text', () => {
-    const targets: PointTarget[] = [
-      { absolute_x: 10, absolute_y: 20, label: 'Click here' },
-      { absolute_x: 30, absolute_y: 40, label: 'Then this' },
-    ];
-    render(<CompanionPointer targets={targets} />);
-    expect(screen.getByText('Click here')).toBeInTheDocument();
-    expect(screen.getByText('Then this')).toBeInTheDocument();
-  });
-
-  it('auto-dismisses after dismissMs elapses', () => {
-    const { container } = render(
-      <CompanionPointer
-        targets={[{ absolute_x: 0, absolute_y: 0, label: 'Vanish' }]}
-        dismissMs={500}
-      />
-    );
-    expect(screen.getByText('Vanish')).toBeInTheDocument();
-
-    act(() => {
-      vi.advanceTimersByTime(500);
-    });
-
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('uses default dismissMs of 2000 when not provided', () => {
-    const { container } = render(
-      <CompanionPointer targets={[{ absolute_x: 0, absolute_y: 0, label: 'Default' }]} />
-    );
-    act(() => {
-      vi.advanceTimersByTime(1999);
-    });
-    expect(screen.getByText('Default')).toBeInTheDocument();
-    act(() => {
-      vi.advanceTimersByTime(1);
-    });
-    expect(container.firstChild).toBeNull();
-  });
-
-  it('cancels rAF and timer on unmount', () => {
-    const cancelTimerSpy = vi.spyOn(window, 'clearTimeout');
-    const cancelRafSpy = vi.spyOn(window, 'cancelAnimationFrame');
-
-    const { unmount } = render(
-      <CompanionPointer targets={[{ absolute_x: 0, absolute_y: 0, label: 'A' }]} />
-    );
-    unmount();
-
-    expect(cancelRafSpy).toHaveBeenCalled();
-    expect(cancelTimerSpy).toHaveBeenCalled();
-  });
-});
diff --git a/app/src/overlay/__tests__/companionStateLabel.test.ts b/app/src/overlay/__tests__/companionStateLabel.test.ts
index 5ec7598e0..0a695c1be 100644
--- a/app/src/overlay/__tests__/companionStateLabel.test.ts
+++ b/app/src/overlay/__tests__/companionStateLabel.test.ts
@@ -11,7 +11,6 @@ describe('companionStateLabel', () => {
     ['listening', '“[overlay.companion.listening]”'],
     ['thinking', '“[overlay.companion.thinking]”'],
     ['speaking', '“[overlay.companion.speaking]”'],
-    ['pointing', '“[overlay.companion.pointing]”'],
   ])('routes %s through the matching i18n key', (state, expected) => {
     expect(companionStateLabel(state, t)).toBe(expected);
   });
diff --git a/app/src/pages/Skills.tsx b/app/src/pages/Skills.tsx
index 83608e6f6..79934035e 100644
--- a/app/src/pages/Skills.tsx
+++ b/app/src/pages/Skills.tsx
@@ -23,12 +23,10 @@ import ComposioPanel from '../components/settings/panels/ComposioPanel';
 import EmbeddingsPanel from '../components/settings/panels/EmbeddingsPanel';
 import LlmConnectionsPanel from '../components/settings/panels/LlmConnectionsPanel';
 import MeetingSettingsPanel from '../components/settings/panels/MeetingSettingsPanel';
-import ScreenIntelligencePanel from '../components/settings/panels/ScreenIntelligencePanel';
 import SearchPanel from '../components/settings/panels/SearchPanel';
 import UsagePanel from '../components/settings/panels/UsagePanel';
 import VoicePanel from '../components/settings/panels/VoicePanel';
 import WalletPanel from '../components/settings/panels/WalletPanel';
-import ScreenIntelligenceSetupModal from '../components/skills/ScreenIntelligenceSetupModal';
 import UnifiedSkillCard from '../components/skills/SkillCard';
 import { SKILL_CATEGORY_ORDER, type SkillCategory } from '../components/skills/skillCategories';
 import SkillCategoryFilter from '../components/skills/SkillCategoryFilter';
@@ -41,7 +39,6 @@ import SkillSearchBar from '../components/skills/SkillSearchBar';
 import SkillsExplorerTab from '../components/skills/SkillsExplorerTab';
 import VoiceSetupModal from '../components/skills/VoiceSetupModal';
 import BetaBanner from '../components/ui/BetaBanner';
-import { useScreenIntelligenceSkillStatus } from '../features/screen-intelligence/useScreenIntelligenceSkillStatus';
 import { useVoiceSkillStatus } from '../features/voice/useVoiceSkillStatus';
 import { useChannelDefinitions } from '../hooks/useChannelDefinitions';
 import { useAgentReadyComposioToolkits, useComposioIntegrations } from '../lib/composio/hooks';
@@ -398,18 +395,7 @@ const BUILT_IN_SKILLS: Array<{
   description: string;
   route: string;
   icon: React.ReactNode;
-}> = [
-  // Hidden — not active yet. Uncomment to re-enable.
-  // {
-  //   id: 'screen-intelligence',
-  //   title: 'Screen Intelligence',
-  //   description:
-  //     'Capture windows, summarize what is on screen, and feed useful context into memory.',
-  //   route: '/settings/screen-intelligence',
-  //   icon: BUILT_IN_SKILL_ICONS.screenIntelligence,
-  // },
-  // text-autocomplete + voice-stt hidden per #717 (modals/status hooks retained for re-enable).
-];
+}> = [];
 
 // ─── Item type for unified list ────────────────────────────────────────────────
 
@@ -455,7 +441,6 @@ type ConnectionsTab =
   | 'usage'
   | 'composio-key'
   | 'wallet'
-  | 'screen-intelligence'
   | 'companion';
 
 /**
@@ -487,10 +472,6 @@ const INTELLIGENCE_HEADERS: Partial<Record<ConnectionsTab, { titleKey: string; d
     },
     search: { titleKey: 'settings.search.title', descKey: 'connections.header.search' },
     usage: { titleKey: 'settings.usage.title', descKey: 'settings.usage.menuDesc' },
-    'screen-intelligence': {
-      titleKey: 'pages.settings.features.screenAwareness',
-      descKey: 'connections.header.screen',
-    },
     companion: {
       titleKey: 'pages.settings.features.desktopCompanion',
       descKey: 'connections.header.companion',
@@ -509,7 +490,6 @@ const INTELLIGENCE_TABS: ReadonlySet<ConnectionsTab> = new Set<ConnectionsTab>([
   'usage',
   'composio-key',
   'wallet',
-  'screen-intelligence',
   'companion',
 ]);
 
@@ -540,7 +520,6 @@ export default function Skills() {
       raw === 'usage' ||
       raw === 'composio-key' ||
       raw === 'wallet' ||
-      raw === 'screen-intelligence' ||
       raw === 'companion'
     )
       return raw;
@@ -609,9 +588,7 @@ export default function Skills() {
   const [composioModalToolkit, setComposioModalToolkit] = useState<ComposioToolkitMeta | null>(
     null
   );
-  const [screenIntelligenceModalOpen, setScreenIntelligenceModalOpen] = useState(false);
   const [voiceModalOpen, setVoiceModalOpen] = useState(false);
-  const screenIntelligenceStatus = useScreenIntelligenceSkillStatus();
   const voiceStatus = useVoiceSkillStatus();
 
   const [toasts, setToasts] = useState<ToastNotification[]>([]);
@@ -872,39 +849,8 @@ export default function Skills() {
         {items.map(item => {
           if (item.kind === 'builtin') {
             /* v8 ignore start -- BUILT_IN_SKILLS list is empty today; the per-id
-               branches below are kept for re-enabling screen-intelligence /
-               text-autocomplete / voice-stt and shouldn't drag the diff-coverage
-               gate down while they're unreachable. */
-            if (item.id === 'screen-intelligence') {
-              return (
-                <UnifiedSkillCard
-                  key={item.id}
-                  icon={item.icon}
-                  title={item.name}
-                  description={item.description}
-                  statusLabel={screenIntelligenceStatus.statusLabel}
-                  statusColor={screenIntelligenceStatus.statusColor}
-                  ctaLabel={screenIntelligenceStatus.ctaLabel}
-                  ctaVariant={screenIntelligenceStatus.ctaVariant}
-                  testId={`skill-row-${item.id}`}
-                  ctaTestId={`skill-install-${item.id}`}
-                  onCtaClick={() => {
-                    if (screenIntelligenceStatus.platformUnsupported) {
-                      navigate(item.route!);
-                      return;
-                    }
-                    if (
-                      screenIntelligenceStatus.connectionStatus === 'connected' ||
-                      screenIntelligenceStatus.connectionStatus === 'disconnected'
-                    ) {
-                      navigate(item.route!);
-                      return;
-                    }
-                    setScreenIntelligenceModalOpen(true);
-                  }}
-                />
-              );
-            }
+               branches below are retained for the hidden voice skill without
+               dragging the diff-coverage gate down while unreachable. */
             if (item.id === 'voice-stt') {
               return (
                 <UnifiedSkillCard
@@ -1020,11 +966,6 @@ export default function Skills() {
                 // Desktop capabilities relocated from Settings → Connections.
                 label: t('connections.groups.desktop'),
                 items: [
-                  {
-                    value: 'screen-intelligence',
-                    label: t('pages.settings.features.screenAwareness'),
-                    icon: navIcon('M3 5h18v12H3zM8 21h8m-4-4v4'),
-                  },
                   {
                     value: 'companion',
                     label: t('pages.settings.features.desktopCompanion'),
@@ -1166,7 +1107,6 @@ export default function Skills() {
                     {activeTab === 'search' && <SearchPanel />}
                     {activeTab === 'usage' && <UsagePanel />}
                     {activeTab === 'composio-key' && <ComposioPanel />}
-                    {activeTab === 'screen-intelligence' && <ScreenIntelligencePanel />}
                     {activeTab === 'companion' && <CompanionPanel />}
                   </SettingsLayoutProvider>
                 </div>
@@ -1433,13 +1373,6 @@ export default function Skills() {
         <ChannelSetupModal definition={channelModalDef} onClose={() => setChannelModalDef(null)} />
       )}
 
-      {screenIntelligenceModalOpen && (
-        <ScreenIntelligenceSetupModal
-          onClose={() => setScreenIntelligenceModalOpen(false)}
-          initialStep={screenIntelligenceStatus.allPermissionsGranted ? 'enable' : 'permissions'}
-        />
-      )}
-
       {voiceModalOpen && (
         <VoiceSetupModal onClose={() => setVoiceModalOpen(false)} skillStatus={voiceStatus} />
       )}
diff --git a/app/src/pages/onboarding/__tests__/OnboardingLayout.test.tsx b/app/src/pages/onboarding/__tests__/OnboardingLayout.test.tsx
index 1d8d2796c..e2ae4c25f 100644
--- a/app/src/pages/onboarding/__tests__/OnboardingLayout.test.tsx
+++ b/app/src/pages/onboarding/__tests__/OnboardingLayout.test.tsx
@@ -121,7 +121,7 @@ async function setupLayout(onboardingTasks: unknown = null) {
         activeMode: 'os_keyring',
         backendName: 'os',
       },
-      runtime: { screenIntelligence: null, localAi: null, service: null },
+      runtime: { localAi: null, service: null },
     },
     isBootstrapping: false,
     isReady: true,
diff --git a/app/src/providers/CoreStateProvider.tsx b/app/src/providers/CoreStateProvider.tsx
index 9d0041cf5..e889a8269 100644
--- a/app/src/providers/CoreStateProvider.tsx
+++ b/app/src/providers/CoreStateProvider.tsx
@@ -240,11 +240,7 @@ function normalizeSnapshot(
       activeMode: 'os_keyring',
       backendName: 'os',
     },
-    runtime: {
-      screenIntelligence: result.runtime?.screenIntelligence ?? null,
-      localAi: result.runtime?.localAi ?? null,
-      service: result.runtime?.service ?? null,
-    },
+    runtime: { localAi: result.runtime?.localAi ?? null, service: result.runtime?.service ?? null },
   };
 }
 
diff --git a/app/src/providers/__tests__/CoreStateProvider.identityFlip.test.tsx b/app/src/providers/__tests__/CoreStateProvider.identityFlip.test.tsx
index 00694173c..694739072 100644
--- a/app/src/providers/__tests__/CoreStateProvider.identityFlip.test.tsx
+++ b/app/src/providers/__tests__/CoreStateProvider.identityFlip.test.tsx
@@ -44,7 +44,7 @@ function makeSnapshot(overrides: {
     chatOnboardingCompleted: false,
     analyticsEnabled: false,
     localState: {},
-    runtime: { screenIntelligence: null as never, localAi: null as never, service: null as never },
+    runtime: { localAi: null as never, service: null as never },
   };
 }
 
@@ -77,7 +77,7 @@ function resetCoreStateStore() {
         activeMode: 'os_keyring',
         backendName: 'os',
       },
-      runtime: { screenIntelligence: null, localAi: null, service: null },
+      runtime: { localAi: null, service: null },
     },
     teams: [],
     teamMembersById: {},
diff --git a/app/src/providers/__tests__/CoreStateProvider.test.tsx b/app/src/providers/__tests__/CoreStateProvider.test.tsx
index 0ad76efae..cd0354e2a 100644
--- a/app/src/providers/__tests__/CoreStateProvider.test.tsx
+++ b/app/src/providers/__tests__/CoreStateProvider.test.tsx
@@ -37,7 +37,7 @@ function makeSnapshot(overrides: {
     chatOnboardingCompleted: false,
     analyticsEnabled: false,
     localState: {},
-    runtime: { screenIntelligence: null as never, localAi: null as never, service: null as never },
+    runtime: { localAi: null as never, service: null as never },
   };
 }
 
@@ -104,7 +104,7 @@ function resetCoreStateStore() {
         activeMode: 'os_keyring',
         backendName: 'os',
       },
-      runtime: { screenIntelligence: null, localAi: null, service: null },
+      runtime: { localAi: null, service: null },
     },
     teams: [],
     teamMembersById: {},
diff --git a/app/src/services/__tests__/companionPayload.test.ts b/app/src/services/__tests__/companionPayload.test.ts
index 042c34cb6..9d103b563 100644
--- a/app/src/services/__tests__/companionPayload.test.ts
+++ b/app/src/services/__tests__/companionPayload.test.ts
@@ -55,7 +55,7 @@ describe('parseCompanionStateChangedEvent', () => {
   });
 
   it('accepts every valid state value', () => {
-    for (const state of ['idle', 'listening', 'thinking', 'speaking', 'pointing', 'error']) {
+    for (const state of ['idle', 'listening', 'thinking', 'speaking', 'error']) {
       const event = parseCompanionStateChangedEvent({ sessionId: 's', state });
       expect(event?.state).toBe(state);
     }
diff --git a/app/src/services/__tests__/coreRpcClient.test.ts b/app/src/services/__tests__/coreRpcClient.test.ts
index f0a46d647..59e5178ec 100644
--- a/app/src/services/__tests__/coreRpcClient.test.ts
+++ b/app/src/services/__tests__/coreRpcClient.test.ts
@@ -3,7 +3,6 @@ import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
 
 import { dispatchLocalAiMethod } from '../../lib/ai/localCoreAiMemory';
 import { CORE_RPC_TIMEOUT_MS } from '../../utils/config';
-import type { AccessibilityStatus, CommandResponse } from '../../utils/tauriCommands';
 import {
   callCoreRpc,
   classifyAuthExpiredReason,
@@ -12,56 +11,6 @@ import {
   isThreadNotFoundCoreRpcError,
 } from '../coreRpcClient';
 
-function sampleAccessibilityStatus(
-  overrides: Partial<AccessibilityStatus> = {}
-): AccessibilityStatus {
-  return {
-    platform_supported: true,
-    core_process: { pid: 4242, started_at_ms: 1712700000000 },
-    permissions: {
-      screen_recording: 'denied',
-      accessibility: 'granted',
-      input_monitoring: 'unknown',
-    },
-    features: { screen_monitoring: true },
-    session: {
-      active: false,
-      started_at_ms: null,
-      expires_at_ms: null,
-      remaining_ms: null,
-      ttl_secs: 300,
-      panic_hotkey: 'Cmd+Shift+.',
-      stop_reason: null,
-      frames_in_memory: 0,
-      last_capture_at_ms: null,
-      last_context: null,
-      vision_enabled: true,
-      vision_state: 'idle',
-      vision_queue_depth: 0,
-      last_vision_at_ms: null,
-      last_vision_summary: null,
-    },
-    config: {
-      enabled: true,
-      capture_policy: 'hybrid',
-      policy_mode: 'all_except_blacklist',
-      baseline_fps: 1,
-      vision_enabled: true,
-      session_ttl_secs: 300,
-      panic_stop_hotkey: 'Cmd+Shift+.',
-      autocomplete_enabled: true,
-      use_vision_model: true,
-      keep_screenshots: false,
-      allowlist: [],
-      denylist: [],
-    },
-    denylist: [],
-    is_context_blocked: false,
-    permission_check_process_path: '/tmp/openhuman-core-aarch64-apple-darwin',
-    ...overrides,
-  };
-}
-
 vi.mock('@tauri-apps/api/core', () => ({ invoke: vi.fn(), isTauri: vi.fn(() => false) }));
 vi.mock('../../lib/ai/localCoreAiMemory', () => ({
   dispatchLocalAiMethod: vi.fn(async (_method: string) => ({ source: 'local-ai' })),
@@ -88,50 +37,6 @@ describe('coreRpcClient', () => {
     expect(body.method).toBe('openhuman.auth_get_state');
   });
 
-  test('maps accessibility prefix to screen intelligence prefix', async () => {
-    const fetchMock = vi.mocked(fetch);
-    fetchMock.mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({ jsonrpc: '2.0', id: 2, result: { accepted: true } }),
-    } as Response);
-
-    await callCoreRpc({ method: 'openhuman.accessibility_status' });
-
-    const requestInit = fetchMock.mock.calls[0][1] as RequestInit;
-    const body = JSON.parse(String(requestInit.body));
-    expect(body.method).toBe('openhuman.screen_intelligence_status');
-  });
-
-  test('fetches accessibility_status CommandResponse with permissions and process path', async () => {
-    const fetchMock = vi.mocked(fetch);
-    const status = sampleAccessibilityStatus({
-      permission_check_process_path:
-        '/Users/dev/openhuman/app/src-tauri/binaries/openhuman-core-aarch64-apple-darwin',
-    });
-    const envelope: CommandResponse<AccessibilityStatus> = {
-      result: status,
-      logs: ['screen intelligence status fetched'],
-    };
-
-    fetchMock.mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({ jsonrpc: '2.0', id: 99, result: envelope }),
-    } as Response);
-
-    const out = await callCoreRpc<CommandResponse<AccessibilityStatus>>({
-      method: 'openhuman.accessibility_status',
-    });
-
-    expect(out.logs).toContain('screen intelligence status fetched');
-    expect(out.result.permissions.screen_recording).toBe('denied');
-    expect(out.result.permissions.accessibility).toBe('granted');
-    expect(out.result.permissions.input_monitoring).toBe('unknown');
-    expect(out.result.core_process?.pid).toBe(4242);
-    expect(out.result.permission_check_process_path).toBe(
-      '/Users/dev/openhuman/app/src-tauri/binaries/openhuman-core-aarch64-apple-darwin'
-    );
-  });
-
   test('throws clean error when JSON-RPC error payload is returned', async () => {
     const fetchMock = vi.mocked(fetch);
     fetchMock.mockResolvedValueOnce({
@@ -241,10 +146,6 @@ describe('coreRpcClient', () => {
     ['openhuman.update_memory_settings', 'openhuman.config_update_memory_settings'],
     ['openhuman.update_model_settings', 'openhuman.inference_update_model_settings'],
     ['openhuman.update_runtime_settings', 'openhuman.config_update_runtime_settings'],
-    [
-      'openhuman.update_screen_intelligence_settings',
-      'openhuman.config_update_screen_intelligence_settings',
-    ],
     [
       'openhuman.workspace_onboarding_flag_exists',
       'openhuman.config_workspace_onboarding_flag_exists',
diff --git a/app/src/services/__tests__/rpcMethods.test.ts b/app/src/services/__tests__/rpcMethods.test.ts
index e60d47ea5..60c5f1d0d 100644
--- a/app/src/services/__tests__/rpcMethods.test.ts
+++ b/app/src/services/__tests__/rpcMethods.test.ts
@@ -18,15 +18,6 @@ describe('rpcMethods catalog', () => {
       expect(normalizeRpcMethod('openhuman.auth.a.b.c')).toBe('openhuman.auth_a_b_c');
     });
 
-    test('transforms accessibility prefix to screen_intelligence prefix', () => {
-      expect(normalizeRpcMethod('openhuman.accessibility_status')).toBe(
-        'openhuman.screen_intelligence_status'
-      );
-      expect(normalizeRpcMethod('openhuman.accessibility_enable')).toBe(
-        'openhuman.screen_intelligence_enable'
-      );
-    });
-
     test('returns unmapped or unrecognized methods unchanged', () => {
       expect(normalizeRpcMethod('openhuman.threads_list')).toBe('openhuman.threads_list');
       expect(normalizeRpcMethod('openhuman.unknown_method')).toBe('openhuman.unknown_method');
@@ -37,8 +28,8 @@ describe('rpcMethods catalog', () => {
     test('trims whitespace and converts to lower case', () => {
       expect(normalizeRpcMethod('  OpenHuman.Auth.Login  ')).toBe('openhuman.auth_login');
       expect(normalizeRpcMethod('  OPENHUMAN.GET_CONFIG ')).toBe(CORE_RPC_METHODS.configGet);
-      expect(normalizeRpcMethod('OpenHuman.Accessibility_Status  ')).toBe(
-        'openhuman.screen_intelligence_status'
+      expect(normalizeRpcMethod('OpenHuman.Unrecognized_Status  ')).toBe(
+        'openhuman.unrecognized_status'
       );
       expect(normalizeRpcMethod('   some_RANDOM_method  ')).toBe('some_random_method');
     });
@@ -137,10 +128,6 @@ describe('rpcMethods catalog', () => {
         path.resolve(__dirname, '../../../../src/openhuman/config/schemas/schema_defs.rs'),
         'utf8'
       ),
-      fs.readFileSync(
-        path.resolve(__dirname, '../../../../src/openhuman/screen_intelligence/schemas.rs'),
-        'utf8'
-      ),
       fs.readFileSync(
         path.resolve(__dirname, '../../../../src/openhuman/inference/provider/schemas.rs'),
         'utf8'
@@ -188,23 +175,21 @@ describe('rpcMethods catalog', () => {
       // core.* methods (e.g. core.ping) are special dispatch methods, not in the schema catalog.
       if (!method.startsWith('openhuman.')) continue;
       const methodRoot = method.slice('openhuman.'.length);
-      const namespace = methodRoot.startsWith('screen_intelligence_')
-        ? 'screen_intelligence'
-        : methodRoot.startsWith('inference_')
-          ? 'inference'
-          : methodRoot.startsWith('embeddings_')
-            ? 'embeddings'
-            : methodRoot.startsWith('providers_')
-              ? 'providers'
-              : methodRoot.startsWith('mcp_clients_')
-                ? 'mcp_clients'
-                : methodRoot.startsWith('health_')
-                  ? 'health'
-                  : methodRoot.startsWith('channels_')
-                    ? 'channels'
-                    : methodRoot.startsWith('tool_registry_')
-                      ? 'tool_registry'
-                      : 'config';
+      const namespace = methodRoot.startsWith('inference_')
+        ? 'inference'
+        : methodRoot.startsWith('embeddings_')
+          ? 'embeddings'
+          : methodRoot.startsWith('providers_')
+            ? 'providers'
+            : methodRoot.startsWith('mcp_clients_')
+              ? 'mcp_clients'
+              : methodRoot.startsWith('health_')
+                ? 'health'
+                : methodRoot.startsWith('channels_')
+                  ? 'channels'
+                  : methodRoot.startsWith('tool_registry_')
+                    ? 'tool_registry'
+                    : 'config';
       const fnName = methodRoot.slice(`${namespace}_`.length);
       expect(schemaSources).toContain(`namespace: "${namespace}"`);
       expect(schemaSources).toContain(`function: "${fnName}"`);
diff --git a/app/src/services/companionEvents.ts b/app/src/services/companionEvents.ts
index 24053e233..c7d6abb18 100644
--- a/app/src/services/companionEvents.ts
+++ b/app/src/services/companionEvents.ts
@@ -23,7 +23,6 @@ const COMPANION_STATES: ReadonlySet<string> = new Set([
   'listening',
   'thinking',
   'speaking',
-  'pointing',
   'error',
 ]);
 
diff --git a/app/src/services/coreStateApi.test.ts b/app/src/services/coreStateApi.test.ts
index 081049488..f2a945bf6 100644
--- a/app/src/services/coreStateApi.test.ts
+++ b/app/src/services/coreStateApi.test.ts
@@ -22,7 +22,7 @@ function makeSnapshotResult(overrides: Record<string, unknown> = {}) {
       activeMode: 'os_keyring',
       backendName: 'os',
     },
-    runtime: { screenIntelligence: {}, localAi: {}, service: {} },
+    runtime: { localAi: {}, service: {} },
     ...overrides,
   };
 }
diff --git a/app/src/services/coreStateApi.ts b/app/src/services/coreStateApi.ts
index 98f512b14..9e5ca7c3d 100644
--- a/app/src/services/coreStateApi.ts
+++ b/app/src/services/coreStateApi.ts
@@ -1,6 +1,5 @@
 import type { User } from '../types/api';
 import type { TeamInvite, TeamMember, TeamWithRole } from '../types/team';
-import type { AccessibilityStatus } from '../utils/tauriCommands/accessibility';
 import type { LocalAiStatus } from '../utils/tauriCommands/localAi';
 import type { ServiceStatus } from '../utils/tauriCommands/service';
 import { callCoreRpc } from './coreRpcClient';
@@ -57,11 +56,7 @@ interface AppStateSnapshotResult {
     keyringConsent?: KeyringConsentPreference | null;
   };
   keyringStatus?: KeyringStatus;
-  runtime: {
-    screenIntelligence: AccessibilityStatus;
-    localAi: LocalAiStatus;
-    service: ServiceStatus;
-  };
+  runtime: { localAi: LocalAiStatus; service: ServiceStatus };
   /**
    * Process + component health, folded into this snapshot (#daemon-poll-fold)
    * so the daemon-health store hydrates from the same poll instead of a second
diff --git a/app/src/services/rpcMethods.ts b/app/src/services/rpcMethods.ts
index f66edc488..1f15baa7f 100644
--- a/app/src/services/rpcMethods.ts
+++ b/app/src/services/rpcMethods.ts
@@ -28,7 +28,6 @@ export const CORE_RPC_METHODS = {
   configUpdateModelSettings: 'openhuman.config_update_model_settings',
   configUpdateRuntimeSettings: 'openhuman.config_update_runtime_settings',
   configUpdateSandboxSettings: 'openhuman.config_update_sandbox_settings',
-  configUpdateScreenIntelligenceSettings: 'openhuman.config_update_screen_intelligence_settings',
   configWorkspaceOnboardingFlagExists: 'openhuman.config_workspace_onboarding_flag_exists',
   configWorkspaceOnboardingFlagSet: 'openhuman.config_workspace_onboarding_flag_set',
   corePing: 'core.ping',
@@ -54,7 +53,6 @@ export const CORE_RPC_METHODS = {
   inferenceUpdateModelSettings: 'openhuman.inference_update_model_settings',
   inferenceWhisperInstallStatus: 'openhuman.inference_whisper_install_status',
   providersListModels: 'openhuman.inference_list_models',
-  screenIntelligenceStatus: 'openhuman.screen_intelligence_status',
   embeddingsGetSettings: 'openhuman.embeddings_get_settings',
   embeddingsUpdateSettings: 'openhuman.embeddings_update_settings',
   embeddingsSetApiKey: 'openhuman.embeddings_set_api_key',
@@ -104,8 +102,6 @@ export const LEGACY_METHOD_ALIASES: Record<string, CoreRpcMethod> = {
   'openhuman.update_memory_settings': CORE_RPC_METHODS.configUpdateMemorySettings,
   'openhuman.update_model_settings': CORE_RPC_METHODS.inferenceUpdateModelSettings,
   'openhuman.update_runtime_settings': CORE_RPC_METHODS.configUpdateRuntimeSettings,
-  'openhuman.update_screen_intelligence_settings':
-    CORE_RPC_METHODS.configUpdateScreenIntelligenceSettings,
   'openhuman.workspace_onboarding_flag_exists':
     CORE_RPC_METHODS.configWorkspaceOnboardingFlagExists,
   'openhuman.workspace_onboarding_flag_set': CORE_RPC_METHODS.configWorkspaceOnboardingFlagSet,
@@ -154,9 +150,5 @@ export function normalizeRpcMethod(method: string): string {
     return `openhuman.auth_${normalized.slice('openhuman.auth.'.length).split('.').join('_')}`;
   }
 
-  if (normalized.startsWith('openhuman.accessibility_')) {
-    return normalized.replace('openhuman.accessibility_', 'openhuman.screen_intelligence_');
-  }
-
   return normalized;
 }
diff --git a/app/src/store/__tests__/socketSelectors.test.ts b/app/src/store/__tests__/socketSelectors.test.ts
index 836568fcd..63608f53c 100644
--- a/app/src/store/__tests__/socketSelectors.test.ts
+++ b/app/src/store/__tests__/socketSelectors.test.ts
@@ -29,7 +29,7 @@ function makeCoreState(token: string | null, userId: string | null = null): Core
         activeMode: 'os_keyring',
         backendName: 'os',
       },
-      runtime: { screenIntelligence: null, localAi: null, service: null },
+      runtime: { localAi: null, service: null },
     },
     teams: [],
     teamMembersById: {},
diff --git a/app/src/store/companionSlice.test.ts b/app/src/store/companionSlice.test.ts
index bb268f69c..b961bf965 100644
--- a/app/src/store/companionSlice.test.ts
+++ b/app/src/store/companionSlice.test.ts
@@ -94,13 +94,7 @@ describe('companionSlice', () => {
   });
 
   it('setConfig stores config object', () => {
-    const config = {
-      hotkey: 'ctrl+space',
-      activation_mode: 'push',
-      ttl_secs: 3600,
-      capture_screen: true,
-      include_app_context: true,
-    };
+    const config = { hotkey: 'ctrl+space', activation_mode: 'push', ttl_secs: 3600 };
     const state = companionReducer(initialState, setConfig(config));
     expect(state.config).toEqual(config);
   });
@@ -121,13 +115,7 @@ describe('companionSlice', () => {
       sessionActive: true,
       state: 'speaking',
       sessionId: 'sess-1',
-      config: {
-        hotkey: 'ctrl+space',
-        activation_mode: 'push',
-        ttl_secs: 3600,
-        capture_screen: true,
-        include_app_context: true,
-      },
+      config: { hotkey: 'ctrl+space', activation_mode: 'push', ttl_secs: 3600 },
       lastError: 'some error',
     };
     const state = companionReducer(active, clearSession());
@@ -151,13 +139,7 @@ describe('companion selectors', () => {
       sessionActive: true,
       state: 'speaking' as const,
       sessionId: 'sess-1',
-      config: {
-        hotkey: 'ctrl+space',
-        activation_mode: 'push',
-        ttl_secs: 3600,
-        capture_screen: true,
-        include_app_context: true,
-      },
+      config: { hotkey: 'ctrl+space', activation_mode: 'push', ttl_secs: 3600 },
       lastError: 'err',
     },
   };
diff --git a/app/src/store/companionSlice.ts b/app/src/store/companionSlice.ts
index 0bdfe6db1..0b9409d8a 100644
--- a/app/src/store/companionSlice.ts
+++ b/app/src/store/companionSlice.ts
@@ -5,15 +5,13 @@ import { resetUserScopedState } from './resetActions';
 // ── Types matching the Tauri-side companion module ───────────────────
 
 /** Matches `CompanionState` enum (serde rename_all = "snake_case"). */
-export type CompanionState = 'idle' | 'listening' | 'thinking' | 'speaking' | 'pointing' | 'error';
+export type CompanionState = 'idle' | 'listening' | 'thinking' | 'speaking' | 'error';
 
 /** Matches `CompanionConfig` struct. */
 export interface CompanionConfig {
   hotkey: string;
   activation_mode: string;
   ttl_secs: number;
-  capture_screen: boolean;
-  include_app_context: boolean;
 }
 
 /**
diff --git a/app/src/test/mockDefaultSkillStatusHooks.ts b/app/src/test/mockDefaultSkillStatusHooks.ts
index 23f9d2dae..1dfc9966b 100644
--- a/app/src/test/mockDefaultSkillStatusHooks.ts
+++ b/app/src/test/mockDefaultSkillStatusHooks.ts
@@ -1,5 +1,5 @@
 /**
- * Shared Vitest mocks for screen-intelligence / voice status hooks.
+ * Shared Vitest mocks for voice status hooks.
  * Import this module first in Skills page tests so `Skills` does not require `CoreStateProvider`.
  */
 import { vi } from 'vitest';
@@ -14,14 +14,6 @@ const offlineStatusBase = {
   ctaVariant: 'sage' as const,
 };
 
-vi.mock('../features/screen-intelligence/useScreenIntelligenceSkillStatus', () => ({
-  useScreenIntelligenceSkillStatus: () => ({
-    ...offlineStatusBase,
-    allPermissionsGranted: false,
-    platformUnsupported: false,
-  }),
-}));
-
 vi.mock('../features/voice/useVoiceSkillStatus', () => ({
   useVoiceSkillStatus: () => ({
     ...offlineStatusBase,
diff --git a/app/src/utils/__tests__/toolTimelineFormatting.test.ts b/app/src/utils/__tests__/toolTimelineFormatting.test.ts
index 0ccb87609..756664507 100644
--- a/app/src/utils/__tests__/toolTimelineFormatting.test.ts
+++ b/app/src/utils/__tests__/toolTimelineFormatting.test.ts
@@ -205,12 +205,6 @@ describe('formatTimelineEntry', () => {
     ).toEqual({ title: 'Git diff', detail: 'diff --stat' });
   });
 
-  it('formats screenshot as a simple label', () => {
-    expect(formatTimelineEntry(entry({ name: 'screenshot' }))).toEqual({
-      title: 'Taking screenshot',
-    });
-  });
-
   it('formats glob with pattern detail', () => {
     expect(
       formatTimelineEntry(
@@ -247,7 +241,6 @@ describe('formatToolName', () => {
     expect(formatToolName('edit')).toBe('Editing file');
     expect(formatToolName('grep')).toBe('Searching code');
     expect(formatToolName('git_operations')).toBe('Git operation');
-    expect(formatToolName('screenshot')).toBe('Taking screenshot');
     expect(formatToolName('lsp')).toBe('Code intelligence');
   });
 
diff --git a/app/src/utils/tauriCommands/aboutApp.ts b/app/src/utils/tauriCommands/aboutApp.ts
index bd8e5bc0b..12f34f9c0 100644
--- a/app/src/utils/tauriCommands/aboutApp.ts
+++ b/app/src/utils/tauriCommands/aboutApp.ts
@@ -16,7 +16,6 @@ export type CapabilityCategory =
   | 'team'
   | 'settings'
   | 'auth'
-  | 'screen_intelligence'
   | 'channels'
   | 'automation';
 
diff --git a/app/src/utils/tauriCommands/accessibility.ts b/app/src/utils/tauriCommands/accessibility.ts
deleted file mode 100644
index a0b2f0ca2..000000000
--- a/app/src/utils/tauriCommands/accessibility.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * Accessibility and Screen Intelligence commands.
- */
-import { callCoreRpc } from '../../services/coreRpcClient';
-import { CommandResponse, isTauri } from './common';
-
-export type AccessibilityPermissionState = 'granted' | 'denied' | 'unknown' | 'unsupported';
-export type AccessibilityPermissionKind =
-  | 'screen_recording'
-  | 'accessibility'
-  | 'input_monitoring'
-  | 'microphone';
-
-export interface AccessibilityPermissionStatus {
-  screen_recording: AccessibilityPermissionState;
-  accessibility: AccessibilityPermissionState;
-  input_monitoring: AccessibilityPermissionState;
-  /**
-   * Microphone permission. The Rust `PermissionStatus` always serializes this,
-   * but it's optional here so existing object literals (e.g. screen-intelligence
-   * status fixtures) that predate the desktop-agent panel still typecheck.
-   */
-  microphone?: AccessibilityPermissionState;
-}
-
-export interface AccessibilityFeatures {
-  screen_monitoring: boolean;
-}
-
-export interface AccessibilitySessionStatus {
-  active: boolean;
-  started_at_ms: number | null;
-  expires_at_ms: number | null;
-  remaining_ms: number | null;
-  ttl_secs: number;
-  panic_hotkey: string;
-  stop_reason: string | null;
-  frames_in_memory: number;
-  last_capture_at_ms: number | null;
-  last_context: string | null;
-  vision_enabled: boolean;
-  vision_state: string;
-  vision_queue_depth: number;
-  last_vision_at_ms: number | null;
-  last_vision_summary: string | null;
-}
-
-export interface AccessibilityConfig {
-  enabled: boolean;
-  capture_policy: string;
-  policy_mode: 'all_except_blacklist' | 'whitelist_only' | string;
-  baseline_fps: number;
-  vision_enabled: boolean;
-  session_ttl_secs: number;
-  panic_stop_hotkey: string;
-  autocomplete_enabled: boolean;
-  use_vision_model: boolean;
-  keep_screenshots: boolean;
-  allowlist: string[];
-  denylist: string[];
-}
-
-export interface AccessibilityCoreProcessStatus {
-  pid: number;
-  started_at_ms: number;
-}
-
-export interface AccessibilityStatus {
-  platform_supported: boolean;
-  permissions: AccessibilityPermissionStatus;
-  features: AccessibilityFeatures;
-  session: AccessibilitySessionStatus;
-  config: AccessibilityConfig;
-  denylist: string[];
-  is_context_blocked: boolean;
-  /** Absolute path of the core binary; macOS TCC applies to this executable. */
-  permission_check_process_path?: string | null;
-  /** Identity of the core process currently serving RPC requests. */
-  core_process?: AccessibilityCoreProcessStatus | null;
-}
-
-export interface AccessibilityStartSessionParams {
-  consent: boolean;
-  ttl_secs?: number;
-  screen_monitoring?: boolean;
-}
-
-export interface AccessibilityStopSessionParams {
-  reason?: string;
-}
-
-export interface AccessibilityCaptureFrame {
-  captured_at_ms: number;
-  reason: string;
-  app_name: string | null;
-  window_title: string | null;
-  image_ref?: string | null;
-}
-
-export interface AccessibilityCaptureNowResult {
-  accepted: boolean;
-  frame: AccessibilityCaptureFrame | null;
-}
-
-export interface AccessibilityInputActionParams {
-  action: string;
-  x?: number;
-  y?: number;
-  button?: string;
-  text?: string;
-  key?: string;
-  modifiers?: string[];
-}
-
-export interface AccessibilityInputActionResult {
-  accepted: boolean;
-  blocked: boolean;
-  reason: string | null;
-}
-
-export interface AccessibilityAutocompleteSuggestion {
-  value: string;
-  confidence: number;
-}
-
-export interface AccessibilityAutocompleteSuggestParams {
-  context?: string;
-  max_results?: number;
-}
-
-export interface AccessibilityAutocompleteSuggestResult {
-  suggestions: AccessibilityAutocompleteSuggestion[];
-}
-
-export interface AccessibilityAutocompleteCommitParams {
-  suggestion: string;
-}
-
-export interface AccessibilityAutocompleteCommitResult {
-  committed: boolean;
-}
-
-export interface AccessibilityVisionSummary {
-  id: string;
-  captured_at_ms: number;
-  app_name: string | null;
-  window_title: string | null;
-  ui_state: string;
-  key_text: string;
-  actionable_notes: string;
-  confidence: number;
-}
-
-export interface AccessibilityVisionRecentResult {
-  summaries: AccessibilityVisionSummary[];
-}
-
-export interface AccessibilityVisionFlushResult {
-  accepted: boolean;
-  summary: AccessibilityVisionSummary | null;
-}
-
-export interface CaptureTestContextInfo {
-  app_name: string | null;
-  window_title: string | null;
-  bounds_x: number | null;
-  bounds_y: number | null;
-  bounds_width: number | null;
-  bounds_height: number | null;
-}
-
-export interface CaptureTestResult {
-  ok: boolean;
-  capture_mode: string;
-  context: CaptureTestContextInfo | null;
-  image_ref: string | null;
-  bytes_estimate: number | null;
-  error: string | null;
-  timing_ms: number;
-}
-
-export async function openhumanAccessibilityStatus(): Promise<
-  CommandResponse<AccessibilityStatus>
-> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityStatus>>({
-    method: 'openhuman.accessibility_status',
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityRequestPermissions(): Promise<
-  CommandResponse<AccessibilityPermissionStatus>
-> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityPermissionStatus>>({
-    method: 'openhuman.accessibility_request_permissions',
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityRequestPermission(
-  permission: AccessibilityPermissionKind
-): Promise<CommandResponse<AccessibilityPermissionStatus>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityPermissionStatus>>({
-    method: 'openhuman.accessibility_request_permission',
-    params: { permission },
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityStartSession(
-  params: AccessibilityStartSessionParams
-): Promise<CommandResponse<AccessibilitySessionStatus>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilitySessionStatus>>({
-    method: 'openhuman.accessibility_start_session',
-    params,
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityStopSession(
-  params?: AccessibilityStopSessionParams
-): Promise<CommandResponse<AccessibilitySessionStatus>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilitySessionStatus>>({
-    method: 'openhuman.accessibility_stop_session',
-    params: params ?? {},
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityCaptureNow(): Promise<
-  CommandResponse<AccessibilityCaptureNowResult>
-> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityCaptureNowResult>>({
-    method: 'openhuman.accessibility_capture_now',
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityInputAction(
-  params: AccessibilityInputActionParams
-): Promise<CommandResponse<AccessibilityInputActionResult>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityInputActionResult>>({
-    method: 'openhuman.accessibility_input_action',
-    params,
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityAutocompleteSuggest(
-  params?: AccessibilityAutocompleteSuggestParams
-): Promise<CommandResponse<AccessibilityAutocompleteSuggestResult>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityAutocompleteSuggestResult>>({
-    method: 'openhuman.accessibility_autocomplete_suggest',
-    params: params ?? {},
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityAutocompleteCommit(
-  params: AccessibilityAutocompleteCommitParams
-): Promise<CommandResponse<AccessibilityAutocompleteCommitResult>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityAutocompleteCommitResult>>({
-    method: 'openhuman.accessibility_autocomplete_commit',
-    params,
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityVisionRecent(
-  limit?: number
-): Promise<CommandResponse<AccessibilityVisionRecentResult>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityVisionRecentResult>>({
-    method: 'openhuman.accessibility_vision_recent',
-    params: { limit },
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanAccessibilityVisionFlush(): Promise<
-  CommandResponse<AccessibilityVisionFlushResult>
-> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<AccessibilityVisionFlushResult>>({
-    method: 'openhuman.accessibility_vision_flush',
-    serviceManaged: true,
-  });
-}
-
-export async function openhumanScreenIntelligenceCaptureTest(): Promise<
-  CommandResponse<CaptureTestResult>
-> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<CaptureTestResult>>({
-    method: 'openhuman.screen_intelligence_capture_test',
-    serviceManaged: true,
-  });
-}
diff --git a/app/src/utils/tauriCommands/config.ts b/app/src/utils/tauriCommands/config.ts
index af6a9f47e..4efdf6e17 100644
--- a/app/src/utils/tauriCommands/config.ts
+++ b/app/src/utils/tauriCommands/config.ts
@@ -153,19 +153,6 @@ export interface BrowserSettingsUpdate {
   backend?: 'agent_browser' | 'playwright' | 'rust_native' | 'computer_use' | 'auto' | null;
 }
 
-export interface ScreenIntelligenceSettingsUpdate {
-  enabled?: boolean | null;
-  capture_policy?: string | null;
-  policy_mode?: 'all_except_blacklist' | 'whitelist_only' | null;
-  baseline_fps?: number | null;
-  vision_enabled?: boolean | null;
-  autocomplete_enabled?: boolean | null;
-  use_vision_model?: boolean | null;
-  keep_screenshots?: boolean | null;
-  allowlist?: string[] | null;
-  denylist?: string[] | null;
-}
-
 export interface LocalAiSettingsUpdate {
   runtime_enabled?: boolean | null;
   /**
@@ -454,18 +441,6 @@ export async function openhumanUpdateBrowserSettings(
   });
 }
 
-export async function openhumanUpdateScreenIntelligenceSettings(
-  update: ScreenIntelligenceSettingsUpdate
-): Promise<CommandResponse<ConfigSnapshot>> {
-  if (!isTauri()) {
-    throw new Error('Not running in Tauri');
-  }
-  return await callCoreRpc<CommandResponse<ConfigSnapshot>>({
-    method: CORE_RPC_METHODS.configUpdateScreenIntelligenceSettings,
-    params: update,
-  });
-}
-
 // ── Agent access mode (autonomy / filesystem permissions) ───────────────────
 
 export type AutonomyLevel = 'readonly' | 'supervised' | 'full';
diff --git a/app/src/utils/tauriCommands/index.ts b/app/src/utils/tauriCommands/index.ts
index a8d1e14e4..b8fbfa7ab 100644
--- a/app/src/utils/tauriCommands/index.ts
+++ b/app/src/utils/tauriCommands/index.ts
@@ -16,7 +16,6 @@ export * from './cron';
 export * from './taskSources';
 export * from './heartbeat';
 export * from './service';
-export * from './accessibility';
 export * from './voice';
 export * from './aboutApp';
 export * from './workspacePaths';
diff --git a/app/src/utils/toolDefinitions.ts b/app/src/utils/toolDefinitions.ts
index 17bdca2b4..3e236ef80 100644
--- a/app/src/utils/toolDefinitions.ts
+++ b/app/src/utils/toolDefinitions.ts
@@ -56,14 +56,6 @@ export const TOOL_CATALOG: ToolDefinition[] = [
   },
 
   // Vision
-  {
-    id: 'screenshot',
-    displayName: 'Screenshot',
-    description: 'Capture screenshots of your screen.',
-    category: 'Vision',
-    defaultEnabled: true,
-    rustToolNames: ['screenshot'],
-  },
   {
     id: 'image_info',
     displayName: 'Image Analysis',
@@ -155,7 +147,7 @@ export const TOOL_CATALOG: ToolDefinition[] = [
 export const CATEGORY_DESCRIPTIONS: Record<ToolCategory, string> = {
   System: 'Shell access and version control',
   Files: 'Read and write files on disk',
-  Vision: 'Screen capture and image analysis',
+  Vision: 'Image analysis',
   Web: 'Browser, HTTP, and web search',
   Memory: 'Persistent recall for the AI',
   Automation: 'Cron jobs and scheduled tasks',
diff --git a/app/src/utils/toolTimelineFormatting.ts b/app/src/utils/toolTimelineFormatting.ts
index d0fcb3698..dc5c8b794 100644
--- a/app/src/utils/toolTimelineFormatting.ts
+++ b/app/src/utils/toolTimelineFormatting.ts
@@ -35,7 +35,6 @@ const TOOL_DISPLAY_NAMES: Record<string, string> = {
   git_operations: 'Git operation',
   browser: 'Browsing',
   browser_open: 'Opening browser',
-  screenshot: 'Taking screenshot',
   image_info: 'Analyzing image',
   install_tool: 'Installing tool',
   lsp: 'Code intelligence',
@@ -115,7 +114,6 @@ const CLIENT_KNOWN_TOOLS = new Set<string>([
   'git_operations',
   'browser',
   'browser_open',
-  'screenshot',
   'image_info',
   'install_tool',
   'lsp',
@@ -189,7 +187,6 @@ const TOOL_CATEGORIES: Record<string, ToolCategory> = {
   curl: 'fetch',
   browser: 'browse',
   browser_open: 'browse',
-  screenshot: 'browse',
 };
 
 /** Categorize a (possibly `subagent:`-prefixed) tool name for grouping/icons. */
@@ -545,9 +542,6 @@ function formatToolDetail(
       return { title: host ? `Browsing ${host}` : 'Browsing' };
     }
 
-    case 'screenshot':
-      return { title: 'Taking screenshot' };
-
     case 'image_info':
       return { title: 'Analyzing image' };
 
diff --git a/app/test/e2e/specs/mega-flow.spec.ts b/app/test/e2e/specs/mega-flow.spec.ts
index 433e4326b..c5845f414 100644
--- a/app/test/e2e/specs/mega-flow.spec.ts
+++ b/app/test/e2e/specs/mega-flow.spec.ts
@@ -467,14 +467,6 @@ describe('Mega flow — login + Gmail OAuth + Composio in one session', () => {
   // can reliably emit nested tool-call chains — neither is present.
   // -------------------------------------------------------------------------
 
-  // -------------------------------------------------------------------------
-  // Scenario 9 — Accessibility permission flow.
-  // SKIPPED: No `openhuman.accessibility_*` RPC surface exists in the Rust
-  // controller registry.  The `accessibility` domain name appears only in
-  // directory listings; it has no `schemas.rs` with registered controllers.
-  // If a future PR adds accessibility controllers, add scenarios here.
-  // -------------------------------------------------------------------------
-
   // -------------------------------------------------------------------------
   // Scenario 10 — Account switch + restore.
   // Login as user A, create a thread, reset, login as user B, then re-login
diff --git a/app/test/e2e/specs/screen-intelligence.spec.ts b/app/test/e2e/specs/screen-intelligence.spec.ts
deleted file mode 100644
index 0f6c58034..000000000
--- a/app/test/e2e/specs/screen-intelligence.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { browser, expect } from '@wdio/globals';
-
-import { waitForApp } from '../helpers/app-helpers';
-import {
-  clickButton,
-  dumpAccessibilityTree,
-  textExists,
-  waitForText,
-} from '../helpers/element-helpers';
-import { isTauriDriver } from '../helpers/platform';
-import { resetApp } from '../helpers/reset-app';
-import { navigateViaHash } from '../helpers/shared-flows';
-import { clearRequestLog, startMockServer, stopMockServer } from '../mock-server';
-
-function stepLog(message: string, context?: unknown): void {
-  const stamp = new Date().toISOString();
-  if (context === undefined) {
-    console.log(`[ScreenIntelligenceE2E][${stamp}] ${message}`);
-    return;
-  }
-  console.log(`[ScreenIntelligenceE2E][${stamp}] ${message}`, JSON.stringify(context, null, 2));
-}
-
-async function waitForCaptureOutcome(timeoutMs = 20_000): Promise<'success' | 'failure'> {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (
-      (await textExists('Success')) &&
-      ((await textExists('windowed')) || (await textExists('fullscreen')))
-    ) {
-      return 'success';
-    }
-    if (
-      (await textExists('Failed')) ||
-      (await textExists('screen recording permission is not granted')) ||
-      (await textExists('screen capture is unsupported on this platform')) ||
-      (await textExists('screen capture failed'))
-    ) {
-      return 'failure';
-    }
-    await browser.pause(500);
-  }
-  throw new Error('Timed out waiting for screen capture outcome');
-}
-
-describe('Screen Intelligence', () => {
-  before(async function () {
-    stepLog('Starting Screen Intelligence E2E');
-    await startMockServer();
-    await waitForApp();
-    await resetApp('e2e-screen-intelligence-user');
-    clearRequestLog();
-  });
-
-  after(async () => {
-    await stopMockServer();
-  });
-
-  it('opens the Screen Intelligence settings route', async function () {
-    if (!isTauriDriver()) {
-      this.skip();
-      return;
-    }
-
-    // Load the settings shell first so nested routes are available.
-    await browser.execute(() => {
-      window.location.hash = '/settings';
-    });
-    await browser.pause(2_000);
-
-    // Now navigate to the nested screen-intelligence route.
-    // Retry if the hash bounces (lazy component load may cause redirect).
-    for (let attempt = 0; attempt < 3; attempt++) {
-      await browser.execute(() => {
-        window.location.hash = '/settings/screen-intelligence';
-      });
-      await browser.pause(3_000);
-      const h = String(await browser.execute(() => window.location.hash));
-      if (h.includes('/settings/screen-intelligence')) break;
-      stepLog(`hash bounce attempt ${attempt}`, { hash: h });
-    }
-
-    const currentHash = await browser.execute(() => window.location.hash);
-    stepLog('Navigated to screen intelligence route', { currentHash });
-
-    // The panel renders the "Screen Awareness" title on every platform.
-    // The "Permissions" sub-section is only rendered when
-    // status.platform_supported is true (macOS) — on Linux/Windows the
-    // section is gated out by ScreenIntelligencePanel, so don't assert
-    // on it here.
-    await waitForText('Screen Awareness', 15_000);
-  });
-
-  it('triggers capture test and reaches a stable UI outcome', async function () {
-    if (!isTauriDriver()) {
-      this.skip();
-      return;
-    }
-
-    // The capture test UI lives in the debug panel, not the main panel.
-    await navigateViaHash('/settings/screen-awareness-debug');
-    await waitForText('Screen Awareness', 10_000);
-
-    // The Expand button opens the Debug & Diagnostics section.
-    // If not present, the debug panel may already be expanded.
-    if (await textExists('Expand')) {
-      await clickButton('Expand', 10_000);
-    }
-    await waitForText('Capture test', 10_000);
-    await clickButton('Test capture', 10_000);
-
-    const outcome = await waitForCaptureOutcome();
-    stepLog('Capture test outcome', { outcome });
-
-    if (outcome === 'success') {
-      const hasPreviewImage = await browser.execute(() => {
-        const img = document.querySelector('img[alt="Capture test result"]');
-        return !!img && !!img.getAttribute('src');
-      });
-      expect(hasPreviewImage).toBe(true);
-      expect((await textExists('windowed')) || (await textExists('fullscreen'))).toBe(true);
-      return;
-    }
-
-    const hasFailureGuidance =
-      (await textExists('Failed')) ||
-      (await textExists('screen recording permission is not granted')) ||
-      (await textExists('screen capture is unsupported on this platform')) ||
-      (await textExists('screen capture failed'));
-    if (!hasFailureGuidance) {
-      const tree = await dumpAccessibilityTree();
-      stepLog('Capture failure outcome missing expected guidance', { tree: tree.slice(0, 4000) });
-    }
-    expect(hasFailureGuidance).toBe(true);
-  });
-});
diff --git a/app/test/e2e/specs/settings-feature-preferences.spec.ts b/app/test/e2e/specs/settings-feature-preferences.spec.ts
index 4c7ee9652..be2b8c3ad 100644
--- a/app/test/e2e/specs/settings-feature-preferences.spec.ts
+++ b/app/test/e2e/specs/settings-feature-preferences.spec.ts
@@ -73,16 +73,25 @@ describe('Settings - Feature Preferences', function () {
     await stopMockServer();
   });
 
-  it('renders the screen-awareness settings route', async () => {
-    // The combined "Features" hub was retired: screen-awareness, notifications,
-    // and tools are now independent sidebar entries. The legacy /settings/features
-    // slug redirects to /settings/screen-intelligence (see Settings.tsx), which
-    // renders the Screen Awareness panel.
-    await navigateViaHash('/settings/features');
+  it('falls through removed feature routes to settings home', async () => {
+    for (const route of [
+      '/settings/features',
+      '/settings/screen-intelligence',
+      '/settings/screen-awareness-debug',
+    ]) {
+      await navigateViaHash(route);
+      await browser.waitUntil(
+        async () => {
+          const hash = await browser.execute(() => window.location.hash);
+          return hash === '#/settings' || hash === '#/settings/account';
+        },
+        { timeout: 15_000, timeoutMsg: `${route} did not normalize to the settings index` }
+      );
 
-    // ScreenIntelligencePanel renders SettingsSection title
-    // t('settings.features.screenAwareness') = 'Screen awareness'.
-    await waitForText('Screen awareness', 15_000);
+      const bodyText = await browser.$('body').getText();
+      expect(bodyText).not.toContain('Screen Intelligence');
+      expect(bodyText).not.toContain('Screen Awareness Debug');
+    }
   });
 
   it('persists the default messaging channel through redux state', async () => {
diff --git a/app/test/e2e/specs/tool-browser-flow.spec.ts b/app/test/e2e/specs/tool-browser-flow.spec.ts
index c8535d27b..ba12f44ea 100644
--- a/app/test/e2e/specs/tool-browser-flow.spec.ts
+++ b/app/test/e2e/specs/tool-browser-flow.spec.ts
@@ -29,11 +29,10 @@ const USER_ID = 'e2e-tool-browser';
  *    over JSON-RPC. Plus: the mock backend correctly records arbitrary HTTP
  *    requests (proving the side-channel browser-automation flows would emit
  *    against the mocked services is intact).
- *  - 7.1.2 — `BrowserTool::parameters_schema` enumerates the automation
- *    surface (open / snapshot / click / fill / type / get_text / etc.).
- *    Asserting that `tools_agent`'s tool scope is wildcard (which would
- *    surface `browser` to the LLM) ensures the schema-driven tool surface is
- *    intact for the agent path.
+ *  - 7.1.2 — the live built-in tool catalog contains `browser` and advertises
+ *    its DOM/accessibility `snapshot` action without the removed screenshot
+ *    action. The exact action-enum schema is pinned by the BrowserTool Rust
+ *    unit test.
  *
  * Future: when the harness gains a deterministic mock-LLM that emits
  * structured `tool_calls`, the `it.skip` block below can flip into a real
@@ -63,6 +62,15 @@ interface ListDefinitionsResult {
   definitions?: AgentDef[];
 }
 
+interface AgentToolInfo {
+  name?: string;
+  description?: string;
+}
+
+interface AvailableToolsResult {
+  tools?: AgentToolInfo[];
+}
+
 describe('System tools — Browser (open URL + automation registry)', () => {
   before(async function () {
     // resetApp bring-up can run ~25-30s and race the default 30s Mocha hook
@@ -71,6 +79,14 @@ describe('System tools — Browser (open URL + automation registry)', () => {
     await startMockServer();
     await waitForApp();
     await resetApp(USER_ID);
+    const browserSettings = await callOpenhumanRpc('openhuman.config_update_browser_settings', {
+      enabled: true,
+    });
+    expect(browserSettings.ok).toBe(true);
+    const toolPreferences = await callOpenhumanRpc('openhuman.app_state_update_local_state', {
+      onboardingTasks: { enabledTools: ['browser'] },
+    });
+    expect(toolPreferences.ok).toBe(true);
     clearRequestLog();
   });
 
@@ -137,30 +153,24 @@ describe('System tools — Browser (open URL + automation registry)', () => {
     expect(Array.isArray(log)).toBe(true);
   });
 
-  it('7.1.2 browser-automation registry surface is reachable via the agent registry', async () => {
-    // BrowserTool's parameters_schema enumerates 22 actions (open, snapshot,
-    // click, fill, type, get_text, screenshot, …). Asserting tools_agent's
-    // wildcard scope is present means the LLM-facing tool surface that
-    // would expose this schema to a model is intact. The schema content
-    // itself is unit-tested in `browser_tests.rs::browser_tool_schema_*`.
-    const list = await callOpenhumanRpc<ListDefinitionsResult>(
-      'openhuman.agent_list_definitions',
+  it('7.1.2 live BrowserTool catalog advertises DOM snapshots without screenshots', async () => {
+    // `agent_registry_available_tools` builds its response from the wildcard
+    // tools-catalog agent's live `tool_specs()`, so this checks the actual
+    // BrowserTool metadata exposed to agents rather than merely finding an
+    // agent definition that might be able to resolve it. The exact
+    // parameters-schema action enum is pinned by
+    // `browser_tests.rs::browser_tool_schema_has_required_action`.
+    const list = await callOpenhumanRpc<AvailableToolsResult>(
+      'openhuman.agent_registry_available_tools',
       {}
     );
     expect(list.ok).toBe(true);
-    const defs = list.result?.definitions ?? [];
-    // The integrations_agent and tools_agent both bring browser surfaces
-    // (the former via SaaS-specific scrapers, the latter via the generic
-    // `browser` automation tool). Confirm at least one is present.
-    const browserBearing = defs.filter(
-      d =>
-        d?.id === 'tools_agent' ||
-        d?.id === 'integrations_agent' ||
-        d?.id === 'researcher' ||
-        d?.id === 'planner'
-    );
-    stepLog('browser-bearing agent definitions', { ids: browserBearing.map(d => d.id) });
-    expect(browserBearing.length).toBeGreaterThan(0);
+    const tools = list.result?.tools ?? [];
+    const browserTool = tools.find(tool => tool?.name === 'browser');
+    stepLog('live browser tool metadata', browserTool);
+    expect(browserTool).toBeDefined();
+    expect(browserTool?.description).toContain("'snapshot'");
+    expect(browserTool?.description?.toLowerCase()).not.toContain('screenshot');
   });
 
   it.skip('(future #68) chat tool_calls drive `browser_open https://example.com` via mock LLM', () => {
diff --git a/app/test/playwright/specs/mcp-tab-flow.spec.ts b/app/test/playwright/specs/mcp-tab-flow.spec.ts
index 60412df40..5bd358bf9 100644
--- a/app/test/playwright/specs/mcp-tab-flow.spec.ts
+++ b/app/test/playwright/specs/mcp-tab-flow.spec.ts
@@ -161,7 +161,6 @@ async function setupMockRpc(page: Page, state: MockState) {
               localState: {},
               keyringStatus: { isUnlocked: true, hasPassphrase: false },
               runtime: {
-                screenIntelligence: { enabled: false },
                 localAi: { enabled: false },
                 autocomplete: { enabled: false },
                 service: { running: false },
diff --git a/app/test/playwright/specs/screen-intelligence.spec.ts b/app/test/playwright/specs/screen-intelligence.spec.ts
deleted file mode 100644
index 1463deae9..000000000
--- a/app/test/playwright/specs/screen-intelligence.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { bootAuthenticatedPage, waitForAppReady } from '../helpers/core-rpc';
-
-test.describe('Screen Intelligence', () => {
-  test('opens the Screen Intelligence settings route', async ({ page }) => {
-    await bootAuthenticatedPage(page, 'pw-screen-intelligence', '/settings/screen-intelligence');
-    await waitForAppReady(page);
-
-    const text = await page.locator('#root').innerText();
-    expect(text.includes('Screen Awareness')).toBe(true);
-  });
-
-  test('debug route reaches a stable success or unsupported/failure state', async ({ page }) => {
-    await bootAuthenticatedPage(
-      page,
-      'pw-screen-intelligence-debug',
-      '/settings/screen-awareness-debug'
-    );
-    await waitForAppReady(page);
-
-    const text = await page.locator('#root').innerText();
-    expect(
-      [
-        'Screen Awareness',
-        'screen capture is unsupported on this platform',
-        'screen recording permission is not granted',
-        'Capture test',
-        'Test capture',
-      ].some(marker => text.includes(marker))
-    ).toBe(true);
-  });
-});
diff --git a/app/test/playwright/specs/settings-feature-preferences.spec.ts b/app/test/playwright/specs/settings-feature-preferences.spec.ts
index c5643ed29..8f29ce977 100644
--- a/app/test/playwright/specs/settings-feature-preferences.spec.ts
+++ b/app/test/playwright/specs/settings-feature-preferences.spec.ts
@@ -196,15 +196,14 @@ function readEnabledTools(snapshot: ToolsSnapshot): string[] {
 }
 
 test.describe('Settings - Feature Preferences', () => {
-  test('renders the features settings section route', async ({ page }) => {
-    // The old "Features" hub page is retired and redirects to the Screen
-    // Awareness tab on Connections.
+  test('falls through the retired features settings route to settings home', async ({ page }) => {
     await openAuthenticatedRoute(page, 'pw-settings-features-route', '/settings/features');
 
     await expect
       .poll(async () => page.evaluate(() => window.location.hash))
-      .toContain('/connections?tab=screen-intelligence');
-    await expect(page.getByText('Screen awareness', { exact: true }).first()).toBeVisible();
+      .toMatch(/^#\/settings(?:\/account)?$/);
+    await expect(page.getByText('Screen Intelligence', { exact: true })).toHaveCount(0);
+    await expect(page.getByText('Screen Awareness Debug', { exact: true })).toHaveCount(0);
   });
 
   test('persists the default messaging channel through redux state', async ({ page }) => {
diff --git a/docs/RELEASE-MANUAL-SMOKE.md b/docs/RELEASE-MANUAL-SMOKE.md
index 13521f6a6..3708307aa 100644
--- a/docs/RELEASE-MANUAL-SMOKE.md
+++ b/docs/RELEASE-MANUAL-SMOKE.md
@@ -31,9 +31,6 @@ Applies to every release, all platforms.
 - [ ] **DMG drag-to-Applications flow works** — Mount the `.dmg`, drag `OpenHuman.app` to the `Applications` alias. Expected: copy completes; eject succeeds; first launch from `/Applications` does not re-prompt Gatekeeper.
 - [ ] **Accessibility permission prompt fires on first agent run** — Trigger an agent action that uses Accessibility (e.g. window-control skill). Expected: macOS prompts `OpenHuman would like to control this computer using accessibility features`. Granting it allows the action; denying it surfaces a clear in-app fallback.
 - [ ] **Input Monitoring prompt fires on first hotkey use** — Press the registered global hotkey for the first time. Expected: `Input Monitoring` prompt; granting it makes the hotkey trigger; denying it does not crash the app.
-- [ ] **Screen Recording prompt fires on first screen-share** — Use the screen-share skill or `getDisplayMedia` shim. Expected: `Screen Recording` prompt; granted → picker shows windows + screens; denied → in-app message explaining the requirement.
-- [ ] **Meet "Present" surfaces the Chrome screen-picker (regression watch — see #2636)** — Open the Google Meet webview account, join a meeting, and click `Present now`. Expected: Chromium's native screen-picker UI appears (Entire screen / Window / Chrome tab tabs) and `getDisplayMedia` only resolves after the user picks a source. Hard fail mode: capture starts immediately with no picker — that means `displayCapture` was re-granted via `Browser.grantPermissions` and bypassed Chromium's transient-activation gate.
-- [ ] **Slack huddle screen-share surfaces the Chrome screen-picker (regression watch — see #2636)** — Open the Slack webview account, start or join a huddle, and click the screen-share button. Expected: same Chromium native screen-picker as Meet; capture only begins after a deliberate user selection. Hard fail mode: huddle begins broadcasting immediately with no picker prompt.
 - [ ] **Microphone prompt fires on first voice capture** — Start a voice session. Expected: standard mic prompt; granted → capture begins; denied → fallback message, no panic.
 - [ ] **Bluetooth prompt fires on first Gmeet call (regression watch — see #1288)** — Open the Google Meet webview account and join a meeting from a fresh install. Expected: macOS prompts `OpenHuman would like to use Bluetooth` the first time the device picker enumerates audio peripherals; granted → AirPods/headsets appear in the picker; denied → fallback to built-in mic, no crash. Hard fail mode (key absent) is a SIGABRT before the prompt can render.
 - [ ] **Location prompt does not crash on Gmeet room-finder probe** — If Gmeet surfaces nearby-room suggestions, the first probe should trigger `OpenHuman would like to use your current location`; granting or denying must NOT crash the app. (Probe path is webview-driven; only verify the no-crash invariant here.)
diff --git a/docs/TEST-COVERAGE-MATRIX.md b/docs/TEST-COVERAGE-MATRIX.md
index 6d8728bb3..86b0de8c6 100644
--- a/docs/TEST-COVERAGE-MATRIX.md
+++ b/docs/TEST-COVERAGE-MATRIX.md
@@ -101,8 +101,7 @@ Canonical mapping of every product feature to its test source(s). Drives gap-fil
 | ----- | --------------------------- | ----- | -------------------- | ------ | ------------------- |
 | 2.1.1 | Accessibility Permission    | MS    | release-manual-smoke | 🚫     | TCC OS-level prompt |
 | 2.1.2 | Input Monitoring Permission | MS    | release-manual-smoke | 🚫     | TCC OS-level prompt |
-| 2.1.3 | Screen Recording Permission | MS    | release-manual-smoke | 🚫     | TCC OS-level prompt |
-| 2.1.4 | Microphone Permission       | MS    | release-manual-smoke | 🚫     | TCC OS-level prompt |
+| 2.1.3 | Microphone Permission       | MS    | release-manual-smoke | 🚫     | TCC OS-level prompt |
 
 ### 2.2 Permission Lifecycle
 
@@ -226,30 +225,22 @@ End-to-end coverage of the agent harness via the web-chat RPC surface against an
 
 ## 5. Built-in Intelligence Skills
 
-### 5.1 Screen Intelligence
-
-| ID    | Feature            | Layer | Test path(s)                              | Status | Notes |
-| ----- | ------------------ | ----- | ----------------------------------------- | ------ | ----- |
-| 5.1.1 | Screen Capture     | RI    | `tests/screen_intelligence_vision_e2e.rs` | ✅     |       |
-| 5.1.2 | Context Extraction | RI    | `tests/screen_intelligence_vision_e2e.rs` | ✅     |       |
-| 5.1.3 | Memory Injection   | RI    | `tests/memory_graph_sync_e2e.rs`          | ✅     |       |
-
-### 5.3 Voice Intelligence
+### 5.1 Voice Intelligence
 
 | ID    | Feature                   | Layer | Test path(s)                                                                                                                                                       | Status | Notes                                                                                                             |
 | ----- | ------------------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------ | ----------------------------------------------------------------------------------------------------------------- |
-| 5.3.1 | Voice Input Capture       | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
-| 5.3.2 | Speech-to-Text Processing | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
-| 5.3.3 | Voice Command Execution   | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
-| 5.3.4 | Mascot Voice Selection    | VU    | `app/src/store/__tests__/mascotSlice.test.ts`, `app/src/components/settings/panels/__tests__/VoicePanel.test.tsx`, `app/src/features/human/useHumanMascot.test.ts` | ✅     | Slice validation + persist REHYDRATE, Settings picker UI (#1762), `synthesizeSpeech` voiceId override propagation |
+| 5.1.1 | Voice Input Capture       | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
+| 5.1.2 | Speech-to-Text Processing | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
+| 5.1.3 | Voice Command Execution   | WD    | `voice-mode.spec.ts`                                                                                                                                               | ✅     |                                                                                                                   |
+| 5.1.4 | Mascot Voice Selection    | VU    | `app/src/store/__tests__/mascotSlice.test.ts`, `app/src/components/settings/panels/__tests__/VoicePanel.test.tsx`, `app/src/features/human/useHumanMascot.test.ts` | ✅     | Slice validation + persist REHYDRATE, Settings picker UI (#1762), `synthesizeSpeech` voiceId override propagation |
 
-### 5.4 Persona
+### 5.2 Persona
 
 | ID    | Feature                    | Layer | Test path(s)                                                                                     | Status | Notes                                                                                        |
 | ----- | -------------------------- | ----- | ------------------------------------------------------------------------------------------------ | ------ | -------------------------------------------------------------------------------------------- |
-| 5.4.1 | Persona Name & Description | VU    | `app/src/store/personaSlice.test.ts`, `app/src/components/settings/panels/PersonaPanel.test.tsx` | ✅     | Slice validation + persist REHYDRATE scrub; Settings identity fields persist on save (#2345) |
-| 5.4.2 | SOUL.md Edit & Reset       | RU+VU | `src/openhuman/workspace/rpc.rs`, `app/src/components/settings/panels/PersonaPanel.test.tsx`     | ✅     | Core read/write/reset with allowlist + size cap; panel loads, saves, resets over RPC (#2345) |
-| 5.4.3 | Persona Settings Surface   | VU    | `app/src/components/settings/panels/PersonaPanel.test.tsx`                                       | ✅     | Bundles identity + SOUL.md + link to Mascot avatar/voice (#2345)                             |
+| 5.2.1 | Persona Name & Description | VU    | `app/src/store/personaSlice.test.ts`, `app/src/components/settings/panels/PersonaPanel.test.tsx` | ✅     | Slice validation + persist REHYDRATE scrub; Settings identity fields persist on save (#2345) |
+| 5.2.2 | SOUL.md Edit & Reset       | RU+VU | `src/openhuman/workspace/rpc.rs`, `app/src/components/settings/panels/PersonaPanel.test.tsx`     | ✅     | Core read/write/reset with allowlist + size cap; panel loads, saves, resets over RPC (#2345) |
+| 5.2.3 | Persona Settings Surface   | VU    | `app/src/components/settings/panels/PersonaPanel.test.tsx`                                       | ✅     | Bundles identity + SOUL.md + link to Mascot avatar/voice (#2345)                             |
 
 ---
 
diff --git a/docs/library-minimal-recipe.md b/docs/library-minimal-recipe.md
index e6fff3743..d291e32e6 100644
--- a/docs/library-minimal-recipe.md
+++ b/docs/library-minimal-recipe.md
@@ -48,7 +48,7 @@ There is **no** `library-minimal` meta-feature in `Cargo.toml`, on purpose — s
 | `media` | ON | **DROP** | `media_generate_*` image/video tools — surface-only | none (backend-proxied) |
 | `meet` | ON | **DROP** | Google-Meet join/live-STT/TTS bot — no headless use | none |
 | `mcp` | ON | **DROP** | MCP stdio/HTTP server + Smithery registry (~20k LOC, ~19 tools) — a library host is not an MCP host | none (hand-rolled over tokio/reqwest/axum) |
-| `desktop-automation` | ON | **DROP** | AX / screen-capture / `computer` tool family drives a **local desktop UI** — meaningless headless | `uiautomation` |
+| `desktop-automation` | ON | **DROP** | AX / `computer` tool family drives a **local desktop UI** — meaningless headless | `uiautomation` |
 | `tui` | ON | **DROP** | `openhuman tui`/`chat` terminal UI — no terminal in a library host | `ratatui`, `crossterm`, `unicode-width` |
 
 **Non-default optional features** (`sandbox-landlock`, `sandbox-bubblewrap`,
@@ -142,7 +142,7 @@ build-fact error:
   returns a "rebuild with --features mcp" build-fact error. (`McpHttpClient` +
   `sanitize` stay compiled — the gitbooks docs tool and the orchestrator prompt
   sanitizer still work.)
-- **desktop-automation:** `accessibility` / `screen_intelligence` / `autocomplete`
+- **desktop-automation:** `accessibility` / `autocomplete`
   / `desktop_companion` domains + the `computer` tool family (`ax_interact`,
   `automate`, mouse/keyboard) absent.
 - **tui:** `openhuman tui` / `chat` returns "tui feature disabled at compile time".
diff --git a/docs/plans/2026-07-24-remove-screen-awareness-implementation-plan.md b/docs/plans/2026-07-24-remove-screen-awareness-implementation-plan.md
new file mode 100644
index 000000000..0c3f4dfd8
--- /dev/null
+++ b/docs/plans/2026-07-24-remove-screen-awareness-implementation-plan.md
@@ -0,0 +1,364 @@
+# Plan: Remove all shipped screen-awareness and screen-capture capability
+
+## Goal and invariants
+
+Remove the shipped screen-awareness surface rather than disabling it. After this
+work, removed JSON-RPC methods are unknown methods, removed CLI/Tauri/browser
+actions are not advertised or dispatchable, and embedded CEF webviews cannot
+obtain desktop-audio or desktop-video capture permission. Keep DOM/accessibility
+text snapshots, user-provided images, normal vision processing of those images,
+camera/microphone access, and test-runner/App Store artifact screenshots.
+
+Work on the existing `remove-screen-awareness-fully` worktree. Do not alter the
+committed approved design spec. Run the specified test before the deletion to
+make it fail for the old surface where applicable, then make it pass in the
+same atomic commit. Use `atomic-commit` with every listed path after validation.
+
+## 1. Remove the core domain, config, accessibility capture, and public core contract
+
+Files:
+
+- Delete `src/openhuman/screen_intelligence/` in full, including its CLI,
+  controller, engine, worker, vision, tool, and unit-test files.
+- Delete `src/openhuman/accessibility/capture.rs`; remove the screen-capture
+  exports from `src/openhuman/accessibility/mod.rs`.
+- In `src/openhuman/accessibility/{permissions.rs,permissions_tests.rs,types.rs,README.md}`
+  remove Screen Recording permission support, the `screen_recording` status
+  field, and their tests; retain focused-text, foreground-window, automation,
+  Globe, input-monitoring, and microphone behavior for now. The companion still
+  consumes the foreground-window types until step 5.
+- Remove the module/registry/CLI/legacy-alias entries from
+  `src/openhuman/{mod.rs}`, `src/core/{all.rs,cli.rs,legacy_aliases.rs}`, and
+  delete the `screen_intelligence` namespace description in `all.rs`.
+- Remove `ScreenIntelligenceConfig` and its schema module/re-export/default
+  field from `src/openhuman/config/{mod.rs,schema/accessibility.rs,schema/mod.rs,schema/types.rs}`.
+  Remove its patch/update/controller/schema entries from
+  `src/openhuman/config/{ops/mod.rs,ops/ui.rs,ops_tests.rs,schemas/helpers.rs,schemas/controllers.rs,schemas/schema_defs.rs,schemas_tests.rs,README.md}`.
+  Do not add a TOML migration: deserializing a persisted unknown
+  `[screen_intelligence]` table must remain accepted by serde and no longer
+  produce a live config field.
+- Remove the runtime snapshot type/build/degraded data and tests from
+  `src/openhuman/app_state/{ops.rs,ops_tests.rs,README.md}` and the login/start/
+  stop hooks/tests/docs in `src/openhuman/credentials/{ops.rs,ops_tests.rs,README.md}`.
+- Remove the screen-derived app-state/config RPC cases and replace the current
+  positive integration assertions in
+  `tests/{config_auth_app_state_connectivity_e2e.rs,json_rpc_e2e.rs}` with one
+  focused regression asserting `openhuman.screen_intelligence_status`,
+  `openhuman.screen_intelligence_capture_now`, and
+  `openhuman.config_update_screen_intelligence_settings` return JSON-RPC
+  method-not-found. Delete `tests/screen_intelligence_vision_e2e.rs` and remove
+  its suite entry from `scripts/test-rust-e2e.sh`.
+- Remove only screen-intelligence assertions/fixtures from
+  `tests/composio_list_tools_stack_overflow_regression.rs`,
+  `tests/raw_coverage/tools_agent_credentials_state_raw_coverage_e2e.rs`, and
+  `src/openhuman/tools/{ops_tests.rs,user_filter.rs}`. Preserve unrelated
+  data-URL and user-image coverage.
+- Remove only the `screenshot-ref` local CLI wrapper/list entry/tests from
+  `src/openhuman/tools/local_cli.rs`, because it calls the deleted
+  `screen_intelligence` module. Preserve the standalone `ScreenshotTool` wrapper
+  for step 3.
+
+Tests and checks:
+
+1. First add the method-not-found and unknown-TOML-table assertions; confirm
+   they fail against the current registered surface.
+2. Run `cargo fmt --check`.
+3. Run these focused library test commands separately:
+   - `GGML_NATIVE=OFF cargo test --lib core::all::tests`
+   - `GGML_NATIVE=OFF cargo test --lib config::schemas_tests`
+   - `GGML_NATIVE=OFF cargo test --lib config::ops_tests`
+   - `GGML_NATIVE=OFF cargo test --lib app_state::ops_tests`
+   - `GGML_NATIVE=OFF cargo test --lib credentials::ops_tests`
+4. Run `bash scripts/test-rust-with-mock.sh --test json_rpc_e2e` and
+   `bash scripts/test-rust-with-mock.sh --test config_auth_app_state_connectivity_e2e`.
+5. Run `GGML_NATIVE=OFF cargo check --manifest-path Cargo.toml`.
+
+Commit:
+
+`refactor(core): remove screen intelligence surface`
+
+## 2. Remove screen-awareness agent discovery and capability catalog entries
+
+Files:
+
+- Delete `src/openhuman/agent_registry/agents/screen_awareness_agent/` and
+  remove its module and `BuiltinAgent` entry from
+  `src/openhuman/agent_registry/agents/{mod.rs,loader.rs}`.
+- Remove it from the orchestrator's allowed subagents in
+  `src/openhuman/agent_registry/agents/orchestrator/agent.toml`, from the
+  built-in-definition assertion in
+  `src/openhuman/agent/harness/builtin_definitions.rs`, and from expected agent
+  counts/worker lists in `src/openhuman/agent/harness/definition_tests.rs` and
+  `src/openhuman/agent_registry/agents/loader.rs` tests.
+- Keep `vision_agent` but remove its two `screen_intelligence_*` tools and
+  revise `src/openhuman/agent_registry/agents/vision_agent/{agent.toml,prompt.md}`
+  to refer only to attached or on-disk user-provided images.
+- Delete the screen-awareness prompt resource from
+  `src/openhuman/mcp_server/resources.rs`.
+- Delete `CapabilityCategory::ScreenIntelligence`, parsing/serialization tests,
+  and all `screen_intelligence.*` catalog entries from
+  `src/openhuman/about_app/{types.rs,catalog_data.rs,catalog_tests.rs,README.md}`.
+  Also remove the stale `screen_intelligence` example in
+  `src/openhuman/overlay/types.rs` and screen-only mentions in
+  `src/openhuman/inference/README.md`.
+
+Tests and checks:
+
+1. Update loader/catalog tests first so they assert the removed agent and
+   capability category are absent while `vision_agent` still resolves with the
+   image-capable hint; confirm they fail before removal.
+2. Run `cargo fmt --check`.
+3. Run these focused library test commands separately:
+   - `GGML_NATIVE=OFF cargo test --lib agent_registry::agents::loader`
+   - `GGML_NATIVE=OFF cargo test --lib agent::harness::definition_tests`
+   - `GGML_NATIVE=OFF cargo test --lib about_app::`
+4. Run `GGML_NATIVE=OFF cargo check --manifest-path Cargo.toml`.
+
+Commit:
+
+`refactor(agents): remove screen awareness discovery`
+
+## 3. Remove native screenshot and pixel-returning browser actions
+
+Files:
+
+- Delete the standalone native `ScreenshotTool` implementation and tests in
+  `src/openhuman/tools/impl/browser/screenshot.rs`; remove its module/re-export
+  from `src/openhuman/tools/impl/browser/mod.rs`, its registration from
+  `src/openhuman/tools/ops.rs`, and the remaining standalone screenshot
+  wrapper/tests in `src/openhuman/tools/local_cli.rs`.
+- In `src/openhuman/tools/impl/browser/{types.rs,action_parser.rs,browser.rs,browser_tests.rs}` remove the `BrowserAction::Screenshot` variant, parser,
+  advertised action/schema option, and `screen_capture` computer-use action.
+  Keep `snapshot` and all non-pixel browser/computer input actions.
+- Remove screenshot execution branches from
+  `src/openhuman/tools/impl/browser/{native_backend.rs,playwright_backend.rs,playwright_runner.mjs}`. Ensure every backend rejects `screenshot` and
+  `screen_capture` as unsupported before sidecar dispatch.
+- Remove browser screenshot expectations from
+  `tests/raw_coverage/{tools_agent_credentials_state_raw_coverage_e2e.rs,tools_approval_channels_raw_coverage_e2e.rs,tools_channels_raw_coverage_e2e.rs}`
+  and retain only assertions for the remaining browser API/data-url helpers
+  that do not capture pixels.
+
+Tests and checks:
+
+1. Convert parser/backend tests to assert `screenshot` and `screen_capture`
+   are unsupported and that `snapshot` still parses; these assertions must fail
+   before the removal.
+2. Run `cargo fmt --check`.
+3. Run `GGML_NATIVE=OFF cargo test --lib
+   openhuman::tools::implementations::browser::browser::tests` and
+   `GGML_NATIVE=OFF cargo test --lib tools::ops_tests` separately.
+4. Run `GGML_NATIVE=OFF cargo test --test tools_approval_channels_raw_coverage_e2e --test tools_channels_raw_coverage_e2e`.
+5. Run `GGML_NATIVE=OFF cargo check --manifest-path Cargo.toml`.
+
+Commit:
+
+`refactor(tools): remove screenshot capture actions`
+
+## 4. Remove Tauri display sharing and enforce CEF desktop-capture denial
+
+Files:
+
+- Delete `app/src-tauri/src/screen_capture/` and remove its module, managed
+  `ScreenShareState`, and three command registrations from
+  `app/src-tauri/src/lib.rs`.
+- Remove `screen_share_begin_session`, `screen_share_thumbnail`, and
+  `screen_share_finalize_session` and their screen-share descriptions from
+  `app/src-tauri/permissions/{allow-webview-recipe.toml,allow-core-process.toml}`.
+- Delete the complete `installGetDisplayMediaShim` block, picker DOM, session
+  IPC calls, and display-capture permission-query override from
+  `app/src-tauri/src/webview_accounts/runtime.js`; leave the ordinary recipe
+  runtime and other webview functionality intact.
+- In `app/src-tauri/vendor/tauri-cef/crates/tauri-runtime-cef/src/permissions.rs`,
+  make `ALLOWED_MEDIA_MASK` contain only device microphone/camera bits and
+  replace the desktop-allowed tests with tests that desktop audio, desktop
+  video, and mixed device+desktop requests are filtered/denied while device
+  audio/video remain allowed. Update the permission-handler comment in
+  `cef_impl.rs` to state desktop bits are rejected.
+- Remove obsolete native-picker claims from
+  `app/src-tauri/src/{cdp/session.rs,meet_audio/captions_bridge.js}` without
+  changing their retained mic/camera/caption behavior.
+
+Tests and checks:
+
+1. Change the CEF unit tests first to require desktop bits to be absent; verify
+   the current mask makes them fail.
+2. Run `cargo fmt --check` in `app/src-tauri`.
+3. Run `cargo test --manifest-path app/src-tauri/vendor/tauri-cef/crates/tauri-runtime-cef/Cargo.toml permissions::tests`.
+4. Run `cargo test --manifest-path app/src-tauri/Cargo.toml` and
+   `cargo check --manifest-path app/src-tauri/Cargo.toml`.
+5. Use `rg -n 'screen_share_|getDisplayMedia|DESKTOP_(AUDIO|VIDEO)_CAPTURE' app/src-tauri/src app/src-tauri/permissions` and require no remaining shipped
+   command, shim, or allowlist match; the CEF denial implementation is checked
+   separately in the vendored `permissions.rs` test above.
+
+Commit:
+
+`refactor(tauri): remove display sharing`
+
+## 5. Make the desktop companion screen-independent
+
+Files:
+
+- Delete `app/src-tauri/src/companion/{pointing.rs,pointing_tests.rs}` and
+  remove the module export from `companion/mod.rs`.
+- In `app/src-tauri/src/companion/{mod.rs,pipeline.rs,types.rs,session.rs,session_tests.rs,pipeline_tests.rs}`, remove monitor geometry collection, foreground
+  app/window context collection, screen-context prompt argument and text,
+  `[POINT:…]` parsing, target fields, pointing state/transitions, and
+  `capture_screen`/`include_app_context` config fields. `run_text_turn` and
+  `run_audio_turn` should accept only the utterance/audio plus cancellation,
+  send conversation history and the current utterance to the LLM, and return
+  text/TTS/cancellation results without targets.
+- After removing the last companion consumer, delete `AppContext` and the
+  frontmost-window/`foreground_context` helpers and tests from
+  `src/openhuman/accessibility/{types.rs,focus.rs,mod.rs,README.md}`. Preserve
+  independently used focused-text helpers in the same files.
+- In `app/src/store/{companionSlice.ts,companionSlice.test.ts}`, remove the
+  `pointing` state and the two removed configuration fields.
+- Remove the pointing-only frontend event/pointer surface from
+  `app/src/services/{companionEvents.ts,__tests__/companionPayload.test.ts}` and
+  `app/src/overlay/{CompanionPointer.tsx,OverlayApp.tsx,__tests__/CompanionPointer.test.tsx,__tests__/companionStateLabel.test.ts}`.
+- In `app/src/components/settings/panels/{CompanionPanel.tsx,__tests__/CompanionPanel.test.tsx}`, remove the two screen-derived status rows and replace
+  the old disabled-state test with coverage for the retained hotkey, activation
+  mode, TTL, and session controls.
+
+Tests and checks:
+
+1. Update pipeline/session tests first to assert a text turn has no screen
+   parameters, no pointing state, and a prompt containing only companion role,
+   history, and utterance; verify the old signatures/state make this fail.
+2. Run `cargo fmt --check` in `app/src-tauri`.
+3. Run `cargo test --manifest-path app/src-tauri/Cargo.toml companion::` and
+   `cargo check --manifest-path app/src-tauri/Cargo.toml`.
+4. Run `cargo fmt --check`, `GGML_NATIVE=OFF cargo test --lib
+   accessibility::`, and `GGML_NATIVE=OFF cargo check --manifest-path
+   Cargo.toml` from the repository root for the shared accessibility cleanup.
+5. Run `pnpm debug unit src/components/settings/panels/__tests__/CompanionPanel.test.tsx src/store/companionSlice.test.ts`.
+
+Commit:
+
+`refactor(companion): remove screen context and pointing`
+
+## 6. Remove frontend screen-awareness UI, routes, core-state data, and RPC wrappers
+
+Files:
+
+- Delete `app/src/features/screen-intelligence/`,
+  `app/src/components/intelligence/{ScreenIntelligenceDebugPanel.tsx,__tests__/ScreenIntelligenceDebugPanel.test.tsx}`,
+  `app/src/components/settings/panels/{ScreenIntelligencePanel.tsx,ScreenAwarenessDebugPanel.tsx,screen-intelligence/,__tests__/ScreenIntelligencePanel.test.tsx,__tests__/ScreenAwarenessDebugPanel.test.tsx}`,
+  `app/src/components/skills/{ScreenIntelligenceSetupModal.tsx,__tests__/ScreenIntelligenceSetupModal.test.tsx}`, and
+  `app/src/utils/tauriCommands/accessibility.ts`.
+- Remove all imports, cards, modal state, tab parsing, panel rendering, and
+  skill icon from `app/src/{pages/Skills.tsx,components/intelligence/WorkflowsTab.tsx,components/skills/skillIcons.tsx,test/mockDefaultSkillStatusHooks.ts}`.
+- Remove the screen-awareness settings route/registry/navigation/developer-row
+  entries from `app/src/components/settings/{settingsRouteElements.tsx,settingsRouteRegistry.ts,hooks/useSettingsNavigation.ts,layout/settingsNavIcons.tsx,panels/DeveloperOptionsPanel.tsx}` and their affected tests. Do not add a
+  redirect: old hashes must use the normal settings-router fallback.
+- Remove `screenIntelligence` from the frontend snapshot types/store/provider in
+  `app/src/{services/coreStateApi.ts,services/coreStateApi.test.ts,lib/coreState/store.ts,lib/coreState/__tests__/store.test.ts,providers/CoreStateProvider.tsx,providers/__tests__/CoreStateProvider.test.tsx,providers/__tests__/CoreStateProvider.identityFlip.test.tsx}` and fix each
+  remaining snapshot fixture in component/oauth/store tests.
+- Remove screen methods, aliases, accessibility-prefix remapping, schema-source
+  dependency, and tests from `app/src/services/{rpcMethods.ts,__tests__/rpcMethods.test.ts,__tests__/coreRpcClient.test.ts}`. Remove the
+  `screen_intelligence` capability category from
+  `app/src/utils/tauriCommands/aboutApp.ts`.
+- Delete all screen-awareness i18n keys, companion screen rows, and companion
+  pointing label from every locale file:
+  `app/src/lib/i18n/{ar,bn,de,en,es,fr,hi,id,it,ko,pl,pt,ru,zh-CN}.ts`.
+
+Tests and checks:
+
+1. Replace settings E2E expectations with assertions that
+   `/settings/screen-intelligence` and `/settings/screen-awareness-debug` do
+   not render a screen-awareness panel and follow existing settings fallback.
+   Then delete the dedicated screen-intelligence specs:
+   `app/test/{e2e,playwright}/specs/screen-intelligence.spec.ts`; revise
+   `app/test/{e2e,playwright}/specs/settings-feature-preferences.spec.ts` and
+   `app/test/playwright/specs/mcp-tab-flow.spec.ts` fixtures.
+   Remove the deleted WDIO spec from the suite inventory in
+   `app/scripts/e2e-run-all-flows.sh`.
+2. Run `pnpm debug unit app/src/services/__tests__/rpcMethods.test.ts app/src/lib/coreState/__tests__/store.test.ts app/src/providers/__tests__/CoreStateProvider.test.tsx app/src/components/settings/panels/__tests__/DeveloperOptionsPanel.test.tsx`.
+3. Run `pnpm i18n:check`, `pnpm i18n:english:check`, `pnpm typecheck`,
+   `pnpm lint`, and `pnpm format:check`.
+
+Commit:
+
+`refactor(app): remove screen awareness UI`
+
+## 7. Remove checked-in schema entries, product docs, and test inventory references
+
+Files:
+
+- Remove the `config_update_screen_intelligence_settings` and all
+  `screen_intelligence_*` methods from the checked-in `app/schema.json` so it
+  matches the registry removed in step 1.
+- Delete `gitbooks/features/screen-intelligence.md` and remove screen/browser
+  capture product claims from
+  `gitbooks/features/native-tools/{README.md,browser-and-computer.md,image-tools.md}`.
+  Preserve documentation of user-supplied image analysis and DOM snapshots.
+- Remove the screen-capture rows from `docs/TEST-COVERAGE-MATRIX.md`, the
+  obsolete desktop-automation wording in `docs/library-minimal-recipe.md`, and
+  the relevant screen-intelligence claims in
+  `docs/{RELEASE-MANUAL-SMOKE.md,tinyagents-inference-migration-plan.md}` and
+  `gitbooks/developing/architecture/tauri-shell.md`.
+- Remove `screen_capture` from the Tauri module inventory and any other stale
+  screen-awareness architecture guidance in `AGENTS.md`.
+- Revise `app/test/e2e/specs/tool-browser-flow.spec.ts` so it documents and
+  tests `snapshot` rather than screenshot action availability. Do not change
+  `app/test/e2e/helpers/artifacts.ts`, `app/test/e2e/specs/tauri-commands.spec.ts`,
+  `gitbooks/developing/{agent-observability.md,e2e-testing.md,testing-strategy.md}`,
+  or `scripts/ios-appstore-{assets,metadata}.mjs`: their screenshot references
+  are explicitly non-shipped test/App Store artifacts.
+
+Tests and checks:
+
+1. Run `pnpm test:inventory` and, if the inventory generator changes a tracked
+   output, include that generated result in this commit.
+2. Run `pnpm docs:generate` followed by `pnpm docs:check`.
+3. Run `pnpm debug e2e test/e2e/specs/tool-browser-flow.spec.ts` when the
+   desktop test prerequisites are available; otherwise record that this is a
+   CI validation and run the unit/type checks from steps 3 and 6 locally.
+4. Run `git diff --check`.
+
+Commit:
+
+`docs: remove screen capture documentation`
+
+## 8. Final whole-product removal audit
+
+Run the following after all commits. If a shipped-surface match remains, fix it
+in a new narrowly scoped atomic commit; do not rewrite already validated
+history:
+
+```bash
+rg -n -i 'screen_intelligence|screen-awareness|screen awareness|screen_awareness_agent|screen_share_|getDisplayMedia|screen_capture' \
+  src app/src app/src-tauri/src app/src-tauri/permissions docs gitbooks scripts tests app/schema.json \
+  --glob '!docs/specs/2026-07-24-remove-screen-awareness-design.md' \
+  --glob '!app/test/e2e/helpers/artifacts.ts' \
+  --glob '!app/test/e2e/specs/tauri-commands.spec.ts' \
+  --glob '!scripts/ios-appstore-assets.mjs' \
+  --glob '!scripts/ios-appstore-metadata.mjs'
+rg -n 'DESKTOP_(AUDIO|VIDEO)_CAPTURE' \
+  app/src-tauri/vendor/tauri-cef/crates/tauri-runtime-cef/src/permissions.rs \
+  app/src-tauri/vendor/tauri-cef/crates/tauri-runtime-cef/src/cef_impl.rs
+```
+
+The first command must have no shipped-product match. The second may reference
+the CEF constants only in denial/filter tests or diagnostic formatting, never
+in `ALLOWED_MEDIA_MASK` or an allow path. Manually confirm surviving words such
+as “screenshot” refer only to user-provided images or the explicitly exempt
+test/App Store artifacts.
+
+Final validation:
+
+```bash
+cargo fmt --check
+GGML_NATIVE=OFF cargo check --manifest-path Cargo.toml
+cargo check --manifest-path app/src-tauri/Cargo.toml
+pnpm typecheck
+pnpm lint
+pnpm format:check
+pnpm i18n:check
+pnpm i18n:english:check
+pnpm docs:check
+pnpm test:inventory
+```
+
+No additional commit is expected for this audit; any correction belongs to its
+own earlier atomic boundary.
diff --git a/docs/specs/2026-07-24-remove-screen-awareness-design.md b/docs/specs/2026-07-24-remove-screen-awareness-design.md
new file mode 100644
index 000000000..b41ff95bb
--- /dev/null
+++ b/docs/specs/2026-07-24-remove-screen-awareness-design.md
@@ -0,0 +1,139 @@
+# Remove Screen Awareness Design
+
+## Objective
+
+Remove every shipped screen-awareness and screen-capture capability from
+OpenHuman. The desktop app, embedded provider webviews, core RPC/CLI surface,
+agent tool surface, and companion must no longer capture, share, inspect, or
+reason from the user's screen.
+
+This is a hard removal. The deleted capabilities will not remain behind feature
+flags or compatibility stubs.
+
+## Product Boundary
+
+The removal includes:
+
+- the complete Rust `screen_intelligence` domain, including capture sessions,
+  vision summaries, screen-derived memory, permission management, screen input
+  actions, autocomplete integration, Globe listener controls, RPC controllers,
+  CLI commands, and agent tools;
+- the `screen_awareness_agent` and every delegation, prompt, registry, MCP
+  resource, and tool reference that makes it discoverable;
+- the standalone native screenshot tool and local CLI wrappers;
+- browser automation actions that return pixels, including `screenshot` and
+  computer-use `screen_capture`, across every browser backend;
+- the Tauri screen-share source picker, thumbnail capture, command permissions,
+  managed state, and injected `getDisplayMedia` shim;
+- CEF permission forwarding for desktop audio and desktop video capture, so an
+  embedded provider cannot bypass the deleted picker and initiate capture
+  directly;
+- companion foreground app/window context, screen-capture configuration,
+  screen-aware prompting, pointing tags, pointing state, and pointing UI;
+- all screen-awareness settings, developer panels, connections/skills tabs,
+  setup flows, routes, navigation entries, frontend state, RPC wrappers,
+  translations, tool presentation metadata, and product tests; and
+- checked-in schemas, capability catalog entries, feature documentation,
+  architecture documentation, and test inventories that advertise the removed
+  behavior.
+
+The following remain:
+
+- DOM and accessibility-tree browser snapshots that return structured text
+  rather than captured pixels;
+- user-supplied image attachments, including screenshots the user captured
+  outside OpenHuman;
+- general image analysis and vision support for those supplied images;
+- camera and microphone capture that do not capture a display;
+- accessibility helpers still required by voice, dictation, hotkeys, or other
+  non-screen features; and
+- developer-only test-runner failure screenshots and App Store asset-generation
+  scripts, because they are not shipped product APIs.
+
+## Core and Configuration
+
+Delete `src/openhuman/screen_intelligence/` and remove its module registration,
+controller schemas, CLI dispatch, legacy aliases, startup/shutdown hooks,
+application snapshot data, built-in agents, agent tools, user-tool filters, MCP
+prompt resources, and capability catalog entries.
+
+Remove `ScreenIntelligenceConfig` and its update controller from the persisted
+configuration schema. Existing user configuration files may still contain a
+`screen_intelligence` table after upgrade; serde's normal unknown-field
+behavior will ignore it. No migration is required because no retained behavior
+consumes the data.
+
+Remove screen capture and Screen Recording permission helpers from the shared
+accessibility domain. Retain only independently used accessibility behavior.
+Removed RPC names must resolve as unknown methods rather than as deprecated
+stubs.
+
+## Browser and Desktop Shell
+
+Remove the top-level `screenshot` tool and its local CLI wrappers. Remove
+pixel-producing screenshot variants from browser action parsing, schemas,
+native WebDriver execution, Playwright execution, and computer-use sidecar
+dispatch. DOM `snapshot` remains the supported inspection action.
+
+Delete the Tauri `screen_capture` module and unregister its managed state and
+commands. Remove those commands from application permission allowlists. Delete
+the injected screen-share picker and `getDisplayMedia` replacement from the
+provider runtime.
+
+Update the vendored CEF permission policy to reject desktop audio and desktop
+video capture bits while continuing to allow device microphone and camera
+capture. Embedded Meet, Slack, Discord, Zoom, and similar provider webviews will
+therefore no longer offer working display sharing through OpenHuman.
+
+## Companion
+
+Keep companion voice and text conversations, but make them screen-independent.
+Remove foreground app/window collection, the `capture_screen` and
+`include_app_context` configuration fields, screen-context prompt construction,
+`[POINT:…]` instructions and parsing, pointing transitions, and corresponding
+settings/status UI. The companion receives only the user's current utterance
+and conversation history.
+
+## Frontend
+
+Delete the screen-intelligence feature hooks, panels, setup modal, debug
+surfaces, and their tests. Remove settings and connections/skills route
+registrations, redirects, tab parsing, navigation icons, developer-menu rows,
+CoreState fields, RPC method mappings, Tauri command wrappers, translations,
+and screen-capture tool labels.
+
+Old hashes such as `/settings/screen-intelligence` and
+`/settings/screen-awareness-debug` will fall through to the existing settings
+routing behavior. They will not redirect to another screen-awareness surface.
+
+## Compatibility and Security
+
+This change intentionally breaks callers of removed RPC, CLI, Tauri, browser,
+and tool interfaces. Retaining callable tombstones would leave a misleading
+surface and is outside the goal.
+
+The final CEF policy must deny desktop capture at the permission boundary, not
+merely hide the picker UI. Product-wide searches must confirm that no shipped
+runtime calls platform screenshot commands, registers display-capture commands,
+offers screenshot/browser capture tools, or exposes screen-awareness routes.
+
+## Delivery and Validation
+
+Implement the removal in small dependency-ordered steps, validating and
+committing each step separately:
+
+1. Remove the core domain, configuration, lifecycle, app-state, agent, catalog,
+   schema, and core tests.
+2. Remove native screenshot and browser pixel-capture tools and their tests.
+3. Remove Tauri screen sharing, the provider shim, desktop-capture permission
+   forwarding, and companion screen behavior.
+4. Remove frontend UI, routes, state, wrappers, translations, and tests.
+5. Remove or revise documentation, generated schemas, E2E inventories, and
+   stale references.
+
+Validation must include Rust formatting, targeted core tests, root
+`cargo check`, Tauri tests and `cargo check`, targeted Vitest tests, frontend
+typecheck/lint/format checks, schema consistency checks, and repository searches
+for residual shipped capture surfaces. Test-only screenshot artifact helpers
+and user-image terminology may remain when each surviving match is demonstrably
+outside the shipped capture surface.
diff --git a/docs/tinyagents-inference-migration-plan.md b/docs/tinyagents-inference-migration-plan.md
index 51b4a0bac..066e9742a 100644
--- a/docs/tinyagents-inference-migration-plan.md
+++ b/docs/tinyagents-inference-migration-plan.md
@@ -34,7 +34,7 @@ Maintaining both stacks means every fix (streaming edge case, retry policy, cont
 
 ### Blast radius
 
-- 170 files outside `inference/` import `openhuman::inference`; 151 import `inference::provider` specifically. Top consumers: agent harness/session/tools/triage, `context`, `voice`, `routing`, `memory_tree`, `learning`, `channels`, `embeddings`, `subconscious`, `screen_intelligence`, `threads`, `migrations`, `config/schema`.
+- 170 files outside `inference/` import `openhuman::inference`; 151 import `inference::provider` specifically. Top consumers: agent harness/session/tools/triage, `context`, `voice`, `routing`, `memory_tree`, `learning`, `channels`, `embeddings`, `subconscious`, `threads`, `migrations`, `config/schema`.
 - Module sizes: `provider/` ≈ 29.6k lines, `local/` ≈ 13.7k, `voice/` + `http/` + `openai_oauth/` ≈ 4.4k, root files ≈ 5.5k. Only `provider/` + parts of the root files migrate; the rest stays.
 
 ---
@@ -95,7 +95,7 @@ Upstream flow: change in `vendor/tinyagents` (submodule working tree) → PR to
 Each phase compiles green in both Cargo worlds, keeps ≥80% diff coverage, and lands as its own PR-sized slice. Provider-string grammar, RPC names, and observable UI behavior (streaming, cost footer, tool timeline) are parity-locked throughout.
 
 ### Phase 0 — Inventory & gap re-audit
-- Enumerate every consumer of `Provider` / `ChatRequest` / `ChatResponse` / `ChatMessage` outside `inference/` (151 files) and bucket them: (a) goes through the seam already, (b) direct one-shot `provider.chat(...)` callers (learning, memory, subconscious, screen_intelligence, sentiment, triage…), (c) type-only imports.
+- Enumerate every consumer of `Provider` / `ChatRequest` / `ChatResponse` / `ChatMessage` outside `inference/` (151 files) and bucket them: (a) goes through the seam already, (b) direct one-shot `provider.chat(...)` callers (learning, memory, subconscious, sentiment, triage…), (c) type-only imports.
 - Re-verify §3 gaps against current crate HEAD; file crate issues; update
   `vendor/tinyagents/docs/sdk-gaps.md`.
 - Golden-transcript capture: record request/response wire dumps for the BYOK catalog matrix + Ollama + openhuman backend on the current stack, as fixtures for Phase 2 parity.
diff --git a/gitbooks/SUMMARY.md b/gitbooks/SUMMARY.md
index 6eab491fd..679a777ae 100644
--- a/gitbooks/SUMMARY.md
+++ b/gitbooks/SUMMARY.md
@@ -60,7 +60,6 @@
   * [System & Utilities](features/native-tools/system-and-utilities.md)
 * [Subconscious Loop](features/subconscious.md)
 * [Notifications & Activity](features/notifications-and-activity.md)
-* [Screen Intelligence](features/screen-intelligence.md)
 * [Wallet](features/wallet.md)
 * [tiny.place Agent Economy](features/tinyplace.md)
 * [Billing, Cost & Usage](features/billing-and-usage.md)
diff --git a/gitbooks/developing/architecture/tauri-shell.md b/gitbooks/developing/architecture/tauri-shell.md
index a66bc7531..da4353bf5 100644
--- a/gitbooks/developing/architecture/tauri-shell.md
+++ b/gitbooks/developing/architecture/tauri-shell.md
@@ -51,9 +51,8 @@ app/src-tauri/src/
 ├── webview_apis/           # WS bridge for webview-side APIs
 ├── discord_scanner/ … whatsapp_scanner/ …   # Per-provider scanners (slack, telegram, wechat,
 │                                            # gmessages, imessage, meet, …) driving CDP
-├── meet_audio/ meet_call/ meet_video/       # Google Meet call window + media capture
+├── meet_audio/ meet_call/ meet_video/       # Google Meet call window + media integration
 ├── fake_camera/            # Virtual camera support
-├── screen_capture/         # Screen share picker sessions (getDisplayMedia shim backend)
 ├── mascot_native_window.rs / notch_window.rs / window_state.rs
 ├── dictation_hotkeys.rs / ptt_hotkeys.rs / ptt_overlay.rs / companion_commands.rs
 ├── native_notifications/ notification_settings/
@@ -168,16 +167,6 @@ Hide-to-tray / reopen behavior is **not** an IPC command — it lives in the `Ru
 | `start_loopback_oauth_listener` / `stop_loopback_oauth_listener` | Localhost OAuth redirect listener (`loopback_oauth.rs`) |
 | `claude_code_login_launch` | Launch the Claude Code login flow (`claude_code.rs`) |
 
-### Screen share picker (CEF / macOS)
-
-From **`screen_capture/mod.rs`**. Backs the in-page `getDisplayMedia` shim in `webview_accounts/runtime.js`. Session-gated: the shim must open a session with a live user gesture before enumeration / thumbnail captures succeed. See issue #713 (picker UX) + #812 (session gating).
-
-| Command                         | Purpose                                                                                                                                                               |
-| ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `screen_share_begin_session`    | Open a 30s session from an account webview, after a `navigator.userActivation.isActive` gesture. Returns `{ token, sources }`. Rate-limited to 10/minute per account. |
-| `screen_share_thumbnail`        | Capture a single source's thumbnail as base64 PNG. Requires a live token and an `id` that the session was issued for. macOS only; other platforms return an error.    |
-| `screen_share_finalize_session` | Close the session. Called by the shim on Share or Cancel; safe to call with an unknown/expired token (no-op).                                                         |
-
 ### Workspace file links
 
 From **`workspace_paths.rs`** (closes `#1402`). These commands accept workspace-relative paths only. The shell resolves each path against the active OpenHuman workspace, canonicalizes the target, and rejects traversal, absolute paths, URI-like prefixes, and symlink escapes before opening or reading anything.
diff --git a/gitbooks/developing/testing-strategy.md b/gitbooks/developing/testing-strategy.md
index 4acd941b2..ec754cf93 100644
--- a/gitbooks/developing/testing-strategy.md
+++ b/gitbooks/developing/testing-strategy.md
@@ -11,13 +11,13 @@ How OpenHuman tests its product. Source of truth for "where does my test go?". C
 
 ## Layers
 
-| Layer                | Where it lives                                                                                                                                        | What it tests                                                                                                                                   | Driver                                                                                                                     |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
-| **Rust unit**        | `#[cfg(test)] mod tests` inside the same `*.rs` file, or sibling `tests.rs`, or `tests/` subdir under a domain (e.g. `src/openhuman/channels/tests/`) | Pure domain logic, schemas, RPC handler shape, in-memory state machines                                                                         | `cargo test`                                                                                                               |
-| **Rust integration** | `tests/*.rs` at repo root                                                                                                                             | Full domain wiring with real Tokio runtime, mock external services, JSON-RPC end-to-end (`tests/json_rpc_e2e.rs`), domain × domain interactions | `pnpm test:rust` (which calls `bash scripts/test-rust-with-mock.sh`)                                                       |
-| **Vitest unit**      | Co-located as `*.test.ts(x)` next to source under `app/src/**`, or under `app/src/**/__tests__/`                                                      | React components, hooks, store slices, pure utilities, service-layer adapters                                                                   | `pnpm test:unit`                                                                                                           |
-| **WDIO E2E**         | `app/test/e2e/specs/*.spec.ts`                                                                                                                        | Full desktop flow: UI → Tauri → in-process core → JSON-RPC; user-visible behaviour                                                                 | All platforms: Appium Chromium driver (port 4723) against the CEF runtime. See [E2E Testing](e2e-testing.md). |
-| **Manual smoke**     | [`docs/RELEASE-MANUAL-SMOKE.md`](../../docs/RELEASE-MANUAL-SMOKE.md)                                                                                           | OS-level surfaces drivers cannot assert: TCC permission prompts, Gatekeeper, code signing, DMG install, OS-native toasts                        | Human at release-cut, signed off in release PR                                                                             |
+| Layer                | Where it lives                                                                                                                                        | What it tests                                                                                                                                   | Driver                                                                                                        |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| **Rust unit**        | `#[cfg(test)] mod tests` inside the same `*.rs` file, or sibling `tests.rs`, or `tests/` subdir under a domain (e.g. `src/openhuman/channels/tests/`) | Pure domain logic, schemas, RPC handler shape, in-memory state machines                                                                         | `cargo test`                                                                                                  |
+| **Rust integration** | `tests/*.rs` at repo root                                                                                                                             | Full domain wiring with real Tokio runtime, mock external services, JSON-RPC end-to-end (`tests/json_rpc_e2e.rs`), domain × domain interactions | `pnpm test:rust` (which calls `bash scripts/test-rust-with-mock.sh`)                                          |
+| **Vitest unit**      | Co-located as `*.test.ts(x)` next to source under `app/src/**`, or under `app/src/**/__tests__/`                                                      | React components, hooks, store slices, pure utilities, service-layer adapters                                                                   | `pnpm test:unit`                                                                                              |
+| **WDIO E2E**         | `app/test/e2e/specs/*.spec.ts`                                                                                                                        | Full desktop flow: UI → Tauri → in-process core → JSON-RPC; user-visible behaviour                                                              | All platforms: Appium Chromium driver (port 4723) against the CEF runtime. See [E2E Testing](e2e-testing.md). |
+| **Manual smoke**     | [`docs/RELEASE-MANUAL-SMOKE.md`](../../docs/RELEASE-MANUAL-SMOKE.md)                                                                                  | OS-level surfaces drivers cannot assert: TCC permission prompts, Gatekeeper, code signing, DMG install, OS-native toasts                        | Human at release-cut, signed off in release PR                                                                |
 
 ---
 
@@ -127,7 +127,7 @@ bash app/scripts/e2e-run-spec.sh test/e2e/specs/<your-spec>.spec.ts <id>
 
 Some surfaces cannot be driven by WDIO / Appium because they cross OS-level trust boundaries or hardware paths. The complete checklist + sign-off block lives in [`docs/RELEASE-MANUAL-SMOKE.md`](../../docs/RELEASE-MANUAL-SMOKE.md), that file is the source of truth for what must be verified per release. Examples of what it covers:
 
-- macOS TCC permission prompts (Accessibility, Input Monitoring, Screen Recording, Microphone)
+- macOS TCC permission prompts (Accessibility, Input Monitoring, Microphone)
 - Gatekeeper signature validation on first launch
 - Code-sign integrity (`codesign --verify --deep --strict`)
 - DMG install / drag-to-Applications flow
diff --git a/gitbooks/features/native-tools/README.md b/gitbooks/features/native-tools/README.md
index c1b0146a4..0223daa3c 100644
--- a/gitbooks/features/native-tools/README.md
+++ b/gitbooks/features/native-tools/README.md
@@ -28,7 +28,7 @@ A plugin-only model means tools live in different processes, behind RPC, with th
 | [Web Search](web-search.md) | Search the live web via the managed proxy, or opt into self-hosted SearXNG. |
 | [Web Scraper](web-scraper.md) | Pull clean text out of any URL - articles, docs, READMEs. |
 | [Coder](coder.md) | Read/write/edit/patch files, glob, grep, git, lint, test. |
-| [Browser & Computer Control](browser-and-computer.md) | Open URLs, screenshot, click, type, move the mouse. |
+| [Browser & Computer Control](browser-and-computer.md) | Open URLs, inspect DOM snapshots, click, type, move the mouse. |
 | [Cron & Scheduling](cron.md) | Recurring jobs, one-off reminders, scheduled agent runs. |
 | [Voice](voice.md) | Speech-to-text in, text-to-speech out, live Google Meet agent. |
 | [Memory Tools](memory-tools.md) | Recall, store, forget, and search the [Memory Tree](../obsidian-wiki/memory-tree.md). |
diff --git a/gitbooks/features/native-tools/browser-and-computer.md b/gitbooks/features/native-tools/browser-and-computer.md
index 153a12526..81a044bee 100644
--- a/gitbooks/features/native-tools/browser-and-computer.md
+++ b/gitbooks/features/native-tools/browser-and-computer.md
@@ -1,17 +1,16 @@
 ---
-description: Open URLs, take screenshots, click, type, and move the mouse - natively.
+description: Open URLs, inspect DOM snapshots, click, type, and move the mouse - natively.
 icon: display
 ---
 
 # Browser & Computer Control
 
-When the agent needs to *use* your machine the way a person would - open a page, screenshot it, click a button, type a phrase - these tools are how it does it.
+When the agent needs to *use* your machine the way a person would - open a page, inspect its DOM snapshot, click a button, type a phrase - these tools are how it does it.
 
 ## Browser
 
 * **Open** a URL in an embedded webview the agent can read back from.
-* **Screenshot** the current page.
-* **Inspect** image output and metadata, so the agent can describe what it sees.
+* **Snapshot** the current page's accessibility/DOM structure, including stable element references for later actions.
 
 The browser surface runs through CEF (Chromium Embedded Framework) and includes a security layer that scopes what pages can do. See [Chromium Embedded Framework](../../developing/cef.md) for the platform details.
 
@@ -24,7 +23,7 @@ The browser surface runs through CEF (Chromium Embedded Framework) and includes
 ## What it's good for
 
 * Driving sites that don't have an API or a [native integration](../integrations/README.md).
-* Multi-step UI flows where a single screenshot isn't enough.
+* Multi-step UI flows where an interactive DOM snapshot provides the next actionable element.
 * Automating local apps from inside a chat.
 
 ## See also
diff --git a/gitbooks/features/native-tools/image-tools.md b/gitbooks/features/native-tools/image-tools.md
index c0ced772a..780d3582f 100644
--- a/gitbooks/features/native-tools/image-tools.md
+++ b/gitbooks/features/native-tools/image-tools.md
@@ -18,7 +18,6 @@ This layer is intentionally high level. Existing lower-level tools still own
 their concrete behavior:
 
 - `image_info` reads local image metadata and optional base64 text.
-- Browser screenshot tooling captures pages and writes image files.
 - Agent multimodal preparation normalizes `[IMAGE:...]` markers for providers
   that accept image data.
 
diff --git a/gitbooks/features/screen-intelligence.md b/gitbooks/features/screen-intelligence.md
deleted file mode 100644
index 1e16dde81..000000000
--- a/gitbooks/features/screen-intelligence.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-description: >-
-  On-device screen capture, OCR + vision summarization, input automation, and
-  inline autocomplete, gated behind explicit macOS privacy permissions.
-icon: scan-eye
----
-
-# Screen Intelligence
-
-Screen Intelligence lets the agent see what you're working on. When you start a consent-gated session, OpenHuman periodically screenshots your **active window**, runs it through on-device OCR and a local vision model, and synthesizes a short "what the user is doing right now" note into memory. On top of that capture loop it offers **input automation** (text staging, keyboard actions, a panic stop) and a separate **system-wide autocomplete** that suggests inline text completions in any focused field.
-
-Everything runs locally. Capture, OCR, and summarization happen on your machine using the local model (Ollama); nothing is sent to the cloud as part of this feature.
-
-> **Platform:** Screen Intelligence is **macOS-only** in V1. On Windows and Linux the engine reports `platform_supported: false`, `start_session` returns a `macOS-only` error, and the embedded capture server does not autostart. Microphone permission detection is the only cross-platform piece.
-
-***
-
-## What it does
-
-A session runs two cooperating background workers:
-
-| Worker | Role |
-| --- | --- |
-| **Capture worker** | Polls the foreground window at `baseline_fps` (default 1 fps), screenshots the **active window only** via `screencapture -l <windowID>` (no fullscreen fallback), applies the allow/deny policy, optionally saves a PNG, and enqueues the frame. |
-| **Processing worker** | Drains to the **latest** frame, compresses it (PNG → JPEG, longest edge ≤ 1024 px, quality 72), runs Apple Vision OCR, then a vision LLM, then a synthesis LLM, and persists a `VisionSummary` to memory. |
-
-Capture only proceeds when the foreground context exposes a `window_id`. Stale queued frames are discarded. Only the most recent frame is analyzed, deduped by capture timestamp.
-
-### Sessions
-
-Sessions are explicitly consent-gated and time-boxed:
-
-* You start a session from Settings (or the `screen_intelligence.start_session` RPC) with `consent: true`.
-* TTL is clamped to **30 to 3600 seconds** (the Settings panel defaults to 300 s). When the TTL expires the session stops on its own.
-* **Analyze now** flushes the pending frame through the vision pipeline immediately.
-* **Stop** ends the session; the `panic_stop` input action force-stops it instantly.
-
-***
-
-## Input automation
-
-While a session is active, `input_action` lets the agent stage text and signal keyboard intent into the session's autocomplete context. Actions are blocked when no session is active or when the foreground app is denylisted by the active policy. The special `panic_stop` action immediately tears down the session regardless of state. It is a hard kill switch.
-
-The capture-side autocomplete helpers (`autocomplete_suggest` / `autocomplete_commit`) maintain a small in-memory context buffer (capped at 256 chars) and return heuristic suggestions; they're gated on `autocomplete_enabled`.
-
-***
-
-## Autocomplete
-
-Separate from the capture session, OpenHuman ships a **system-wide inline autocomplete** engine (the `autocomplete` domain). It is also **macOS-only** at runtime.
-
-* It captures your currently-focused text field through the macOS accessibility (AX) layer, runs **local** inference to generate a short single-line continuation, and renders it in a floating overlay badge.
-* Press **Tab** to accept (it inserts the text and cleans up any stray indentation the app added), or **Escape** to reject.
-* Accepted completions are saved as personalization examples in a local KV store and a local memory-doc namespace, and feed back into later suggestions.
-* It special-cases terminals (extracting just the input line), skips blocked/disabled apps and OpenHuman's own window, and filters low-quality suggestions (too short, no alphanumerics, or an echo of what you just typed).
-* Debounce is clamped between 50 and 2000 ms; the displayed/applied suggestion is capped at 64 characters. After 5 consecutive inference failures the engine auto-stops to avoid notification floods.
-
-There is also an in-app path: the OpenHuman composer passes an explicit `context` to the engine, bypassing AX capture entirely.
-
-***
-
-## Permissions
-
-Capture and automation require macOS privacy grants. OpenHuman detects each one and can open the relevant **System Settings → Privacy & Security** pane and trigger the system prompt.
-
-| Permission | Why it's needed | Detected via |
-| --- | --- | --- |
-| **Screen Recording** | Screenshot the active window for OCR + vision. | `CGPreflightScreenCaptureAccess` |
-| **Accessibility** | Read the foreground window/element, capture focused text, and insert text (required to start a session and to run autocomplete). | `AXIsProcessTrusted` |
-| **Input Monitoring** | Listen for accept/reject key edges (Tab/Escape) and the Globe/Fn hotkey. | `IOHIDCheckAccess` |
-| **Microphone** | Voice features (cross-platform; the only permission detected off macOS). | CPAL device probe |
-
-> **Restart after granting.** macOS TCC grants are per-executable **and per-process**, so a running core never sees a freshly granted permission. After you grant a permission you must restart the core for it to take effect. The status payload carries `permission_check_process_path` and the core process pid/start time so the UI can confirm a restart actually happened. The panel exposes a "refresh with restart" action for this.
-
-***
-
-## Privacy considerations
-
-* **Local-only processing.** OCR (Apple Vision) and both LLM passes run on-device via the local model. The vision pipeline requires `local_ai.runtime_enabled = true` with the `ollama` provider; without it, analysis errors out rather than falling back to a cloud call.
-* **What's stored.** Each summary is written to **unified memory** in the `background` namespace (source type `screenshot`, tagged `screen_intelligence`) as a small markdown doc with the app name, window title, capture timestamp, and confidence. Raw frames are **not** persisted to memory.
-* **Screenshots on disk are opt-in.** PNGs are only saved to `{workspace}/screenshots/` when **Keep screenshots** is enabled; otherwise a temp file is written for OCR and deleted immediately.
-* **Allow/deny policy.** A policy mode (`all_except_blacklist` or `whitelist_only`) plus allow/deny app lists control which windows are ever captured.
-* **Time-boxed + consent-gated.** Nothing captures until you start a session, and every session expires on its TTL.
-
-***
-
-## Enabling & configuring
-
-Configure it under **Settings → Screen awareness** (the `ScreenIntelligencePanel`):
-
-* **Permissions section**: per-permission status (granted / denied / unknown), request buttons, and the restart-to-refresh flow.
-* **Enabled**: master toggle for the feature.
-* **Mode**: `All except blacklist` or `Whitelist only`, backed by the allow/deny lists.
-* **Screen monitoring**: toggle the capture loop for a session.
-* **Session controls**: Start / Stop / **Analyze now**, with a live remaining-time countdown. Start is disabled until Accessibility is granted and the platform is supported.
-
-Under the hood these map to the `[screen_intelligence]` config block (`enabled`, `vision_enabled`, `use_vision_model`, `keep_screenshots`, `baseline_fps`, `session_ttl_secs`, `policy_mode`, allow/deny lists, `autocomplete_enabled`) and the `screen_intelligence.*` JSON-RPC surface. The same capabilities are available from the `openhuman screen-intelligence` CLI (`status`, `start`, `stop`, `capture`, `doctor`, `run`).
-
-***
-
-## See also
-
-* [Memory Tree](obsidian-wiki/memory-tree.md): where vision summaries land.
-* [Privacy & Security](privacy-and-security.md): the broader permission and data model.
-* [Voice](native-tools/voice.md): the other feature that uses the Microphone permission.
diff --git a/scripts/ci/rust-coverage-changed.sh b/scripts/ci/rust-coverage-changed.sh
index 2627988a6..cdc05736e 100755
--- a/scripts/ci/rust-coverage-changed.sh
+++ b/scripts/ci/rust-coverage-changed.sh
@@ -108,6 +108,12 @@ fi
 lib_filters_raw=""
 test_targets_raw=""
 for f in "${files[@]}"; do
+  if [ ! -e "${f}" ]; then
+    # dorny/paths-filter includes deleted paths. They contain no changed lines
+    # to cover and, for tests, no longer correspond to runnable Cargo targets.
+    log "ignoring deleted rust-relevant path: ${f}"
+    continue
+  fi
   case "${f}" in
     src/lib.rs | src/main.rs)
       run_full "root module ${f} changed — whole-crate scope"
diff --git a/scripts/feature-ids.json b/scripts/feature-ids.json
index 03f680b2a..30fbea701 100644
--- a/scripts/feature-ids.json
+++ b/scripts/feature-ids.json
@@ -29,7 +29,6 @@
     "2.1.1",
     "2.1.2",
     "2.1.3",
-    "2.1.4",
     "2.2.1",
     "2.2.2",
     "2.2.3",
@@ -61,9 +60,10 @@
     "5.1.1",
     "5.1.2",
     "5.1.3",
-    "5.3.1",
-    "5.3.2",
-    "5.3.3",
+    "5.1.4",
+    "5.2.1",
+    "5.2.2",
+    "5.2.3",
     "6.1.1",
     "6.1.2",
     "6.1.3",
diff --git a/scripts/i18n-find-english.ts b/scripts/i18n-find-english.ts
index d879e5ab8..277b13898 100644
--- a/scripts/i18n-find-english.ts
+++ b/scripts/i18n-find-english.ts
@@ -72,7 +72,6 @@ const INTENTIONAL_ENGLISH = new Set([
   "memorySources.searchQueryPlaceholder",
   "migration.vendor.hermes",
   "namespaceOverview.entitiesShort",
-  "screenAwareness.debug.defaultPanicHotkey",
   "settings.ai.connectionsPerTick",
   "settings.ai.claudeCode.button", // Claude Code is a product name
   "settings.ai.claudeCode.modalTitle", // Claude Code CLI is a product name
diff --git a/scripts/test-rust-e2e.sh b/scripts/test-rust-e2e.sh
index 73b1c5304..ffaa73f2f 100755
--- a/scripts/test-rust-e2e.sh
+++ b/scripts/test-rust-e2e.sh
@@ -53,7 +53,6 @@ ALL_E2E_SUITES=(
   memory_tree_summarizer_e2e
   memory_fast_retrieve_e2e
   ollama_embeddings_fallback_e2e
-  screen_intelligence_vision_e2e
   skill_registry_e2e
   subconscious_e2e
   worker_b_domain_e2e
diff --git a/src/core/all.rs b/src/core/all.rs
index 8bd701796..f38222f5c 100644
--- a/src/core/all.rs
+++ b/src/core/all.rs
@@ -444,12 +444,6 @@ fn build_registered_controllers() -> Vec<GroupedController> {
         DomainGroup::Platform,
         crate::openhuman::people::all_people_registered_controllers(),
     );
-    // Screen capture and UI analysis
-    push(
-        &mut controllers,
-        DomainGroup::Platform,
-        crate::openhuman::screen_intelligence::all_screen_intelligence_registered_controllers(),
-    );
     // Sandbox execution backends (Docker, local jail, policy, cleanup)
     push(
         &mut controllers,
@@ -882,7 +876,6 @@ pub fn namespace_description(namespace: &str) -> Option<&'static str> {
         "javascript" => Some("First-class JavaScript runtime bridge for listing and dispatching tools."),
         "medulla_local" => Some("Supervised local medulla-serve brain: status of the child and instruct enqueue (Flavor A draft)."),
         "monitor" => Some("Start, inspect, read, and stop bounded background command monitors."),
-        "screen_intelligence" => Some("Screen capture, permissions, and accessibility automation."),
         "security" => Some("Security policy and autonomy guardrail metadata."),
         "service" => Some("Desktop service lifecycle management."),
         "session_import" => {
diff --git a/src/core/cli.rs b/src/core/cli.rs
index 286bc6244..9fbb5ac6a 100644
--- a/src/core/cli.rs
+++ b/src/core/cli.rs
@@ -91,10 +91,6 @@ pub fn run_from_cli_args(args: &[String]) -> Result<()> {
         // `unknown namespace: tui`.
         "tui" | "chat" => crate::openhuman::tui::run_from_cli(&args[1..]),
         "call" => run_call_command(&args[1..]),
-        // Domain-specific CLI adapters that don't follow the generic namespace pattern.
-        "screen-intelligence" => {
-            crate::openhuman::screen_intelligence::cli::run_screen_intelligence_command(&args[1..])
-        }
         "tree-summarizer" => {
             crate::openhuman::memory_tree::tree_runtime::cli::run_tree_summarizer_command(
                 &args[1..],
diff --git a/src/core/legacy_aliases.rs b/src/core/legacy_aliases.rs
index a558aaec4..b2273d3c0 100644
--- a/src/core/legacy_aliases.rs
+++ b/src/core/legacy_aliases.rs
@@ -110,10 +110,6 @@ const LEGACY_ALIASES: &[(&str, &str)] = &[
         "openhuman.update_runtime_settings",
         "openhuman.config_update_runtime_settings",
     ),
-    (
-        "openhuman.update_screen_intelligence_settings",
-        "openhuman.config_update_screen_intelligence_settings",
-    ),
     (
         "openhuman.workspace_onboarding_flag_exists",
         "openhuman.config_workspace_onboarding_flag_exists",
diff --git a/src/openhuman/about_app/README.md b/src/openhuman/about_app/README.md
index 0145f36ce..8589df002 100644
--- a/src/openhuman/about_app/README.md
+++ b/src/openhuman/about_app/README.md
@@ -5,7 +5,7 @@ The single source of truth for the OpenHuman desktop app's **user-facing capabil
 ## Responsibilities
 
 - Define the canonical, hard-coded list of user-facing capabilities (`CAPABILITIES` in `catalog.rs`).
-- Classify each capability by `CapabilityCategory` (conversation, intelligence, workflows, local_ai, team, settings, auth, screen_intelligence, channels, automation, mobile) and `CapabilityStatus`.
+- Classify each capability by `CapabilityCategory` (conversation, intelligence, workflows, local_ai, team, settings, auth, channels, automation, mobile) and `CapabilityStatus`.
 - Attach optional `CapabilityPrivacy` disclosures (`leaves_device`, `data_kind`, `destinations`) so the in-app Privacy surface can render "what leaves my computer".
 - Provide read APIs: list all (optionally filtered by category), look up one by stable id, keyword search across id/name/domain/category/description/how_to/status.
 - Validate catalog integrity at first access (no empty ids, no duplicate ids) via a `OnceLock` guard.
@@ -75,4 +75,4 @@ No dependencies on other `openhuman` domains — capability metadata for other d
 - Privacy constants encode real third-party destinations (Hugging Face, GitHub Releases, Composio `backend.composio.dev`, Polymarket, SearXNG, configured embedding providers, ElevenLabs, etc.) — the inline comments document why several were corrected away from the generic `DERIVED_TO_BACKEND` / `LOCAL_CREDENTIALS` defaults; mirror that diligence when adding network-touching capabilities.
 - `Capability` fields are all `&'static str` / copy types, so `Capability` is `Copy` and the read APIs cheaply return owned `Vec`s by copying.
 - A capability's `domain` is a free-text label and does not always equal its `category` wire name (e.g. `embeddings`, `wallet`, `runtime_python`, `devices`, `desktop_companion`, `security`, `tools`, `memory`).
-- `CapabilityCategory::FromStr` is lenient (case-insensitive, accepts `local-ai`/`local ai`/`localai` and `screen-intelligence`/`screen intelligence` aliases); `as_str` emits the canonical snake_case wire name used by serde.
+- `CapabilityCategory::FromStr` is lenient (case-insensitive, accepts `local-ai`/`local ai`/`localai` aliases); `as_str` emits the canonical snake_case wire name used by serde.
diff --git a/src/openhuman/about_app/catalog_data.rs b/src/openhuman/about_app/catalog_data.rs
index 36b4cd917..09f3c390e 100644
--- a/src/openhuman/about_app/catalog_data.rs
+++ b/src/openhuman/about_app/catalog_data.rs
@@ -1236,92 +1236,17 @@ pub(super) const CAPABILITIES: &[Capability] = &[
         status: CapabilityStatus::Stable,
         privacy: None,
     },
-    Capability {
-        id: "screen_intelligence.toggle_monitoring",
-        name: "Enable or Disable Screen Monitoring",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Turn desktop screen intelligence capture on or off.",
-        how_to: "Settings > Screen Intelligence",
-        status: CapabilityStatus::Beta,
-        privacy: LOCAL_RAW,
-    },
-    Capability {
-        id: "screen_intelligence.manage_accessibility_permissions",
-        name: "Manage Accessibility Permissions",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Review and grant the accessibility permissions required for desktop assistance.",
-        how_to: "Onboarding > Screen permissions or Settings > Accessibility Automation",
-        status: CapabilityStatus::Stable,
-        privacy: None,
-    },
-    Capability {
-        id: "screen_intelligence.review_vision_data",
-        name: "Review Vision Data",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Inspect the captured screen intelligence and related vision summaries.",
-        how_to: "Settings > Screen Intelligence",
-        status: CapabilityStatus::Beta,
-        privacy: LOCAL_RAW,
-    },
-    Capability {
-        id: "screen_intelligence.configure_capture_fps",
-        name: "Configure Capture FPS",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Tune the screen capture frame rate used by screen intelligence.",
-        how_to: "Settings > Screen Intelligence",
-        status: CapabilityStatus::Beta,
-        privacy: None,
-    },
-    Capability {
-        id: "screen_intelligence.app_whitelist",
-        name: "Whitelist Apps for Capture",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Allow screen intelligence only for selected applications.",
-        how_to: "Settings > Screen Intelligence",
-        status: CapabilityStatus::Beta,
-        privacy: None,
-    },
-    Capability {
-        id: "screen_intelligence.app_blacklist",
-        name: "Blacklist Apps from Capture",
-        domain: "screen_intelligence",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Exclude selected applications from screen intelligence capture.",
-        how_to: "Settings > Screen Intelligence",
-        status: CapabilityStatus::Beta,
-        privacy: None,
-    },
     Capability {
         id: "companion.session",
         name: "Desktop Companion Session",
         domain: "companion",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Run a consent-gated desktop companion session that combines a global \
-                      hotkey, native microphone capture, optional foreground app/window context, \
-                      hosted assistant reasoning, speech synthesis, and visual pointing. The \
-                      interaction loop runs in the Tauri shell while speech services run through \
-                      the embedded core.",
+        category: CapabilityCategory::Conversation,
+        description: "Run a consent-gated desktop companion conversation with a global hotkey, \
+                      native microphone capture, hosted assistant reasoning, and speech synthesis.",
         how_to: "Settings > Companion: start a session, then use the configured hotkey.",
         status: CapabilityStatus::Beta,
         privacy: DERIVED_TO_BACKEND,
     },
-    Capability {
-        id: "companion.pointing",
-        name: "Visual Pointing",
-        domain: "companion",
-        category: CapabilityCategory::ScreenIntelligence,
-        description: "Parse pointing targets from companion responses and render them over the \
-                      matching desktop monitor. Target coordinates and labels are derived by the \
-                      hosted assistant from the session's optional foreground-window context.",
-        how_to: "Automatic during an active companion session when the assistant identifies a UI target.",
-        status: CapabilityStatus::Beta,
-        privacy: DERIVED_TO_BACKEND,
-    },
     Capability {
         id: "channels.connect_platform",
         name: "Connect Messaging Platforms",
diff --git a/src/openhuman/about_app/catalog_tests.rs b/src/openhuman/about_app/catalog_tests.rs
index 9ddd26309..34197f567 100644
--- a/src/openhuman/about_app/catalog_tests.rs
+++ b/src/openhuman/about_app/catalog_tests.rs
@@ -161,7 +161,6 @@ fn catalog_includes_additional_user_facing_surfaces() {
         "intelligence.coding_session_memory",
         "conversation.subagent_mascots",
         "companion.session",
-        "companion.pointing",
     ] {
         assert!(
             ids.contains(expected),
@@ -172,16 +171,39 @@ fn catalog_includes_additional_user_facing_surfaces() {
 
 #[test]
 fn companion_capabilities_disclose_backend_reasoning() {
-    for id in ["companion.session", "companion.pointing"] {
-        let capability = lookup(id).expect("companion capability registered");
-        assert_eq!(capability.domain, "companion");
-        assert_eq!(capability.category, CapabilityCategory::ScreenIntelligence);
+    let capability = lookup("companion.session").expect("companion capability registered");
+    assert_eq!(capability.domain, "companion");
+    assert_eq!(capability.category, CapabilityCategory::Conversation);
 
-        let privacy = capability.privacy.expect("privacy disclosure");
-        assert!(privacy.leaves_device);
-        assert_eq!(privacy.data_kind, PrivacyDataKind::Derived);
-        assert!(privacy.destinations.contains(&"OpenHuman backend"));
-    }
+    let privacy = capability.privacy.expect("privacy disclosure");
+    assert!(privacy.leaves_device);
+    assert_eq!(privacy.data_kind, PrivacyDataKind::Derived);
+    assert!(privacy.destinations.contains(&"OpenHuman backend"));
+
+    assert!(
+        lookup("companion.pointing").is_none(),
+        "visual pointing depends on removed screen context and must not be catalogued"
+    );
+}
+
+#[test]
+fn screen_intelligence_is_not_a_catalog_category_or_capability() {
+    assert!(
+        "screen_intelligence".parse::<CapabilityCategory>().is_err(),
+        "removed category must not deserialize"
+    );
+    assert!(
+        CapabilityCategory::ALL
+            .iter()
+            .all(|category| category.as_str() != "screen_intelligence"),
+        "removed category must not be exposed by CapabilityCategory::ALL"
+    );
+    assert!(
+        all_capabilities()
+            .iter()
+            .all(|capability| !capability.id.starts_with("screen_intelligence.")),
+        "screen intelligence capability entries must be removed"
+    );
 }
 
 #[test]
diff --git a/src/openhuman/about_app/types.rs b/src/openhuman/about_app/types.rs
index c6403726f..0d61a2918 100644
--- a/src/openhuman/about_app/types.rs
+++ b/src/openhuman/about_app/types.rs
@@ -18,8 +18,6 @@ pub enum CapabilityCategory {
     Settings,
     #[serde(rename = "auth")]
     Auth,
-    #[serde(rename = "screen_intelligence")]
-    ScreenIntelligence,
     #[serde(rename = "channels")]
     Channels,
     #[serde(rename = "automation")]
@@ -29,7 +27,7 @@ pub enum CapabilityCategory {
 }
 
 impl CapabilityCategory {
-    pub const ALL: [Self; 11] = [
+    pub const ALL: [Self; 10] = [
         Self::Conversation,
         Self::Intelligence,
         Self::Workflows,
@@ -37,7 +35,6 @@ impl CapabilityCategory {
         Self::Team,
         Self::Settings,
         Self::Auth,
-        Self::ScreenIntelligence,
         Self::Channels,
         Self::Automation,
         Self::Mobile,
@@ -52,7 +49,6 @@ impl CapabilityCategory {
             Self::Team => "team",
             Self::Settings => "settings",
             Self::Auth => "auth",
-            Self::ScreenIntelligence => "screen_intelligence",
             Self::Channels => "channels",
             Self::Automation => "automation",
             Self::Mobile => "mobile",
@@ -73,9 +69,6 @@ impl FromStr for CapabilityCategory {
             "team" => Ok(Self::Team),
             "settings" => Ok(Self::Settings),
             "auth" => Ok(Self::Auth),
-            "screen_intelligence" | "screen-intelligence" | "screen intelligence" => {
-                Ok(Self::ScreenIntelligence)
-            }
             "channels" => Ok(Self::Channels),
             "automation" => Ok(Self::Automation),
             "mobile" => Ok(Self::Mobile),
@@ -168,11 +161,6 @@ mod tests {
             serde_json::to_string(&CapabilityCategory::LocalAI).expect("serialize LocalAI"),
             "\"local_ai\""
         );
-        assert_eq!(
-            serde_json::to_string(&CapabilityCategory::ScreenIntelligence)
-                .expect("serialize ScreenIntelligence"),
-            "\"screen_intelligence\""
-        );
     }
 
     #[test]
@@ -184,8 +172,8 @@ mod tests {
     }
 
     #[test]
-    fn category_all_has_11_variants() {
-        assert_eq!(CapabilityCategory::ALL.len(), 11);
+    fn category_all_has_10_variants() {
+        assert_eq!(CapabilityCategory::ALL.len(), 10);
     }
 
     #[test]
@@ -211,14 +199,6 @@ mod tests {
             "localai".parse::<CapabilityCategory>().unwrap(),
             CapabilityCategory::LocalAI
         );
-        assert_eq!(
-            "screen-intelligence".parse::<CapabilityCategory>().unwrap(),
-            CapabilityCategory::ScreenIntelligence
-        );
-        assert_eq!(
-            "screen intelligence".parse::<CapabilityCategory>().unwrap(),
-            CapabilityCategory::ScreenIntelligence
-        );
     }
 
     #[test]
diff --git a/src/openhuman/accessibility/README.md b/src/openhuman/accessibility/README.md
index fedefd904..e01c5dc2a 100644
--- a/src/openhuman/accessibility/README.md
+++ b/src/openhuman/accessibility/README.md
@@ -1,20 +1,19 @@
 # Accessibility
 
-Cross-platform accessibility middleware. Owns macOS AX / CGEvent / IOKit FFI, the unified Swift helper-process bridge, screen capture, focused-text + foreground app inspection, system-permission detection (Accessibility, Input Monitoring, Screen Recording, Microphone), the Globe-key listener, the floating overlay window, paste / backspace key synthesis, terminal heuristics, and AX-string normalization. Centralises platform-specific code so that `autocomplete`, `screen_intelligence`, and `voice` never touch FFI directly.
+Cross-platform accessibility middleware. Owns macOS AX / CGEvent / IOKit FFI, the unified Swift helper-process bridge, focused-text inspection, system-permission detection (Accessibility, Input Monitoring, Microphone), the Globe-key listener, the floating overlay window, paste / backspace key synthesis, terminal heuristics, and AX-string normalization. Centralises platform-specific code so that `voice` never touches FFI directly.
 
 ## Public surface
 
-- `pub fn capture_screen_image_ref_for_context` / `pub enum CaptureMode` / `pub const MAX_SCREENSHOT_BYTES` — `capture.rs` — bounded screen capture.
-- `pub fn focused_text_context` / `focused_text_context_verbose` / `foreground_context` / `parse_foreground_output` / `validate_focused_target` — `focus.rs` — query the OS for the currently focused text field and frontmost app.
+- `pub fn focused_text_context` / `focused_text_context_verbose` / `validate_focused_target` — `focus.rs` — query the OS for the currently focused text field.
 - `pub fn globe_listener_start` / `globe_listener_stop` / `globe_listener_poll` / `pub struct GlobeHotkeyPollResult` / `pub enum GlobeHotkeyStatus` — `globe.rs` — macOS Globe-key (Fn) hotkey monitor.
 - `pub fn precompile_helper_background` — `helper.rs` — warm the Swift helper process at startup.
 - `pub fn any_modifier_down` / `is_escape_key_down` / `is_tab_key_down` — `keys.rs` — modifier polling for cancellation gestures.
 - `pub fn show_overlay` / `hide_overlay` / `quit_overlay` — `overlay.rs` — floating completion overlay control.
 - `pub fn apply_text_to_focused_field` / `pub fn send_backspace` — `paste.rs` — programmatic text insertion.
-- Permission detection: `detect_permissions`, `detect_microphone_permission`, `microphone_denied_message`, `permission_to_str`, `request_microphone_access` (cross-platform); macOS-only `detect_accessibility_permission`, `detect_input_monitoring_permission`, `detect_screen_recording_permission`, `open_macos_privacy_pane`, `request_accessibility_access`, `request_screen_recording_access` — `permissions.rs`.
+- Permission detection: `detect_permissions`, `detect_microphone_permission`, `microphone_denied_message`, `permission_to_str`, `request_microphone_access` (cross-platform); macOS-only `detect_accessibility_permission`, `detect_input_monitoring_permission`, `open_macos_privacy_pane`, `request_accessibility_access` — `permissions.rs`.
 - `pub fn extract_terminal_input_context` / `is_terminal_app` / `is_text_role` / `looks_like_terminal_buffer` — `terminal.rs` — terminal-window heuristics.
 - `pub fn normalize_ax_value` / `parse_ax_number` / `truncate_tail` — `text_util.rs` — AX value normalization.
-- `pub struct AppContext` / `ElementBounds` / `FocusedTextContext` / `PermissionKind` / `PermissionState` / `PermissionStatus` — `types.rs`.
+- `pub struct ElementBounds` / `FocusedTextContext` / `PermissionKind` / `PermissionState` / `PermissionStatus` — `types.rs`.
 
 ## Calls into
 
@@ -24,12 +23,9 @@ Cross-platform accessibility middleware. Owns macOS AX / CGEvent / IOKit FFI, th
 
 ## Called by
 
-- `src/openhuman/autocomplete/core/{terminal,text,overlay,types,focus}.rs` — focus-driven autocomplete needs every accessibility primitive.
-- `src/openhuman/screen_intelligence/{types,state,capture_worker,input,tests}.rs` — screen capture + focus context for vision pipelines.
-- `src/openhuman/voice/` — microphone permission + foreground app context (indirect, via re-exports).
-- `src/core/` — surfaces `AccessibilityStatus` snapshots for the shell.
+- `src/openhuman/voice/` — microphone permission and focused-text helpers (indirect, via re-exports).
 
 ## Tests
 
-- This domain has no `*_tests.rs` siblings; coverage runs through the consumer modules' `tests.rs` (notably `screen_intelligence/tests.rs`) and integration tests in `tests/screen_intelligence_vision_e2e.rs`.
+- Permission and focus coverage runs through `permissions_tests.rs`, inline module tests, and retained consumers.
 - AX FFI surface is best validated end-to-end on a real macOS host — most CI runs are Linux and skip platform-gated paths.
diff --git a/src/openhuman/accessibility/capture.rs b/src/openhuman/accessibility/capture.rs
deleted file mode 100644
index 103c93eca..000000000
--- a/src/openhuman/accessibility/capture.rs
+++ /dev/null
@@ -1,336 +0,0 @@
-//! Timestamp helper and screen capture via platform-native tools.
-
-use super::types::AppContext;
-#[cfg(target_os = "macos")]
-use super::{detect_permissions, PermissionState};
-#[cfg(target_os = "macos")]
-use std::path::{Path, PathBuf};
-
-/// Maximum screenshot size in bytes before downscaling is attempted.
-pub const MAX_SCREENSHOT_BYTES: usize = 1_500_000;
-#[cfg(target_os = "macos")]
-const SCREENSHOT_DOWNSCALE_WIDTH: &str = "1280";
-
-/// Capture mode used for a screenshot.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum CaptureMode {
-    Windowed,
-    Fullscreen,
-}
-
-impl std::fmt::Display for CaptureMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            CaptureMode::Windowed => write!(f, "windowed"),
-            CaptureMode::Fullscreen => write!(f, "fullscreen"),
-        }
-    }
-}
-
-fn capture_mode_for_context(context: Option<&AppContext>) -> CaptureMode {
-    // Only use windowed capture when we have a reliable CGWindowID.
-    // Without a window ID we still return Windowed so the caller can
-    // decide — but `capture_screen_image_ref_for_context` will fail
-    // gracefully when neither window_id nor bounds are available.
-    if context.and_then(|ctx| ctx.window_id).is_some() {
-        return CaptureMode::Windowed;
-    }
-    // Fallback to bounds-based if available, otherwise fullscreen.
-    match context.and_then(|ctx| ctx.bounds) {
-        Some(bounds) if bounds.width > 0 && bounds.height > 0 => CaptureMode::Windowed,
-        _ => CaptureMode::Fullscreen,
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn log_capture_mode_decision(context: Option<&AppContext>, capture_mode: &CaptureMode) {
-    match (capture_mode, context.and_then(|ctx| ctx.bounds)) {
-        (CaptureMode::Windowed, Some(bounds)) => {
-            tracing::debug!(
-                "[accessibility] capture mode=windowed rect={},{},{},{} app={:?}",
-                bounds.x,
-                bounds.y,
-                bounds.width,
-                bounds.height,
-                context.and_then(|ctx| ctx.app_name.as_deref())
-            );
-        }
-        (CaptureMode::Windowed, None) => {
-            tracing::debug!(
-                "[accessibility] capture mode resolved to windowed without bounds; treating as fullscreen fallback"
-            );
-        }
-        (CaptureMode::Fullscreen, Some(bounds)) => {
-            tracing::debug!(
-                "[accessibility] invalid bounds ({}x{}), falling back to fullscreen",
-                bounds.width,
-                bounds.height
-            );
-        }
-        (CaptureMode::Fullscreen, None) => {
-            tracing::debug!(
-                "[accessibility] no window bounds available, falling back to fullscreen"
-            );
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn downscale_width_for_capture(
-    bytes_len: usize,
-    _capture_mode: &CaptureMode,
-) -> Option<&'static str> {
-    (bytes_len > MAX_SCREENSHOT_BYTES).then_some(SCREENSHOT_DOWNSCALE_WIDTH)
-}
-
-#[cfg(target_os = "macos")]
-struct TemporaryScreenshotFile {
-    path: PathBuf,
-}
-
-#[cfg(target_os = "macos")]
-impl TemporaryScreenshotFile {
-    fn new(path: PathBuf) -> Self {
-        Self { path }
-    }
-
-    fn path(&self) -> &Path {
-        &self.path
-    }
-}
-
-#[cfg(target_os = "macos")]
-impl Drop for TemporaryScreenshotFile {
-    fn drop(&mut self) {
-        let _ = std::fs::remove_file(&self.path);
-    }
-}
-
-pub fn capture_screen_image_ref_for_context(
-    context: Option<&AppContext>,
-) -> Result<String, String> {
-    #[cfg(target_os = "macos")]
-    {
-        use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
-        use uuid::Uuid;
-
-        let tmp_file = TemporaryScreenshotFile::new(std::env::temp_dir().join(format!(
-            "openhuman_screen_intelligence_{}.png",
-            Uuid::new_v4()
-        )));
-
-        let capture_mode = capture_mode_for_context(context);
-        log_capture_mode_decision(context, &capture_mode);
-
-        // Never fall back to fullscreen — capturing the entire display is
-        // almost never what the caller wants and leaks unrelated content.
-        if capture_mode == CaptureMode::Fullscreen {
-            let app = context.and_then(|ctx| ctx.app_name.as_deref());
-            tracing::debug!(
-                "[accessibility] refusing fullscreen fallback for app={:?} — \
-                 no window_id or valid bounds available",
-                app,
-            );
-            return Err(
-                "no window_id or valid bounds available — refusing fullscreen capture".to_string(),
-            );
-        }
-
-        let mut cmd = std::process::Command::new("screencapture");
-        cmd.arg("-x").arg("-t").arg("png");
-
-        if let Some(wid) = context.and_then(|ctx| ctx.window_id) {
-            // Capture by window ID — most reliable, no coordinate issues.
-            cmd.arg("-l").arg(wid.to_string());
-            tracing::debug!(
-                "[accessibility] capture mode=window_id id={} app={:?}",
-                wid,
-                context.and_then(|ctx| ctx.app_name.as_deref())
-            );
-        } else if capture_mode == CaptureMode::Windowed {
-            let b = &context
-                .and_then(|ctx| ctx.bounds)
-                .expect("windowed capture requires bounds");
-            let rect = format!("{},{},{},{}", b.x, b.y, b.width, b.height);
-            cmd.arg("-R").arg(&rect);
-        }
-
-        cmd.arg(tmp_file.path());
-
-        let output = cmd
-            .output()
-            .map_err(|e| format!("screencapture failed to start: {e}"))?;
-        if !output.status.success() {
-            let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
-            let permissions = detect_permissions();
-            tracing::debug!(
-                "[accessibility] screencapture failed status={:?} stderr={:?} screen_recording={:?}",
-                output.status.code(),
-                stderr,
-                permissions.screen_recording
-            );
-            if permissions.screen_recording != PermissionState::Granted {
-                return Err("screen recording permission is not granted".to_string());
-            }
-            if stderr.is_empty() {
-                return Err(
-                    "screen capture failed: screencapture returned non-zero status".to_string(),
-                );
-            }
-            return Err(format!("screen capture failed: {}", stderr));
-        }
-
-        let bytes = std::fs::read(tmp_file.path())
-            .map_err(|e| format!("failed to read captured screenshot: {e}"))?;
-        tracing::debug!(
-            "[accessibility] captured {} bytes (mode={})",
-            bytes.len(),
-            capture_mode
-        );
-
-        if let Some(width) = downscale_width_for_capture(bytes.len(), &capture_mode) {
-            tracing::debug!(
-                "[accessibility] {} capture {} bytes exceeds limit, retrying downscale width={}",
-                capture_mode,
-                bytes.len(),
-                width
-            );
-            let sips_output = std::process::Command::new("sips")
-                .arg("--resampleWidth")
-                .arg(width)
-                .arg(tmp_file.path())
-                .output();
-            match sips_output {
-                Ok(output) if output.status.success() => {
-                    let resized = match std::fs::read(tmp_file.path()) {
-                        Ok(resized) => resized,
-                        Err(e) => return Err(format!("failed to read resized screenshot: {e}")),
-                    };
-                    tracing::debug!("[accessibility] resized to {} bytes", resized.len());
-                    if resized.len() > MAX_SCREENSHOT_BYTES {
-                        return Err(
-                            "captured screenshot exceeds size limit after downscale".to_string()
-                        );
-                    }
-                    let encoded = BASE64_STANDARD.encode(resized);
-                    return Ok(format!("data:image/png;base64,{encoded}"));
-                }
-                Ok(output) => {
-                    tracing::debug!(
-                        "[accessibility] sips failed status={:?} stderr={:?}",
-                        output.status.code(),
-                        String::from_utf8_lossy(&output.stderr).trim()
-                    );
-                    return Err(
-                        "captured screenshot exceeds size limit and downscale failed".to_string(),
-                    );
-                }
-                Err(e) => {
-                    tracing::debug!("[accessibility] sips not available: {e}");
-                    return Err("captured screenshot exceeds size limit".to_string());
-                }
-            }
-        }
-
-        if bytes.len() > MAX_SCREENSHOT_BYTES {
-            return Err("captured screenshot exceeds size limit".to_string());
-        }
-
-        let encoded = BASE64_STANDARD.encode(bytes);
-        Ok(format!("data:image/png;base64,{encoded}"))
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    {
-        let _ = context;
-        Err("screen capture is unsupported on this platform".to_string())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::openhuman::accessibility::ElementBounds;
-
-    #[test]
-    fn capture_mode_uses_window_bounds_when_positive() {
-        let context = AppContext {
-            app_name: Some("Code".to_string()),
-            window_title: Some("main.rs".to_string()),
-            bounds: Some(ElementBounds {
-                x: 10,
-                y: 20,
-                width: 1440,
-                height: 900,
-            }),
-            window_id: None,
-        };
-
-        assert_eq!(
-            capture_mode_for_context(Some(&context)),
-            CaptureMode::Windowed
-        );
-    }
-
-    #[test]
-    fn capture_mode_falls_back_to_fullscreen_for_missing_or_invalid_bounds() {
-        let invalid_context = AppContext {
-            app_name: Some("Finder".to_string()),
-            window_title: Some("Desktop".to_string()),
-            window_id: None,
-            bounds: Some(ElementBounds {
-                x: 0,
-                y: 0,
-                width: 0,
-                height: 900,
-            }),
-        };
-
-        assert_eq!(
-            capture_mode_for_context(Some(&invalid_context)),
-            CaptureMode::Fullscreen
-        );
-        assert_eq!(capture_mode_for_context(None), CaptureMode::Fullscreen);
-    }
-
-    #[cfg(target_os = "macos")]
-    #[test]
-    fn fullscreen_fallback_is_rejected() {
-        // No window_id and no valid bounds → should refuse to capture.
-        let result = capture_screen_image_ref_for_context(None);
-        assert!(result.is_err());
-        assert!(result.unwrap_err().contains("refusing fullscreen capture"));
-
-        let invalid_context = AppContext {
-            app_name: Some("Finder".to_string()),
-            window_title: Some("Desktop".to_string()),
-            window_id: None,
-            bounds: Some(ElementBounds {
-                x: 0,
-                y: 0,
-                width: 0,
-                height: 900,
-            }),
-        };
-        let result = capture_screen_image_ref_for_context(Some(&invalid_context));
-        assert!(result.is_err());
-        assert!(result.unwrap_err().contains("refusing fullscreen capture"));
-    }
-
-    #[cfg(target_os = "macos")]
-    #[test]
-    fn oversized_windowed_capture_is_eligible_for_downscale_retry() {
-        assert_eq!(
-            downscale_width_for_capture(MAX_SCREENSHOT_BYTES + 1, &CaptureMode::Windowed),
-            Some(SCREENSHOT_DOWNSCALE_WIDTH)
-        );
-        assert_eq!(
-            downscale_width_for_capture(MAX_SCREENSHOT_BYTES + 1, &CaptureMode::Fullscreen),
-            Some(SCREENSHOT_DOWNSCALE_WIDTH)
-        );
-        assert_eq!(
-            downscale_width_for_capture(MAX_SCREENSHOT_BYTES, &CaptureMode::Windowed),
-            None
-        );
-    }
-}
diff --git a/src/openhuman/accessibility/focus.rs b/src/openhuman/accessibility/focus.rs
index cbb5cf096..64b6b1283 100644
--- a/src/openhuman/accessibility/focus.rs
+++ b/src/openhuman/accessibility/focus.rs
@@ -1,4 +1,4 @@
-//! Accessibility focus queries and foreground app context.
+//! Accessibility focus queries.
 //!
 //! Primary path: unified Swift helper (native AX API, fast, persistent process).
 //! Fallback: osascript subprocess (slower, but works without compiled helper).
@@ -7,7 +7,9 @@
 use super::terminal::{is_terminal_app, is_text_role};
 #[cfg(target_os = "macos")]
 use super::text_util::{normalize_ax_value, parse_ax_number};
-use super::types::{AppContext, ElementBounds, FocusedTextContext};
+#[cfg(target_os = "macos")]
+use super::types::ElementBounds;
+use super::types::FocusedTextContext;
 #[cfg(any(target_os = "macos", test))]
 use std::{
     process::{Command, Output, Stdio},
@@ -15,7 +17,7 @@ use std::{
 };
 
 #[cfg(target_os = "macos")]
-const FOREGROUND_CONTEXT_COMMAND_TIMEOUT: Duration = Duration::from_millis(1_500);
+const FOCUS_COMMAND_TIMEOUT: Duration = Duration::from_millis(1_500);
 #[cfg(any(target_os = "macos", test))]
 const COMMAND_TIMEOUT_POLL_INTERVAL: Duration = Duration::from_millis(10);
 
@@ -316,7 +318,7 @@ fn focused_text_via_osascript() -> Result<FocusedTextContext, String> {
     let output = command_output_with_timeout(
         "osascript focused_text_via_osascript",
         &mut command,
-        FOREGROUND_CONTEXT_COMMAND_TIMEOUT,
+        FOCUS_COMMAND_TIMEOUT,
     )?;
     if !output.status.success() {
         let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
@@ -443,291 +445,6 @@ pub fn validate_focused_target(
     }
 }
 
-// ---------------------------------------------------------------------------
-// Foreground app context (from screen_intelligence)
-// ---------------------------------------------------------------------------
-
-/// Parse the raw stdout from the AppleScript foreground-context query.
-///
-/// Expected format: 6 lines — app_name, window_title, x, y, width, height.
-/// This is a pure function, fully testable without macOS.
-pub fn parse_foreground_output(stdout: &str) -> Option<AppContext> {
-    let mut lines = stdout.lines();
-    let app = lines.next().map(|s| s.trim().to_string());
-    let title = lines.next().map(|s| s.trim().to_string());
-    let x = lines.next().and_then(|s| s.trim().parse::<i32>().ok());
-    let y = lines.next().and_then(|s| s.trim().parse::<i32>().ok());
-    let width = lines.next().and_then(|s| s.trim().parse::<i32>().ok());
-    let height = lines.next().and_then(|s| s.trim().parse::<i32>().ok());
-
-    let bounds = match (x, y, width, height) {
-        (Some(x), Some(y), Some(width), Some(height)) if width > 0 && height > 0 => {
-            Some(ElementBounds {
-                x,
-                y,
-                width,
-                height,
-            })
-        }
-        _ => None,
-    };
-
-    let app = app.filter(|s| !s.is_empty());
-    let title = title.filter(|s| !s.is_empty());
-    if app.is_none() && title.is_none() && bounds.is_none() {
-        return None;
-    }
-    Some(AppContext {
-        app_name: app,
-        window_title: title,
-        bounds,
-        window_id: None, // Populated later by foreground_context() via resolve_frontmost_window_id.
-    })
-}
-
-#[cfg(target_os = "macos")]
-pub fn foreground_context() -> Option<AppContext> {
-    if super::automation_state::system_events_denied() {
-        log::debug!(
-            "[accessibility] foreground_context skipped: System Events automation previously denied (-1743)"
-        );
-        return None;
-    }
-
-    let script = r#"
-      tell application "System Events"
-        set frontApp to name of first application process whose frontmost is true
-        set frontWindow to ""
-        set windowX to ""
-        set windowY to ""
-        set windowW to ""
-        set windowH to ""
-        try
-          tell process frontApp
-            if (count of windows) > 0 then
-              set w to front window
-              set frontWindow to name of w
-              set p to position of w
-              set s to size of w
-              set windowX to item 1 of p as text
-              set windowY to item 2 of p as text
-              set windowW to item 1 of s as text
-              set windowH to item 2 of s as text
-            end if
-          end tell
-        end try
-        return frontApp & "\n" & frontWindow & "\n" & windowX & "\n" & windowY & "\n" & windowW & "\n" & windowH
-      end tell
-    "#;
-
-    let mut command = Command::new("osascript");
-    command.arg("-e").arg(script);
-    let output = match command_output_with_timeout(
-        "osascript foreground_context",
-        &mut command,
-        FOREGROUND_CONTEXT_COMMAND_TIMEOUT,
-    ) {
-        Ok(output) => output,
-        Err(error) => {
-            tracing::debug!("[accessibility] foreground_context failed: {error}");
-            return None;
-        }
-    };
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        tracing::debug!(
-            "[accessibility] osascript failed: status={:?} stderr={}",
-            output.status.code(),
-            stderr.trim()
-        );
-        return None;
-    }
-
-    let text = String::from_utf8_lossy(&output.stdout);
-    let mut result = parse_foreground_output(&text);
-
-    // Resolve the CGWindowID for the frontmost window so capture can use
-    // `screencapture -l <id>` instead of the fragile `-R x,y,w,h` region
-    // approach. Falls back gracefully — window_id stays None.
-    if let Some(ref mut ctx) = result {
-        ctx.window_id =
-            resolve_frontmost_window_id(ctx.app_name.as_deref(), ctx.window_title.as_deref());
-    }
-
-    tracing::debug!(
-        "[accessibility] foreground_context: app={:?} window_id={:?} bounds_present={}",
-        result.as_ref().and_then(|c| c.app_name.as_deref()),
-        result.as_ref().and_then(|c| c.window_id),
-        result.as_ref().map(|c| c.bounds.is_some()).unwrap_or(false)
-    );
-    result
-}
-
-/// Resolve the CGWindowID of the frontmost on-screen window owned by the
-/// given application name (and optionally matching the window title).
-///
-/// Uses a Swift subprocess to query Quartz `CGWindowListCopyWindowInfo`.
-/// Swift ships with macOS and has direct CoreGraphics access.
-///
-/// Strategy:
-/// 1. Prefer a window matching both app name AND title (when title provided).
-/// 2. Fall back to first layer-0 window matching app name only.
-/// 3. Retry once after a short delay if the first attempt fails (the window
-///    list can be briefly stale during fast app switches).
-#[cfg(target_os = "macos")]
-fn resolve_frontmost_window_id(app_name: Option<&str>, window_title: Option<&str>) -> Option<u32> {
-    let app = app_name?;
-
-    // Try up to 2 times — the CGWindowList can briefly lag behind
-    // AppleScript during fast app switches.
-    for attempt in 0..2 {
-        if attempt > 0 {
-            // Intentional blocking sleep: `resolve_frontmost_window_id` is called
-            // from `foreground_context()`, which is a synchronous function invoked
-            // from within an async context (the capture/status hot path). The sleep
-            // is only 50ms and is rare (second attempt only), so the blocking impact
-            // on the Tokio runtime is minimal and acceptable here.
-            std::thread::sleep(std::time::Duration::from_millis(50));
-            tracing::debug!(
-                "[accessibility] retrying window_id resolution for app={:?} (attempt {})",
-                app,
-                attempt + 1
-            );
-        }
-
-        if let Some(wid) = run_swift_window_lookup(app, window_title) {
-            return Some(wid);
-        }
-    }
-
-    tracing::debug!(
-        "[accessibility] window_id resolution failed after retries for app={:?} title={:?}",
-        app,
-        window_title,
-    );
-    None
-}
-
-/// Run the Swift subprocess that queries CGWindowList and returns the best
-/// matching window ID.
-#[cfg(target_os = "macos")]
-fn run_swift_window_lookup(app_name: &str, window_title: Option<&str>) -> Option<u32> {
-    // Escape single-quotes for shell embedding.
-    let escaped_app = app_name.replace('\'', "'\\''");
-    let escaped_title = window_title
-        .map(|t| t.replace('\'', "'\\''"))
-        .unwrap_or_default();
-    let has_title = window_title.is_some() && !escaped_title.is_empty();
-
-    // Strip Unicode formatting/control characters (e.g. U+200E LTR mark)
-    // from the app name before embedding in Swift. Some apps like WhatsApp
-    // have invisible Unicode prefixes in their bundle name that AppleScript
-    // preserves but can cause comparison issues.
-    let stripped_app: String = escaped_app
-        .chars()
-        .filter(|c| {
-            !c.is_control()
-                && !matches!(
-                    c,
-                    '\u{200E}' | '\u{200F}' | '\u{200B}' | '\u{FEFF}' | '\u{200C}' | '\u{200D}'
-                )
-        })
-        .collect();
-    let stripped_title: String = escaped_title
-        .chars()
-        .filter(|c| {
-            !c.is_control()
-                && !matches!(
-                    c,
-                    '\u{200E}' | '\u{200F}' | '\u{200B}' | '\u{FEFF}' | '\u{200C}' | '\u{200D}'
-                )
-        })
-        .collect();
-
-    // Swift snippet: iterate CGWindowList, prefer title+app match, fall
-    // back to first layer-0 app-name-only match.
-    //
-    // Uses `.optionAll` instead of `.optionOnScreenOnly` because some apps
-    // (e.g. WhatsApp, Catalyst/Electron apps) have visible windows that
-    // aren't reported by the on-screen-only filter. We compensate by
-    // requiring layer == 0 and positive bounds to skip truly off-screen
-    // or minimised windows.
-    let swift_code = format!(
-        r#"
-import CoreGraphics
-import Foundation
-func strip(_ s: String) -> String {{
-    s.unicodeScalars.filter {{ !($0.properties.isDefaultIgnorableCodePoint || $0.value == 0x200E || $0.value == 0x200F || $0.value == 0xFEFF) }}.map {{ String($0) }}.joined()
-}}
-let target = strip("{stripped_app}")
-let targetTitle = strip("{stripped_title}")
-let o: CGWindowListOption = [.optionAll, .excludeDesktopElements]
-var fallback: Int = -1
-if let l = CGWindowListCopyWindowInfo(o, kCGNullWindowID) as? [[String: Any]] {{
-    for w in l {{
-        let owner = strip(w["kCGWindowOwnerName"] as? String ?? "")
-        let layer = w["kCGWindowLayer"] as? Int ?? -1
-        let wid = w["kCGWindowNumber"] as? Int ?? -1
-        let name = strip(w["kCGWindowName"] as? String ?? "")
-        let bounds = w["kCGWindowBounds"] as? [String: Any] ?? [:]
-        let bw = bounds["Width"] as? Int ?? 0
-        let bh = bounds["Height"] as? Int ?? 0
-        if owner == target && layer == 0 && bw > 1 && bh > 1 {{
-            if {has_title_swift} && name == targetTitle {{
-                print(wid)
-                exit(0)
-            }}
-            if fallback < 0 {{
-                fallback = wid
-            }}
-        }}
-    }}
-}}
-if fallback > 0 {{ print(fallback) }}
-"#,
-        has_title_swift = if has_title { "true" } else { "false" },
-    );
-
-    let mut command = Command::new("swift");
-    command.arg("-e").arg(&swift_code);
-    let output = match command_output_with_timeout(
-        "swift CGWindowList",
-        &mut command,
-        FOREGROUND_CONTEXT_COMMAND_TIMEOUT,
-    ) {
-        Ok(output) => output,
-        Err(error) => {
-            tracing::debug!(
-                "[accessibility] swift CGWindowList failed: {} app={:?}",
-                error,
-                app_name,
-            );
-            return None;
-        }
-    };
-
-    if !output.status.success() {
-        tracing::debug!(
-            "[accessibility] swift CGWindowList failed: status={:?} stderr={} app={:?}",
-            output.status.code(),
-            String::from_utf8_lossy(&output.stderr).trim(),
-            app_name,
-        );
-        return None;
-    }
-
-    let id_str = String::from_utf8_lossy(&output.stdout);
-    let wid = id_str.trim().parse::<u32>().ok().filter(|&id| id > 0);
-    tracing::debug!(
-        "[accessibility] resolved window_id={:?} for app={:?} title={:?}",
-        wid,
-        app_name,
-        window_title,
-    );
-    wid
-}
-
 #[cfg(not(target_os = "macos"))]
 pub fn validate_focused_target(
     _expected_app: Option<&str>,
@@ -736,11 +453,6 @@ pub fn validate_focused_target(
     Ok(())
 }
 
-#[cfg(not(target_os = "macos"))]
-pub fn foreground_context() -> Option<AppContext> {
-    None
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/openhuman/accessibility/mod.rs b/src/openhuman/accessibility/mod.rs
index 423051249..09ea5c89c 100644
--- a/src/openhuman/accessibility/mod.rs
+++ b/src/openhuman/accessibility/mod.rs
@@ -1,12 +1,10 @@
-//! Platform accessibility middleware: focus queries, foreground context,
-//! screen capture, and permission management.
+//! Platform accessibility middleware: focus queries and permission management.
 //!
 //! Centralises macOS AX/IOKit FFI and the unified Swift helper process.
-//! Consumer modules (screen_intelligence, voice) call into this module
-//! instead of owning platform-specific code directly.
+//! Voice services call into this module instead of owning platform-specific
+//! code directly.
 
 mod automation_state;
-mod capture;
 mod focus;
 mod globe;
 mod helper;
@@ -18,11 +16,7 @@ mod types;
 pub use automation_state::{
     clear as clear_automation_denial, mark_system_events_denied, system_events_denied,
 };
-pub use capture::{capture_screen_image_ref_for_context, CaptureMode, MAX_SCREENSHOT_BYTES};
-pub use focus::{
-    focused_text_context, focused_text_context_verbose, foreground_context,
-    parse_foreground_output, validate_focused_target,
-};
+pub use focus::{focused_text_context, focused_text_context_verbose, validate_focused_target};
 pub use globe::{
     globe_listener_poll, globe_listener_start, globe_listener_stop, GlobeHotkeyPollResult,
     GlobeHotkeyStatus,
@@ -30,9 +24,8 @@ pub use globe::{
 pub use helper::precompile_helper_background;
 #[cfg(target_os = "macos")]
 pub use permissions::{
-    detect_accessibility_permission, detect_input_monitoring_permission,
-    detect_screen_recording_permission, open_macos_privacy_pane, request_accessibility_access,
-    request_screen_recording_access,
+    detect_accessibility_permission, detect_input_monitoring_permission, open_macos_privacy_pane,
+    request_accessibility_access,
 };
 pub use permissions::{
     detect_microphone_permission, detect_permissions, microphone_denied_message, permission_to_str,
@@ -43,6 +36,5 @@ pub use terminal::{
 };
 pub use text_util::{normalize_ax_value, parse_ax_number, truncate_tail};
 pub use types::{
-    AppContext, ElementBounds, FocusedTextContext, PermissionKind, PermissionState,
-    PermissionStatus,
+    ElementBounds, FocusedTextContext, PermissionKind, PermissionState, PermissionStatus,
 };
diff --git a/src/openhuman/accessibility/permissions.rs b/src/openhuman/accessibility/permissions.rs
index eeb03b542..1355ca9c2 100644
--- a/src/openhuman/accessibility/permissions.rs
+++ b/src/openhuman/accessibility/permissions.rs
@@ -1,4 +1,4 @@
-//! Platform permission detection and requests for accessibility, screen recording, input monitoring.
+//! Platform permission detection and requests for accessibility, input monitoring, and microphone access.
 
 use super::types::{PermissionKind, PermissionState, PermissionStatus};
 
@@ -20,8 +20,6 @@ extern "C" {
     fn AXIsProcessTrusted() -> bool;
     fn AXIsProcessTrustedWithOptions(options: CFDictionaryRef) -> bool;
     static kAXTrustedCheckOptionPrompt: CFStringRef;
-    fn CGPreflightScreenCaptureAccess() -> bool;
-    fn CGRequestScreenCaptureAccess() -> bool;
 }
 
 #[cfg(target_os = "macos")]
@@ -57,7 +55,6 @@ const IOHID_ACCESS_UNKNOWN: isize = 2;
 
 pub fn permission_to_str(permission: PermissionKind) -> &'static str {
     match permission {
-        PermissionKind::ScreenRecording => "screen_recording",
         PermissionKind::Accessibility => "accessibility",
         PermissionKind::InputMonitoring => "input_monitoring",
         PermissionKind::Microphone => "microphone",
@@ -90,13 +87,6 @@ pub fn request_accessibility_access() {
     }
 }
 
-#[cfg(target_os = "macos")]
-pub fn request_screen_recording_access() {
-    unsafe {
-        let _ = CGRequestScreenCaptureAccess();
-    }
-}
-
 #[cfg(target_os = "macos")]
 pub fn detect_accessibility_permission() -> PermissionState {
     unsafe {
@@ -108,17 +98,6 @@ pub fn detect_accessibility_permission() -> PermissionState {
     }
 }
 
-#[cfg(target_os = "macos")]
-pub fn detect_screen_recording_permission() -> PermissionState {
-    unsafe {
-        if CGPreflightScreenCaptureAccess() {
-            PermissionState::Granted
-        } else {
-            PermissionState::Denied
-        }
-    }
-}
-
 #[cfg(target_os = "macos")]
 pub fn detect_input_monitoring_permission() -> PermissionState {
     let access = unsafe { IOHIDCheckAccess(IOHID_REQUEST_TYPE_LISTEN_EVENT) };
@@ -271,7 +250,6 @@ pub fn microphone_denied_message() -> String {
 #[cfg(target_os = "macos")]
 pub fn detect_permissions() -> PermissionStatus {
     PermissionStatus {
-        screen_recording: detect_screen_recording_permission(),
         accessibility: detect_accessibility_permission(),
         input_monitoring: detect_input_monitoring_permission(),
         microphone: detect_microphone_permission(),
@@ -281,7 +259,6 @@ pub fn detect_permissions() -> PermissionStatus {
 #[cfg(not(target_os = "macos"))]
 pub fn detect_permissions() -> PermissionStatus {
     PermissionStatus {
-        screen_recording: PermissionState::Unsupported,
         accessibility: PermissionState::Unsupported,
         input_monitoring: PermissionState::Unsupported,
         microphone: detect_microphone_permission(),
diff --git a/src/openhuman/accessibility/permissions_tests.rs b/src/openhuman/accessibility/permissions_tests.rs
index 671cedab3..037030a48 100644
--- a/src/openhuman/accessibility/permissions_tests.rs
+++ b/src/openhuman/accessibility/permissions_tests.rs
@@ -1,7 +1,7 @@
 //! Unit tests for `accessibility::permissions`.
 //!
 //! macOS-only FFI functions (`detect_accessibility_permission`,
-//! `detect_screen_recording_permission`, `detect_input_monitoring_permission`,
+//! `detect_input_monitoring_permission`,
 //! `request_*`) call into Apple frameworks and cannot be exercised in a
 //! cross-platform test binary without hardware. Tests here cover:
 //!
@@ -14,14 +14,6 @@ use super::*;
 
 // ── permission_to_str ─────────────────────────────────────────────────────
 
-#[test]
-fn permission_to_str_screen_recording() {
-    assert_eq!(
-        permission_to_str(PermissionKind::ScreenRecording),
-        "screen_recording"
-    );
-}
-
 #[test]
 fn permission_to_str_accessibility() {
     assert_eq!(
@@ -46,7 +38,6 @@ fn permission_to_str_microphone() {
 #[test]
 fn permission_to_str_is_snake_case_and_nonempty() {
     for kind in [
-        PermissionKind::ScreenRecording,
         PermissionKind::Accessibility,
         PermissionKind::InputMonitoring,
         PermissionKind::Microphone,
@@ -89,18 +80,13 @@ fn microphone_denied_message_is_human_readable() {
 
 // ── detect_permissions (non-macOS path) ──────────────────────────────────
 
-/// On non-macOS platforms `detect_permissions` reports screen_recording,
-/// accessibility, and input_monitoring as `Unsupported`. Microphone gets a
+/// On non-macOS platforms `detect_permissions` reports accessibility and
+/// input_monitoring as `Unsupported`. Microphone gets a
 /// real check via CPAL.
 #[cfg(not(target_os = "macos"))]
 #[test]
 fn detect_permissions_non_macos_reports_unsupported_for_desktop_perms() {
     let status = detect_permissions();
-    assert_eq!(
-        status.screen_recording,
-        PermissionState::Unsupported,
-        "screen_recording should be Unsupported on non-macOS"
-    );
     assert_eq!(
         status.accessibility,
         PermissionState::Unsupported,
@@ -133,14 +119,12 @@ fn permission_state_serde_round_trip() {
     use crate::openhuman::accessibility::types::{PermissionState, PermissionStatus};
 
     let status = PermissionStatus {
-        screen_recording: PermissionState::Granted,
         accessibility: PermissionState::Denied,
         input_monitoring: PermissionState::Unknown,
         microphone: PermissionState::Unsupported,
     };
     let json = serde_json::to_string(&status).expect("serialize PermissionStatus");
     let back: PermissionStatus = serde_json::from_str(&json).expect("deserialize PermissionStatus");
-    assert_eq!(back.screen_recording, PermissionState::Granted);
     assert_eq!(back.accessibility, PermissionState::Denied);
     assert_eq!(back.input_monitoring, PermissionState::Unknown);
     assert_eq!(back.microphone, PermissionState::Unsupported);
diff --git a/src/openhuman/accessibility/types.rs b/src/openhuman/accessibility/types.rs
index a4baf60bd..e41b5fae5 100644
--- a/src/openhuman/accessibility/types.rs
+++ b/src/openhuman/accessibility/types.rs
@@ -2,7 +2,7 @@
 
 use serde::{Deserialize, Serialize};
 
-/// Unified element bounds — used by both autocomplete and screen intelligence.
+/// Unified element bounds — used by autocomplete.
 #[derive(Debug, Clone, Copy)]
 pub struct ElementBounds {
     pub x: i32,
@@ -22,35 +22,6 @@ pub struct FocusedTextContext {
     pub bounds: Option<ElementBounds>,
 }
 
-/// Foreground application context for capture and policy decisions.
-#[derive(Debug, Clone)]
-pub struct AppContext {
-    pub app_name: Option<String>,
-    pub window_title: Option<String>,
-    pub bounds: Option<ElementBounds>,
-    /// macOS CGWindowID — used by `screencapture -l` for reliable window capture.
-    pub window_id: Option<u32>,
-}
-
-impl AppContext {
-    pub fn same_as(&self, other: &AppContext) -> bool {
-        self.app_name == other.app_name
-            && self.window_title == other.window_title
-            && self.window_id == other.window_id
-            && self.bounds.as_ref().map(|b| (b.x, b.y, b.width, b.height))
-                == other.bounds.as_ref().map(|b| (b.x, b.y, b.width, b.height))
-    }
-
-    pub fn as_compound_text(&self) -> String {
-        format!(
-            "{} {}",
-            self.app_name.clone().unwrap_or_default(),
-            self.window_title.clone().unwrap_or_default()
-        )
-        .to_lowercase()
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum PermissionState {
@@ -62,7 +33,6 @@ pub enum PermissionState {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PermissionStatus {
-    pub screen_recording: PermissionState,
     pub accessibility: PermissionState,
     pub input_monitoring: PermissionState,
     pub microphone: PermissionState,
@@ -71,152 +41,7 @@ pub struct PermissionStatus {
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum PermissionKind {
-    ScreenRecording,
     Accessibility,
     InputMonitoring,
     Microphone,
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn make_ctx(
-        app: Option<&str>,
-        title: Option<&str>,
-        bounds: Option<ElementBounds>,
-    ) -> AppContext {
-        AppContext {
-            app_name: app.map(str::to_string),
-            window_title: title.map(str::to_string),
-            window_id: None,
-            bounds,
-        }
-    }
-
-    fn make_bounds(x: i32, y: i32, w: i32, h: i32) -> ElementBounds {
-        ElementBounds {
-            x,
-            y,
-            width: w,
-            height: h,
-        }
-    }
-
-    // --- AppContext::same_as ---
-
-    #[test]
-    fn same_as_identical_contexts_true() {
-        let a = make_ctx(
-            Some("App"),
-            Some("Window"),
-            Some(make_bounds(0, 0, 800, 600)),
-        );
-        let b = make_ctx(
-            Some("App"),
-            Some("Window"),
-            Some(make_bounds(0, 0, 800, 600)),
-        );
-        assert!(a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_both_none_fields_true() {
-        let a = make_ctx(None, None, None);
-        let b = make_ctx(None, None, None);
-        assert!(a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_app_name_false() {
-        let a = make_ctx(Some("AppA"), Some("Window"), None);
-        let b = make_ctx(Some("AppB"), Some("Window"), None);
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_window_title_false() {
-        let a = make_ctx(Some("App"), Some("Win1"), None);
-        let b = make_ctx(Some("App"), Some("Win2"), None);
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_one_has_bounds_other_none_false() {
-        let a = make_ctx(Some("App"), None, Some(make_bounds(0, 0, 100, 100)));
-        let b = make_ctx(Some("App"), None, None);
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_bounds_x_false() {
-        let a = make_ctx(None, None, Some(make_bounds(10, 0, 100, 100)));
-        let b = make_ctx(None, None, Some(make_bounds(20, 0, 100, 100)));
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_bounds_y_false() {
-        let a = make_ctx(None, None, Some(make_bounds(0, 10, 100, 100)));
-        let b = make_ctx(None, None, Some(make_bounds(0, 20, 100, 100)));
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_bounds_width_false() {
-        let a = make_ctx(None, None, Some(make_bounds(0, 0, 100, 100)));
-        let b = make_ctx(None, None, Some(make_bounds(0, 0, 200, 100)));
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_different_bounds_height_false() {
-        let a = make_ctx(None, None, Some(make_bounds(0, 0, 100, 100)));
-        let b = make_ctx(None, None, Some(make_bounds(0, 0, 100, 200)));
-        assert!(!a.same_as(&b));
-    }
-
-    #[test]
-    fn same_as_reflexive() {
-        let a = make_ctx(Some("App"), Some("Win"), Some(make_bounds(1, 2, 3, 4)));
-        assert!(a.same_as(&a));
-    }
-
-    // --- AppContext::as_compound_text ---
-
-    #[test]
-    fn as_compound_text_both_some_lowercase() {
-        let ctx = make_ctx(Some("MyApp"), Some("My Window"), None);
-        assert_eq!(ctx.as_compound_text(), "myapp my window");
-    }
-
-    #[test]
-    fn as_compound_text_app_none_title_some() {
-        let ctx = make_ctx(None, Some("Window Title"), None);
-        assert_eq!(ctx.as_compound_text(), " window title");
-    }
-
-    #[test]
-    fn as_compound_text_app_some_title_none() {
-        let ctx = make_ctx(Some("AppName"), None, None);
-        assert_eq!(ctx.as_compound_text(), "appname ");
-    }
-
-    #[test]
-    fn as_compound_text_both_none_returns_space() {
-        let ctx = make_ctx(None, None, None);
-        assert_eq!(ctx.as_compound_text(), " ");
-    }
-
-    #[test]
-    fn as_compound_text_already_lowercase_unchanged() {
-        let ctx = make_ctx(Some("slack"), Some("general"), None);
-        assert_eq!(ctx.as_compound_text(), "slack general");
-    }
-
-    #[test]
-    fn as_compound_text_mixed_case_lowercased() {
-        let ctx = make_ctx(Some("VS Code"), Some("README.md"), None);
-        assert_eq!(ctx.as_compound_text(), "vs code readme.md");
-    }
-}
diff --git a/src/openhuman/agent/harness/builtin_definitions.rs b/src/openhuman/agent/harness/builtin_definitions.rs
index 4af8c7e35..d7ab06a66 100644
--- a/src/openhuman/agent/harness/builtin_definitions.rs
+++ b/src/openhuman/agent/harness/builtin_definitions.rs
@@ -258,7 +258,6 @@ mod tests {
             "settings_agent",
             "profile_memory_agent",
             "account_admin_agent",
-            "screen_awareness_agent",
             "tinyplace_agent",
             "tool_maker",
             "skill_creator",
diff --git a/src/openhuman/agent/harness/definition_tests.rs b/src/openhuman/agent/harness/definition_tests.rs
index dee82c0f9..b14d8dfbc 100644
--- a/src/openhuman/agent/harness/definition_tests.rs
+++ b/src/openhuman/agent/harness/definition_tests.rs
@@ -402,7 +402,6 @@ fn all_builtin_agent_definitions_have_expected_effective_max_iterations() {
         ("morning_briefing", 8),
         ("profile_memory_agent", 8),
         ("scheduler_agent", 8),
-        ("screen_awareness_agent", 8),
         ("settings_agent", 8),
         ("summarizer", 1),
         ("tool_maker", 2),
diff --git a/src/openhuman/agent_registry/agents/help/prompt.md b/src/openhuman/agent_registry/agents/help/prompt.md
index e0c584d97..25c0d8752 100644
--- a/src/openhuman/agent_registry/agents/help/prompt.md
+++ b/src/openhuman/agent_registry/agents/help/prompt.md
@@ -19,7 +19,7 @@ You have three tools:
 
 ### Standard flow
 
-1. **Search first.** Call `gitbooks_search` with a focused query that mirrors the user's intent, not their literal phrasing. Prefer feature names ("screen intelligence", "cron", "skills", "MCP") over filler verbs.
+1. **Search first.** Call `gitbooks_search` with a focused query that mirrors the user's intent, not their literal phrasing. Prefer feature names ("cron", "skills", "MCP") over filler verbs.
 2. **Read the excerpts.** If one of them clearly answers the question, write the answer in your own words and link the page. Done.
 3. **Drill in if needed.** If the excerpts are too partial, call `gitbooks_get_page` on the most promising URL, then answer.
 4. **Refine the search.** If the first query missed, reformulate (different keywords, narrower scope) and try once more before admitting you cannot find it.
diff --git a/src/openhuman/agent_registry/agents/loader.rs b/src/openhuman/agent_registry/agents/loader.rs
index aceaf1405..d74f5df45 100644
--- a/src/openhuman/agent_registry/agents/loader.rs
+++ b/src/openhuman/agent_registry/agents/loader.rs
@@ -137,12 +137,6 @@ pub const BUILTINS: &[BuiltinAgent] = &[
         prompt_fn: super::account_admin_agent::prompt::build,
         graph_fn: None,
     },
-    BuiltinAgent {
-        id: "screen_awareness_agent",
-        toml: include_str!("screen_awareness_agent/agent.toml"),
-        prompt_fn: super::screen_awareness_agent::prompt::build,
-        graph_fn: None,
-    },
     BuiltinAgent {
         id: "scheduler_agent",
         toml: include_str!("scheduler_agent/agent.toml"),
@@ -725,6 +719,38 @@ mod tests {
                 .any(|s| matches!(s, SubagentEntry::AgentId(id) if id == "vision_agent")),
             "orchestrator must list vision_agent in its subagents allowlist"
         );
+
+        assert!(
+            !BUILTINS
+                .iter()
+                .any(|builtin| builtin.id == "screen_awareness_agent"),
+            "screen_awareness_agent must not remain a discoverable built-in"
+        );
+        assert!(
+            !orchestrator
+                .subagents
+                .iter()
+                .any(|entry| matches!(entry, SubagentEntry::AgentId(id) if id == "screen_awareness_agent")),
+            "orchestrator must not expose a screen_awareness_agent delegate"
+        );
+        assert!(
+            load_builtins()
+                .expect("built-in TOML must parse")
+                .iter()
+                .all(|definition| definition.id != "screen_awareness_agent"),
+            "screen_awareness_agent must not load into the built-in registry"
+        );
+
+        match def.tools {
+            ToolScope::Named(ref tools) => assert_eq!(
+                tools,
+                &vec!["file_read".to_string(), "image_info".to_string()],
+                "vision_agent must only inspect user-provided attached or on-disk images"
+            ),
+            ToolScope::Wildcard => {
+                panic!("vision_agent must keep a narrow user-image tool allowlist")
+            }
+        }
     }
 
     #[test]
@@ -2078,7 +2104,6 @@ mod tests {
             "settings_agent",
             "profile_memory_agent",
             "account_admin_agent",
-            "screen_awareness_agent",
         ] {
             assert!(
                 subagents.contains(expected),
@@ -2096,7 +2121,6 @@ mod tests {
             "settings_agent",
             "profile_memory_agent",
             "account_admin_agent",
-            "screen_awareness_agent",
         ] {
             let def = find(expected);
             assert_eq!(def.agent_tier, AgentTier::Worker);
diff --git a/src/openhuman/agent_registry/agents/mod.rs b/src/openhuman/agent_registry/agents/mod.rs
index dceab04c6..34288f62c 100644
--- a/src/openhuman/agent_registry/agents/mod.rs
+++ b/src/openhuman/agent_registry/agents/mod.rs
@@ -25,7 +25,6 @@ pub mod presentation_agent;
 pub mod profile_memory_agent;
 pub mod researcher;
 pub mod scheduler_agent;
-pub mod screen_awareness_agent;
 pub mod settings_agent;
 pub mod skill_creator;
 pub mod summarizer;
diff --git a/src/openhuman/agent_registry/agents/orchestrator/agent.toml b/src/openhuman/agent_registry/agents/orchestrator/agent.toml
index e7cee8816..eafeb886f 100644
--- a/src/openhuman/agent_registry/agents/orchestrator/agent.toml
+++ b/src/openhuman/agent_registry/agents/orchestrator/agent.toml
@@ -77,11 +77,8 @@ allowlist = [
     # Account/admin specialist. Route billing, team membership/invites/roles,
     # OAuth/credential/session, and referral requests here.
     "account_admin_agent",
-    # Screen-awareness specialist. Route screen-intelligence permissions,
-    # capture/session/listener state, and "what can you see" requests here.
-    "screen_awareness_agent",
     # Image-understanding specialist. Route anything that hinges on the content
-    # of an attached image / screenshot / on-disk image file here — it rides the
+    # of an attached or on-disk user-provided image file here — it rides the
     # multimodal `vision-v1` tier, so it can actually see the image.
     "vision_agent",
     # Image-generation specialist. Synthesised into a `delegate_create_image`
diff --git a/src/openhuman/agent_registry/agents/screen_awareness_agent/agent.toml b/src/openhuman/agent_registry/agents/screen_awareness_agent/agent.toml
deleted file mode 100644
index 07e4e2206..000000000
--- a/src/openhuman/agent_registry/agents/screen_awareness_agent/agent.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-id = "screen_awareness_agent"
-display_name = "Screen Awareness Agent"
-delegate_name = "inspect_screen_awareness"
-when_to_use = "Screen-awareness specialist — owns screen-intelligence status, permissions, capture image refs, recent vision, capture/session/globe listener lifecycle, and low-level screen input actions. Use for 'what can you see', screen permission setup, screen intelligence debugging, or controlled screen observation."
-temperature = 0.2
-max_iterations = 8
-sandbox_mode = "none"
-agent_tier = "worker"
-omit_identity = true
-omit_memory_context = true
-omit_safety_preamble = false
-omit_skills_catalog = true
-omit_profile = true
-omit_memory_md = true
-
-[model]
-hint = "agentic"
-
-[tools]
-named = [
-    "screen_intelligence_status",
-    "screen_intelligence_capture_image_ref",
-    "screen_intelligence_vision_recent",
-    "screen_intelligence_vision_flush",
-    "screen_intelligence_refresh_permissions",
-    "screen_intelligence_capture_now",
-    "screen_intelligence_capture_test",
-    "screen_intelligence_session_start",
-    "screen_intelligence_session_stop",
-    "screen_intelligence_input_action",
-    "screen_intelligence_globe_listener_start",
-    "screen_intelligence_globe_listener_poll",
-    "screen_intelligence_globe_listener_stop",
-    "screen_intelligence_request_permissions",
-    "screen_intelligence_request_permission",
-    "ask_user_clarification",
-]
diff --git a/src/openhuman/agent_registry/agents/screen_awareness_agent/mod.rs b/src/openhuman/agent_registry/agents/screen_awareness_agent/mod.rs
deleted file mode 100644
index 8bf84783c..000000000
--- a/src/openhuman/agent_registry/agents/screen_awareness_agent/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod prompt;
diff --git a/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.md b/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.md
deleted file mode 100644
index ad59bfacb..000000000
--- a/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Screen Awareness Agent
-
-You own screen-intelligence observation, permission checks, capture sessions, globe listener state, and screen input actions.
-
-Use a permission-first flow:
-
-- Start with `screen_intelligence_status` or recent observations before asking for new capture.
-- Request permissions only when the user asked for screen awareness and status shows missing permissions.
-- Explain whether you are reading cached/recent vision, triggering a one-shot capture, starting a session, or controlling a listener.
-- Ask for explicit confirmation before permission prompts, capture tests, session start/stop, globe listener start/stop, or input actions.
-- Keep observations factual. If no fresh screen data is available, say so and call the appropriate status/capture tool rather than guessing.
-- For input actions, verify the target and action before acting; defer full desktop operation to the Desktop Control Agent.
-
-Return observed state, freshness, and the next useful action.
diff --git a/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.rs b/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.rs
deleted file mode 100644
index 896dfed70..000000000
--- a/src/openhuman/agent_registry/agents/screen_awareness_agent/prompt.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-//! System prompt builder for the `screen_awareness_agent` built-in agent.
-
-use crate::openhuman::context::prompt::{
-    render_safety, render_tools, render_user_files, render_workspace, PromptContext,
-};
-use anyhow::Result;
-
-const ARCHETYPE: &str = include_str!("prompt.md");
-
-pub fn build(ctx: &PromptContext<'_>) -> Result<String> {
-    let mut out = String::with_capacity(4096);
-    out.push_str(ARCHETYPE.trim_end());
-    out.push_str("\n\n");
-
-    let user_files = render_user_files(ctx)?;
-    if !user_files.trim().is_empty() {
-        out.push_str(user_files.trim_end());
-        out.push_str("\n\n");
-    }
-
-    let tools = render_tools(ctx)?;
-    if !tools.trim().is_empty() {
-        out.push_str(tools.trim_end());
-        out.push_str("\n\n");
-    }
-
-    let safety = render_safety();
-    out.push_str(safety.trim_end());
-    out.push_str("\n\n");
-
-    let workspace = render_workspace(ctx)?;
-    if !workspace.trim().is_empty() {
-        out.push_str(workspace.trim_end());
-        out.push('\n');
-    }
-
-    Ok(out)
-}
diff --git a/src/openhuman/agent_registry/agents/vision_agent/agent.toml b/src/openhuman/agent_registry/agents/vision_agent/agent.toml
index ea70f6b2b..c95fd92a9 100644
--- a/src/openhuman/agent_registry/agents/vision_agent/agent.toml
+++ b/src/openhuman/agent_registry/agents/vision_agent/agent.toml
@@ -1,7 +1,7 @@
 id = "vision_agent"
 display_name = "Vision"
 delegate_name = "analyze_image"
-when_to_use = "Image / screenshot understanding specialist — describe, OCR, read charts/diagrams, compare images, or locate UI elements in attached images. Route here whenever the task hinges on the *content of an image* (attachments the user sent, a captured screenshot, or an on-disk image file). Rides the multimodal `vision-v1` tier, so it is always image-capable. Read-only — it inspects images and reports back; it does not edit files or run commands."
+when_to_use = "Image understanding specialist — describe, OCR, read charts/diagrams, compare images, or locate UI elements in user-provided images. Route here whenever the task hinges on the *content of an image* attached by the user or supplied as an on-disk image file. Rides the multimodal `vision-v1` tier, so it is always image-capable. Read-only — it inspects images and reports back; it does not edit files or run commands."
 temperature = 0.3
 max_iterations = 6
 max_result_chars = 16000
@@ -21,13 +21,9 @@ hint = "vision"
 [tools]
 # Attached images arrive inline in the sub-agent's context via the multimodal
 # pipeline (no tool call needed to "see" them). These tools cover the extra
-# actions a vision task may need: pulling another image file in, inspecting
-# image metadata, and grabbing/reviewing a screen capture. Unknown names are
-# dropped silently at spawn, so the screen tools are harmless when the screen
-# intelligence surface is disabled.
+# actions a vision task may need: loading another user-provided image file and
+# inspecting image metadata.
 named = [
     "file_read",
     "image_info",
-    "screen_intelligence_capture_image_ref",
-    "screen_intelligence_vision_recent",
 ]
diff --git a/src/openhuman/agent_registry/agents/vision_agent/prompt.md b/src/openhuman/agent_registry/agents/vision_agent/prompt.md
index 75f069902..b4db34039 100644
--- a/src/openhuman/agent_registry/agents/vision_agent/prompt.md
+++ b/src/openhuman/agent_registry/agents/vision_agent/prompt.md
@@ -1,9 +1,9 @@
 # Vision specialist
 
 You are a focused **image-understanding** sub-agent. You run on a multimodal
-model that accepts image input, so any images attached to your task — user
-uploads, captured screenshots, or on-disk image files — are visible to you
-directly in the conversation.
+model that accepts image input, so any user-provided images attached to your
+task or available as on-disk image files are visible to you directly in the
+conversation.
 
 ## Your job
 
@@ -15,7 +15,7 @@ precisely. Typical work:
 - **Read data visuals** — charts, graphs, diagrams, dashboards — and report the
   numbers/structure, not just "it's a bar chart".
 - **Locate UI elements** — buttons, fields, errors, menu items — and describe
-  where they are, for screen-driven tasks.
+  where they are in a provided image.
 - **Compare** two or more images and report what differs.
 
 ## How to work
@@ -25,9 +25,8 @@ precisely. Typical work:
   as fact.
 - Quote on-image text verbatim (preserve casing, punctuation, numbers). Use a
   fenced block for multi-line transcriptions.
-- If the task references an image file that was not attached inline, use
-  `file_read` / `image_info` to load it, or the screen-capture tools to grab a
-  fresh screenshot, before analyzing.
+- If the task references a user-provided image file that was not attached
+  inline, use `file_read` / `image_info` to load it before analyzing.
 - Be concise and structured. Lead with the direct answer, then supporting
   detail. Return findings to the delegating agent — you are not talking to the
   end user.
diff --git a/src/openhuman/app_state/README.md b/src/openhuman/app_state/README.md
index 04d85ae4c..39ccb9084 100644
--- a/src/openhuman/app_state/README.md
+++ b/src/openhuman/app_state/README.md
@@ -1,10 +1,10 @@
 # App State
 
-Aggregator that the React shell polls every few seconds to render the OS-level chrome (auth user, autocomplete status, accessibility status, local-AI status, service health, onboarding tasks). Owns the on-disk `app-state.json`, an in-memory current-user cache, and the merge/patch surface for shell-managed local fields. Does NOT own any of the underlying domain state — it only assembles snapshots from peer domains and persists shell-side onboarding metadata.
+Aggregator that the React shell polls every few seconds to render the OS-level chrome (auth user, autocomplete status, local-AI status, service health, onboarding tasks). Owns the on-disk `app-state.json`, an in-memory current-user cache, and the merge/patch surface for shell-managed local fields. Does NOT own any of the underlying domain state — it only assembles snapshots from peer domains and persists shell-side onboarding metadata.
 
 ## Public surface
 
-- `pub struct AppStateSnapshot` — `ops.rs` — composite payload returned to the shell (auth user, runtime status, autocomplete, local AI, accessibility, onboarding).
+- `pub struct AppStateSnapshot` — `ops.rs` — composite payload returned to the shell (auth user, runtime status, autocomplete, local AI, onboarding).
 - `pub struct RuntimeSnapshot` — `ops.rs` — runtime sub-section of the snapshot.
 - `pub struct StoredAppState` — `ops.rs` — disk schema persisted to `<workspace>/app-state.json`.
 - `pub struct StoredAppStatePatch` — `ops.rs` — partial-update payload used by `update_local_state`.
@@ -18,7 +18,6 @@ Aggregator that the React shell polls every few seconds to render the OS-level c
 - `src/openhuman/config/` — `config_rpc::*` for `Config` reads and the workspace dir resolver.
 - `src/openhuman/autocomplete/` — `AutocompleteStatus` snapshot.
 - `src/openhuman/inference/local/` — `LocalAiStatus` snapshot.
-- `src/openhuman/screen_intelligence/` — `AccessibilityStatus` snapshot.
 - `src/openhuman/service/` — `ServiceState` / `ServiceStatus` runtime info.
 - `src/openhuman/credentials/` — `session_support::build_session_state` for the auth slice.
 - `src/api/{config,jwt}` — backend base URL + bearer token used by the cached current-user fetch.
@@ -31,4 +30,4 @@ Aggregator that the React shell polls every few seconds to render the OS-level c
 
 ## Tests
 
-- This domain has no `*_tests.rs` siblings; coverage is exercised indirectly through controller-registry tests in `src/core/` and through the JSON-RPC harness `tests/json_rpc_e2e.rs`.
+- Snapshot behavior is covered by `ops_tests.rs` and schema tests in `schemas.rs`; integration coverage runs through the JSON-RPC harness in `tests/json_rpc_e2e.rs`.
diff --git a/src/openhuman/app_state/ops.rs b/src/openhuman/app_state/ops.rs
index 715a75c7f..96db87f59 100644
--- a/src/openhuman/app_state/ops.rs
+++ b/src/openhuman/app_state/ops.rs
@@ -26,15 +26,14 @@ use crate::openhuman::credentials::session_support::{
 };
 use crate::openhuman::credentials::{AuthService, APP_SESSION_PROVIDER, DEFAULT_AUTH_PROFILE_NAME};
 use crate::openhuman::inference::LocalAiStatus;
-use crate::openhuman::screen_intelligence::AccessibilityStatus;
 use crate::openhuman::service::{ServiceState, ServiceStatus};
 use crate::rpc::RpcOutcome;
 
 const LOG_PREFIX: &str = "[app_state]";
 const APP_STATE_FILENAME: &str = "app-state.json";
 const CURRENT_USER_REFRESH_TTL: Duration = Duration::from_secs(5);
-// Runtime-status widgets (screen intelligence / local AI / autocomplete /
-// service) tolerate ~10s of staleness. A short TTL (was 2s < the ~2.4s build
+// Runtime-status widgets (local AI / autocomplete / service) tolerate ~10s of
+// staleness. A short TTL (was 2s < the ~2.4s build
 // time) meant the cache was stale before it was even written, so the frontend's
 // ~4s `app_state_snapshot` poll never hit the fast path and every poll re-ran
 // the full 4-way fan-out (issue #4249 profiling: this, combined with the lack
@@ -177,7 +176,6 @@ pub struct AppStateSnapshot {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct RuntimeSnapshot {
-    pub screen_intelligence: AccessibilityStatus,
     pub local_ai: LocalAiStatus,
     pub service: ServiceStatus,
 }
@@ -830,37 +828,12 @@ async fn build_runtime_snapshot(config: &Config, req_id: u64) -> RuntimeSnapshot
         return snapshot;
     }
 
-    let si_config = config.screen_intelligence.clone();
     let config_for_local_ai = config.clone();
     let config_for_service = config.clone();
 
     let t0 = Instant::now();
 
-    let (screen_intelligence, local_ai, service) = tokio::join!(
-        async {
-            let t = Instant::now();
-            let status = match tokio::time::timeout(SNAPSHOT_SUB_OP_TIMEOUT, async {
-                let _ = crate::openhuman::screen_intelligence::global_engine()
-                    .apply_config(si_config)
-                    .await;
-                crate::openhuman::screen_intelligence::global_engine()
-                    .status()
-                    .await
-            })
-            .await
-            {
-                Ok(s) => s,
-                Err(_) => {
-                    warn!(
-                        "{LOG_PREFIX} screen_intelligence timed out after {}s; using degraded sub-snapshot req_id={}",
-                        SNAPSHOT_SUB_OP_TIMEOUT.as_secs(),
-                        req_id,
-                    );
-                    degraded_runtime_snapshot(config).screen_intelligence
-                }
-            };
-            (status, t.elapsed().as_millis())
-        },
+    let (local_ai, service) = tokio::join!(
         async {
             let t = Instant::now();
             let status = match tokio::time::timeout(
@@ -911,16 +884,13 @@ async fn build_runtime_snapshot(config: &Config, req_id: u64) -> RuntimeSnapshot
 
     let total_ms = t0.elapsed().as_millis();
     debug!(
-        "{LOG_PREFIX} build_runtime_snapshot timings req_id={} si_ms={} local_ai_ms={} service_ms={} total_ms={}",
+        "{LOG_PREFIX} build_runtime_snapshot timings req_id={} local_ai_ms={} service_ms={} total_ms={}",
         req_id,
-        screen_intelligence.1,
-        local_ai.1,
-        service.1,
+        local_ai.1, service.1,
         total_ms,
     );
 
     let snapshot = RuntimeSnapshot {
-        screen_intelligence: screen_intelligence.0,
         local_ai: local_ai.0,
         service: service.0,
     };
@@ -1185,14 +1155,13 @@ pub async fn snapshot() -> Result<RpcOutcome<AppStateSnapshot>, String> {
     );
 
     debug!(
-        "{LOG_PREFIX} snapshot req_id={} auth={} onboarding={} chat_onboarding={} analytics={} meet_handoff={} si_active={} local_ai_state={} service_state={:?}",
+        "{LOG_PREFIX} snapshot req_id={} auth={} onboarding={} chat_onboarding={} analytics={} meet_handoff={} local_ai_state={} service_state={:?}",
         req_id,
         auth.is_authenticated,
         snapshot_config.onboarding_completed,
         snapshot_config.chat_onboarding_completed,
         snapshot_config.observability.analytics_enabled,
         snapshot_config.meet.auto_orchestrator_handoff,
-        runtime.screen_intelligence.session.active,
         runtime.local_ai.state,
         runtime.service.state
     );
@@ -1219,51 +1188,7 @@ pub async fn snapshot() -> Result<RpcOutcome<AppStateSnapshot>, String> {
 }
 
 fn degraded_runtime_snapshot(config: &Config) -> RuntimeSnapshot {
-    use crate::openhuman::screen_intelligence::{
-        AccessibilityFeatures, PermissionState, PermissionStatus, SessionStatus,
-    };
-
     RuntimeSnapshot {
-        screen_intelligence: AccessibilityStatus {
-            platform_supported: cfg!(target_os = "macos"),
-            permissions: PermissionStatus {
-                screen_recording: PermissionState::Unknown,
-                accessibility: PermissionState::Unknown,
-                input_monitoring: PermissionState::Unknown,
-                microphone: PermissionState::Unknown,
-            },
-            features: AccessibilityFeatures {
-                screen_monitoring: false,
-            },
-            session: SessionStatus {
-                active: false,
-                started_at_ms: None,
-                expires_at_ms: None,
-                remaining_ms: None,
-                ttl_secs: 0,
-                panic_hotkey: config.screen_intelligence.panic_stop_hotkey.clone(),
-                stop_reason: None,
-                capture_count: 0,
-                frames_in_memory: 0,
-                last_capture_at_ms: None,
-                last_context: None,
-                last_window_title: None,
-                vision_enabled: false,
-                vision_state: "degraded".to_string(),
-                vision_queue_depth: 0,
-                last_vision_at_ms: None,
-                last_vision_summary: None,
-                vision_persist_count: 0,
-                last_vision_persisted_key: None,
-                last_vision_persist_error: None,
-            },
-            foreground_context: None,
-            config: config.screen_intelligence.clone(),
-            denylist: vec![],
-            is_context_blocked: false,
-            permission_check_process_path: None,
-            core_process: None,
-        },
         local_ai: crate::openhuman::inference::LocalAiStatus::disabled(config),
         service: ServiceStatus {
             state: ServiceState::Unknown("snapshot timed out".to_string()),
diff --git a/src/openhuman/app_state/ops_tests.rs b/src/openhuman/app_state/ops_tests.rs
index 2c7d56b01..57c21885d 100644
--- a/src/openhuman/app_state/ops_tests.rs
+++ b/src/openhuman/app_state/ops_tests.rs
@@ -320,7 +320,6 @@ fn degraded_runtime_snapshot_has_expected_degraded_fields() {
         ),
         "service state should be Unknown in degraded snapshot"
     );
-    assert!(!snapshot.screen_intelligence.session.active);
 }
 
 #[test]
diff --git a/src/openhuman/config/README.md b/src/openhuman/config/README.md
index 980f5313c..89b1b401f 100644
--- a/src/openhuman/config/README.md
+++ b/src/openhuman/config/README.md
@@ -5,7 +5,7 @@ Authoritative TOML-backed configuration layer. Owns the `Config` schema (every d
 ## Public surface
 
 - `pub struct Config` — `schema/types.rs` (re-exported `mod.rs:28`) — top-level user settings.
-- Per-domain config structs (re-exported `mod.rs:28-39`): `AgentConfig`, `AuditConfig`, `AutocompleteConfig`, `AutonomyConfig`, `BrowserComputerUseConfig`, `BrowserConfig`, `CapabilityProviderConfig`, `ChannelsConfig`, `ComposioConfig`, `ContextConfig`, `CostConfig`, `CronConfig`, `CurlConfig`, `DelegateAgentConfig`, `DictationConfig`, `DiscordConfig`, `DockerRuntimeConfig`, `EmbeddingRouteConfig`, `GitbooksConfig`, `HeartbeatConfig`, `HttpRequestConfig`, `IMessageConfig`, `IntegrationsConfig`, `LarkConfig`, `LearningConfig`, `LocalAiConfig`, `MatrixConfig`, `MemoryConfig`, `ModelRouteConfig`, `MultimodalConfig`, `ObservabilityConfig`, `ProxyConfig`, `ReliabilityConfig`, `ResourceLimitsConfig`, `RuntimeConfig`, `SandboxConfig`, `SchedulerConfig`, `ScreenIntelligenceConfig`, `SecretsConfig`, `SecurityConfig`, `SlackConfig`, `StorageConfig`, `TelegramConfig`, `UpdateConfig`, `VoiceServerConfig`, `WebSearchConfig`, `WebhookConfig`.
+- Per-domain config structs (re-exported `mod.rs:28-39`): `AgentConfig`, `AuditConfig`, `AutocompleteConfig`, `AutonomyConfig`, `BrowserComputerUseConfig`, `BrowserConfig`, `CapabilityProviderConfig`, `ChannelsConfig`, `ComposioConfig`, `ContextConfig`, `CostConfig`, `CronConfig`, `CurlConfig`, `DelegateAgentConfig`, `DictationConfig`, `DiscordConfig`, `DockerRuntimeConfig`, `EmbeddingRouteConfig`, `GitbooksConfig`, `HeartbeatConfig`, `HttpRequestConfig`, `IMessageConfig`, `IntegrationsConfig`, `LarkConfig`, `LearningConfig`, `LocalAiConfig`, `MatrixConfig`, `MemoryConfig`, `ModelRouteConfig`, `MultimodalConfig`, `ObservabilityConfig`, `ProxyConfig`, `ReliabilityConfig`, `ResourceLimitsConfig`, `RuntimeConfig`, `SandboxConfig`, `SchedulerConfig`, `SecretsConfig`, `SecurityConfig`, `SlackConfig`, `StorageConfig`, `TelegramConfig`, `UpdateConfig`, `VoiceServerConfig`, `WebSearchConfig`, `WebhookConfig`.
 - Enums: `CapabilityProviderTrustState`, `DictationActivationMode`, `IntegrationToggle`, `ProxyScope`, `ReflectionSource`, `SandboxBackend`, `StorageProviderConfig`, `StorageProviderSection`, `StreamMode`, `VoiceActivationMode`.
 - Model constants: `DEFAULT_MODEL`, `MODEL_AGENTIC_V1`, `MODEL_CODING_V1`, `MODEL_REASONING_V1`.
 - `pub struct DaemonConfig` — `daemon.rs` — sidecar lifecycle / port descriptor.
@@ -13,7 +13,7 @@ Authoritative TOML-backed configuration layer. Owns the `Config` schema (every d
 - Workspace identity helpers: `pub fn clear_active_user`, `default_root_openhuman_dir`, `pre_login_user_dir`, `read_active_user_id`, `user_openhuman_dir`, `write_active_user_id`, `PRE_LOGIN_USER_ID` — `schema/identity_cost.rs`.
 - `pub mod ops` (re-exported as `rpc`) — `ops.rs` — RPC handlers and settings mutation.
 - `pub mod settings_cli` — `settings_cli.rs` — `openhuman settings ...` CLI surface.
-- RPC `config.{get_config, update_model_settings, update_memory_settings, update_screen_intelligence_settings, update_runtime_settings, update_browser_settings, resolve_api_url, get_runtime_flags, set_browser_allow_all, workspace_onboarding_flag_exists, workspace_onboarding_flag_set, update_analytics_settings, get_analytics_settings, update_meet_settings, get_meet_settings, agent_server_status, reset_local_data, get_onboarding_completed, get_dictation_settings, update_dictation_settings, get_voice_server_settings, update_voice_server_settings, set_onboarding_completed}` — `schemas.rs`.
+- RPC `config.{get_config, update_model_settings, update_memory_settings, update_runtime_settings, update_browser_settings, resolve_api_url, get_runtime_flags, set_browser_allow_all, workspace_onboarding_flag_exists, workspace_onboarding_flag_set, update_analytics_settings, get_analytics_settings, update_meet_settings, get_meet_settings, agent_server_status, reset_local_data, get_onboarding_completed, get_dictation_settings, update_dictation_settings, get_voice_server_settings, update_voice_server_settings, set_onboarding_completed}` — `schemas.rs`.
 
 ## Calls into
 
diff --git a/src/openhuman/config/mod.rs b/src/openhuman/config/mod.rs
index 292a2f344..4251e3d2d 100644
--- a/src/openhuman/config/mod.rs
+++ b/src/openhuman/config/mod.rs
@@ -44,16 +44,16 @@ pub use schema::{
     ObservabilityConfig, OrchestratorModelConfig, PolymarketClobCredentials, PolymarketConfig,
     PrivacyConfig, PrivacyMode, ProxyConfig, ProxyScope, ReflectionSource, ReliabilityConfig,
     ResourceLimitsConfig, RuntimeConfig, RuntimePoolConfig, RuntimePoolLangConfig, SandboxBackend,
-    SandboxConfig, SchedulerConfig, SchedulerGateConfig, SchedulerGateMode,
-    ScreenIntelligenceConfig, SearchConfig, SearchEngine, SearchEngineCredentials, SearxngConfig,
-    SecretsConfig, SecurityConfig, ShellConfig, SlackConfig, StorageConfig, StorageProviderConfig,
-    StorageProviderSection, StreamMode, TeamModelConfig, TelegramConfig, TokenjuiceConfig,
-    UpdateConfig, UpdateRestartStrategy, VoiceActivationMode, VoiceServerConfig, WebSearchConfig,
-    WebhookConfig, YuanbaoConfig, DEFAULT_CLOUD_LLM_MODEL, DEFAULT_MEMORY_SYNC_INTERVAL_SECS,
-    DEFAULT_MODEL, MEMORY_SYNC_INTERVAL_PRESETS_SECS, MODEL_AGENTIC_V1, MODEL_BURST_V1,
-    MODEL_CHAT_V1, MODEL_CODING_V1, MODEL_REASONING_QUICK_V1, MODEL_REASONING_V1,
-    MODEL_SUMMARIZATION_V1, MODEL_VISION_V1, SEARCH_ENGINE_BRAVE, SEARCH_ENGINE_DISABLED,
-    SEARCH_ENGINE_MANAGED, SEARCH_ENGINE_PARALLEL, SEARCH_ENGINE_QUERIT,
+    SandboxConfig, SchedulerConfig, SchedulerGateConfig, SchedulerGateMode, SearchConfig,
+    SearchEngine, SearchEngineCredentials, SearxngConfig, SecretsConfig, SecurityConfig,
+    ShellConfig, SlackConfig, StorageConfig, StorageProviderConfig, StorageProviderSection,
+    StreamMode, TeamModelConfig, TelegramConfig, TokenjuiceConfig, UpdateConfig,
+    UpdateRestartStrategy, VoiceActivationMode, VoiceServerConfig, WebSearchConfig, WebhookConfig,
+    YuanbaoConfig, DEFAULT_CLOUD_LLM_MODEL, DEFAULT_MEMORY_SYNC_INTERVAL_SECS, DEFAULT_MODEL,
+    MEMORY_SYNC_INTERVAL_PRESETS_SECS, MODEL_AGENTIC_V1, MODEL_BURST_V1, MODEL_CHAT_V1,
+    MODEL_CODING_V1, MODEL_REASONING_QUICK_V1, MODEL_REASONING_V1, MODEL_SUMMARIZATION_V1,
+    MODEL_VISION_V1, SEARCH_ENGINE_BRAVE, SEARCH_ENGINE_DISABLED, SEARCH_ENGINE_MANAGED,
+    SEARCH_ENGINE_PARALLEL, SEARCH_ENGINE_QUERIT,
 };
 // Kept as a separate re-export (issue #4117) so the large alphabetized group
 // above stays byte-identical and rustfmt-stable.
diff --git a/src/openhuman/config/ops/mod.rs b/src/openhuman/config/ops/mod.rs
index aca1aa65b..4a1839615 100644
--- a/src/openhuman/config/ops/mod.rs
+++ b/src/openhuman/config/ops/mod.rs
@@ -61,17 +61,15 @@ pub use sandbox::{
 };
 
 pub use ui::{
-    apply_analytics_settings, apply_browser_settings, apply_meet_settings,
-    apply_screen_intelligence_settings, apply_search_settings, get_dictation_settings,
-    get_onboarding_completed, get_search_settings, get_super_context_enabled,
-    get_voice_server_settings, load_and_apply_analytics_settings, load_and_apply_browser_settings,
-    load_and_apply_dictation_settings, load_and_apply_meet_settings,
-    load_and_apply_screen_intelligence_settings, load_and_apply_search_settings,
+    apply_analytics_settings, apply_browser_settings, apply_meet_settings, apply_search_settings,
+    get_dictation_settings, get_onboarding_completed, get_search_settings,
+    get_super_context_enabled, get_voice_server_settings, load_and_apply_analytics_settings,
+    load_and_apply_browser_settings, load_and_apply_dictation_settings,
+    load_and_apply_meet_settings, load_and_apply_search_settings,
     load_and_apply_voice_server_settings, set_onboarding_completed, set_super_context_enabled,
     workspace_onboarding_flag_exists, workspace_onboarding_flag_resolve,
     workspace_onboarding_flag_set, AnalyticsSettingsPatch, BrowserSettingsPatch,
-    DictationSettingsPatch, MeetSettingsPatch, ScreenIntelligenceSettingsPatch,
-    SearchSettingsPatch, VoiceServerSettingsPatch,
+    DictationSettingsPatch, MeetSettingsPatch, SearchSettingsPatch, VoiceServerSettingsPatch,
 };
 
 #[cfg(test)]
diff --git a/src/openhuman/config/ops/ui.rs b/src/openhuman/config/ops/ui.rs
index ecd809aad..d7aeae92e 100644
--- a/src/openhuman/config/ops/ui.rs
+++ b/src/openhuman/config/ops/ui.rs
@@ -1,4 +1,4 @@
-//! UI-facing config operations: browser, screen intelligence, analytics, meet,
+//! UI-facing config operations: browser, analytics, meet,
 //! search, dictation, voice server, onboarding flags.
 
 use std::collections::HashMap;
@@ -7,7 +7,6 @@ use serde_json::json;
 
 use crate::openhuman::config::schema::CalendarProvider;
 use crate::openhuman::config::{AutoJoinPolicy, AutoSummarizePolicy, Config};
-use crate::openhuman::screen_intelligence;
 use crate::rpc::RpcOutcome;
 
 use super::loader::{fallback_workspace_dir, load_config_with_timeout, snapshot_config_json};
@@ -18,20 +17,6 @@ pub struct BrowserSettingsPatch {
     pub backend: Option<String>,
 }
 
-#[derive(Debug, Clone, Default)]
-pub struct ScreenIntelligenceSettingsPatch {
-    pub enabled: Option<bool>,
-    pub capture_policy: Option<String>,
-    pub policy_mode: Option<String>,
-    pub baseline_fps: Option<f32>,
-    pub vision_enabled: Option<bool>,
-    pub autocomplete_enabled: Option<bool>,
-    pub use_vision_model: Option<bool>,
-    pub keep_screenshots: Option<bool>,
-    pub allowlist: Option<Vec<String>>,
-    pub denylist: Option<Vec<String>>,
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct AnalyticsSettingsPatch {
     pub enabled: Option<bool>,
@@ -162,65 +147,6 @@ pub async fn load_and_apply_browser_settings(
     apply_browser_settings(&mut config, update).await
 }
 
-/// Updates the screen intelligence settings in the configuration.
-pub async fn apply_screen_intelligence_settings(
-    config: &mut Config,
-    update: ScreenIntelligenceSettingsPatch,
-) -> Result<RpcOutcome<serde_json::Value>, String> {
-    if let Some(enabled) = update.enabled {
-        config.screen_intelligence.enabled = enabled;
-    }
-    if let Some(capture_policy) = update.capture_policy {
-        config.screen_intelligence.capture_policy = capture_policy;
-    }
-    if let Some(policy_mode) = update.policy_mode {
-        config.screen_intelligence.policy_mode = policy_mode;
-    }
-    if let Some(baseline_fps) = update.baseline_fps {
-        config.screen_intelligence.baseline_fps = baseline_fps.clamp(0.2, 30.0);
-    }
-    if let Some(vision_enabled) = update.vision_enabled {
-        config.screen_intelligence.vision_enabled = vision_enabled;
-    }
-    if let Some(autocomplete_enabled) = update.autocomplete_enabled {
-        config.screen_intelligence.autocomplete_enabled = autocomplete_enabled;
-    }
-    if let Some(use_vision_model) = update.use_vision_model {
-        config.screen_intelligence.use_vision_model = use_vision_model;
-    }
-    if let Some(keep_screenshots) = update.keep_screenshots {
-        config.screen_intelligence.keep_screenshots = keep_screenshots;
-    }
-    if let Some(allowlist) = update.allowlist {
-        config.screen_intelligence.allowlist = allowlist;
-    }
-    if let Some(denylist) = update.denylist {
-        config.screen_intelligence.denylist = denylist;
-    }
-
-    config.save().await.map_err(|e| e.to_string())?;
-    let _ = screen_intelligence::global_engine()
-        .apply_config(config.screen_intelligence.clone())
-        .await;
-
-    let snapshot = snapshot_config_json(config)?;
-    Ok(RpcOutcome::new(
-        snapshot,
-        vec![format!(
-            "screen intelligence settings saved to {}",
-            config.config_path.display()
-        )],
-    ))
-}
-
-/// Loads the configuration, applies screen intelligence settings updates, and saves it.
-pub async fn load_and_apply_screen_intelligence_settings(
-    update: ScreenIntelligenceSettingsPatch,
-) -> Result<RpcOutcome<serde_json::Value>, String> {
-    let mut config = load_config_with_timeout().await?;
-    apply_screen_intelligence_settings(&mut config, update).await
-}
-
 /// Updates the analytics-related settings in the configuration.
 pub async fn apply_analytics_settings(
     config: &mut Config,
diff --git a/src/openhuman/config/ops_tests.rs b/src/openhuman/config/ops_tests.rs
index b90dd996f..368f4fce1 100644
--- a/src/openhuman/config/ops_tests.rs
+++ b/src/openhuman/config/ops_tests.rs
@@ -1598,34 +1598,6 @@ async fn apply_model_settings_trims_and_clears_optional_provider_fields() {
     assert!(cfg.subconscious_provider.is_none());
 }
 
-#[tokio::test]
-async fn apply_screen_intelligence_settings_clamps_baseline_fps() {
-    let tmp = tempdir().unwrap();
-    let mut cfg = tmp_config(&tmp);
-
-    apply_screen_intelligence_settings(
-        &mut cfg,
-        ScreenIntelligenceSettingsPatch {
-            baseline_fps: Some(99.0),
-            ..Default::default()
-        },
-    )
-    .await
-    .expect("high clamp");
-    assert!((cfg.screen_intelligence.baseline_fps - 30.0).abs() < f32::EPSILON);
-
-    apply_screen_intelligence_settings(
-        &mut cfg,
-        ScreenIntelligenceSettingsPatch {
-            baseline_fps: Some(0.01),
-            ..Default::default()
-        },
-    )
-    .await
-    .expect("low clamp");
-    assert!((cfg.screen_intelligence.baseline_fps - 0.2).abs() < f32::EPSILON);
-}
-
 // ── apply_autonomy_settings ────────────────────────────────────
 
 #[tokio::test]
diff --git a/src/openhuman/config/schema/accessibility.rs b/src/openhuman/config/schema/accessibility.rs
deleted file mode 100644
index 9e705ccdb..000000000
--- a/src/openhuman/config/schema/accessibility.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-#[serde(default)]
-pub struct ScreenIntelligenceConfig {
-    #[serde(default = "default_enabled")]
-    pub enabled: bool,
-    #[serde(default = "default_capture_policy")]
-    pub capture_policy: String,
-    #[serde(default = "default_policy_mode")]
-    pub policy_mode: String,
-    #[serde(default = "default_baseline_fps")]
-    pub baseline_fps: f32,
-    #[serde(default = "default_vision_enabled")]
-    pub vision_enabled: bool,
-    #[serde(default = "default_session_ttl_secs")]
-    pub session_ttl_secs: u64,
-    #[serde(default = "default_panic_stop_hotkey")]
-    pub panic_stop_hotkey: String,
-    #[serde(default = "default_autocomplete_enabled")]
-    pub autocomplete_enabled: bool,
-    /// When `true`, Pass 2 sends the screenshot to a vision-capable LLM for
-    /// visual context extraction.  When `false`, only Apple Vision OCR (Pass 1)
-    /// feeds into the text synthesis LLM (Pass 3) — no vision model required.
-    /// Default: `true`.
-    #[serde(default = "default_use_vision_model")]
-    pub use_vision_model: bool,
-    /// When `true`, captured screenshots are saved to `{workspace_dir}/screenshots/`
-    /// instead of being discarded after vision processing. Default: `false`.
-    #[serde(default)]
-    pub keep_screenshots: bool,
-    #[serde(default)]
-    pub allowlist: Vec<String>,
-    #[serde(default)]
-    pub denylist: Vec<String>,
-}
-
-fn default_enabled() -> bool {
-    false
-}
-
-fn default_capture_policy() -> String {
-    "hybrid".to_string()
-}
-
-fn default_policy_mode() -> String {
-    "all_except_blacklist".to_string()
-}
-
-fn default_baseline_fps() -> f32 {
-    0.2
-}
-
-fn default_vision_enabled() -> bool {
-    true
-}
-
-fn default_session_ttl_secs() -> u64 {
-    300
-}
-
-fn default_panic_stop_hotkey() -> String {
-    "Cmd+Shift+.".to_string()
-}
-
-fn default_autocomplete_enabled() -> bool {
-    true
-}
-
-fn default_use_vision_model() -> bool {
-    false
-}
-
-impl Default for ScreenIntelligenceConfig {
-    fn default() -> Self {
-        Self {
-            enabled: default_enabled(),
-            capture_policy: default_capture_policy(),
-            policy_mode: default_policy_mode(),
-            baseline_fps: default_baseline_fps(),
-            vision_enabled: default_vision_enabled(),
-            session_ttl_secs: default_session_ttl_secs(),
-            panic_stop_hotkey: default_panic_stop_hotkey(),
-            autocomplete_enabled: default_autocomplete_enabled(),
-            use_vision_model: default_use_vision_model(),
-            keep_screenshots: false,
-            allowlist: vec![],
-            denylist: vec![
-                "1password".to_string(),
-                "keychain".to_string(),
-                "wallet".to_string(),
-                "seed phrase".to_string(),
-            ],
-        }
-    }
-}
diff --git a/src/openhuman/config/schema/mod.rs b/src/openhuman/config/schema/mod.rs
index 5fa5e57d3..30fa902ad 100644
--- a/src/openhuman/config/schema/mod.rs
+++ b/src/openhuman/config/schema/mod.rs
@@ -11,7 +11,6 @@ pub use cloud_providers::{
 };
 pub mod subconscious;
 pub use subconscious::{MedullaLocalConfig, SubconsciousConfig, SubconsciousEngine};
-mod accessibility;
 mod agent;
 mod autonomy;
 mod capability_providers;
@@ -54,7 +53,6 @@ mod tokenjuice;
 mod tools;
 mod update;
 
-pub use accessibility::ScreenIntelligenceConfig;
 pub use agent::{
     AgentConfig, DelegateAgentConfig, MemoryContextWindow, MemoryWindowLimits,
     OrchestratorModelConfig, RequiredOutputContract, TeamModelConfig,
diff --git a/src/openhuman/config/schema/types.rs b/src/openhuman/config/schema/types.rs
index 9c413891b..2be9538c3 100644
--- a/src/openhuman/config/schema/types.rs
+++ b/src/openhuman/config/schema/types.rs
@@ -151,9 +151,6 @@ pub struct Config {
     #[serde(default)]
     pub shell: ShellConfig,
 
-    #[serde(default)]
-    pub screen_intelligence: ScreenIntelligenceConfig,
-
     #[serde(default)]
     pub reliability: ReliabilityConfig,
 
@@ -754,7 +751,6 @@ impl Default for Config {
             sandbox: SandboxConfig::default(),
             runtime: RuntimeConfig::default(),
             shell: ShellConfig::default(),
-            screen_intelligence: ScreenIntelligenceConfig::default(),
             reliability: ReliabilityConfig::default(),
             scheduler: SchedulerConfig::default(),
             scheduler_gate: SchedulerGateConfig::default(),
@@ -898,6 +894,25 @@ mod model_pin_tests {
         );
     }
 
+    #[test]
+    fn config_ignores_legacy_screen_intelligence_table() {
+        let config: Config = toml::from_str(
+            r#"
+                [screen_intelligence]
+                enabled = true
+                baseline_fps = 30.0
+            "#,
+        )
+        .expect("legacy screen intelligence TOML should be ignored");
+
+        assert!(
+            !toml::to_string(&config)
+                .expect("config should serialize")
+                .contains("screen_intelligence"),
+            "legacy screen intelligence data must not be persisted again"
+        );
+    }
+
     #[test]
     fn config_parses_capability_provider_entries() {
         let config: Config = toml::from_str(
diff --git a/src/openhuman/config/schemas/controllers.rs b/src/openhuman/config/schemas/controllers.rs
index 538d27084..29124ccc0 100644
--- a/src/openhuman/config/schemas/controllers.rs
+++ b/src/openhuman/config/schemas/controllers.rs
@@ -12,9 +12,9 @@ use super::helpers::{
     ComposioTriggerSettingsUpdate, DictationSettingsUpdate, LocalAiSettingsUpdate,
     MeetSettingsUpdate, MemorySettingsUpdate, MemorySyncSettingsUpdate, ModelSettingsUpdate,
     OnboardingCompletedSetParams, PrivacyModeUpdate, RuntimeSettingsUpdate, SandboxSettingsUpdate,
-    ScreenIntelligenceSettingsUpdate, SearchSettingsUpdate, SetBrowserAllowAllParams,
-    SuperContextSetParams, VoiceServerSettingsUpdate, WorkspaceOnboardingFlagParams,
-    WorkspaceOnboardingFlagSetParams, DEFAULT_ONBOARDING_FLAG_NAME,
+    SearchSettingsUpdate, SetBrowserAllowAllParams, SuperContextSetParams,
+    VoiceServerSettingsUpdate, WorkspaceOnboardingFlagParams, WorkspaceOnboardingFlagSetParams,
+    DEFAULT_ONBOARDING_FLAG_NAME,
 };
 use super::schema_defs::schemas;
 
@@ -24,7 +24,6 @@ pub fn all_controller_schemas() -> Vec<ControllerSchema> {
         schemas("get_client_config"),
         schemas("update_model_settings"),
         schemas("update_memory_settings"),
-        schemas("update_screen_intelligence_settings"),
         schemas("update_runtime_settings"),
         schemas("update_browser_settings"),
         schemas("update_local_ai_settings"),
@@ -88,10 +87,6 @@ pub fn all_registered_controllers() -> Vec<RegisteredController> {
             schema: schemas("update_memory_settings"),
             handler: handle_update_memory_settings,
         },
-        RegisteredController {
-            schema: schemas("update_screen_intelligence_settings"),
-            handler: handle_update_screen_intelligence_settings,
-        },
         RegisteredController {
             schema: schemas("update_runtime_settings"),
             handler: handle_update_runtime_settings,
@@ -417,25 +412,6 @@ fn handle_update_memory_settings(params: Map<String, Value>) -> ControllerFuture
     })
 }
 
-fn handle_update_screen_intelligence_settings(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let update = deserialize_params::<ScreenIntelligenceSettingsUpdate>(params)?;
-        let patch = config_rpc::ScreenIntelligenceSettingsPatch {
-            enabled: update.enabled,
-            capture_policy: update.capture_policy,
-            policy_mode: update.policy_mode,
-            baseline_fps: update.baseline_fps,
-            vision_enabled: update.vision_enabled,
-            autocomplete_enabled: update.autocomplete_enabled,
-            use_vision_model: update.use_vision_model,
-            keep_screenshots: update.keep_screenshots,
-            allowlist: update.allowlist,
-            denylist: update.denylist,
-        };
-        to_json(config_rpc::load_and_apply_screen_intelligence_settings(patch).await?)
-    })
-}
-
 fn handle_update_runtime_settings(params: Map<String, Value>) -> ControllerFuture {
     Box::pin(async move {
         let update = deserialize_params::<RuntimeSettingsUpdate>(params)?;
diff --git a/src/openhuman/config/schemas/helpers.rs b/src/openhuman/config/schemas/helpers.rs
index 355f6aa40..153d6800e 100644
--- a/src/openhuman/config/schemas/helpers.rs
+++ b/src/openhuman/config/schemas/helpers.rs
@@ -97,20 +97,6 @@ pub(super) struct BrowserSettingsUpdate {
     pub(super) backend: Option<String>,
 }
 
-#[derive(Debug, Deserialize)]
-pub(super) struct ScreenIntelligenceSettingsUpdate {
-    pub(super) enabled: Option<bool>,
-    pub(super) capture_policy: Option<String>,
-    pub(super) policy_mode: Option<String>,
-    pub(super) baseline_fps: Option<f32>,
-    pub(super) vision_enabled: Option<bool>,
-    pub(super) autocomplete_enabled: Option<bool>,
-    pub(super) use_vision_model: Option<bool>,
-    pub(super) keep_screenshots: Option<bool>,
-    pub(super) allowlist: Option<Vec<String>>,
-    pub(super) denylist: Option<Vec<String>>,
-}
-
 #[derive(Debug, Deserialize)]
 pub(super) struct AnalyticsSettingsUpdate {
     pub(super) enabled: Option<bool>,
diff --git a/src/openhuman/config/schemas/schema_defs.rs b/src/openhuman/config/schemas/schema_defs.rs
index 6ad3c9b43..19052fe7d 100644
--- a/src/openhuman/config/schemas/schema_defs.rs
+++ b/src/openhuman/config/schemas/schema_defs.rs
@@ -128,46 +128,6 @@ pub fn schemas(function: &str) -> ControllerSchema {
             ],
             outputs: vec![json_output("snapshot", "Updated config snapshot.")],
         },
-        "update_screen_intelligence_settings" => ControllerSchema {
-            namespace: "config",
-            function: "update_screen_intelligence_settings",
-            description: "Update screen intelligence runtime settings.",
-            inputs: vec![
-                optional_bool("enabled", "Enable screen intelligence."),
-                optional_string("capture_policy", "Capture policy mode."),
-                optional_string("policy_mode", "Policy mode override."),
-                FieldSchema {
-                    name: "baseline_fps",
-                    ty: TypeSchema::Option(Box::new(TypeSchema::F64)),
-                    comment: "Baseline capture FPS.",
-                    required: false,
-                },
-                optional_bool("vision_enabled", "Enable vision analysis."),
-                optional_bool("autocomplete_enabled", "Enable autocomplete integration."),
-                optional_bool(
-                    "use_vision_model",
-                    "Use a vision LLM for screenshot analysis (false = OCR + text LLM).",
-                ),
-                optional_bool("keep_screenshots", "Keep screenshots on disk after vision processing."),
-                FieldSchema {
-                    name: "allowlist",
-                    ty: TypeSchema::Option(Box::new(TypeSchema::Array(Box::new(
-                        TypeSchema::String,
-                    )))),
-                    comment: "Allowed app list.",
-                    required: false,
-                },
-                FieldSchema {
-                    name: "denylist",
-                    ty: TypeSchema::Option(Box::new(TypeSchema::Array(Box::new(
-                        TypeSchema::String,
-                    )))),
-                    comment: "Denied app list.",
-                    required: false,
-                },
-            ],
-            outputs: vec![json_output("snapshot", "Updated config snapshot.")],
-        },
         "update_runtime_settings" => ControllerSchema {
             namespace: "config",
             function: "update_runtime_settings",
diff --git a/src/openhuman/config/schemas_tests.rs b/src/openhuman/config/schemas_tests.rs
index 3eab53b0a..a4f1bd8c3 100644
--- a/src/openhuman/config/schemas_tests.rs
+++ b/src/openhuman/config/schemas_tests.rs
@@ -31,7 +31,6 @@ fn every_registered_key_resolves_to_non_unknown_schema() {
         "get_config",
         "update_model_settings",
         "update_memory_settings",
-        "update_screen_intelligence_settings",
         "update_runtime_settings",
         "update_browser_settings",
         "update_local_ai_settings",
diff --git a/src/openhuman/credentials/README.md b/src/openhuman/credentials/README.md
index 39eeb67e0..ef8ea71a1 100644
--- a/src/openhuman/credentials/README.md
+++ b/src/openhuman/credentials/README.md
@@ -5,7 +5,7 @@ Credential management for the OpenHuman app session and provider/OAuth auth prof
 ## Responsibilities
 
 - Store and validate the app session JWT (`app-session` provider, `default` profile), including local offline sessions and backend `GET /auth/me` validation.
-- On login: activate the user-scoped openhuman directory, purge pre-login (anonymous) conversation threads on first activation, bind memory/conversation persistence, bootstrap subconscious, and start login-gated services (local AI, voice, dictation, screen intelligence, autocomplete).
+- On login: activate the user-scoped openhuman directory, purge pre-login (anonymous) conversation threads on first activation, bind memory/conversation persistence, bootstrap subconscious, and start login-gated services (local AI, voice, dictation, autocomplete).
 - On logout / session-expiry: remove the JWT, clear the active-user marker, stop login-gated services, reset subconscious, and flip the scheduler-gate signed-out override.
 - Persist arbitrary provider credentials (token + metadata fields) as named auth profiles; list/remove/set-active; prefix-list profiles for grouped namespaces (e.g. `channel:*`).
 - Run backend OAuth flows: connect URL, list integrations, fetch integration handoff tokens, fetch one-time client key, revoke integration.
@@ -88,7 +88,7 @@ None. This module owns no agent tools (`tools.rs` does not exist).
 - `crate::openhuman::memory_conversations` — purge pre-login threads, bind conversation persistence after login.
 - `crate::openhuman::memory` — bind memory client to the active workspace after login.
 - `crate::openhuman::subconscious` — post-login bootstrap / user-switch reset.
-- `crate::openhuman::inference`, `::voice`, `::screen_intelligence`, `::autocomplete` — login-gated services started/stopped.
+- `crate::openhuman::inference`, `::voice`, `::autocomplete` — login-gated services started/stopped.
 - `crate::api::config`, `::jwt`, `::rest` — backend API URL, session-token read, `BackendOAuthClient` + OAuth/handoff types.
 - `crate::core::all` (`ControllerFuture`, `RegisteredController`), `crate::core` (`ControllerSchema`/`FieldSchema`/`TypeSchema`), `crate::core::event_bus` (`DomainEvent`/`EventHandler`), `crate::rpc::RpcOutcome` — controller registry + RPC envelope + event bus.
 
diff --git a/src/openhuman/credentials/bus.rs b/src/openhuman/credentials/bus.rs
index 73a25ba66..60d682d7a 100644
--- a/src/openhuman/credentials/bus.rs
+++ b/src/openhuman/credentials/bus.rs
@@ -11,7 +11,7 @@
 //!    re-enters the gate during teardown also stalls.
 //! 2. Call [`clear_session`] to remove the stored JWT, clear the
 //!    active-user marker, and stop login-gated services
-//!    (voice / autocomplete / screen intelligence / local AI / dictation /
+//!    (voice / autocomplete / local AI / dictation /
 //!    subconscious). Idempotent — repeat events are safe.
 //!
 //! Without this subscriber, a 401 from a background LLM call would only
diff --git a/src/openhuman/credentials/ops.rs b/src/openhuman/credentials/ops.rs
index 986592f81..865c013e9 100644
--- a/src/openhuman/credentials/ops.rs
+++ b/src/openhuman/credentials/ops.rs
@@ -24,10 +24,9 @@ use crate::openhuman::memory_conversations as conversations;
 const AUTH_ME_STORE_RETRY_DELAY: Duration = Duration::from_millis(150);
 const AUTH_ME_STORE_TRANSIENT_STATUSES: &[u16] = &[408, 429, 500, 502, 503, 504, 520];
 
-/// Start all login-gated background services (local AI, voice, screen
-/// intelligence, autocomplete).  Called both from the initial boot path
-/// (when an existing session is detected) and from `store_session()` on
-/// fresh login.
+/// Start all login-gated background services (local AI, voice, and
+/// orchestration). Called both from the initial boot path (when an existing
+/// session is detected) and from `store_session()` on fresh login.
 pub async fn start_login_gated_services(config: &Config) {
     // These login-gated services are mutually independent — the ONLY ordering
     // constraint is voice-server → standalone-dictation-listener (they contend
@@ -35,9 +34,9 @@ pub async fn start_login_gated_services(config: &Config) {
     // `.await`ed in series, so their cold-start costs SUMMED: the local-AI
     // bootstrap (Ollama/whisper/embeddings) + the Windows WASAPI microphone init
     // (a synchronous readiness handshake in `always_on::spawn_capture_thread`) +
-    // the screen-capture server + the hosted-client network sync stacked into
-    // the ~10s stall users hit before hotkeys/commands were usable — worst on
-    // Windows (#3490). Worse, the hotkey/command registration (steps 2–3) sat
+    // the hosted-client network sync stacked into the ~10s stall users hit
+    // before hotkeys/commands were usable — worst on Windows (#3490). Worse,
+    // the hotkey/command registration (steps 2–3) sat
     // *after* the local-AI bootstrap in the series, so commands could not
     // register until Ollama/whisper finished warming.
     //
@@ -49,8 +48,8 @@ pub async fn start_login_gated_services(config: &Config) {
 
     // Unit tests must not launch the real login-gated background services: they
     // are detached, long-lived loops (hosted-client read-sync + world-diff
-    // uploader + one-shot history migration, continuous audio capture, screen
-    // capture) that outlive the test that spawned them and interleave with the
+    // uploader + one-shot history migration, continuous audio capture) that
+    // outlive the test that spawned them and interleave with the
     // shared process state (HOME / active_user.toml) of the parallel `cargo
     // test` run. Once startup became concurrent (#3490) that interleaving made
     // the session-isolation tests order-dependent. `cfg!(test)` is compiled out
@@ -135,22 +134,6 @@ pub async fn start_login_gated_services(config: &Config) {
         ));
     }
 
-    // 4. Screen intelligence (capture + vision analysis).
-    {
-        let config = config.clone();
-        tasks.push((
-            "screen_intelligence",
-            tokio::spawn(async move {
-                let step = std::time::Instant::now();
-                crate::openhuman::screen_intelligence::server::start_if_enabled(&config).await;
-                log::debug!(
-                    "[services] screen intelligence started ({} ms)",
-                    step.elapsed().as_millis()
-                );
-            }),
-        ));
-    }
-
     // 6. Orchestration hosted-client: read-sync loop + world-diff uploader +
     //    one-shot history migration. Idempotent (aborts a prior session's loops
     //    first); no-op when orchestration is disabled. Runs here so both startup
@@ -199,12 +182,6 @@ pub async fn stop_login_gated_services(config: &Config) {
         log::info!("[services] voice server stopped on logout");
     }
 
-    // 3. Screen intelligence server
-    if let Some(server) = crate::openhuman::screen_intelligence::server::try_global_server() {
-        server.stop().await;
-        log::info!("[services] screen intelligence server stopped on logout");
-    }
-
     // 4. Local AI — reset state to idle. We don't kill the Ollama process
     //    (it may be serving other clients or mid-download), but we clear
     //    the internal state so it re-bootstraps on next login.
@@ -600,9 +577,9 @@ async fn store_session_inner(
         logs.push("subconscious engine bootstrapped".to_string());
     }
 
-    // Start all login-gated services (voice, autocomplete, screen
-    // intelligence, local AI). Uses the effective config so services see
-    // the user-scoped workspace directory.
+    // Start all login-gated services (voice, orchestration, and local AI).
+    // Uses the effective config so services see the user-scoped workspace
+    // directory.
     start_login_gated_services(&effective_config).await;
     logs.push("login-gated services started".to_string());
 
@@ -733,9 +710,9 @@ pub async fn clear_session(config: &Config) -> Result<RpcOutcome<serde_json::Val
         }
     }
 
-    // Stop all login-gated services (voice, autocomplete, screen
-    // intelligence, local AI) so they don't run as orphan processes after
-    // logout, consuming RAM/CPU with no user context to operate against.
+    // Stop all login-gated services (voice, orchestration, and local AI) so
+    // they don't run as orphan processes after logout, consuming RAM/CPU with
+    // no user context to operate against.
     stop_login_gated_services(config).await;
 
     // Tear down the subconscious engine + heartbeat loop. Without this the
diff --git a/src/openhuman/credentials/ops_tests.rs b/src/openhuman/credentials/ops_tests.rs
index b149ff756..13da6f4d7 100644
--- a/src/openhuman/credentials/ops_tests.rs
+++ b/src/openhuman/credentials/ops_tests.rs
@@ -1129,7 +1129,6 @@ async fn start_login_gated_services_completes_with_all_services_disabled() {
     config.local_ai.runtime_enabled = false;
     config.voice_server.auto_start = false;
     config.voice_server.always_on_enabled = false;
-    config.screen_intelligence.enabled = false;
     config.orchestration.enabled = false;
 
     // Bound the wait so a serial-blocking regression (or a hung join) fails the
diff --git a/src/openhuman/image/README.md b/src/openhuman/image/README.md
index cbbc17034..7ce5c9b2b 100644
--- a/src/openhuman/image/README.md
+++ b/src/openhuman/image/README.md
@@ -20,21 +20,22 @@ expose when image capabilities are available.
 
 ## Module Shape
 
-| File | Role |
-| --- | --- |
-| `mod.rs` | Export-only module entrypoint. |
-| `types.rs` | Shared descriptors, permission/config types, and gating helpers. |
-| `image_generation.rs` | `image_generation` schema and output-format contract. |
-| `image_view.rs` | `view_image` schema and detail-level contract. |
-| `prompt.rs` | Agent prompt guidance for enabled image tools. |
-| `tests.rs` | Contract-level e2e tests across config, schemas, and prompt output. |
+| File                  | Role                                                                |
+| --------------------- | ------------------------------------------------------------------- |
+| `mod.rs`              | Export-only module entrypoint.                                      |
+| `types.rs`            | Shared descriptors, permission/config types, and gating helpers.    |
+| `image_generation.rs` | `image_generation` schema and output-format contract.               |
+| `image_view.rs`       | `view_image` schema and detail-level contract.                      |
+| `prompt.rs`           | Agent prompt guidance for enabled image tools.                      |
+| `tests.rs`            | Contract-level e2e tests across config, schemas, and prompt output. |
 
 ## Notes
 
 Existing lower-level image helpers remain separate:
 
 - `image_info` reads metadata/base64 text.
-- Browser screenshot tooling captures page images.
+- Browser `snapshot` exposes structured DOM and accessibility content without
+  capturing page pixels.
 - Multimodal `[IMAGE:...]` preparation normalizes image references for
   image-capable providers.
 
diff --git a/src/openhuman/image/mod.rs b/src/openhuman/image/mod.rs
index 51ad4a672..4d0073054 100644
--- a/src/openhuman/image/mod.rs
+++ b/src/openhuman/image/mod.rs
@@ -1,7 +1,7 @@
 //! Image-tool contracts for model-facing agents.
 //!
 //! This module is intentionally a high-level contract layer. OpenHuman already
-//! has lower-level image helpers (`image_info`, browser screenshots, and
+//! has lower-level image helpers (`image_info`, local image viewing, and
 //! multimodal `[IMAGE:...]` normalization). The image layer defines the
 //! stable tool names, schema, gating, and prompt guidance that agents should see
 //! when a runtime can provide Codex-like media tools.
diff --git a/src/openhuman/inference/README.md b/src/openhuman/inference/README.md
index bbd5c7f98..f9787d520 100644
--- a/src/openhuman/inference/README.md
+++ b/src/openhuman/inference/README.md
@@ -110,7 +110,7 @@ Also exposes a non-RPC HTTP router (`http::router()`) nested at `/v1` by `src/co
 
 ## Used by
 
-Widely depended on by the agent layer (`agent/harness`, `agent/harness/session`, `agent/tools`, `agent/triage`, `agent/harness/subagent_runner`), `context`, `voice`, `memory_tree/tree_runtime`, `learning` (+ `learning/transcript_ingest`), `channels`, `embeddings`, `subconscious`, `screen_intelligence`, `threads`, and `migrations`/`config/schema`.
+Widely depended on by the agent layer (`agent/harness`, `agent/harness/session`, `agent/tools`, `agent/triage`, `agent/harness/subagent_runner`), `context`, `voice`, `memory_tree/tree_runtime`, `learning` (+ `learning/transcript_ingest`), `channels`, `embeddings`, `subconscious`, `threads`, and `migrations`/`config/schema`.
 
 ## Notes / gotchas
 
diff --git a/src/openhuman/mcp_server/resources.rs b/src/openhuman/mcp_server/resources.rs
index 2930a57a5..0d9f8c34c 100644
--- a/src/openhuman/mcp_server/resources.rs
+++ b/src/openhuman/mcp_server/resources.rs
@@ -235,12 +235,6 @@ const RESOURCE_CATALOG: &[PromptResource] = &[
         description: "Specialist worker for connected account and integration administration.",
         content: include_str!("../agent_registry/agents/account_admin_agent/prompt.md"),
     },
-    PromptResource {
-        uri: "openhuman://prompts/agents/screen_awareness_agent",
-        name: "screen_awareness_agent",
-        description: "Specialist worker for screen context and desktop state inspection.",
-        content: include_str!("../agent_registry/agents/screen_awareness_agent/prompt.md"),
-    },
     PromptResource {
         uri: "openhuman://prompts/agents/flow_discovery",
         name: "flow_discovery",
diff --git a/src/openhuman/memory_store/client.rs b/src/openhuman/memory_store/client.rs
index 8a250b0f0..92dee81c8 100644
--- a/src/openhuman/memory_store/client.rs
+++ b/src/openhuman/memory_store/client.rs
@@ -158,9 +158,9 @@ impl MemoryClient {
     }
 
     /// Store a document (DB row + markdown file) without vector embedding or
-    /// graph extraction.  Use this for high-frequency, ephemeral writes where
-    /// the full pipeline would be too expensive (e.g. screen-intelligence
-    /// snapshots).  The document is still searchable by metadata/FTS but will
+    /// graph extraction. Use this for high-frequency, ephemeral writes where
+    /// the full pipeline would be too expensive (e.g. transient sync
+    /// checkpoints). The document is still searchable by metadata/FTS but will
     /// not appear in semantic vector queries or the knowledge graph.
     pub async fn put_doc_light(&self, input: NamespaceDocumentInput) -> Result<String, String> {
         self.inner.upsert_document_metadata_only(input).await
diff --git a/src/openhuman/memory_store/namespace_store/documents.rs b/src/openhuman/memory_store/namespace_store/documents.rs
index a615ee775..ca7b8534f 100644
--- a/src/openhuman/memory_store/namespace_store/documents.rs
+++ b/src/openhuman/memory_store/namespace_store/documents.rs
@@ -241,8 +241,8 @@ impl UnifiedMemory {
     }
 
     /// Store a document (DB row + markdown file) without chunking, embedding,
-    /// or graph extraction.  Suitable for high-frequency, low-value writes
-    /// (e.g. screen-intelligence snapshots) where the full ingestion pipeline
+    /// or graph extraction. Suitable for high-frequency, low-value writes
+    /// (e.g. transient sync checkpoints) where the full ingestion pipeline
     /// would be too expensive.
     pub async fn upsert_document_metadata_only(
         &self,
diff --git a/src/openhuman/mod.rs b/src/openhuman/mod.rs
index c48f006b8..129784f18 100644
--- a/src/openhuman/mod.rs
+++ b/src/openhuman/mod.rs
@@ -112,7 +112,6 @@ pub mod runtime_python;
 pub mod runtime_python_server;
 pub mod sandbox;
 pub mod scheduler_gate;
-pub mod screen_intelligence;
 pub mod search;
 pub mod security;
 pub mod service;
diff --git a/src/openhuman/overlay/README.md b/src/openhuman/overlay/README.md
index 9c13d0720..0db1b9339 100644
--- a/src/openhuman/overlay/README.md
+++ b/src/openhuman/overlay/README.md
@@ -5,7 +5,7 @@ Signals pushed from the core to the desktop **overlay window** — a separate Ta
 ## Responsibilities
 
 - Define the `OverlayAttentionEvent` payload and its `OverlayAttentionTone` visual hint.
-- Provide a process-global broadcast channel so any core caller (subconscious loop, heartbeat, screen intelligence, …) can surface a transient overlay message without threading a sender around.
+- Provide a process-global broadcast channel so any core caller (subconscious loop, heartbeat, …) can surface a transient overlay message without threading a sender around.
 - Expose `publish_attention` (fire-and-forget producer) and `subscribe_attention_events` (consumed by the Socket.IO bridge).
 - (STT/dictation overlay activation is driven separately by `voice::dictation_listener`'s `dictation:toggle` / `dictation:transcription` events — not by this module.)
 
@@ -40,7 +40,7 @@ None. State is purely an in-memory broadcast channel; events not consumed when p
 
 - `src/core/socketio.rs` — subscribes to the bus and forwards events to the overlay WebView over Socket.IO.
 - `src/openhuman/notifications/bus.rs` — references this module's bus only as a documented pattern to mirror (no code dependency).
-- Per the module docstring, intended publishers include the subconscious loop, heartbeat, and screen-intelligence domains via `publish_attention`.
+- Per the module docstring, intended publishers include the subconscious loop and heartbeat via `publish_attention`.
 
 ## Notes / gotchas
 
diff --git a/src/openhuman/overlay/mod.rs b/src/openhuman/overlay/mod.rs
index 092ffa4d3..56e86caa4 100644
--- a/src/openhuman/overlay/mod.rs
+++ b/src/openhuman/overlay/mod.rs
@@ -12,7 +12,7 @@
 //!      and `dictation:transcription` events (see `voice::dictation_listener`).
 //!   2. **Attention** — a short, user-visible message the core wants to
 //!      surface without stealing focus. Any core-side caller (subconscious
-//!      loop, heartbeat, screen intelligence, …) can publish an
+//!      loop, heartbeat, and other services) can publish an
 //!      `OverlayAttentionEvent` via [`publish_attention`] and it will be
 //!      broadcast to the overlay window as `overlay:attention`.
 //!
diff --git a/src/openhuman/overlay/types.rs b/src/openhuman/overlay/types.rs
index 3d6a70c99..878c1be87 100644
--- a/src/openhuman/overlay/types.rs
+++ b/src/openhuman/overlay/types.rs
@@ -36,7 +36,7 @@ pub struct OverlayAttentionEvent {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub ttl_ms: Option<u32>,
     /// Free-form source label for logging / debugging ("subconscious",
-    /// "heartbeat", "screen_intelligence", …). Optional.
+    /// "heartbeat", "subconscious", …). Optional.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub source: Option<String>,
 }
diff --git a/src/openhuman/screen_intelligence/README.md b/src/openhuman/screen_intelligence/README.md
deleted file mode 100644
index f67e756b9..000000000
--- a/src/openhuman/screen_intelligence/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# screen_intelligence
-
-macOS-focused screen capture, accessibility automation, and on-device vision summarization. The module boots an in-process `AccessibilityEngine` singleton that runs consent-gated capture sessions: it polls the foreground window, screenshots the active window via `screencapture -l <windowID>`, runs a 3-pass OCR + local-LLM pipeline over each frame, and persists synthesized "what the user is doing right now" markdown documents into unified memory. It also exposes permission detection/requests, manual capture/diagnostics, input-action automation, autocomplete suggestions, and a macOS Globe/Fn hotkey listener. Capture is macOS-only in V1; on other platforms session start returns a `macOS-only` error and the embedded server autostart is skipped.
-
-## Responsibilities
-
-- Own the process-global `AccessibilityEngine` (state in `state.rs`) and its session lifecycle (enable / `start_session` with consent + TTL clamp 30..3600s / disable / TTL expiry).
-- Detect and request macOS privacy permissions (Screen Recording, Accessibility, Input Monitoring, cross-platform Microphone) and open the relevant System Settings panes.
-- Run a capture worker (`capture_worker.rs`) that polls foreground context at `baseline_fps`, captures the active window (window-ID only — never fullscreen fallback), applies allow/deny policy, optionally saves PNGs to `{workspace}/screenshots/`, and feeds frames to the vision worker.
-- Run a processing worker (`processing_worker.rs`) that drains to the latest frame, compresses the image, runs Apple Vision OCR → vision LLM → synthesis LLM (Ollama), and persists a `VisionSummary` to memory.
-- Provide manual / diagnostic capture (`capture_now`, `capture_image_ref_test`, `capture_test`), vision queries (`vision_recent`, `vision_flush`), and input automation (`input_action`) including a `panic_stop` action.
-- Maintain in-memory autocomplete context and produce heuristic suggestions.
-- Host a standalone `SiServer` (`server.rs`) that drives a capture+vision session in a monitoring loop, for embedded core autostart or CLI use.
-- Expose the `openhuman screen-intelligence` CLI (`cli/`) and the `screen_intelligence.*` JSON-RPC controller surface.
-
-## Key files
-
-| File | Role |
-| --- | --- |
-| `mod.rs` | Export-focused. Re-exports `ops as rpc`, all `ops::*`, schema pair, `global_engine`/`AccessibilityEngine`, and `types::*`. |
-| `ops.rs` | RPC/CLI handler functions returning `RpcOutcome<T>` (status, permissions, sessions, capture, vision, globe listener) + `accessibility_doctor_cli_json`. |
-| `schemas.rs` | `ControllerSchema`s, `all_controller_schemas`, `all_registered_controllers`, and `handle_*` fns delegating to `ops`. |
-| `types.rs` | Serde domain types (`AccessibilityStatus`, `SessionStatus`, `CaptureFrame`, `VisionSummary`, `InputActionParams`, params/results). Re-exports permission types from `accessibility`. |
-| `state.rs` | `EngineState`, `SessionRuntime`, `AccessibilityEngine`, and the `ACCESSIBILITY_ENGINE` lazy singleton / `global_engine()`. |
-| `engine.rs` | Core `impl AccessibilityEngine`: config apply, session lifecycle, status, capture actions, screenshot-to-disk, allow/deny policy. |
-| `input.rs` | `impl AccessibilityEngine` for `input_action`, `autocomplete_suggest`, `autocomplete_commit`. |
-| `vision.rs` | `impl AccessibilityEngine` for `vision_recent`, `vision_flush`, `analyze_and_persist_frame`. |
-| `capture_worker.rs` | Background screenshot loop (foreground poll, window capture, disk save, frame enqueue). |
-| `processing_worker.rs` | Background vision pipeline: drain-to-latest, OCR (Apple Vision via `swift`), vision LLM, synthesis LLM, persist. |
-| `image_processing.rs` | PNG→resized JPEG compression for the vision LLM (`compress_screenshot`, defaults 1024px / quality 72). |
-| `helpers.rs` | Input validation, ephemeral ring-buffer pushes, vision-output parsing, memory persistence (`persist_vision_summary` → `background` namespace), suggestion generation, `truncate_tail`. |
-| `limits.rs` | Buffer/string caps (max 120 frames/summaries, 256-char context, etc.). |
-| `capture.rs` | `now_ms()` timestamp helper. |
-| `permissions.rs` | Empty stub — permission detection moved to the `accessibility` middleware; retained for module-tree compatibility. |
-| `server.rs` | `SiServer` runtime, `ServerState`/`SiServerStatus`/`SiServerConfig`, global singleton, `start_if_enabled`, `run_standalone`, benign-failure classifiers. |
-| `cli/mod.rs` | `openhuman screen-intelligence` dispatch + shared opts/bootstrap helpers. |
-| `cli/{capture,doctor,server,session}.rs` | CLI subcommand impls (`capture`/`vision`, `doctor`, `run`, `status`/`start`/`stop`). |
-| `tests.rs`, `engine_tests.rs`, `schemas_tests.rs` | Test suites (sibling-file `#[path]` for engine/schemas). |
-
-## Public surface
-
-- `global_engine() -> Arc<AccessibilityEngine>` and `AccessibilityEngine` (the session engine; impl blocks split across `engine.rs`/`input.rs`/`vision.rs`).
-- `ops::*` (re-exported as `rpc`): async handlers e.g. `accessibility_status`, `accessibility_request_permission(s)`, `accessibility_refresh_permissions`, `accessibility_start_session`, `accessibility_stop_session`, `accessibility_capture_now`, `accessibility_capture_image_ref`, `accessibility_capture_test`, `accessibility_input_action`, `accessibility_vision_recent`, `accessibility_vision_flush`, `accessibility_globe_listener_{start,poll,stop}`, `accessibility_doctor_cli_json`.
-- `all_screen_intelligence_controller_schemas` / `all_screen_intelligence_registered_controllers` (registry wiring).
-- `types::*` — `AccessibilityStatus`, `SessionStatus`, `AccessibilityFeatures`, `CaptureFrame`, `CaptureNowResult`, `CaptureImageRefResult`, `CaptureTestResult`, `VisionSummary`, `VisionRecentResult`, `VisionFlushResult`, `InputActionParams`/`Result`, `StartSessionParams`, `StopSessionParams`, `PermissionRequestParams`, `AppContextInfo`, autocomplete types, plus re-exported `PermissionKind`/`PermissionState`/`PermissionStatus`/`GlobeHotkey*`.
-- `server::{SiServer, SiServerConfig, SiServerStatus, ServerState, global_server, try_global_server, start_if_enabled, run_standalone}`.
-- `cli::run_screen_intelligence_command`.
-
-## RPC / controllers
-
-Namespace `screen_intelligence` (registered via `all_screen_intelligence_registered_controllers` in `src/core/all.rs`). Functions: `status`, `request_permissions`, `request_permission`, `refresh_permissions`, `start_session`, `stop_session`, `capture_now`, `capture_image_ref`, `input_action`, `vision_recent`, `vision_flush`, `capture_test`, `globe_listener_start`, `globe_listener_poll`, `globe_listener_stop`. All `handle_*` fns delegate to `ops` and return CLI-compatible JSON via `RpcOutcome::into_cli_compatible_json`.
-
-## Agent tools
-
-None. This module owns no `tools.rs` / agent-tool impls.
-
-## Events
-
-None. No `bus.rs` / `EventHandler` impls; the module is driven by RPC/CLI/in-process workers, not the event bus.
-
-## Persistence
-
-- **Vision summaries → unified memory** (`helpers::persist_vision_summary`): writes via `MemoryClient::from_workspace_dir(...).put_doc_light(...)` (light path — no vectors/graph). Namespace `background`, source type `screenshot`, category/tag `screen_intelligence`, key `screen_intelligence_{captured_at_ms}_{fnv_hash(id)}`. Body is markdown with YAML frontmatter (app, window, captured ts, confidence, id).
-- **Screenshots → disk** (`engine::save_screenshot_to_disk`): `{workspace_dir}/screenshots/{captured_at_ms}_{app_slug}.png` when `keep_screenshots` is set (otherwise a temp file is written for OCR and deleted).
-- **In-memory only**: `SessionRuntime` holds ring buffers of recent `CaptureFrame`s and `VisionSummary`s (capped at 120 each) plus autocomplete context — not durably persisted.
-
-## Dependencies
-
-- `crate::openhuman::accessibility` — permission detection/requests, `foreground_context`, `AppContext`, window screenshot (`capture_screen_image_ref_for_context`), macOS privacy-pane opener, and the Globe/Fn hotkey listener (`globe_listener_*`). Permission types are re-exported from here.
-- `crate::openhuman::config` — loads `Config` / `ScreenIntelligenceConfig` (enabled, vision_enabled, use_vision_model, keep_screenshots, baseline_fps, session_ttl_secs, panic_stop_hotkey, policy_mode, allow/deny lists, autocomplete_enabled) and `workspace_dir`; `local_ai` provider/model settings gate vision.
-- `crate::openhuman::inference::local` (as `local_ai`) — Ollama vision + synthesis LLM calls in the processing worker.
-- `crate::openhuman::memory_store` — `MemoryClient` / `NamespaceDocumentInput` for persisting vision summaries.
-- `crate::core::all` — `ControllerFuture`/`RegisteredController` for the RPC registry; `crate::core::{ControllerSchema, FieldSchema, TypeSchema}` for schemas; `crate::core::logging` for CLI logging; `crate::rpc::RpcOutcome`.
-- `crate::openhuman::embeddings::NoopEmbedding` — test-only (`tests.rs`).
-
-## Used by
-
-- `src/core/all.rs` — registers controllers/schemas and the namespace description.
-- `src/core/cli.rs` — dispatches the `screen-intelligence` CLI subcommand.
-- `src/openhuman/config/ops.rs` — applies config changes to the engine.
-- `src/openhuman/app_state/ops.rs`, `src/openhuman/credentials/ops.rs` — referenced for lifecycle/state.
-- `src/openhuman/tools/local_cli.rs` — referenced from the local CLI tool surface.
-
-## Notes / gotchas
-
-- **macOS-only V1.** `enable`/`start_session` return an error off macOS; `start_if_enabled` no-ops on non-macOS and must not initialize the global server (enforced by test).
-- **Permission cache per-process.** macOS TCC grants are per-executable and per-process; the running core never sees a freshly-granted permission until it restarts. `refresh_permissions` re-detects (status always calls `detect_permissions()`), but a `restart_core_process` is required to pick up new grants — see GH #133. `AccessibilityStatus` carries `permission_check_process_path` and `core_process` (pid/started_at) so the UI can verify a restart actually happened.
-- **Window-ID required.** Capture only proceeds when the foreground context has a `window_id`; there is no fullscreen fallback.
-- **Vision pipeline requires local AI.** `analyze_frame` errors unless `local_ai.runtime_enabled=true` and provider is `ollama`. OCR shells out to `swift -e <Vision code>` with a 30s timeout and `kill_on_drop`. `--no-vision-model` / `--ocr-only` (CLI) sets `use_vision_model=false` at runtime (not persisted) to skip the vision LLM pass.
-- **Drain-to-latest.** The processing worker discards stale queued frames and only analyzes the most recent, deduping by `captured_at_ms`; vision-summary pushes also dedupe on `captured_at_ms` so `vision_flush` and the worker channel don't double-store.
-- **Lock discipline.** Workers read all needed state under the `Mutex`, then drop the lock before slow I/O (screencapture, disk, LLM); session task handles are aborted/awaited outside the lock to avoid deadlocks.
-- **Benign start-session failures** (`macOS-only` off-macOS, `session already active`) are classified down to `info!` so they don't surface as Sentry errors; the `SiServer` cancellation token is swappable so it can restart after logout→login within one process.
-- `permissions.rs` is an intentional empty stub; YAML frontmatter escaping in `persist_vision_summary` is best-effort (only quotes/newlines).
diff --git a/src/openhuman/screen_intelligence/capture.rs b/src/openhuman/screen_intelligence/capture.rs
deleted file mode 100644
index 4783e032f..000000000
--- a/src/openhuman/screen_intelligence/capture.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Timestamp helper (`now_ms`) for the screen intelligence engine.
-
-use chrono::Utc;
-
-pub(crate) fn now_ms() -> i64 {
-    Utc::now().timestamp_millis()
-}
diff --git a/src/openhuman/screen_intelligence/capture_worker.rs b/src/openhuman/screen_intelligence/capture_worker.rs
deleted file mode 100644
index feaf01e03..000000000
--- a/src/openhuman/screen_intelligence/capture_worker.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-//! Screenshot capture worker — polls foreground context at baseline FPS,
-//! captures the active window via `screencapture -l <windowID>`, saves to
-//! disk when `keep_screenshots` is set, and sends frames to the vision
-//! processing worker via an unbounded channel.
-
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use crate::openhuman::accessibility::{capture_screen_image_ref_for_context, foreground_context};
-use crate::openhuman::config::Config;
-
-use super::capture::now_ms;
-use super::helpers::push_ephemeral_frame;
-use super::state::AccessibilityEngine;
-use super::types::CaptureFrame;
-
-/// Main capture loop. Runs until session TTL expires or the session is stopped.
-pub(crate) async fn run(engine: Arc<AccessibilityEngine>) {
-    let mut tick = tokio::time::interval(std::time::Duration::from_millis(250));
-    tracing::debug!("[capture_worker] started");
-
-    loop {
-        tick.tick().await;
-
-        // Check TTL.
-        let should_stop = {
-            let state = engine.inner.lock().await;
-            match &state.session {
-                Some(session) => now_ms() >= session.expires_at_ms,
-                None => {
-                    tracing::debug!("[capture_worker] no session, exiting");
-                    return;
-                }
-            }
-        };
-        if should_stop {
-            tracing::debug!("[capture_worker] TTL expired, stopping");
-            engine
-                .stop_session_internal("ttl_expired".to_string())
-                .await;
-            return;
-        }
-
-        let context = foreground_context();
-        let now = now_ms();
-
-        // Read all session/config fields we need while holding the lock, then
-        // drop it before performing I/O (screencapture + optional disk save).
-        let (
-            baseline_ms,
-            screen_monitoring,
-            config,
-            last_capture_at_ms,
-            last_context_clone,
-            vision_enabled,
-        ) = {
-            let state = engine.inner.lock().await;
-            let baseline_ms =
-                (1000.0_f64 / (state.config.baseline_fps.max(0.2) as f64)).round() as i64;
-            let screen_monitoring = state.features.screen_monitoring;
-            let config = state.config.clone();
-            let (last_capture_at_ms, last_context_clone, vision_enabled) = match &state.session {
-                Some(session) => (
-                    session.last_capture_at_ms,
-                    session.last_context.clone(),
-                    session.vision_enabled,
-                ),
-                None => {
-                    tracing::debug!("[capture_worker] no session while reading fields, exiting");
-                    return;
-                }
-            };
-            (
-                baseline_ms,
-                screen_monitoring,
-                config,
-                last_capture_at_ms,
-                last_context_clone,
-                vision_enabled,
-            )
-        };
-
-        if !screen_monitoring {
-            continue;
-        }
-
-        let is_allowed = context
-            .as_ref()
-            .map(|ctx| engine.should_capture_context(ctx, &config))
-            .unwrap_or(false);
-        if !is_allowed {
-            tracing::trace!(
-                "[capture_worker] skipped: context blocked by denylist (app={:?})",
-                context.as_ref().and_then(|c| c.app_name.as_deref())
-            );
-            continue;
-        }
-
-        let context_changed = match (&last_context_clone, &context) {
-            (Some(prev), Some(curr)) => !prev.same_as(curr),
-            (None, Some(_)) => true,
-            _ => false,
-        };
-
-        let baseline_due = last_capture_at_ms
-            .map(|last| now - last >= baseline_ms)
-            .unwrap_or(true);
-
-        if !(context_changed || baseline_due) {
-            continue;
-        }
-
-        let reason = if context_changed {
-            "event:foreground_changed"
-        } else {
-            "baseline"
-        };
-
-        // Only capture when we have a window ID — never fall back to fullscreen.
-        let has_window_id = context.as_ref().and_then(|c| c.window_id).is_some();
-        if !has_window_id {
-            tracing::debug!(
-                "[capture_worker] skipping: no window_id for app={:?}",
-                context.as_ref().and_then(|c| c.app_name.as_deref()),
-            );
-            // Re-acquire lock to update last_context.
-            let mut state = engine.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.last_context = context;
-            }
-            continue;
-        }
-
-        tracing::debug!(
-            "[capture_worker] capturing app={:?} window_id={:?}",
-            context.as_ref().and_then(|c| c.app_name.as_deref()),
-            context.as_ref().and_then(|c| c.window_id),
-        );
-
-        // Perform I/O (screencapture) without holding the lock.
-        let capture_result = capture_screen_image_ref_for_context(context.as_ref());
-        if let Err(ref e) = capture_result {
-            tracing::debug!("[capture_worker] capture failed (reason={}): {}", reason, e);
-        }
-
-        let frame = CaptureFrame {
-            captured_at_ms: now,
-            reason: reason.to_string(),
-            app_name: context.as_ref().and_then(|c| c.app_name.clone()),
-            window_title: context.as_ref().and_then(|c| c.window_title.clone()),
-            image_ref: capture_result.ok(),
-        };
-
-        // Save to disk without holding the lock — this is slow I/O.
-        if frame.image_ref.is_some() && config.keep_screenshots {
-            let ws = match Config::load_or_init().await {
-                Ok(c) => c.workspace_dir.clone(),
-                Err(_) => PathBuf::from("."),
-            };
-            match AccessibilityEngine::save_screenshot_to_disk(&ws, &frame) {
-                Ok(path) => {
-                    tracing::debug!("[capture_worker] saved: {}", path.display())
-                }
-                Err(e) => tracing::debug!("[capture_worker] save failed: {e}"),
-            }
-        }
-
-        // Re-acquire lock to update session state and enqueue the frame.
-        let mut state = engine.inner.lock().await;
-        let Some(session) = state.session.as_mut() else {
-            return;
-        };
-
-        push_ephemeral_frame(&mut session.frames, frame.clone());
-        session.capture_count = session.capture_count.saturating_add(1);
-        session.last_capture_at_ms = Some(now);
-        session.last_context = context;
-
-        if frame.image_ref.is_some() && vision_enabled {
-            if let Some(tx) = session.vision_tx.as_ref() {
-                if tx.send(frame).is_ok() {
-                    session.vision_queue_depth = session.vision_queue_depth.saturating_add(1);
-                    session.vision_state = "queued".to_string();
-                }
-            }
-        }
-        state.last_event = Some(reason.to_string());
-    }
-}
diff --git a/src/openhuman/screen_intelligence/cli/capture.rs b/src/openhuman/screen_intelligence/cli/capture.rs
deleted file mode 100644
index ff6e69ee6..000000000
--- a/src/openhuman/screen_intelligence/cli/capture.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-//! Capture + vision inspection subcommands: `capture`, `vision`.
-
-use anyhow::Result;
-
-use super::{bootstrap_engine, init_quiet_logging, is_help, parse_opts};
-
-/// `openhuman screen-intelligence capture` — take a single screenshot and print info.
-pub(super) fn run_capture(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence capture [--keep] [-v]");
-        println!();
-        println!("Take a single screenshot, optionally save to workspace, and print diagnostics.");
-        println!();
-        println!("  --keep           Save the screenshot to {{workspace}}/screenshots/");
-        println!("  -v, --verbose    Enable debug logging");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    init_quiet_logging(opts.verbose);
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let engine = bootstrap_engine(opts.verbose).await?;
-        let result = engine.capture_test().await;
-
-        if result.ok {
-            eprintln!("  Capture: OK");
-            eprintln!("  Mode:    {}", result.capture_mode);
-            eprintln!("  Timing:  {}ms", result.timing_ms);
-            if let Some(bytes) = result.bytes_estimate {
-                eprintln!("  Size:    {} bytes", bytes);
-            }
-            if let Some(ctx) = &result.context {
-                eprintln!(
-                    "  App:     {}",
-                    ctx.app_name.as_deref().unwrap_or("unknown")
-                );
-                eprintln!(
-                    "  Window:  {}",
-                    ctx.window_title.as_deref().unwrap_or("unknown")
-                );
-            }
-
-            // Save to disk if --keep
-            if opts.keep {
-                let config = crate::openhuman::config::Config::load_or_init()
-                    .await
-                    .map_err(|e| anyhow::anyhow!("config load failed: {e}"))?;
-
-                match crate::openhuman::screen_intelligence::AccessibilityEngine::save_capture_test_result(
-                    &config.workspace_dir,
-                    &result,
-                    "cli_capture",
-                ) {
-                    Some(Ok(path)) => eprintln!("  Saved:   {}", path.display()),
-                    Some(Err(e)) => eprintln!("  Save failed: {e}"),
-                    None => {}
-                }
-            }
-        } else {
-            eprintln!("  Capture: FAILED");
-            if let Some(err) = &result.error {
-                eprintln!("  Error:   {err}");
-            }
-            std::process::exit(1);
-        }
-
-        // Also print as JSON for machine-readable output.
-        let mut json_result = serde_json::to_value(&result).unwrap_or_default();
-        // Strip image_ref from JSON output (too large for terminal).
-        if let Some(obj) = json_result.as_object_mut() {
-            obj.remove("image_ref");
-        }
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&json_result).unwrap_or_default()
-        );
-        Ok(())
-    })
-}
-
-/// `openhuman screen-intelligence vision` — inspect recent vision summaries.
-pub(super) fn run_vision(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence vision [--limit <n>] [-v]");
-        println!();
-        println!("Print recent vision summaries from the active session.");
-        println!();
-        println!("  --limit <n>      Maximum summaries to show (default: 10)");
-        println!("  -v, --verbose    Enable debug logging");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    init_quiet_logging(opts.verbose);
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let engine = bootstrap_engine(opts.verbose).await?;
-        let result = engine.vision_recent(Some(opts.limit)).await;
-
-        if result.summaries.is_empty() {
-            eprintln!("  No vision summaries available.");
-            eprintln!("  Start a session first: openhuman screen-intelligence start");
-        } else {
-            eprintln!("  {} vision summary(ies):\n", result.summaries.len());
-            for (i, s) in result.summaries.iter().enumerate() {
-                let ts = chrono::DateTime::from_timestamp_millis(s.captured_at_ms)
-                    .map(|dt| dt.format("%H:%M:%S").to_string())
-                    .unwrap_or_else(|| "?".to_string());
-                eprintln!(
-                    "  [{}] {} — {} (confidence: {:.0}%)",
-                    i + 1,
-                    ts,
-                    s.app_name.as_deref().unwrap_or("unknown"),
-                    s.confidence * 100.0,
-                );
-                if !s.ui_state.is_empty() {
-                    let truncated = if s.ui_state.chars().count() > 120 {
-                        format!("{}…", s.ui_state.chars().take(120).collect::<String>())
-                    } else {
-                        s.ui_state.clone()
-                    };
-                    eprintln!("       ui: {truncated}");
-                }
-                if !s.actionable_notes.is_empty() {
-                    let truncated = if s.actionable_notes.chars().count() > 120 {
-                        format!(
-                            "{}…",
-                            s.actionable_notes.chars().take(120).collect::<String>()
-                        )
-                    } else {
-                        s.actionable_notes.clone()
-                    };
-                    eprintln!("       notes: {truncated}");
-                }
-                eprintln!();
-            }
-        }
-
-        // Machine-readable output.
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&result).unwrap_or_default()
-        );
-        Ok(())
-    })
-}
diff --git a/src/openhuman/screen_intelligence/cli/doctor.rs b/src/openhuman/screen_intelligence/cli/doctor.rs
deleted file mode 100644
index 733800b6d..000000000
--- a/src/openhuman/screen_intelligence/cli/doctor.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-//! `openhuman screen-intelligence doctor` — diagnostic readiness check.
-
-use anyhow::Result;
-
-use super::{bootstrap_engine, init_quiet_logging, is_help, parse_opts};
-
-pub(super) fn run_doctor(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence doctor [-v]");
-        println!();
-        println!("Check system readiness: permissions, platform support, vision config.");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    init_quiet_logging(opts.verbose);
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let _engine = bootstrap_engine(opts.verbose).await?;
-
-        let doctor_json =
-            crate::openhuman::screen_intelligence::rpc::accessibility_doctor_cli_json()
-                .await
-                .map_err(|e| anyhow::anyhow!("doctor check failed: {e}"))?;
-
-        let summary = &doctor_json["result"]["summary"];
-        let recommendations = &doctor_json["result"]["recommendations"];
-        let permissions = &doctor_json["result"]["permissions"];
-
-        eprintln!("  Screen Intelligence Doctor");
-        eprintln!("  ──────────────────────────");
-        eprintln!();
-
-        let check = |ok: bool| if ok { "✓" } else { "✗" };
-
-        let platform_ok = summary["platform_supported"].as_bool().unwrap_or(false);
-        let screen_ok = summary["screen_capture_ready"].as_bool().unwrap_or(false);
-        let control_ok = summary["accessibility_ready"].as_bool().unwrap_or(false);
-        let input_ok = summary["input_monitoring_ready"].as_bool().unwrap_or(false);
-        let overall_ok = summary["overall_ready"].as_bool().unwrap_or(false);
-
-        eprintln!("  {} Platform supported", check(platform_ok));
-        eprintln!("  {} Screen recording", check(screen_ok));
-        eprintln!("  {} Accessibility automation", check(control_ok));
-        eprintln!("  {} Input monitoring", check(input_ok));
-        eprintln!();
-
-        // Vision config check.
-        let config = crate::openhuman::config::Config::load_or_init().await.ok();
-        if let Some(ref cfg) = config {
-            let si = &cfg.screen_intelligence;
-            let la = &cfg.local_ai;
-            eprintln!("  Config:");
-            eprintln!("    enabled:           {}", si.enabled);
-            eprintln!("    vision_enabled:    {}", si.vision_enabled);
-            eprintln!("    use_vision_model:  {}", si.use_vision_model);
-            eprintln!("    baseline_fps:      {}", si.baseline_fps);
-            eprintln!("    keep_screenshots:  {}", si.keep_screenshots);
-            eprintln!("    local_ai.runtime_enabled:  {}", la.runtime_enabled);
-            eprintln!("    local_ai.provider: {}", la.provider);
-            if si.vision_enabled && !la.runtime_enabled {
-                eprintln!("    ⚠  Vision is enabled but local_ai.runtime_enabled=false — vision analysis will fail");
-            }
-        }
-
-        eprintln!();
-        if overall_ok {
-            eprintln!("  ✓ Overall: READY");
-        } else {
-            eprintln!("  ✗ Overall: NOT READY");
-            eprintln!();
-            eprintln!("  Recommendations:");
-            if let Some(recs) = recommendations.as_array() {
-                for rec in recs {
-                    if let Some(s) = rec.as_str() {
-                        eprintln!("    • {s}");
-                    }
-                }
-            }
-        }
-        eprintln!();
-
-        // Machine-readable JSON output.
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&serde_json::json!({
-                "summary": summary,
-                "permissions": permissions,
-                "config": config.as_ref().map(|c| serde_json::json!({
-                    "enabled": c.screen_intelligence.enabled,
-                    "vision_enabled": c.screen_intelligence.vision_enabled,
-                    "use_vision_model": c.screen_intelligence.use_vision_model,
-                    "baseline_fps": c.screen_intelligence.baseline_fps,
-                    "keep_screenshots": c.screen_intelligence.keep_screenshots,
-                    "local_ai_enabled": c.local_ai.runtime_enabled,
-                    "local_ai_provider": c.local_ai.provider,
-                })),
-            }))
-            .unwrap_or_default()
-        );
-        Ok(())
-    })
-}
diff --git a/src/openhuman/screen_intelligence/cli/mod.rs b/src/openhuman/screen_intelligence/cli/mod.rs
deleted file mode 100644
index e2ac3996b..000000000
--- a/src/openhuman/screen_intelligence/cli/mod.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-//! `openhuman screen-intelligence` — standalone CLI for the screen intelligence loop.
-//!
-//! Boots **only** the screen intelligence engine (accessibility capture + local-AI
-//! vision) without the full desktop app, Socket.IO, or the node/tool runtime. Useful for
-//! testing the capture → save → vision-analysis pipeline from a terminal.
-//!
-//! Usage:
-//!   openhuman screen-intelligence run       [--ttl <secs>] [--keep] [-v]
-//!   openhuman screen-intelligence status    [-v]
-//!   openhuman screen-intelligence capture   [--keep] [-v]
-//!   openhuman screen-intelligence start     [--ttl <secs>] [-v]
-//!   openhuman screen-intelligence stop      [-v]
-//!   openhuman screen-intelligence doctor    [-v]
-//!   openhuman screen-intelligence vision    [--limit <n>] [-v]
-
-use anyhow::Result;
-use std::sync::Arc;
-
-mod capture;
-mod doctor;
-mod server;
-mod session;
-
-/// Entry point for `openhuman screen-intelligence <subcommand>`.
-pub(crate) fn run_screen_intelligence_command(args: &[String]) -> Result<()> {
-    if args.is_empty() || is_help(&args[0]) {
-        print_help();
-        return Ok(());
-    }
-
-    match args[0].as_str() {
-        "run" => server::run_server(&args[1..]),
-        "status" => session::run_status(&args[1..]),
-        "capture" => capture::run_capture(&args[1..]),
-        "start" => session::run_start_session(&args[1..]),
-        "stop" => session::run_stop_session(&args[1..]),
-        "doctor" => doctor::run_doctor(&args[1..]),
-        "vision" => capture::run_vision(&args[1..]),
-        other => Err(anyhow::anyhow!(
-            "unknown screen-intelligence subcommand '{other}'. Run `openhuman screen-intelligence --help`."
-        )),
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Shared helpers (visible to sibling subcommand modules)
-// ---------------------------------------------------------------------------
-
-pub(super) struct CliOpts {
-    pub verbose: bool,
-    pub ttl_secs: u64,
-    pub keep: bool,
-    pub limit: usize,
-    pub no_vision_model: bool,
-}
-
-pub(super) fn parse_opts(args: &[String]) -> Result<(CliOpts, Vec<String>)> {
-    let mut verbose = false;
-    let mut ttl_secs: u64 = 300;
-    let mut keep = false;
-    let mut limit: usize = 10;
-    let mut no_vision_model = false;
-    let mut rest = Vec::new();
-    let mut i = 0;
-
-    while i < args.len() {
-        match args[i].as_str() {
-            "--no-vision-model" | "--ocr-only" => {
-                no_vision_model = true;
-                i += 1;
-            }
-            "--ttl" => {
-                let val = args
-                    .get(i + 1)
-                    .ok_or_else(|| anyhow::anyhow!("missing value for --ttl"))?;
-                ttl_secs = val
-                    .parse()
-                    .map_err(|e| anyhow::anyhow!("invalid --ttl: {e}"))?;
-                i += 2;
-            }
-            "--limit" => {
-                let val = args
-                    .get(i + 1)
-                    .ok_or_else(|| anyhow::anyhow!("missing value for --limit"))?;
-                limit = val
-                    .parse()
-                    .map_err(|e| anyhow::anyhow!("invalid --limit: {e}"))?;
-                i += 2;
-            }
-            "--keep" => {
-                keep = true;
-                i += 1;
-            }
-            "-v" | "--verbose" => {
-                verbose = true;
-                i += 1;
-            }
-            "-h" | "--help" => {
-                rest.push(args[i].clone());
-                i += 1;
-            }
-            _ => {
-                rest.push(args[i].clone());
-                i += 1;
-            }
-        }
-    }
-
-    Ok((
-        CliOpts {
-            verbose,
-            ttl_secs,
-            keep,
-            limit,
-            no_vision_model,
-        },
-        rest,
-    ))
-}
-
-/// Bootstrap the screen intelligence engine with config.
-pub(super) async fn bootstrap_engine(
-    verbose: bool,
-) -> Result<Arc<crate::openhuman::screen_intelligence::AccessibilityEngine>> {
-    bootstrap_engine_with_opts(verbose, false).await
-}
-
-/// Bootstrap with CLI overrides.
-pub(super) async fn bootstrap_engine_with_opts(
-    verbose: bool,
-    no_vision_model: bool,
-) -> Result<Arc<crate::openhuman::screen_intelligence::AccessibilityEngine>> {
-    use crate::openhuman::config::Config;
-    use crate::openhuman::screen_intelligence::global_engine;
-
-    let mut config = Config::load_or_init()
-        .await
-        .map_err(|e| anyhow::anyhow!("config load failed: {e}"))?;
-
-    if no_vision_model {
-        config.screen_intelligence.use_vision_model = false;
-    }
-
-    let engine = global_engine();
-    let _ = engine
-        .apply_config(config.screen_intelligence.clone())
-        .await;
-
-    if verbose {
-        log::info!(
-            "[screen-intelligence-cli] engine initialized, enabled={}, vision={}, use_vision_model={}, keep_screenshots={}, workspace={}",
-            config.screen_intelligence.enabled,
-            config.screen_intelligence.vision_enabled,
-            config.screen_intelligence.use_vision_model,
-            config.screen_intelligence.keep_screenshots,
-            config.workspace_dir.display(),
-        );
-    }
-
-    Ok(engine)
-}
-
-/// Quiet logging: only `warn` unless verbose (used for non-server subcommands).
-pub(super) fn init_quiet_logging(verbose: bool) {
-    if !verbose && std::env::var_os("RUST_LOG").is_none() {
-        std::env::set_var("RUST_LOG", "warn");
-    }
-    crate::core::logging::init_for_cli_run(verbose, crate::core::logging::CliLogDefault::Global);
-}
-
-pub(super) fn is_help(value: &str) -> bool {
-    matches!(value, "-h" | "--help" | "help")
-}
-
-fn print_help() {
-    println!("openhuman screen-intelligence — standalone screen intelligence runtime\n");
-    println!("Boots only the screen intelligence engine (accessibility capture + local-AI");
-    println!("vision) without the full desktop app, Socket.IO, or the node/tool runtime.\n");
-    println!("Usage:");
-    println!("  openhuman screen-intelligence run       [--ttl <secs>] [--no-vision-model] [-v]");
-    println!("  openhuman screen-intelligence status     [-v]");
-    println!("  openhuman screen-intelligence capture    [--keep] [-v]");
-    println!("  openhuman screen-intelligence start      [--ttl <secs>] [--no-vision-model] [-v]");
-    println!("  openhuman screen-intelligence stop       [-v]");
-    println!("  openhuman screen-intelligence doctor     [-v]");
-    println!("  openhuman screen-intelligence vision     [--limit <n>] [-v]");
-    println!();
-    println!("Subcommands:");
-    println!("  run       Start the capture → vision → log loop (blocks until TTL/Ctrl+C)");
-    println!("  status    Print current engine status (permissions, session, config)");
-    println!("  capture   Take a single screenshot and print diagnostics");
-    println!("  start     Start a capture + vision session (runs until TTL or Ctrl+C)");
-    println!("  stop      Stop the active session");
-    println!("  doctor    Check system readiness (permissions, vision config, platform)");
-    println!("  vision    Print recent vision summaries from the active session");
-    println!();
-    println!("Common options:");
-    println!("  --ttl <secs>        Session TTL (default: 300)");
-    println!("  --limit <n>         Max vision summaries for 'vision' (default: 10)");
-    println!("  --keep              Save screenshot to disk (for 'capture')");
-    println!("  --no-vision-model   Skip vision LLM — use OCR + text LLM only");
-    println!("  --ocr-only          Alias for --no-vision-model");
-    println!("  -v, --verbose       Enable debug logging");
-}
diff --git a/src/openhuman/screen_intelligence/cli/server.rs b/src/openhuman/screen_intelligence/cli/server.rs
deleted file mode 100644
index f63aa0ee9..000000000
--- a/src/openhuman/screen_intelligence/cli/server.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-//! `openhuman screen-intelligence run` — start the standalone capture + vision loop.
-
-use anyhow::Result;
-
-use super::{is_help, parse_opts};
-
-/// Delegates to [`crate::openhuman::screen_intelligence::server::run_standalone`],
-/// which boots the engine, starts a capture session, and blocks in a
-/// monitoring loop logging captures and vision summaries until TTL or Ctrl+C.
-pub(super) fn run_server(args: &[String]) -> Result<()> {
-    let (opts, rest) = parse_opts(args)?;
-
-    if rest.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence run [--ttl <secs>] [--keep] [--no-vision-model] [-v]");
-        println!();
-        println!("Start the screen intelligence capture + vision loop.");
-        println!("Captures screenshots at baseline FPS, runs OCR and vision analysis,");
-        println!("and logs summaries. Blocks until TTL expires or Ctrl+C.");
-        println!();
-        println!("  --ttl <secs>        Session duration (default: 300)");
-        println!("  --keep              Keep screenshots on disk after vision processing");
-        println!("  --no-vision-model   Skip the vision LLM — use OCR + text LLM only");
-        println!("  --ocr-only          Alias for --no-vision-model");
-        println!("  -v, --verbose       Enable debug logging");
-        return Ok(());
-    }
-
-    crate::core::logging::init_for_cli_run(
-        opts.verbose,
-        crate::core::logging::CliLogDefault::Global,
-    );
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let mut config = crate::openhuman::config::Config::load_or_init()
-            .await
-            .map_err(|e| anyhow::anyhow!("config load failed: {e}"))?;
-
-        if opts.no_vision_model {
-            config.screen_intelligence.use_vision_model = false;
-        }
-
-        let keep_screenshots = opts.keep || config.screen_intelligence.keep_screenshots;
-
-        let server_config = crate::openhuman::screen_intelligence::server::SiServerConfig {
-            ttl_secs: opts.ttl_secs,
-            log_interval_secs: 5,
-            keep_screenshots,
-        };
-
-        let mode_label = if config.screen_intelligence.use_vision_model {
-            format!("vision LLM ({})", config.local_ai.vision_model_id)
-        } else {
-            "OCR + text LLM (no vision model)".to_string()
-        };
-
-        eprintln!();
-        eprintln!("  Screen Intelligence");
-        eprintln!("  ───────────────────");
-        eprintln!("  TTL:              {}s", opts.ttl_secs);
-        eprintln!("  Mode:             {}", mode_label);
-        eprintln!(
-            "  FPS:              {}",
-            config.screen_intelligence.baseline_fps
-        );
-        eprintln!("  Keep screenshots: {}", keep_screenshots);
-        eprintln!();
-        eprintln!("  Capturing → Vision → Log. Press Ctrl+C to stop.");
-        eprintln!();
-
-        crate::openhuman::screen_intelligence::server::run_standalone(config, server_config)
-            .await
-            .map_err(|e| anyhow::anyhow!("{e}"))
-    })
-}
diff --git a/src/openhuman/screen_intelligence/cli/session.rs b/src/openhuman/screen_intelligence/cli/session.rs
deleted file mode 100644
index f03833355..000000000
--- a/src/openhuman/screen_intelligence/cli/session.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-//! Session lifecycle subcommands: `start`, `stop`, `status`.
-
-use anyhow::Result;
-
-use super::{
-    bootstrap_engine, bootstrap_engine_with_opts, init_quiet_logging, is_help, parse_opts,
-};
-
-/// `openhuman screen-intelligence status` — print current engine status as JSON.
-pub(super) fn run_status(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence status [-v]");
-        println!();
-        println!("Print current screen intelligence engine status (permissions, session, config).");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    init_quiet_logging(opts.verbose);
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let engine = bootstrap_engine(opts.verbose).await?;
-        let status = engine.status().await;
-        println!(
-            "{}",
-            serde_json::to_string_pretty(&status).unwrap_or_else(|_| format!("{:?}", status))
-        );
-        Ok(())
-    })
-}
-
-/// `openhuman screen-intelligence start` — start a capture + vision session.
-pub(super) fn run_start_session(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!(
-            "Usage: openhuman screen-intelligence start [--ttl <secs>] [--no-vision-model] [-v]"
-        );
-        println!();
-        println!("Start a screen intelligence capture session with vision analysis.");
-        println!("The session runs until TTL expires or Ctrl+C is pressed.");
-        println!();
-        println!("  --ttl <secs>        Session duration (default: 300, max: 3600)");
-        println!("  --no-vision-model   Skip the vision LLM — use OCR + text LLM only");
-        println!("  --ocr-only          Alias for --no-vision-model");
-        println!("  -v, --verbose       Enable debug logging");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    crate::core::logging::init_for_cli_run(
-        opts.verbose,
-        crate::core::logging::CliLogDefault::Global,
-    );
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let engine = bootstrap_engine_with_opts(opts.verbose, opts.no_vision_model).await?;
-
-        let params = crate::openhuman::screen_intelligence::StartSessionParams {
-            consent: true,
-            ttl_secs: Some(opts.ttl_secs),
-            screen_monitoring: Some(true),
-        };
-
-        match engine.start_session(params).await {
-            Ok(session) => {
-                eprintln!("  Session started!");
-                eprintln!("  TTL:           {}s", session.ttl_secs);
-                eprintln!("  Vision:        {}", session.vision_enabled);
-                eprintln!("  Panic hotkey:  {}", session.panic_hotkey);
-                eprintln!();
-                eprintln!("  Capturing screenshots and running vision analysis...");
-                eprintln!("  Press Ctrl+C to stop.");
-                eprintln!();
-
-                // Print periodic status updates until the session ends.
-                let mut tick = tokio::time::interval(std::time::Duration::from_secs(5));
-                loop {
-                    tick.tick().await;
-                    let status = engine.status().await;
-                    if !status.session.active {
-                        eprintln!(
-                            "\n  Session ended: {}",
-                            status
-                                .session
-                                .stop_reason
-                                .unwrap_or_else(|| "unknown".into())
-                        );
-                        break;
-                    }
-                    eprintln!(
-                        "  [{}] captures={} vision={} queue={} last_app={:?}",
-                        chrono::Utc::now().format("%H:%M:%S"),
-                        status.session.capture_count,
-                        status.session.vision_state,
-                        status.session.vision_queue_depth,
-                        status.session.last_context.as_deref().unwrap_or("-"),
-                    );
-                    if let Some(summary) = &status.session.last_vision_summary {
-                        let truncated = if summary.chars().count() > 100 {
-                            format!("{}…", summary.chars().take(100).collect::<String>())
-                        } else {
-                            summary.clone()
-                        };
-                        eprintln!("           notes: {truncated}");
-                    }
-                }
-            }
-            Err(e) => {
-                eprintln!("  Failed to start session: {e}");
-                std::process::exit(1);
-            }
-        }
-        Ok(())
-    })
-}
-
-/// `openhuman screen-intelligence stop` — stop an active session.
-pub(super) fn run_stop_session(args: &[String]) -> Result<()> {
-    if args.iter().any(|a| is_help(a)) {
-        println!("Usage: openhuman screen-intelligence stop [-v]");
-        println!();
-        println!("Stop the active screen intelligence session.");
-        return Ok(());
-    }
-
-    let (opts, _) = parse_opts(args)?;
-    init_quiet_logging(opts.verbose);
-
-    let rt = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()?;
-
-    rt.block_on(async {
-        let engine = bootstrap_engine(opts.verbose).await?;
-        let session = engine.stop_session(Some("cli_stop".to_string())).await;
-        eprintln!(
-            "  Session stopped: {}",
-            session
-                .stop_reason
-                .unwrap_or_else(|| "no active session".into())
-        );
-        Ok(())
-    })
-}
diff --git a/src/openhuman/screen_intelligence/engine.rs b/src/openhuman/screen_intelligence/engine.rs
deleted file mode 100644
index b99361159..000000000
--- a/src/openhuman/screen_intelligence/engine.rs
+++ /dev/null
@@ -1,629 +0,0 @@
-//! Core engine — session lifecycle, status, capture actions, and policy rules.
-//!
-//! Impl blocks for `AccessibilityEngine` are split across files:
-//! - `engine.rs`  — session lifecycle, status, capture, policy (this file)
-//! - `input.rs`   — input_action, autocomplete_suggest, autocomplete_commit
-//! - `vision.rs`  — vision_recent, vision_flush, analyze_and_persist_frame
-
-use crate::openhuman::config::ScreenIntelligenceConfig;
-use std::collections::VecDeque;
-use std::path::PathBuf;
-use std::sync::{Arc, OnceLock};
-
-use super::capture::now_ms;
-use super::helpers::push_ephemeral_frame;
-use super::state::{AccessibilityEngine, SessionRuntime};
-use super::types::{
-    AccessibilityStatus, AppContextInfo, CaptureFrame, CaptureImageRefResult, CaptureNowResult,
-    CaptureTestResult, CoreProcessStatus, SessionStatus, StartSessionParams,
-};
-use crate::openhuman::accessibility::request_microphone_access;
-use crate::openhuman::accessibility::{
-    capture_screen_image_ref_for_context, detect_permissions, foreground_context,
-    permission_to_str, AppContext, PermissionKind, PermissionState, PermissionStatus,
-};
-#[cfg(target_os = "macos")]
-use crate::openhuman::accessibility::{
-    open_macos_privacy_pane, request_accessibility_access, request_screen_recording_access,
-};
-
-impl AccessibilityEngine {
-    // ── Config ───────────────────────────────────────────────────────
-
-    pub async fn apply_config(
-        self: &Arc<Self>,
-        config: ScreenIntelligenceConfig,
-    ) -> Result<AccessibilityStatus, String> {
-        {
-            let mut state = self.inner.lock().await;
-            state.config = config.clone();
-        }
-
-        if config.enabled {
-            let _ = self.enable().await;
-        } else {
-            let _ = self.disable(Some("disabled_by_config".to_string())).await;
-        }
-
-        Ok(self.status().await)
-    }
-
-    // ── Session lifecycle ────────────────────────────────────────────
-
-    pub async fn enable(self: &Arc<Self>) -> Result<SessionStatus, String> {
-        if !cfg!(target_os = "macos") {
-            return Err("screen intelligence is macOS-only in V1".to_string());
-        }
-
-        let mut spawned_new_session = false;
-        {
-            let mut state = self.inner.lock().await;
-            if state.session.is_some() {
-                tracing::debug!(
-                    "[screen_intelligence] enable requested while session already active"
-                );
-            } else {
-                state.permissions = detect_permissions();
-                if state.permissions.screen_recording != PermissionState::Granted {
-                    return Err("screen recording permission is not granted".to_string());
-                }
-
-                let now = now_ms();
-                state.features.screen_monitoring = true;
-                state.session = Some(new_session_runtime(&state.config, now, i64::MAX, 0));
-                state.last_event = Some("screen_intelligence_enabled".to_string());
-                state.last_error = None;
-                spawned_new_session = true;
-            }
-        }
-
-        let status = self.status().await;
-        if spawned_new_session {
-            self.spawn_workers().await;
-            Ok(self.status().await.session)
-        } else {
-            Ok(status.session)
-        }
-    }
-
-    pub async fn start_session(
-        self: &Arc<Self>,
-        params: StartSessionParams,
-    ) -> Result<SessionStatus, String> {
-        if !params.consent {
-            return Err("explicit consent is required to start accessibility session".to_string());
-        }
-        if !cfg!(target_os = "macos") {
-            return Err("accessibility automation is macOS-only in V1".to_string());
-        }
-
-        let ttl_secs = params
-            .ttl_secs
-            .unwrap_or(ScreenIntelligenceConfig::default().session_ttl_secs)
-            .clamp(30, 3600);
-
-        let mut spawned_new_session = false;
-        {
-            let mut state = self.inner.lock().await;
-            if state.session.is_some() {
-                tracing::debug!(
-                    "[screen_intelligence] start_session requested while session already active"
-                );
-            } else {
-                state.permissions = detect_permissions();
-                if state.permissions.accessibility != PermissionState::Granted {
-                    return Err("accessibility permission is not granted".to_string());
-                }
-
-                let screen_monitoring_requested = params.screen_monitoring.unwrap_or(true);
-                if screen_monitoring_requested
-                    && state.permissions.screen_recording != PermissionState::Granted
-                {
-                    return Err("screen recording permission is not granted".to_string());
-                }
-
-                let now = now_ms();
-                let expires_at_ms = now + (ttl_secs as i64 * 1000);
-                state.features.screen_monitoring = screen_monitoring_requested;
-
-                state.session = Some(new_session_runtime(
-                    &state.config,
-                    now,
-                    expires_at_ms,
-                    ttl_secs,
-                ));
-                state.last_event = Some("session_started".to_string());
-                state.last_error = None;
-                spawned_new_session = true;
-            }
-        }
-
-        let status = self.status().await;
-        if spawned_new_session {
-            self.spawn_workers().await;
-            Ok(self.status().await.session)
-        } else {
-            Ok(status.session)
-        }
-    }
-
-    pub async fn disable(&self, reason: Option<String>) -> SessionStatus {
-        self.stop_session_internal(reason.unwrap_or_else(|| "manual_stop".to_string()))
-            .await;
-        self.status().await.session
-    }
-
-    pub async fn stop_session(&self, reason: Option<String>) -> SessionStatus {
-        self.disable(reason).await
-    }
-
-    pub(crate) async fn stop_session_internal(&self, reason: String) {
-        let (task, vision_task) = {
-            let mut state = self.inner.lock().await;
-            let Some(mut session) = state.session.take() else {
-                return;
-            };
-            session.stop_reason = Some(reason.clone());
-            session.vision_tx = None;
-            state.last_event = Some(format!("session_stopped:{reason}"));
-            (session.task.take(), session.vision_task.take())
-        };
-        // Abort + await outside the lock to avoid deadlocks.
-        if let Some(task) = task {
-            task.abort();
-            let _ = task.await;
-        }
-        if let Some(task) = vision_task {
-            task.abort();
-            let _ = task.await;
-        }
-    }
-
-    async fn spawn_workers(self: &Arc<Self>) {
-        let (vision_tx, vision_rx) = tokio::sync::mpsc::unbounded_channel::<CaptureFrame>();
-        // Store vision_tx before spawning workers so they can find it immediately.
-        {
-            let mut state = self.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.vision_tx = Some(vision_tx);
-            }
-        }
-        let capture_engine = self.clone();
-        let handle = tokio::spawn(async move {
-            super::capture_worker::run(capture_engine).await;
-        });
-        let processing_engine = self.clone();
-        let vision_handle = tokio::spawn(async move {
-            super::processing_worker::run(processing_engine, vision_rx).await;
-        });
-        {
-            let mut state = self.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.task = Some(handle);
-                session.vision_task = Some(vision_handle);
-            }
-        }
-    }
-
-    // ── Permissions ──────────────────────────────────────────────────
-
-    pub async fn request_permissions(&self) -> Result<PermissionStatus, String> {
-        if !cfg!(target_os = "macos") {
-            return Ok(PermissionStatus {
-                screen_recording: PermissionState::Unsupported,
-                accessibility: PermissionState::Unsupported,
-                input_monitoring: PermissionState::Unsupported,
-                microphone: PermissionState::Unsupported,
-            });
-        }
-
-        self.request_permission(PermissionKind::Accessibility)
-            .await?;
-        self.request_permission(PermissionKind::InputMonitoring)
-            .await?;
-
-        let mut state = self.inner.lock().await;
-        state.permissions = detect_permissions();
-        state.last_event = Some("permissions_requested:accessibility,input_monitoring".to_string());
-        Ok(state.permissions.clone())
-    }
-
-    pub async fn request_permission(
-        &self,
-        permission: PermissionKind,
-    ) -> Result<PermissionStatus, String> {
-        // Microphone permission is cross-platform; other permissions are macOS-only.
-        if matches!(permission, PermissionKind::Microphone) {
-            request_microphone_access();
-        } else if !cfg!(target_os = "macos") {
-            return Ok(PermissionStatus {
-                screen_recording: PermissionState::Unsupported,
-                accessibility: PermissionState::Unsupported,
-                input_monitoring: PermissionState::Unsupported,
-                microphone: PermissionState::Unsupported,
-            });
-        } else {
-            #[cfg(target_os = "macos")]
-            {
-                match permission {
-                    PermissionKind::ScreenRecording => {
-                        request_screen_recording_access();
-                        open_macos_privacy_pane("Privacy_ScreenCapture");
-                    }
-                    PermissionKind::Accessibility => {
-                        request_accessibility_access();
-                        open_macos_privacy_pane("Privacy_Accessibility");
-                    }
-                    PermissionKind::InputMonitoring => {
-                        open_macos_privacy_pane("Privacy_ListenEvent");
-                    }
-                    PermissionKind::Microphone => unreachable!(),
-                }
-            }
-        }
-
-        let mut state = self.inner.lock().await;
-        state.permissions = detect_permissions();
-        state.last_event = Some(format!(
-            "permission_requested:{}",
-            permission_to_str(permission)
-        ));
-        Ok(state.permissions.clone())
-    }
-
-    // ── Status ───────────────────────────────────────────────────────
-
-    pub async fn status(&self) -> AccessibilityStatus {
-        let mut state = self.inner.lock().await;
-        state.permissions = detect_permissions();
-
-        let context = foreground_context();
-        let foreground_context = context.as_ref().map(|ctx| AppContextInfo {
-            app_name: ctx.app_name.clone(),
-            window_title: ctx.window_title.clone(),
-            bounds_x: ctx.bounds.map(|b| b.x),
-            bounds_y: ctx.bounds.map(|b| b.y),
-            bounds_width: ctx.bounds.map(|b| b.width),
-            bounds_height: ctx.bounds.map(|b| b.height),
-        });
-        let blocked = context
-            .as_ref()
-            .map(|ctx| !self.should_capture_context(ctx, &state.config))
-            .unwrap_or(false);
-
-        let now = now_ms();
-        let session = match &state.session {
-            Some(s) => SessionStatus {
-                active: true,
-                started_at_ms: Some(s.started_at_ms),
-                expires_at_ms: Some(s.expires_at_ms),
-                remaining_ms: Some((s.expires_at_ms - now).max(0)),
-                ttl_secs: s.ttl_secs,
-                panic_hotkey: s.panic_hotkey.clone(),
-                stop_reason: s.stop_reason.clone(),
-                capture_count: s.capture_count,
-                frames_in_memory: s.frames.len(),
-                last_capture_at_ms: s.last_capture_at_ms,
-                last_context: s.last_context.as_ref().and_then(|c| c.app_name.clone()),
-                last_window_title: s.last_context.as_ref().and_then(|c| c.window_title.clone()),
-                vision_enabled: s.vision_enabled,
-                vision_state: s.vision_state.clone(),
-                vision_queue_depth: s.vision_queue_depth,
-                last_vision_at_ms: s.last_vision_at_ms,
-                last_vision_summary: s.last_vision_summary.clone(),
-                vision_persist_count: s.vision_persist_count,
-                last_vision_persisted_key: s.last_vision_persisted_key.clone(),
-                last_vision_persist_error: s.last_vision_persist_error.clone(),
-            },
-            None => SessionStatus {
-                active: false,
-                started_at_ms: None,
-                expires_at_ms: None,
-                remaining_ms: None,
-                ttl_secs: state.config.session_ttl_secs,
-                panic_hotkey: state.config.panic_stop_hotkey.clone(),
-                stop_reason: None,
-                capture_count: 0,
-                frames_in_memory: 0,
-                last_capture_at_ms: None,
-                last_context: None,
-                last_window_title: None,
-                vision_enabled: state.config.vision_enabled,
-                vision_state: "idle".to_string(),
-                vision_queue_depth: 0,
-                last_vision_at_ms: None,
-                last_vision_summary: None,
-                vision_persist_count: 0,
-                last_vision_persisted_key: None,
-                last_vision_persist_error: None,
-            },
-        };
-
-        AccessibilityStatus {
-            platform_supported: cfg!(target_os = "macos"),
-            permissions: state.permissions.clone(),
-            features: state.features.clone(),
-            session,
-            foreground_context,
-            config: state.config.clone(),
-            denylist: state.config.denylist.clone(),
-            is_context_blocked: blocked,
-            permission_check_process_path: std::env::current_exe()
-                .ok()
-                .map(|p| p.display().to_string()),
-            core_process: Some(CoreProcessStatus {
-                pid: std::process::id(),
-                started_at_ms: core_process_started_at_ms(),
-            }),
-        }
-    }
-
-    // ── Capture actions ──────────────────────────────────────────────
-
-    pub async fn capture_now(&self) -> Result<CaptureNowResult, String> {
-        let mut state = self.inner.lock().await;
-        let context = foreground_context();
-
-        let Some(session) = state.session.as_mut() else {
-            return Ok(CaptureNowResult {
-                accepted: false,
-                frame: None,
-            });
-        };
-
-        let has_window_id = context.as_ref().and_then(|c| c.window_id).is_some();
-        if !has_window_id {
-            tracing::debug!(
-                "[screen_intelligence] capture_now: no window_id for app={:?}",
-                context.as_ref().and_then(|c| c.app_name.as_deref()),
-            );
-            session.last_context = context;
-            return Ok(CaptureNowResult {
-                accepted: false,
-                frame: None,
-            });
-        }
-
-        let frame = CaptureFrame {
-            captured_at_ms: now_ms(),
-            reason: "manual_capture".to_string(),
-            app_name: context.as_ref().and_then(|c| c.app_name.clone()),
-            window_title: context.as_ref().and_then(|c| c.window_title.clone()),
-            image_ref: capture_screen_image_ref_for_context(context.as_ref()).ok(),
-        };
-
-        push_ephemeral_frame(&mut session.frames, frame.clone());
-        session.capture_count = session.capture_count.saturating_add(1);
-        session.last_capture_at_ms = Some(frame.captured_at_ms);
-        session.last_context = context;
-        if frame.image_ref.is_some() && session.vision_enabled {
-            if let Some(tx) = session.vision_tx.as_ref() {
-                if tx.send(frame.clone()).is_ok() {
-                    session.vision_queue_depth = session.vision_queue_depth.saturating_add(1);
-                }
-            }
-        }
-        state.last_event = Some("capture_now".to_string());
-
-        Ok(CaptureNowResult {
-            accepted: true,
-            frame: Some(frame),
-        })
-    }
-
-    pub async fn capture_image_ref_test(&self) -> CaptureImageRefResult {
-        let context = foreground_context();
-        match capture_screen_image_ref_for_context(context.as_ref()) {
-            Ok(image_ref) => {
-                let bytes_estimate = image_ref
-                    .strip_prefix("data:image/png;base64,")
-                    .map(|payload| payload.len() * 3 / 4);
-                CaptureImageRefResult {
-                    ok: true,
-                    image_ref: Some(image_ref),
-                    mime_type: "image/png".to_string(),
-                    bytes_estimate,
-                    message: "screen capture completed".to_string(),
-                }
-            }
-            Err(err) => CaptureImageRefResult {
-                ok: false,
-                image_ref: None,
-                mime_type: "image/png".to_string(),
-                bytes_estimate: None,
-                message: err,
-            },
-        }
-    }
-
-    pub async fn capture_test(&self) -> CaptureTestResult {
-        let start = std::time::Instant::now();
-        let context = foreground_context();
-
-        let context_info = context.as_ref().map(|c| AppContextInfo {
-            app_name: c.app_name.clone(),
-            window_title: c.window_title.clone(),
-            bounds_x: c.bounds.as_ref().map(|b| b.x),
-            bounds_y: c.bounds.as_ref().map(|b| b.y),
-            bounds_width: c.bounds.as_ref().map(|b| b.width),
-            bounds_height: c.bounds.as_ref().map(|b| b.height),
-        });
-
-        let has_bounds = context
-            .as_ref()
-            .and_then(|c| c.bounds.as_ref())
-            .map(|b| b.width > 0 && b.height > 0)
-            .unwrap_or(false);
-
-        let capture_mode = if has_bounds {
-            "windowed".to_string()
-        } else {
-            "fullscreen".to_string()
-        };
-
-        match capture_screen_image_ref_for_context(context.as_ref()) {
-            Ok(image_ref) => {
-                let bytes_estimate = image_ref
-                    .strip_prefix("data:image/png;base64,")
-                    .map(|payload| payload.len() * 3 / 4);
-                CaptureTestResult {
-                    ok: true,
-                    capture_mode,
-                    context: context_info,
-                    image_ref: Some(image_ref),
-                    bytes_estimate,
-                    error: None,
-                    timing_ms: start.elapsed().as_millis() as u64,
-                }
-            }
-            Err(err) => CaptureTestResult {
-                ok: false,
-                capture_mode,
-                context: context_info,
-                image_ref: None,
-                bytes_estimate: None,
-                error: Some(err),
-                timing_ms: start.elapsed().as_millis() as u64,
-            },
-        }
-    }
-
-    /// Save the image payload from a [`CaptureTestResult`] to disk, reconstructing
-    /// the minimum [`CaptureFrame`] needed by [`save_screenshot_to_disk`].
-    ///
-    /// Returns `None` when the result carries no `image_ref` (nothing to save).
-    /// Callers supply a `reason` string to label the frame (e.g. `"cli_capture"`).
-    pub(crate) fn save_capture_test_result(
-        workspace_dir: &std::path::Path,
-        result: &CaptureTestResult,
-        reason: &str,
-    ) -> Option<Result<PathBuf, String>> {
-        let image_ref = result.image_ref.as_ref()?.clone();
-        let frame = CaptureFrame {
-            captured_at_ms: chrono::Utc::now().timestamp_millis(),
-            reason: reason.to_string(),
-            app_name: result.context.as_ref().and_then(|c| c.app_name.clone()),
-            window_title: result.context.as_ref().and_then(|c| c.window_title.clone()),
-            image_ref: Some(image_ref),
-        };
-        Some(Self::save_screenshot_to_disk(workspace_dir, &frame))
-    }
-
-    /// Save a screenshot PNG to `{workspace_dir}/screenshots/{timestamp}_{app}.png`.
-    pub fn save_screenshot_to_disk(
-        workspace_dir: &std::path::Path,
-        frame: &CaptureFrame,
-    ) -> Result<PathBuf, String> {
-        use base64::{engine::general_purpose::STANDARD as B64, Engine};
-
-        let image_ref = frame
-            .image_ref
-            .as_deref()
-            .ok_or_else(|| "frame has no image payload".to_string())?;
-
-        let b64_payload = if let Some(pos) = image_ref.find(";base64,") {
-            &image_ref[pos + 8..]
-        } else {
-            image_ref
-        };
-
-        let raw_bytes = B64
-            .decode(b64_payload)
-            .map_err(|e| format!("base64 decode for screenshot save failed: {e}"))?;
-
-        let screenshots_dir = workspace_dir.join("screenshots");
-        std::fs::create_dir_all(&screenshots_dir)
-            .map_err(|e| format!("failed to create screenshots dir: {e}"))?;
-
-        let app_slug: String = frame
-            .app_name
-            .as_deref()
-            .unwrap_or("unknown")
-            .chars()
-            .map(|c| {
-                if c.is_alphanumeric() || c == '-' {
-                    c
-                } else {
-                    '_'
-                }
-            })
-            .collect();
-        let filename = format!("{}_{}.png", frame.captured_at_ms, app_slug);
-        let file_path = screenshots_dir.join(&filename);
-
-        std::fs::write(&file_path, &raw_bytes)
-            .map_err(|e| format!("failed to write screenshot {filename}: {e}"))?;
-
-        tracing::debug!(
-            "[screen_intelligence] screenshot saved: {} ({} bytes)",
-            file_path.display(),
-            raw_bytes.len()
-        );
-        Ok(file_path)
-    }
-
-    // ── Policy ───────────────────────────────────────────────────────
-
-    pub(crate) fn rule_matches_context(&self, ctx: &AppContext, rules: &[String]) -> bool {
-        let compound = ctx.as_compound_text();
-        rules
-            .iter()
-            .any(|d| !d.trim().is_empty() && compound.contains(&d.to_lowercase()))
-    }
-
-    pub(crate) fn should_capture_context(
-        &self,
-        ctx: &AppContext,
-        config: &ScreenIntelligenceConfig,
-    ) -> bool {
-        let blacklisted = self.rule_matches_context(ctx, &config.denylist);
-        let whitelisted = self.rule_matches_context(ctx, &config.allowlist);
-
-        match config.policy_mode.as_str() {
-            "whitelist_only" => whitelisted && !blacklisted,
-            _ => !blacklisted,
-        }
-    }
-}
-
-fn core_process_started_at_ms() -> i64 {
-    static CORE_PROCESS_STARTED_AT_MS: OnceLock<i64> = OnceLock::new();
-    *CORE_PROCESS_STARTED_AT_MS.get_or_init(now_ms)
-}
-
-// ── Helpers ─────────────────────────────────────────────────────────────
-
-fn new_session_runtime(
-    config: &ScreenIntelligenceConfig,
-    now: i64,
-    expires_at_ms: i64,
-    ttl_secs: u64,
-) -> SessionRuntime {
-    SessionRuntime {
-        started_at_ms: now,
-        expires_at_ms,
-        ttl_secs,
-        panic_hotkey: config.panic_stop_hotkey.clone(),
-        stop_reason: None,
-        last_capture_at_ms: None,
-        capture_count: 0,
-        frames: VecDeque::new(),
-        last_context: None,
-        task: None,
-        vision_enabled: config.vision_enabled,
-        vision_state: "idle".to_string(),
-        vision_queue_depth: 0,
-        last_vision_at_ms: None,
-        last_vision_summary: None,
-        vision_persist_count: 0,
-        last_vision_persisted_key: None,
-        last_vision_persist_error: None,
-        vision_summaries: VecDeque::new(),
-        vision_task: None,
-        vision_tx: None,
-    }
-}
-
-#[cfg(test)]
-#[path = "engine_tests.rs"]
-mod tests;
diff --git a/src/openhuman/screen_intelligence/engine_tests.rs b/src/openhuman/screen_intelligence/engine_tests.rs
deleted file mode 100644
index c29c58e03..000000000
--- a/src/openhuman/screen_intelligence/engine_tests.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[cfg(target_os = "macos")]
-use super::*;
-#[cfg(target_os = "macos")]
-use crate::openhuman::screen_intelligence::state::EngineState;
-#[cfg(target_os = "macos")]
-use tokio::sync::Mutex;
-#[cfg(target_os = "macos")]
-use tokio::time::Duration;
-
-#[cfg(target_os = "macos")]
-#[tokio::test]
-async fn enable_with_existing_session_does_not_deadlock() {
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig {
-            enabled: true,
-            ..Default::default()
-        })),
-    });
-
-    {
-        let mut state = engine.inner.lock().await;
-        state.session = Some(new_session_runtime(&state.config, now_ms(), i64::MAX, 300));
-    }
-
-    let result = tokio::time::timeout(Duration::from_millis(250), engine.enable()).await;
-    assert!(
-        result.is_ok(),
-        "enable should not deadlock with an active session"
-    );
-    assert!(
-        result.unwrap().is_ok(),
-        "enable should return the existing session status"
-    );
-}
diff --git a/src/openhuman/screen_intelligence/helpers.rs b/src/openhuman/screen_intelligence/helpers.rs
deleted file mode 100644
index 12960408f..000000000
--- a/src/openhuman/screen_intelligence/helpers.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-use crate::openhuman::memory_store::NamespaceDocumentInput;
-use std::collections::VecDeque;
-use uuid::Uuid;
-
-use super::limits::{MAX_CONTEXT_CHARS, MAX_EPHEMERAL_FRAMES, MAX_EPHEMERAL_VISION_SUMMARIES};
-use super::types::{AutocompleteSuggestion, CaptureFrame, InputActionParams, VisionSummary};
-
-/// Default confidence score used when the model does not provide one.
-/// Applied consistently across both JSON and plain-text vision output branches.
-const DEFAULT_VISION_CONFIDENCE: f32 = 0.8;
-
-pub(crate) const VISION_MEMORY_NAMESPACE: &str = "background";
-pub(crate) const VISION_MEMORY_SOURCE_TYPE: &str = "screenshot";
-pub(crate) const VISION_MEMORY_CATEGORY: &str = "screen_intelligence";
-pub(crate) const VISION_MEMORY_TAG: &str = "screen_intelligence";
-
-#[derive(Debug, Clone)]
-pub(crate) struct PersistVisionSummaryResult {
-    pub namespace: String,
-    pub key: String,
-}
-
-pub(crate) fn validate_input_action(action: &InputActionParams) -> Result<(), String> {
-    match action.action.as_str() {
-        "mouse_move" | "mouse_click" | "mouse_drag" => {
-            let x = action
-                .x
-                .ok_or_else(|| "x coordinate is required".to_string())?;
-            let y = action
-                .y
-                .ok_or_else(|| "y coordinate is required".to_string())?;
-            if !(0..=10000).contains(&x) || !(0..=10000).contains(&y) {
-                return Err("coordinates must be between 0 and 10000".to_string());
-            }
-        }
-        "key_type" => {
-            let text = action
-                .text
-                .as_ref()
-                .ok_or_else(|| "text is required for key_type".to_string())?;
-            if text.is_empty() || text.len() > MAX_CONTEXT_CHARS {
-                return Err("text length must be between 1 and 256".to_string());
-            }
-        }
-        "key_press" => {
-            let key = action
-                .key
-                .as_ref()
-                .ok_or_else(|| "key is required for key_press".to_string())?;
-            if key.trim().is_empty() {
-                return Err("key cannot be empty".to_string());
-            }
-        }
-        other => {
-            return Err(format!("unsupported input action: {other}"));
-        }
-    }
-
-    Ok(())
-}
-
-pub(crate) fn push_ephemeral_frame(frames: &mut VecDeque<CaptureFrame>, frame: CaptureFrame) {
-    frames.push_back(frame);
-    while frames.len() > MAX_EPHEMERAL_FRAMES {
-        let _ = frames.pop_front();
-    }
-}
-
-pub(crate) fn push_ephemeral_vision_summary(
-    summaries: &mut VecDeque<VisionSummary>,
-    summary: VisionSummary,
-) {
-    // Deduplicate: skip if a summary with the same captured_at_ms already exists.
-    // This prevents `vision_flush` from storing duplicates when called concurrently
-    // with the processing worker channel path.
-    if summaries
-        .iter()
-        .any(|s| s.captured_at_ms == summary.captured_at_ms)
-    {
-        tracing::debug!(
-            "[screen_intelligence] skipping duplicate vision summary (captured_at_ms={})",
-            summary.captured_at_ms
-        );
-        return;
-    }
-    summaries.push_back(summary);
-    while summaries.len() > MAX_EPHEMERAL_VISION_SUMMARIES {
-        let _ = summaries.pop_front();
-    }
-}
-
-pub(crate) fn parse_vision_summary_output(frame: CaptureFrame, raw: &str) -> VisionSummary {
-    let trimmed = raw.trim();
-
-    // Try JSON first (backwards compat / mock testing).
-    if let Ok(value) = serde_json::from_str::<serde_json::Value>(trimmed) {
-        let ui_state = value
-            .get("ui_state")
-            .and_then(|v| v.as_str())
-            .unwrap_or("")
-            .trim();
-        let key_text = value
-            .get("key_text")
-            .and_then(|v| v.as_str())
-            .unwrap_or("")
-            .trim();
-        let actionable_notes = value
-            .get("actionable_notes")
-            .and_then(|v| v.as_str())
-            .unwrap_or("")
-            .trim();
-        let confidence = value
-            .get("confidence")
-            .and_then(|v| v.as_f64())
-            .map(|v| v as f32)
-            .unwrap_or(DEFAULT_VISION_CONFIDENCE)
-            .clamp(0.0, 1.0);
-
-        return VisionSummary {
-            id: format!("vision-{}-{}", frame.captured_at_ms, Uuid::new_v4()),
-            captured_at_ms: frame.captured_at_ms,
-            app_name: frame.app_name,
-            window_title: frame.window_title,
-            ui_state: truncate_tail(ui_state, 500),
-            key_text: truncate_tail(key_text, 2000),
-            actionable_notes: truncate_tail(actionable_notes, 1000),
-            confidence,
-        };
-    }
-
-    // Plain text mode: first line = ui_state, second line = actionable_notes,
-    // rest = key_text (the full content extraction).
-    let mut lines = trimmed.lines();
-    let ui_state = lines.next().unwrap_or("").trim().to_string();
-    let actionable_notes = lines.next().unwrap_or("").trim().to_string();
-    let key_text: String = lines.collect::<Vec<_>>().join("\n").trim().to_string();
-
-    VisionSummary {
-        id: format!("vision-{}-{}", frame.captured_at_ms, Uuid::new_v4()),
-        captured_at_ms: frame.captured_at_ms,
-        app_name: frame.app_name,
-        window_title: frame.window_title,
-        ui_state: truncate_tail(&ui_state, 500),
-        key_text: truncate_tail(&key_text, 4000),
-        actionable_notes: truncate_tail(&actionable_notes, 1000),
-        confidence: DEFAULT_VISION_CONFIDENCE,
-    }
-}
-
-pub(crate) async fn persist_vision_summary(
-    summary: VisionSummary,
-) -> Result<PersistVisionSummaryResult, String> {
-    // Create a MemoryClient from the current config each time.  This is safe
-    // because put_doc_light does no background work (no vectors, no graph) so
-    // the client's ingestion queue is never used and can be dropped immediately.
-    // We intentionally avoid the process-global singleton here because tests
-    // override OPENHUMAN_WORKSPACE per-test and the global may point elsewhere.
-    let config = crate::openhuman::config::Config::load_or_init()
-        .await
-        .map_err(|err| format!("config load failed: {err}"))?;
-    let client =
-        crate::openhuman::memory_store::MemoryClient::from_workspace_dir(config.workspace_dir)
-            .map_err(|err| format!("memory init failed: {err}"))?;
-
-    let ts = chrono::DateTime::from_timestamp_millis(summary.captured_at_ms)
-        .map(|dt| dt.format("%Y-%m-%d %H:%M:%S UTC").to_string())
-        .unwrap_or_else(|| summary.captured_at_ms.to_string());
-    let app = summary.app_name.as_deref().unwrap_or("Unknown");
-    let window = summary.window_title.as_deref().unwrap_or("");
-
-    let title = format!("Screen capture — {} — {}", app, ts);
-
-    // YAML frontmatter for metadata, body is clean markdown content.
-    // Limitation: escaping is best-effort — only double-quotes and newlines are
-    // escaped. Values containing YAML-special characters like `:`, `{`, `}`, `[`,
-    // `]`, `#`, `|`, `>`, `&`, `*` may still produce invalid YAML in edge cases.
-    let yaml_escape = |s: &str| -> String {
-        s.replace('"', "\\\"")
-            .replace('\n', "\\n")
-            .replace('\r', "")
-    };
-    let mut content = String::from("---\n");
-    content.push_str(&format!("app: \"{}\"\n", yaml_escape(app)));
-    if !window.is_empty() {
-        content.push_str(&format!("window: \"{}\"\n", yaml_escape(window)));
-    }
-    content.push_str(&format!("captured: \"{}\"\n", ts));
-    content.push_str(&format!("captured_ms: {}\n", summary.captured_at_ms));
-    content.push_str(&format!("confidence: {:.2}\n", summary.confidence));
-    content.push_str(&format!("id: \"{}\"\n", summary.id));
-    content.push_str("---\n\n");
-
-    // key_text = synthesized summary (the main document body)
-    if !summary.key_text.is_empty() {
-        content.push_str(&format!("{}\n", summary.key_text));
-    }
-
-    let key = vision_summary_memory_key(&summary);
-    let document = NamespaceDocumentInput {
-        namespace: VISION_MEMORY_NAMESPACE.to_string(),
-        key: key.clone(),
-        title,
-        content,
-        source_type: VISION_MEMORY_SOURCE_TYPE.to_string(),
-        priority: "medium".to_string(),
-        tags: vec![VISION_MEMORY_TAG.to_string()],
-        metadata: serde_json::json!({}),
-        category: VISION_MEMORY_CATEGORY.to_string(),
-        session_id: None,
-        document_id: None,
-        // Screen-intelligence captures the user's own active window;
-        // not third-party sync content. Internal preserves the
-        // baseline subconscious-trust behaviour.
-        taint: crate::openhuman::memory::MemoryTaint::Internal,
-    };
-
-    // put_doc_light stores the document (DB row + markdown file) without
-    // vector embedding or graph extraction — screen captures are too frequent
-    // and ephemeral to justify the heavier ingestion path per frame.
-    client
-        .put_doc_light(document)
-        .await
-        .map_err(|err| format!("memory upsert failed: {err}"))?;
-
-    tracing::debug!(
-        "[screen_intelligence] persisted vision summary into unified memory (namespace={} key={} app={:?} captured_at_ms={})",
-        VISION_MEMORY_NAMESPACE,
-        key,
-        summary.app_name,
-        summary.captured_at_ms
-    );
-
-    Ok(PersistVisionSummaryResult {
-        namespace: VISION_MEMORY_NAMESPACE.to_string(),
-        key,
-    })
-}
-
-pub(crate) fn vision_summary_memory_key(summary: &VisionSummary) -> String {
-    format!(
-        "screen_intelligence_{}_{}",
-        summary.captured_at_ms,
-        stable_decimal_hash(&summary.id)
-    )
-}
-
-fn stable_decimal_hash(value: &str) -> u64 {
-    let mut hash = 0xcbf29ce484222325u64;
-    for byte in value.as_bytes() {
-        hash ^= u64::from(*byte);
-        hash = hash.wrapping_mul(0x100000001b3);
-    }
-    hash
-}
-
-pub(crate) fn truncate_tail(text: &str, max_chars: usize) -> String {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.len() <= max_chars {
-        return text.to_string();
-    }
-    chars[chars.len() - max_chars..].iter().collect()
-}
-
-pub(crate) fn generate_suggestions(
-    context: &str,
-    max_results: usize,
-) -> Vec<AutocompleteSuggestion> {
-    let trimmed = context.trim();
-    let lower = trimmed.to_lowercase();
-
-    let mut out = Vec::new();
-    if lower.ends_with("thanks") || lower.ends_with("thank you") {
-        out.push(AutocompleteSuggestion {
-            value: " for your help!".to_string(),
-            confidence: 0.89,
-        });
-    }
-    if lower.contains("meeting") {
-        out.push(AutocompleteSuggestion {
-            value: " tomorrow at 10am works for me.".to_string(),
-            confidence: 0.84,
-        });
-    }
-    if lower.contains("ship") || lower.contains("release") {
-        out.push(AutocompleteSuggestion {
-            value: " after we pass QA and smoke tests.".to_string(),
-            confidence: 0.81,
-        });
-    }
-
-    if out.is_empty() {
-        out.push(AutocompleteSuggestion {
-            value: " Please share any constraints and I can refine this.".to_string(),
-            confidence: 0.55,
-        });
-    }
-
-    out.truncate(max_results);
-    out
-}
diff --git a/src/openhuman/screen_intelligence/image_processing.rs b/src/openhuman/screen_intelligence/image_processing.rs
deleted file mode 100644
index 75e841562..000000000
--- a/src/openhuman/screen_intelligence/image_processing.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-//! Image compression and resizing for screenshot intelligence.
-//!
-//! Before sending screenshots to the vision LLM we shrink them:
-//!   1. Decode the base64 PNG data-URI into pixels.
-//!   2. Resize so the longest edge fits within `max_dimension` (default 1024 px).
-//!   3. Re-encode as JPEG at a configurable quality (default 72).
-//!   4. Return a `data:image/jpeg;base64,…` URI ready for the Ollama vision API.
-//!
-//! Smaller images mean fewer tokens, faster inference, and lower memory pressure.
-
-use base64::{engine::general_purpose::STANDARD as B64, Engine};
-use image::codecs::jpeg::JpegEncoder;
-use image::imageops::FilterType;
-use image::{DynamicImage, ImageReader};
-use std::io::Cursor;
-
-/// Default longest-edge cap (pixels). Vision models rarely benefit from
-/// more than 1024 px on the long side for UI-screenshot analysis.
-pub(crate) const DEFAULT_MAX_DIMENSION: u32 = 1024;
-
-/// Default JPEG quality (1-100). 72 is a good trade-off: visually acceptable
-/// for UI text while cutting size by ~70-85 % compared to PNG.
-pub(crate) const DEFAULT_JPEG_QUALITY: u8 = 72;
-
-/// Result of compressing a screenshot.
-#[derive(Debug, Clone)]
-pub(crate) struct CompressedImage {
-    /// `data:image/jpeg;base64,…` ready for the vision API.
-    pub data_uri: String,
-    /// Original decoded size in bytes (raw PNG payload).
-    pub original_bytes: usize,
-    /// Compressed JPEG size in bytes.
-    pub compressed_bytes: usize,
-    /// Original dimensions (width, height).
-    pub original_dimensions: (u32, u32),
-    /// Final dimensions after resize (width, height).
-    pub final_dimensions: (u32, u32),
-}
-
-/// Compress and resize a base64 PNG data-URI for vision LLM consumption.
-///
-/// Accepts a full `data:image/png;base64,…` URI **or** a raw base64 string.
-/// Returns `Err` if the payload cannot be decoded as a valid image.
-pub(crate) fn compress_screenshot(
-    image_ref: &str,
-    max_dimension: Option<u32>,
-    jpeg_quality: Option<u8>,
-) -> Result<CompressedImage, String> {
-    let max_dim = max_dimension.unwrap_or(DEFAULT_MAX_DIMENSION).max(64);
-    let quality = jpeg_quality.unwrap_or(DEFAULT_JPEG_QUALITY).clamp(10, 100);
-
-    // ── 1. Strip data-URI prefix and decode base64 ──────────────────────
-    let b64_payload = strip_data_uri_prefix(image_ref);
-    let raw_bytes = B64
-        .decode(b64_payload)
-        .map_err(|e| format!("base64 decode failed: {e}"))?;
-    let original_bytes = raw_bytes.len();
-
-    // ── 2. Decode into pixels ───────────────────────────────────────────
-    let img = ImageReader::new(Cursor::new(&raw_bytes))
-        .with_guessed_format()
-        .map_err(|e| format!("image format detection failed: {e}"))?
-        .decode()
-        .map_err(|e| format!("image decode failed: {e}"))?;
-
-    let original_dimensions = (img.width(), img.height());
-
-    // ── 3. Resize if needed ─────────────────────────────────────────────
-    let resized = resize_to_fit(img, max_dim);
-    let final_dimensions = (resized.width(), resized.height());
-
-    // ── 4. Encode as JPEG ───────────────────────────────────────────────
-    let jpeg_bytes = encode_jpeg(&resized, quality)?;
-    let compressed_bytes = jpeg_bytes.len();
-
-    // ── 5. Build data-URI ───────────────────────────────────────────────
-    let b64_out = B64.encode(&jpeg_bytes);
-    let data_uri = format!("data:image/jpeg;base64,{b64_out}");
-
-    tracing::debug!(
-        "[screen_intelligence] image compressed: {}x{} -> {}x{}, {} -> {} bytes ({:.0}% reduction)",
-        original_dimensions.0,
-        original_dimensions.1,
-        final_dimensions.0,
-        final_dimensions.1,
-        original_bytes,
-        compressed_bytes,
-        (1.0 - compressed_bytes as f64 / original_bytes as f64) * 100.0,
-    );
-
-    Ok(CompressedImage {
-        data_uri,
-        original_bytes,
-        compressed_bytes,
-        original_dimensions,
-        final_dimensions,
-    })
-}
-
-/// Strip common data-URI prefixes, returning the raw base64 payload.
-fn strip_data_uri_prefix(input: &str) -> &str {
-    // Handle: data:image/png;base64,… | data:image/jpeg;base64,… | data:image/*;base64,…
-    if let Some(pos) = input.find(";base64,") {
-        &input[pos + 8..]
-    } else {
-        input
-    }
-}
-
-/// Resize `img` so neither dimension exceeds `max_dim`, preserving aspect ratio.
-/// If both dimensions are already within bounds the image is returned unchanged.
-fn resize_to_fit(img: DynamicImage, max_dim: u32) -> DynamicImage {
-    let (w, h) = (img.width(), img.height());
-    if w <= max_dim && h <= max_dim {
-        return img;
-    }
-
-    let scale = max_dim as f64 / w.max(h) as f64;
-    let new_w = ((w as f64 * scale).round() as u32).max(1);
-    let new_h = ((h as f64 * scale).round() as u32).max(1);
-
-    // Lanczos3 gives crisp text edges — important for UI screenshots.
-    img.resize_exact(new_w, new_h, FilterType::Lanczos3)
-}
-
-/// Encode a `DynamicImage` as JPEG bytes at the given quality.
-fn encode_jpeg(img: &DynamicImage, quality: u8) -> Result<Vec<u8>, String> {
-    let rgb = img.to_rgb8();
-    let mut buf: Vec<u8> = Vec::new();
-    let encoder = JpegEncoder::new_with_quality(&mut buf, quality);
-    rgb.write_with_encoder(encoder)
-        .map_err(|e| format!("JPEG encode failed: {e}"))?;
-    Ok(buf)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use image::{ImageBuffer, Rgb, RgbImage};
-
-    /// Helper: create a solid-color PNG image of given dimensions and return
-    /// its `data:image/png;base64,…` URI.
-    fn make_test_png(width: u32, height: u32, color: [u8; 3]) -> String {
-        let img: RgbImage = ImageBuffer::from_fn(width, height, |_, _| Rgb(color));
-        let mut png_bytes: Vec<u8> = Vec::new();
-        let encoder = image::codecs::png::PngEncoder::new(&mut png_bytes);
-        img.write_with_encoder(encoder).expect("PNG encode");
-        let b64 = B64.encode(&png_bytes);
-        format!("data:image/png;base64,{b64}")
-    }
-
-    // ── Basic compression ───────────────────────────────────────────────
-
-    #[test]
-    fn compress_reduces_size_for_large_image() {
-        let uri = make_test_png(2048, 1536, [100, 150, 200]);
-        let result = compress_screenshot(&uri, None, None).unwrap();
-
-        assert!(
-            result.compressed_bytes < result.original_bytes,
-            "JPEG should be smaller than PNG for a large solid image"
-        );
-        assert_eq!(result.original_dimensions, (2048, 1536));
-        assert!(
-            result.final_dimensions.0 <= DEFAULT_MAX_DIMENSION,
-            "width should be capped"
-        );
-        assert!(
-            result.final_dimensions.1 <= DEFAULT_MAX_DIMENSION,
-            "height should be capped"
-        );
-        assert!(result.data_uri.starts_with("data:image/jpeg;base64,"));
-    }
-
-    #[test]
-    fn compress_preserves_aspect_ratio() {
-        let uri = make_test_png(2000, 1000, [255, 0, 0]);
-        let result = compress_screenshot(&uri, Some(500), None).unwrap();
-
-        // 2000x1000 → 500x250  (long edge capped at 500)
-        assert_eq!(result.final_dimensions.0, 500);
-        assert_eq!(result.final_dimensions.1, 250);
-    }
-
-    #[test]
-    fn compress_portrait_image() {
-        let uri = make_test_png(600, 1800, [0, 255, 0]);
-        let result = compress_screenshot(&uri, Some(900), None).unwrap();
-
-        // 600x1800 → 300x900  (height is long edge)
-        assert_eq!(result.final_dimensions.1, 900);
-        assert_eq!(result.final_dimensions.0, 300);
-    }
-
-    // ── No-resize path ──────────────────────────────────────────────────
-
-    #[test]
-    fn small_image_not_resized() {
-        let uri = make_test_png(200, 150, [50, 50, 50]);
-        let result = compress_screenshot(&uri, Some(1024), None).unwrap();
-
-        assert_eq!(result.original_dimensions, result.final_dimensions);
-    }
-
-    #[test]
-    fn exact_max_dimension_not_resized() {
-        let uri = make_test_png(1024, 768, [80, 80, 80]);
-        let result = compress_screenshot(&uri, Some(1024), None).unwrap();
-
-        assert_eq!(result.final_dimensions, (1024, 768));
-    }
-
-    // ── Quality settings ────────────────────────────────────────────────
-
-    #[test]
-    fn lower_quality_produces_smaller_output() {
-        let uri = make_test_png(800, 600, [128, 64, 200]);
-        let high = compress_screenshot(&uri, None, Some(95)).unwrap();
-        let low = compress_screenshot(&uri, None, Some(30)).unwrap();
-
-        assert!(
-            low.compressed_bytes < high.compressed_bytes,
-            "quality 30 should produce smaller JPEG than quality 95"
-        );
-    }
-
-    #[test]
-    fn quality_clamped_to_valid_range() {
-        let uri = make_test_png(100, 100, [0, 0, 0]);
-        // quality below 10 should be clamped to 10
-        let result = compress_screenshot(&uri, None, Some(1)).unwrap();
-        assert!(result.compressed_bytes > 0);
-
-        // quality above 100 should be clamped to 100
-        let result2 = compress_screenshot(&uri, None, Some(255)).unwrap();
-        assert!(result2.compressed_bytes > 0);
-    }
-
-    // ── Data-URI prefix handling ────────────────────────────────────────
-
-    #[test]
-    fn handles_raw_base64_without_prefix() {
-        // Build raw base64 without data URI prefix
-        let img: RgbImage = ImageBuffer::from_fn(64, 64, |_, _| Rgb([255, 255, 255]));
-        let mut png_bytes: Vec<u8> = Vec::new();
-        let encoder = image::codecs::png::PngEncoder::new(&mut png_bytes);
-        img.write_with_encoder(encoder).expect("PNG encode");
-        let raw_b64 = B64.encode(&png_bytes);
-
-        let result = compress_screenshot(&raw_b64, None, None).unwrap();
-        assert_eq!(result.original_dimensions, (64, 64));
-    }
-
-    #[test]
-    fn handles_jpeg_data_uri_prefix() {
-        // Even if input is labeled as JPEG, we decode by content not prefix
-        let img: RgbImage = ImageBuffer::from_fn(64, 64, |_, _| Rgb([100, 100, 100]));
-        let mut png_bytes: Vec<u8> = Vec::new();
-        let encoder = image::codecs::png::PngEncoder::new(&mut png_bytes);
-        img.write_with_encoder(encoder).expect("PNG encode");
-        let b64 = B64.encode(&png_bytes);
-        let uri = format!("data:image/jpeg;base64,{b64}");
-
-        let result = compress_screenshot(&uri, None, None).unwrap();
-        assert_eq!(result.original_dimensions, (64, 64));
-    }
-
-    // ── Edge cases ──────────────────────────────────────────────────────
-
-    #[test]
-    fn tiny_1x1_image() {
-        let uri = make_test_png(1, 1, [255, 0, 0]);
-        let result = compress_screenshot(&uri, None, None).unwrap();
-
-        assert_eq!(result.original_dimensions, (1, 1));
-        assert_eq!(result.final_dimensions, (1, 1));
-    }
-
-    #[test]
-    fn very_wide_panoramic_image() {
-        let uri = make_test_png(4000, 100, [0, 0, 255]);
-        let result = compress_screenshot(&uri, Some(1024), None).unwrap();
-
-        assert_eq!(result.final_dimensions.0, 1024);
-        // 4000x100 → 1024x26 (proportional)
-        assert!(result.final_dimensions.1 > 0);
-        assert!(result.final_dimensions.1 <= 100);
-    }
-
-    #[test]
-    fn square_image() {
-        let uri = make_test_png(2000, 2000, [128, 128, 128]);
-        let result = compress_screenshot(&uri, Some(512), None).unwrap();
-
-        assert_eq!(result.final_dimensions, (512, 512));
-    }
-
-    #[test]
-    fn invalid_base64_returns_error() {
-        let result = compress_screenshot("data:image/png;base64,!!!invalid!!!", None, None);
-        assert!(result.is_err());
-        assert!(result.unwrap_err().contains("base64 decode failed"));
-    }
-
-    #[test]
-    fn valid_base64_but_not_image_returns_error() {
-        let b64 = B64.encode(b"this is not an image");
-        let uri = format!("data:image/png;base64,{b64}");
-        let result = compress_screenshot(&uri, None, None);
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn min_max_dimension_floor() {
-        // max_dimension below 64 should be clamped to 64
-        let uri = make_test_png(200, 200, [0, 0, 0]);
-        let result = compress_screenshot(&uri, Some(10), None).unwrap();
-        assert!(
-            result.final_dimensions.0 >= 64,
-            "max_dimension should be floored to 64"
-        );
-    }
-
-    // ── strip_data_uri_prefix ───────────────────────────────────────────
-
-    #[test]
-    fn strip_prefix_png() {
-        let input = "data:image/png;base64,ABCD1234";
-        assert_eq!(strip_data_uri_prefix(input), "ABCD1234");
-    }
-
-    #[test]
-    fn strip_prefix_jpeg() {
-        let input = "data:image/jpeg;base64,XYZ";
-        assert_eq!(strip_data_uri_prefix(input), "XYZ");
-    }
-
-    #[test]
-    fn strip_prefix_no_prefix() {
-        let input = "ABCD1234";
-        assert_eq!(strip_data_uri_prefix(input), "ABCD1234");
-    }
-
-    // ── Multicolored image (more realistic compression ratio) ───────────
-
-    #[test]
-    fn multicolored_image_compresses_well() {
-        // Create a gradient image that's more representative of real screenshots
-        let width = 1920u32;
-        let height = 1080u32;
-        let img: RgbImage = ImageBuffer::from_fn(width, height, |x, y| {
-            Rgb([(x % 256) as u8, (y % 256) as u8, ((x + y) % 256) as u8])
-        });
-        let mut png_bytes: Vec<u8> = Vec::new();
-        let encoder = image::codecs::png::PngEncoder::new(&mut png_bytes);
-        img.write_with_encoder(encoder).expect("PNG encode");
-        let b64 = B64.encode(&png_bytes);
-        let uri = format!("data:image/png;base64,{b64}");
-
-        let result = compress_screenshot(&uri, Some(1024), Some(72)).unwrap();
-
-        assert!(result.final_dimensions.0 <= 1024);
-        assert!(result.final_dimensions.1 <= 1024);
-        // For a gradient image, combined resize+JPEG should give significant savings
-        assert!(
-            result.compressed_bytes < result.original_bytes / 2,
-            "should achieve at least 50% size reduction on a 1920x1080 gradient"
-        );
-    }
-}
diff --git a/src/openhuman/screen_intelligence/input.rs b/src/openhuman/screen_intelligence/input.rs
deleted file mode 100644
index 6cb68b080..000000000
--- a/src/openhuman/screen_intelligence/input.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-//! Input actions and autocomplete helpers for the screen intelligence session.
-
-use super::helpers::{generate_suggestions, truncate_tail, validate_input_action};
-use super::limits::{MAX_CONTEXT_CHARS, MAX_SUGGESTION_CHARS};
-use super::state::AccessibilityEngine;
-use super::types::{
-    AutocompleteCommitParams, AutocompleteCommitResult, AutocompleteSuggestParams,
-    AutocompleteSuggestResult, InputActionParams, InputActionResult,
-};
-use crate::openhuman::accessibility::foreground_context;
-
-impl AccessibilityEngine {
-    pub async fn input_action(
-        &self,
-        action: InputActionParams,
-    ) -> Result<InputActionResult, String> {
-        let mut state = self.inner.lock().await;
-
-        if action.action == "panic_stop" {
-            drop(state);
-            self.stop_session_internal("panic_stop".to_string()).await;
-            return Ok(InputActionResult {
-                accepted: true,
-                blocked: false,
-                reason: Some("panic stop executed".to_string()),
-            });
-        }
-
-        if state.session.is_none() {
-            return Ok(InputActionResult {
-                accepted: false,
-                blocked: true,
-                reason: Some("session is not active".to_string()),
-            });
-        }
-
-        let context = foreground_context();
-        if let Some(ctx) = &context {
-            if !self.should_capture_context(ctx, &state.config) {
-                return Ok(InputActionResult {
-                    accepted: false,
-                    blocked: true,
-                    reason: Some("action blocked by denylisted context".to_string()),
-                });
-            }
-        }
-
-        validate_input_action(&action)?;
-
-        if let Some(text) = action.text.as_ref() {
-            if !text.is_empty() {
-                if !state.autocomplete_context.is_empty() {
-                    state.autocomplete_context.push(' ');
-                }
-                state.autocomplete_context.push_str(text);
-                state.autocomplete_context =
-                    truncate_tail(&state.autocomplete_context, MAX_CONTEXT_CHARS);
-            }
-        }
-
-        let action_name = action.action.clone();
-        state.last_event = Some(format!("input_action:{action_name}"));
-
-        Ok(InputActionResult {
-            accepted: true,
-            blocked: false,
-            reason: None,
-        })
-    }
-
-    pub async fn autocomplete_suggest(
-        &self,
-        params: AutocompleteSuggestParams,
-    ) -> Result<AutocompleteSuggestResult, String> {
-        let state = self.inner.lock().await;
-
-        if !state.config.autocomplete_enabled {
-            return Ok(AutocompleteSuggestResult {
-                suggestions: Vec::new(),
-            });
-        }
-
-        let mut context = params.context.unwrap_or_default();
-        if context.trim().is_empty() {
-            context = state.autocomplete_context.clone();
-        }
-        drop(state);
-
-        let max_results = params.max_results.unwrap_or(3).clamp(1, 8);
-        let suggestions = generate_suggestions(&context, max_results);
-
-        Ok(AutocompleteSuggestResult { suggestions })
-    }
-
-    pub async fn autocomplete_commit(
-        &self,
-        params: AutocompleteCommitParams,
-    ) -> Result<AutocompleteCommitResult, String> {
-        let cleaned = params.suggestion.trim();
-        if cleaned.is_empty() {
-            return Err("suggestion cannot be empty".to_string());
-        }
-        if cleaned.len() > MAX_SUGGESTION_CHARS {
-            return Err("suggestion exceeds maximum length".to_string());
-        }
-
-        let mut state = self.inner.lock().await;
-        if !state.config.autocomplete_enabled {
-            return Ok(AutocompleteCommitResult { committed: false });
-        }
-        if !state.autocomplete_context.is_empty() {
-            state.autocomplete_context.push(' ');
-        }
-        state.autocomplete_context.push_str(cleaned);
-        state.autocomplete_context = truncate_tail(&state.autocomplete_context, MAX_CONTEXT_CHARS);
-        state.last_event = Some("autocomplete_commit".to_string());
-
-        Ok(AutocompleteCommitResult { committed: true })
-    }
-}
diff --git a/src/openhuman/screen_intelligence/limits.rs b/src/openhuman/screen_intelligence/limits.rs
deleted file mode 100644
index 97b98c520..000000000
--- a/src/openhuman/screen_intelligence/limits.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Buffer sizes and string limits for screen intelligence.
-
-pub(crate) const MAX_EPHEMERAL_FRAMES: usize = 120;
-pub(crate) const MAX_EPHEMERAL_VISION_SUMMARIES: usize = 120;
-pub(crate) const MAX_SCREENSHOT_BYTES: usize = 1_500_000;
-pub(crate) const MAX_CONTEXT_CHARS: usize = 256;
-pub(crate) const MAX_SUGGESTION_CHARS: usize = 128;
diff --git a/src/openhuman/screen_intelligence/mod.rs b/src/openhuman/screen_intelligence/mod.rs
deleted file mode 100644
index 5fabf0ae3..000000000
--- a/src/openhuman/screen_intelligence/mod.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-//! Screen capture, accessibility automation, and vision summaries (macOS-focused).
-
-pub(crate) mod cli;
-pub mod ops;
-mod schemas;
-pub mod server;
-pub mod tools;
-
-mod capture;
-mod capture_worker;
-mod engine;
-mod helpers;
-mod image_processing;
-mod input;
-mod limits;
-mod permissions;
-mod processing_worker;
-mod state;
-mod types;
-mod vision;
-
-pub use ops as rpc;
-pub use ops::*;
-pub use schemas::{
-    all_controller_schemas as all_screen_intelligence_controller_schemas,
-    all_registered_controllers as all_screen_intelligence_registered_controllers,
-};
-pub use state::{global_engine, AccessibilityEngine};
-pub use types::*;
-
-#[cfg(test)]
-mod tests;
diff --git a/src/openhuman/screen_intelligence/ops.rs b/src/openhuman/screen_intelligence/ops.rs
deleted file mode 100644
index 4608e8b00..000000000
--- a/src/openhuman/screen_intelligence/ops.rs
+++ /dev/null
@@ -1,310 +0,0 @@
-//! JSON-RPC / CLI controller surface for screen capture and accessibility automation.
-//!
-//! macOS permission UX (stale DENIED until sidecar restarts) is tracked in
-//! <https://github.com/tinyhumansai/openhuman/issues/133>.
-
-use serde_json::json;
-
-use crate::openhuman::screen_intelligence::{
-    self, AccessibilityStatus, CaptureImageRefResult, CaptureNowResult, CaptureTestResult,
-    GlobeHotkeyPollResult, GlobeHotkeyStatus, InputActionParams, InputActionResult,
-    PermissionRequestParams, PermissionState, PermissionStatus, SessionStatus, StartSessionParams,
-    StopSessionParams, VisionFlushResult, VisionRecentResult,
-};
-use crate::rpc::RpcOutcome;
-
-pub async fn accessibility_status() -> Result<RpcOutcome<AccessibilityStatus>, String> {
-    if let Ok(config) = crate::openhuman::config::Config::load_or_init().await {
-        let _ = screen_intelligence::global_engine()
-            .apply_config(config.screen_intelligence.clone())
-            .await;
-    }
-    let status = screen_intelligence::global_engine().status().await;
-    Ok(RpcOutcome::single_log(
-        status,
-        "screen intelligence status fetched",
-    ))
-}
-
-/// CLI `accessibility doctor`: recommendations from current [`AccessibilityStatus`].
-pub async fn accessibility_doctor_cli_json() -> Result<serde_json::Value, String> {
-    let RpcOutcome {
-        value: status,
-        logs,
-    } = accessibility_status().await?;
-    let permissions = &status.permissions;
-
-    let screen_ready = permissions.screen_recording == PermissionState::Granted;
-    let control_ready = permissions.accessibility == PermissionState::Granted;
-    let monitoring_ready = permissions.input_monitoring == PermissionState::Granted;
-    let overall_ready = status.platform_supported && screen_ready && control_ready;
-
-    let mut recommendations: Vec<String> = Vec::new();
-    if !status.platform_supported {
-        recommendations
-            .push("Accessibility automation is macOS-only in this build/runtime.".to_string());
-    }
-    if permissions.screen_recording != PermissionState::Granted {
-        recommendations.push(
-            "Grant Screen Recording in System Settings -> Privacy & Security -> Screen Recording."
-                .to_string(),
-        );
-    }
-    if permissions.accessibility != PermissionState::Granted {
-        recommendations.push(
-            "Grant Accessibility in System Settings -> Privacy & Security -> Accessibility."
-                .to_string(),
-        );
-    }
-    if permissions.input_monitoring != PermissionState::Granted {
-        recommendations.push(
-            "Grant Input Monitoring in System Settings -> Privacy & Security -> Input Monitoring (optional but recommended)."
-                .to_string(),
-        );
-    }
-    if recommendations.is_empty() {
-        recommendations.push("No action required. Accessibility automation is ready.".to_string());
-    }
-
-    Ok(json!({
-        "result": {
-            "summary": {
-                "overall_ready": overall_ready,
-                "platform_supported": status.platform_supported,
-                "session_active": status.session.active,
-                "screen_capture_ready": screen_ready,
-                "accessibility_ready": control_ready,
-                "input_monitoring_ready": monitoring_ready
-            },
-            "permissions": permissions,
-            "features": status.features,
-            "recommendations": recommendations
-        },
-        "logs": logs
-    }))
-}
-
-pub async fn accessibility_request_permissions() -> Result<RpcOutcome<PermissionStatus>, String> {
-    let permissions = screen_intelligence::global_engine()
-        .request_permissions()
-        .await?;
-    Ok(RpcOutcome::single_log(
-        permissions,
-        "accessibility automation permissions requested",
-    ))
-}
-
-pub async fn accessibility_request_permission(
-    payload: PermissionRequestParams,
-) -> Result<RpcOutcome<PermissionStatus>, String> {
-    let permissions = screen_intelligence::global_engine()
-        .request_permission(payload.permission)
-        .await?;
-    Ok(RpcOutcome::single_log(
-        permissions,
-        "accessibility permission requested",
-    ))
-}
-
-pub async fn accessibility_start_session(
-    payload: StartSessionParams,
-) -> Result<RpcOutcome<SessionStatus>, String> {
-    let session = screen_intelligence::global_engine()
-        .start_session(payload)
-        .await?;
-    Ok(RpcOutcome::single_log(
-        session,
-        "screen intelligence enabled",
-    ))
-}
-
-pub async fn accessibility_stop_session(
-    payload: StopSessionParams,
-) -> Result<RpcOutcome<SessionStatus>, String> {
-    let session = screen_intelligence::global_engine()
-        .disable(payload.reason)
-        .await;
-    Ok(RpcOutcome::single_log(
-        session,
-        "screen intelligence stopped",
-    ))
-}
-
-pub async fn accessibility_capture_now() -> Result<RpcOutcome<CaptureNowResult>, String> {
-    let result = screen_intelligence::global_engine().capture_now().await?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "accessibility manual capture requested",
-    ))
-}
-
-pub async fn accessibility_capture_image_ref() -> Result<RpcOutcome<CaptureImageRefResult>, String>
-{
-    let result: CaptureImageRefResult = screen_intelligence::global_engine()
-        .capture_image_ref_test()
-        .await;
-    Ok(RpcOutcome::single_log(
-        result,
-        "accessibility direct image_ref capture requested",
-    ))
-}
-
-pub async fn accessibility_input_action(
-    payload: InputActionParams,
-) -> Result<RpcOutcome<InputActionResult>, String> {
-    let result = screen_intelligence::global_engine()
-        .input_action(payload)
-        .await?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "screen intelligence input action processed",
-    ))
-}
-
-pub async fn accessibility_vision_recent(
-    limit: Option<usize>,
-) -> Result<RpcOutcome<VisionRecentResult>, String> {
-    let result: VisionRecentResult = screen_intelligence::global_engine()
-        .vision_recent(limit)
-        .await;
-    Ok(RpcOutcome::single_log(
-        result,
-        "screen intelligence vision summaries fetched",
-    ))
-}
-
-pub async fn accessibility_vision_flush() -> Result<RpcOutcome<VisionFlushResult>, String> {
-    let result: VisionFlushResult = screen_intelligence::global_engine().vision_flush().await?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "screen intelligence vision flush completed",
-    ))
-}
-
-/// Re-detect current permission state. Intended to be called after the sidecar
-/// restarts so the new process reads freshly granted macOS permissions.
-///
-/// macOS caches permission grants per-process; the running sidecar never sees an
-/// updated grant until it restarts. After `restart_core_process` brings up a fresh
-/// sidecar, calling this endpoint returns the authoritative permission state as seen
-/// by that new process.
-pub async fn accessibility_refresh_permissions() -> Result<RpcOutcome<PermissionStatus>, String> {
-    log::info!("[screen_intelligence] refresh_permissions:re-detecting permissions");
-    // `status()` unconditionally calls `detect_permissions()` before returning, so
-    // fetching the full status and extracting the permissions field is the correct
-    // way to get a freshly computed permission state.
-    let full_status = screen_intelligence::global_engine().status().await;
-    let permissions = full_status.permissions;
-    log::debug!(
-        "[screen_intelligence] accessibility_refresh_permissions: screen_recording={:?} accessibility={:?} input_monitoring={:?}",
-        permissions.screen_recording,
-        permissions.accessibility,
-        permissions.input_monitoring,
-    );
-    Ok(RpcOutcome::single_log(
-        permissions,
-        "accessibility permissions refreshed",
-    ))
-}
-
-pub async fn accessibility_capture_test() -> Result<RpcOutcome<CaptureTestResult>, String> {
-    let result: CaptureTestResult = screen_intelligence::global_engine().capture_test().await;
-    Ok(RpcOutcome::single_log(
-        result,
-        "screen intelligence capture test completed",
-    ))
-}
-
-pub async fn accessibility_globe_listener_start() -> Result<RpcOutcome<GlobeHotkeyStatus>, String> {
-    log::info!("[screen_intelligence] globe_listener_start requested");
-    let result = crate::openhuman::accessibility::globe_listener_start()?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "globe listener start processed",
-    ))
-}
-
-pub async fn accessibility_globe_listener_poll() -> Result<RpcOutcome<GlobeHotkeyPollResult>, String>
-{
-    let result = crate::openhuman::accessibility::globe_listener_poll()?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "globe listener poll processed",
-    ))
-}
-
-pub async fn accessibility_globe_listener_stop() -> Result<RpcOutcome<GlobeHotkeyStatus>, String> {
-    log::info!("[screen_intelligence] globe_listener_stop requested");
-    let result = crate::openhuman::accessibility::globe_listener_stop()?;
-    Ok(RpcOutcome::single_log(
-        result,
-        "globe listener stop processed",
-    ))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn accessibility_status_returns_ok() {
-        let outcome = accessibility_status().await.expect("status");
-        // Permissions field is always present (even if all Denied on Linux).
-        let _ = outcome.value;
-    }
-
-    #[tokio::test]
-    async fn accessibility_doctor_cli_json_returns_summary_permissions_and_recommendations() {
-        let v = accessibility_doctor_cli_json().await.expect("doctor json");
-        assert!(v.get("result").is_some());
-        let result = &v["result"];
-        assert!(result.get("summary").is_some());
-        assert!(result.get("permissions").is_some());
-        assert!(result.get("recommendations").is_some());
-        // Recommendations are always non-empty (either action-items or "ready").
-        assert!(result["recommendations"]
-            .as_array()
-            .map_or(false, |a| !a.is_empty()));
-    }
-
-    #[tokio::test]
-    async fn accessibility_doctor_cli_json_has_summary_flags_as_bools() {
-        let v = accessibility_doctor_cli_json().await.unwrap();
-        let summary = &v["result"]["summary"];
-        for field in [
-            "overall_ready",
-            "platform_supported",
-            "session_active",
-            "screen_capture_ready",
-            "accessibility_ready",
-            "input_monitoring_ready",
-        ] {
-            assert!(
-                summary[field].is_boolean(),
-                "summary field `{field}` should be boolean"
-            );
-        }
-    }
-
-    #[tokio::test]
-    async fn accessibility_stop_session_is_tolerant_of_no_reason() {
-        let payload = StopSessionParams { reason: None };
-        let _ = accessibility_stop_session(payload).await;
-    }
-
-    #[tokio::test]
-    async fn accessibility_capture_image_ref_returns_ok_even_on_unsupported_platform() {
-        // `capture_image_ref_test` is `async fn` returning `CaptureImageRefResult`
-        // directly (no `Result`), so this call should always succeed. On
-        // non-macOS platforms the result will simply report capture failure.
-        let outcome = accessibility_capture_image_ref().await.expect("capture");
-        let _ = outcome.value;
-    }
-
-    #[tokio::test]
-    async fn accessibility_vision_recent_with_no_args_returns_ok() {
-        let outcome = accessibility_vision_recent(Some(5)).await;
-        // Either Ok or Err — just ensure the call doesn't panic.
-        let _ = outcome;
-    }
-}
diff --git a/src/openhuman/screen_intelligence/permissions.rs b/src/openhuman/screen_intelligence/permissions.rs
deleted file mode 100644
index ae5872588..000000000
--- a/src/openhuman/screen_intelligence/permissions.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Permission detection — now in accessibility middleware.
-//! This module is retained for module-tree compatibility.
diff --git a/src/openhuman/screen_intelligence/processing_worker.rs b/src/openhuman/screen_intelligence/processing_worker.rs
deleted file mode 100644
index a088922f5..000000000
--- a/src/openhuman/screen_intelligence/processing_worker.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-//! Vision processing worker — receives captured frames, runs OCR + LLM
-//! analysis, and persists the synthesized document to unified memory.
-//!
-//! Pipeline per frame:
-//!   1. Apple Vision OCR  (Swift, ~200ms) → raw text extraction
-//!   2. Vision LLM        (Ollama, ~2-5s) → app/activity/focus/mood context
-//!   3. Synthesis LLM     (Ollama, ~3-5s) → final informative document
-//!   4. Persist to unified memory as markdown with YAML frontmatter
-
-use std::collections::HashSet;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use crate::openhuman::config::Config;
-use crate::openhuman::inference::local as local_ai;
-
-use super::helpers::{persist_vision_summary, push_ephemeral_vision_summary, truncate_tail};
-use super::state::AccessibilityEngine;
-use super::types::{CaptureFrame, VisionSummary};
-
-/// Main processing loop. Receives frames from the capture worker channel.
-pub(crate) async fn run(
-    engine: Arc<AccessibilityEngine>,
-    mut rx: tokio::sync::mpsc::UnboundedReceiver<CaptureFrame>,
-) {
-    tracing::debug!("[processing_worker] started");
-
-    let mut processed_timestamps: HashSet<i64> = HashSet::new();
-
-    while let Some(mut frame) = rx.recv().await {
-        // Drain channel — keep only the latest frame.
-        let mut skipped = 0u64;
-        while let Ok(newer) = rx.try_recv() {
-            skipped += 1;
-            frame = newer;
-        }
-        if skipped > 0 {
-            tracing::debug!(
-                "[processing_worker] skipped {} stale frame(s), processing latest (ts={})",
-                skipped,
-                frame.captured_at_ms,
-            );
-            let mut state = engine.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.vision_queue_depth =
-                    session.vision_queue_depth.saturating_sub(skipped as usize);
-            }
-        }
-
-        // Skip already-processed frames.
-        if processed_timestamps.contains(&frame.captured_at_ms) {
-            tracing::debug!(
-                "[processing_worker] frame ts={} already processed, skipping",
-                frame.captured_at_ms,
-            );
-            let mut state = engine.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.vision_queue_depth = session.vision_queue_depth.saturating_sub(1);
-            }
-            continue;
-        }
-
-        tracing::debug!(
-            "[processing_worker] processing frame (app={:?}, ts={}, reason={})",
-            frame.app_name,
-            frame.captured_at_ms,
-            frame.reason
-        );
-
-        let keep_screenshots = engine.inner.lock().await.config.keep_screenshots;
-
-        // Temp save for vision processing when keep_screenshots is off.
-        let saved_path = if !keep_screenshots && frame.image_ref.is_some() {
-            let workspace_dir = match Config::load_or_init().await {
-                Ok(cfg) => cfg.workspace_dir.clone(),
-                Err(_) => PathBuf::from("."),
-            };
-            match AccessibilityEngine::save_screenshot_to_disk(&workspace_dir, &frame) {
-                Ok(path) => Some(path),
-                Err(err) => {
-                    tracing::debug!("[processing_worker] temp save failed: {err}");
-                    None
-                }
-            }
-        } else {
-            None
-        };
-
-        {
-            let mut state = engine.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.vision_state = "processing".to_string();
-            } else {
-                tracing::debug!("[processing_worker] no session, exiting");
-                break;
-            }
-        }
-
-        let capture_ts = frame.captured_at_ms;
-        let result = analyze_frame(&engine, frame).await;
-
-        // Mark processed.
-        processed_timestamps.insert(capture_ts);
-        if processed_timestamps.len() > 500 {
-            let oldest = *processed_timestamps.iter().min().unwrap();
-            processed_timestamps.remove(&oldest);
-        }
-
-        // Clean up temp screenshot.
-        if !keep_screenshots {
-            if let Some(path) = saved_path {
-                let _ = std::fs::remove_file(&path);
-            }
-        }
-
-        // Update session state and persist.
-        let mut summary_to_persist: Option<VisionSummary> = None;
-        {
-            let mut state = engine.inner.lock().await;
-            let Some(session) = state.session.as_mut() else {
-                break;
-            };
-            session.vision_queue_depth = session.vision_queue_depth.saturating_sub(1);
-            match result {
-                Ok(summary) => {
-                    tracing::debug!(
-                        "[processing_worker] analysis complete (id={} confidence={:.2})",
-                        summary.id,
-                        summary.confidence
-                    );
-                    push_ephemeral_vision_summary(&mut session.vision_summaries, summary.clone());
-                    session.last_vision_at_ms = Some(summary.captured_at_ms);
-                    session.last_vision_summary = Some(summary.key_text.clone());
-                    session.vision_state = "ready".to_string();
-                    summary_to_persist = Some(summary);
-                }
-                Err(err) => {
-                    tracing::debug!("[processing_worker] analysis failed: {err}");
-                    session.vision_state = "error".to_string();
-                    state.last_error = Some(err);
-                }
-            }
-        }
-
-        if let Some(summary) = summary_to_persist {
-            match persist_vision_summary(summary).await {
-                Ok(persisted) => {
-                    let mut state = engine.inner.lock().await;
-                    if let Some(session) = state.session.as_mut() {
-                        session.vision_persist_count =
-                            session.vision_persist_count.saturating_add(1);
-                        session.last_vision_persisted_key = Some(persisted.key.clone());
-                        session.last_vision_persist_error = None;
-                    }
-                }
-                Err(err) => {
-                    tracing::debug!("[processing_worker] persistence failed: {err}");
-                    let mut state = engine.inner.lock().await;
-                    if let Some(session) = state.session.as_mut() {
-                        session.vision_state = "error".to_string();
-                        session.last_vision_persist_error = Some(err.clone());
-                    }
-                    state.last_error = Some(format!("vision_summary_persist_failed: {err}"));
-                }
-            }
-        }
-    }
-
-    tracing::debug!("[processing_worker] exiting");
-}
-
-// ── Analysis pipeline ───────────────────────────────────────────────────
-
-/// Run the analysis pipeline on a captured frame.
-///
-/// When `use_vision_model` is `true` (default), the full 3-pass pipeline runs:
-///   1. Apple Vision OCR → raw text
-///   2. Vision LLM (Ollama) → visual context from screenshot
-///   3. Synthesis LLM → final document combining OCR + vision context
-///
-/// When `use_vision_model` is `false`, Pass 2 is skipped and the synthesis LLM
-/// works from OCR text + app metadata only — no vision-capable model required.
-///
-/// Public within the crate so `engine.rs` can call it for flush/diagnostics.
-pub(crate) async fn analyze_frame(
-    engine: &AccessibilityEngine,
-    frame: CaptureFrame,
-) -> Result<VisionSummary, String> {
-    let image_ref = frame
-        .image_ref
-        .clone()
-        .ok_or_else(|| "frame has no image payload".to_string())?;
-
-    // ── Mock path for testing ───────────────────────────────────────
-    if let Ok(mock_raw) = std::env::var("OPENHUMAN_SCREEN_INTELLIGENCE_MOCK_VISION_JSON") {
-        if !mock_raw.trim().is_empty() {
-            tracing::debug!("[processing_worker] using mocked vision output");
-            return Ok(super::helpers::parse_vision_summary_output(
-                frame, &mock_raw,
-            ));
-        }
-    }
-
-    // ── Read use_vision_model from the engine's runtime config ─────
-    // The CLI `--no-vision-model` flag overrides this at runtime without
-    // persisting to disk, so we read from the engine state, not from the
-    // persisted config file.
-    let use_vision_model = engine.inner.lock().await.config.use_vision_model;
-
-    // ── Validate config before doing any work ─────────────────────────
-    let config = Config::load_or_init()
-        .await
-        .map_err(|e| format!("failed to load config: {e}"))?;
-    if !config.local_ai.runtime_enabled {
-        return Err(
-            "screen intelligence vision requires local_ai.runtime_enabled=true in config"
-                .to_string(),
-        );
-    }
-    let provider = config.local_ai.provider.trim().to_ascii_lowercase();
-    if provider != "ollama" {
-        return Err(format!(
-            "screen intelligence vision requires provider 'ollama' (found '{provider}')",
-        ));
-    }
-
-    tracing::debug!(
-        "[processing_worker] use_vision_model={} (from engine runtime config)",
-        use_vision_model,
-    );
-
-    // ── Image compression (always runs — used by vision LLM and/or storage) ──
-    let compressed = super::image_processing::compress_screenshot(&image_ref, None, None)
-        .map_err(|e| format!("image compression failed: {e}"))?;
-
-    // ── Pass 1: OCR via Apple Vision ────────────────────────────────
-    tracing::debug!("[processing_worker] pass 1/3: Apple Vision OCR");
-    let ocr_text = tokio::time::timeout(
-        std::time::Duration::from_secs(30),
-        run_apple_vision_ocr(image_ref.clone()),
-    )
-    .await
-    .map_err(|_| "Apple Vision OCR timed out after 30s".to_string())??;
-    tracing::debug!("[processing_worker] OCR extracted {} chars", ocr_text.len());
-
-    // ── Pass 2: Vision LLM for context (skipped when use_vision_model=false) ──
-    let vision_context = if use_vision_model {
-        let vision_image_ref = compressed.data_uri;
-
-        tracing::debug!(
-            "[processing_worker] pass 2/3: vision LLM (model={})",
-            config.local_ai.vision_model_id,
-        );
-        let service = local_ai::global(&config);
-        let vision_prompt = r#"Describe this screenshot briefly. Answer each on its own line:
-
-APP: Name the application and the specific page/view/tab shown.
-DOING: What is the user actively doing? (e.g. writing code, reading email, browsing, chatting)
-FOCUS: What's the main content area about? (e.g. a PR review for auth refactor, a Slack thread about deployment)
-MOOD: Is anything urgent, broken, or notable? (errors, notifications, warnings — or "nothing notable")
-
-One line per answer. No text extraction. Be specific and concise."#;
-        Some(
-            service
-                .vision_prompt(&config, vision_prompt, &[vision_image_ref], Some(150))
-                .await?
-                .trim()
-                .to_string(),
-        )
-    } else {
-        tracing::debug!("[processing_worker] pass 2/3: SKIPPED (use_vision_model=false)");
-        None
-    };
-
-    // ── Pass 3: Synthesis LLM — final document ──────────────────────
-    let app_label = frame.app_name.as_deref().unwrap_or("Unknown");
-    let window_label = frame.window_title.as_deref().unwrap_or("");
-    let ocr_truncated = truncate_tail(&ocr_text, 4000);
-
-    let pass_label = if use_vision_model { "3/3" } else { "2/2" };
-    tracing::debug!(
-        "[processing_worker] pass {}: synthesis LLM (ocr={} chars, vision={} chars)",
-        pass_label,
-        ocr_truncated.len(),
-        vision_context.as_ref().map_or(0, |s| s.len()),
-    );
-
-    let service = local_ai::global(&config);
-
-    let synthesis_prompt = if let Some(ref vc) = vision_context {
-        format!(
-            r#"You are summarizing what a user is doing on their computer right now.
-
-Application: {app_label}
-Window: {window_label}
-
-Visual context from the screenshot:
-{vc}
-
-Extracted text from screen (OCR):
-{ocr_truncated}
-
-Write a clear, informative summary in plain text. Include:
-- What application and specific view/page the user has open
-- What they are actively doing (coding, reading, chatting, browsing, etc.)
-- Key content visible — summarize what's on screen (don't just list raw OCR, synthesize it)
-- Any notable items: errors, notifications, deadlines, action items
-- Brief context that would help someone understand this moment later
-
-Be specific and informative. Write in present tense. ~300-500 words."#
-        )
-    } else {
-        format!(
-            r#"You are summarizing what a user is doing on their computer right now.
-You only have the application name, window title, and OCR-extracted text to work with.
-
-Application: {app_label}
-Window: {window_label}
-
-Extracted text from screen (OCR):
-{ocr_truncated}
-
-Write a clear, informative summary in plain text. Include:
-- What application and specific view/page the user has open (infer from window title and OCR text)
-- What they are actively doing (coding, reading, chatting, browsing, etc.)
-- Key content visible — synthesize the OCR text into a coherent description
-- Any notable items: errors, notifications, deadlines, action items
-- Brief context that would help someone understand this moment later
-
-Be specific and informative. Write in present tense. ~300-500 words."#
-        )
-    };
-
-    let fallback_text = vision_context.as_deref().unwrap_or("");
-    let synthesis = service
-        .prompt(&config, &synthesis_prompt, Some(700), true)
-        .await
-        .unwrap_or_else(|e| {
-            tracing::debug!("[processing_worker] synthesis failed, using fallback: {e}");
-            format!("{}\n\n{}", fallback_text, ocr_truncated)
-        });
-
-    tracing::debug!(
-        "[processing_worker] synthesis complete ({} chars)",
-        synthesis.len(),
-    );
-
-    Ok(VisionSummary {
-        id: format!("vision-{}-{}", frame.captured_at_ms, uuid::Uuid::new_v4()),
-        captured_at_ms: frame.captured_at_ms,
-        app_name: frame.app_name,
-        window_title: frame.window_title,
-        ui_state: truncate_tail(vision_context.as_deref().unwrap_or(&ocr_truncated), 500),
-        key_text: truncate_tail(&synthesis, 4000),
-        actionable_notes: String::new(),
-        confidence: if use_vision_model { 0.9 } else { 0.75 },
-    })
-}
-
-// ── Apple Vision OCR ────────────────────────────────────────────────────
-
-/// Run Apple Vision framework OCR on a base64-encoded image.
-///
-/// Uses `tokio::process::Command` with `.kill_on_drop(true)` so the subprocess
-/// is cleaned up if the future is dropped (e.g. due to the 30s timeout in the
-/// caller). The temp file is removed whether or not the OCR succeeds.
-async fn run_apple_vision_ocr(image_ref: String) -> Result<String, String> {
-    use base64::{engine::general_purpose::STANDARD as B64, Engine};
-
-    let b64_payload = if let Some(pos) = image_ref.find(";base64,") {
-        &image_ref[pos + 8..]
-    } else {
-        &image_ref[..]
-    };
-
-    let raw_bytes = B64
-        .decode(b64_payload)
-        .map_err(|e| format!("base64 decode for OCR failed: {e}"))?;
-
-    let tmp_path = std::env::temp_dir().join(format!("openhuman_ocr_{}.png", uuid::Uuid::new_v4()));
-    std::fs::write(&tmp_path, &raw_bytes)
-        .map_err(|e| format!("failed to write temp OCR image: {e}"))?;
-
-    let swift_code = format!(
-        r#"
-import Vision
-import AppKit
-
-let url = URL(fileURLWithPath: "{path}")
-guard let image = NSImage(contentsOf: url),
-      let cgImage = image.cgImage(forProposedRect: nil, context: nil, hints: nil) else {{
-    fputs("ERROR: failed to load image\n", stderr)
-    exit(1)
-}}
-
-let request = VNRecognizeTextRequest()
-request.recognitionLevel = .accurate
-request.usesLanguageCorrection = true
-
-let handler = VNImageRequestHandler(cgImage: cgImage, options: [:])
-try handler.perform([request])
-
-guard let observations = request.results else {{
-    exit(0)
-}}
-
-for obs in observations {{
-    if let candidate = obs.topCandidates(1).first {{
-        print(candidate.string)
-    }}
-}}
-"#,
-        path = tmp_path.display()
-    );
-
-    let output = tokio::process::Command::new("swift")
-        .arg("-e")
-        .arg(&swift_code)
-        .kill_on_drop(true)
-        .output()
-        .await
-        .map_err(|e| format!("swift OCR failed to start: {e}"))?;
-
-    let _ = std::fs::remove_file(&tmp_path);
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        return Err(format!("Apple Vision OCR failed: {}", stderr.trim()));
-    }
-
-    Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
-}
diff --git a/src/openhuman/screen_intelligence/schemas.rs b/src/openhuman/screen_intelligence/schemas.rs
deleted file mode 100644
index 437e4559a..000000000
--- a/src/openhuman/screen_intelligence/schemas.rs
+++ /dev/null
@@ -1,408 +0,0 @@
-use serde::de::DeserializeOwned;
-use serde::Deserialize;
-use serde_json::{Map, Value};
-
-use crate::core::all::{ControllerFuture, RegisteredController};
-use crate::core::{ControllerSchema, FieldSchema, TypeSchema};
-use crate::openhuman::screen_intelligence::{
-    InputActionParams, PermissionRequestParams, StartSessionParams, StopSessionParams,
-};
-use crate::rpc::RpcOutcome;
-
-#[derive(Debug, Deserialize)]
-struct AccessibilityVisionRecentParams {
-    limit: Option<usize>,
-}
-
-pub fn all_controller_schemas() -> Vec<ControllerSchema> {
-    vec![
-        schemas("status"),
-        schemas("request_permissions"),
-        schemas("request_permission"),
-        schemas("refresh_permissions"),
-        schemas("start_session"),
-        schemas("stop_session"),
-        schemas("capture_now"),
-        schemas("capture_image_ref"),
-        schemas("input_action"),
-        schemas("vision_recent"),
-        schemas("vision_flush"),
-        schemas("capture_test"),
-        schemas("globe_listener_start"),
-        schemas("globe_listener_poll"),
-        schemas("globe_listener_stop"),
-    ]
-}
-
-pub fn all_registered_controllers() -> Vec<RegisteredController> {
-    vec![
-        RegisteredController {
-            schema: schemas("status"),
-            handler: handle_status,
-        },
-        RegisteredController {
-            schema: schemas("request_permissions"),
-            handler: handle_request_permissions,
-        },
-        RegisteredController {
-            schema: schemas("request_permission"),
-            handler: handle_request_permission,
-        },
-        RegisteredController {
-            schema: schemas("refresh_permissions"),
-            handler: handle_refresh_permissions,
-        },
-        RegisteredController {
-            schema: schemas("start_session"),
-            handler: handle_start_session,
-        },
-        RegisteredController {
-            schema: schemas("stop_session"),
-            handler: handle_stop_session,
-        },
-        RegisteredController {
-            schema: schemas("capture_now"),
-            handler: handle_capture_now,
-        },
-        RegisteredController {
-            schema: schemas("capture_image_ref"),
-            handler: handle_capture_image_ref,
-        },
-        RegisteredController {
-            schema: schemas("input_action"),
-            handler: handle_input_action,
-        },
-        RegisteredController {
-            schema: schemas("vision_recent"),
-            handler: handle_vision_recent,
-        },
-        RegisteredController {
-            schema: schemas("vision_flush"),
-            handler: handle_vision_flush,
-        },
-        RegisteredController {
-            schema: schemas("capture_test"),
-            handler: handle_capture_test,
-        },
-        RegisteredController {
-            schema: schemas("globe_listener_start"),
-            handler: handle_globe_listener_start,
-        },
-        RegisteredController {
-            schema: schemas("globe_listener_poll"),
-            handler: handle_globe_listener_poll,
-        },
-        RegisteredController {
-            schema: schemas("globe_listener_stop"),
-            handler: handle_globe_listener_stop,
-        },
-    ]
-}
-
-pub fn schemas(function: &str) -> ControllerSchema {
-    match function {
-        "status" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "status",
-            description: "Read screen intelligence accessibility status.",
-            inputs: vec![],
-            outputs: vec![json_output("status", "Accessibility status payload.")],
-        },
-        "request_permissions" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "request_permissions",
-            description:
-                "Request accessibility automation permissions without prompting for screen recording.",
-            inputs: vec![],
-            outputs: vec![json_output("permissions", "Permission status payload.")],
-        },
-        "request_permission" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "request_permission",
-            description: "Request one permission such as accessibility, input monitoring, or screen recording.",
-            inputs: vec![FieldSchema {
-                name: "permission",
-                ty: TypeSchema::String,
-                comment: "Permission name.",
-                required: true,
-            }],
-            outputs: vec![json_output("permissions", "Permission status payload.")],
-        },
-        "refresh_permissions" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "refresh_permissions",
-            description: "Re-detect current macOS permission state without requesting new grants. \
-                           Call this after the sidecar restarts to read freshly granted permissions.",
-            inputs: vec![],
-            outputs: vec![json_output("permissions", "Freshly detected permission status.")],
-        },
-        "start_session" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "start_session",
-            description: "Start screen intelligence session.",
-            inputs: vec![
-                FieldSchema {
-                    name: "consent",
-                    ty: TypeSchema::Bool,
-                    comment: "Explicit user consent to start the accessibility session.",
-                    required: true,
-                },
-                FieldSchema {
-                    name: "ttl_secs",
-                    ty: TypeSchema::Option(Box::new(TypeSchema::U64)),
-                    comment: "Session time-to-live in seconds.",
-                    required: false,
-                },
-                FieldSchema {
-                    name: "screen_monitoring",
-                    ty: TypeSchema::Option(Box::new(TypeSchema::Bool)),
-                    comment: "Whether screen recording capture should be enabled for this session.",
-                    required: false,
-                },
-            ],
-            outputs: vec![json_output("session", "Session status payload.")],
-        },
-        "stop_session" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "stop_session",
-            description: "Stop screen intelligence session.",
-            inputs: vec![FieldSchema {
-                name: "reason",
-                ty: TypeSchema::Option(Box::new(TypeSchema::String)),
-                comment: "Optional stop reason.",
-                required: false,
-            }],
-            outputs: vec![json_output("session", "Session status payload.")],
-        },
-        "capture_now" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "capture_now",
-            description: "Trigger immediate screen capture.",
-            inputs: vec![],
-            outputs: vec![json_output("capture", "Capture result payload.")],
-        },
-        "capture_image_ref" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "capture_image_ref",
-            description: "Capture screenshot and return image ref.",
-            inputs: vec![],
-            outputs: vec![json_output("capture", "Capture image_ref payload.")],
-        },
-        "input_action" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "input_action",
-            description: "Perform input action through accessibility automation.",
-            inputs: vec![FieldSchema {
-                name: "action",
-                ty: TypeSchema::Ref("InputActionParams"),
-                comment: "Input action payload.",
-                required: true,
-            }],
-            outputs: vec![json_output("result", "Input action result payload.")],
-        },
-        "vision_recent" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "vision_recent",
-            description: "Read recent vision summaries.",
-            inputs: vec![FieldSchema {
-                name: "limit",
-                ty: TypeSchema::Option(Box::new(TypeSchema::U64)),
-                comment: "Maximum number of summaries.",
-                required: false,
-            }],
-            outputs: vec![json_output("result", "Vision recent payload.")],
-        },
-        "vision_flush" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "vision_flush",
-            description: "Flush stored vision summaries.",
-            inputs: vec![],
-            outputs: vec![json_output("result", "Vision flush payload.")],
-        },
-        "capture_test" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "capture_test",
-            description: "Standalone capture test with diagnostics (no session required).",
-            inputs: vec![],
-            outputs: vec![json_output(
-                "result",
-                "Capture test result with diagnostics.",
-            )],
-        },
-        "globe_listener_start" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "globe_listener_start",
-            description: "Start the macOS Globe/Fn hotkey listener helper.",
-            inputs: vec![],
-            outputs: vec![json_output("result", "Globe hotkey listener status.")],
-        },
-        "globe_listener_poll" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "globe_listener_poll",
-            description: "Drain pending Globe/Fn listener events and return listener status.",
-            inputs: vec![],
-            outputs: vec![json_output("result", "Globe hotkey listener poll result.")],
-        },
-        "globe_listener_stop" => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "globe_listener_stop",
-            description: "Stop the macOS Globe/Fn hotkey listener helper.",
-            inputs: vec![],
-            outputs: vec![json_output("result", "Globe hotkey listener status.")],
-        },
-        _ => ControllerSchema {
-            namespace: "screen_intelligence",
-            function: "unknown",
-            description: "Unknown screen_intelligence controller function.",
-            inputs: vec![],
-            outputs: vec![FieldSchema {
-                name: "error",
-                ty: TypeSchema::String,
-                comment: "Lookup error details.",
-                required: true,
-            }],
-        },
-    }
-}
-
-fn handle_status(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(crate::openhuman::screen_intelligence::rpc::accessibility_status().await?)
-    })
-}
-
-fn handle_request_permissions(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_request_permissions().await?,
-        )
-    })
-}
-
-fn handle_refresh_permissions(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_refresh_permissions().await?,
-        )
-    })
-}
-
-fn handle_request_permission(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let payload = deserialize_params::<PermissionRequestParams>(params)?;
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_request_permission(payload)
-                .await?,
-        )
-    })
-}
-
-fn handle_start_session(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let payload = deserialize_params::<StartSessionParams>(params)?;
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_start_session(payload)
-                .await?,
-        )
-    })
-}
-
-fn handle_stop_session(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let payload = deserialize_params::<StopSessionParams>(params)?;
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_stop_session(payload).await?,
-        )
-    })
-}
-
-fn handle_capture_now(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(crate::openhuman::screen_intelligence::rpc::accessibility_capture_now().await?)
-    })
-}
-
-fn handle_capture_image_ref(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_capture_image_ref().await?,
-        )
-    })
-}
-
-fn handle_input_action(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let payload = deserialize_params::<InputActionParams>(params)?;
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_input_action(payload).await?,
-        )
-    })
-}
-
-fn handle_vision_recent(params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async move {
-        let payload = deserialize_params::<AccessibilityVisionRecentParams>(params)?;
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_vision_recent(payload.limit)
-                .await?,
-        )
-    })
-}
-
-fn handle_vision_flush(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(crate::openhuman::screen_intelligence::rpc::accessibility_vision_flush().await?)
-    })
-}
-
-fn handle_capture_test(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(crate::openhuman::screen_intelligence::rpc::accessibility_capture_test().await?)
-    })
-}
-
-fn handle_globe_listener_start(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_globe_listener_start()
-                .await?,
-        )
-    })
-}
-
-fn handle_globe_listener_poll(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_globe_listener_poll().await?,
-        )
-    })
-}
-
-fn handle_globe_listener_stop(_params: Map<String, Value>) -> ControllerFuture {
-    Box::pin(async {
-        to_json(
-            crate::openhuman::screen_intelligence::rpc::accessibility_globe_listener_stop().await?,
-        )
-    })
-}
-
-fn deserialize_params<T: DeserializeOwned>(params: Map<String, Value>) -> Result<T, String> {
-    serde_json::from_value(Value::Object(params)).map_err(|e| format!("invalid params: {e}"))
-}
-
-fn json_output(name: &'static str, comment: &'static str) -> FieldSchema {
-    FieldSchema {
-        name,
-        ty: TypeSchema::Json,
-        comment,
-        required: true,
-    }
-}
-
-fn to_json<T: serde::Serialize>(outcome: RpcOutcome<T>) -> Result<Value, String> {
-    outcome.into_cli_compatible_json()
-}
-
-#[cfg(test)]
-#[path = "schemas_tests.rs"]
-mod tests;
diff --git a/src/openhuman/screen_intelligence/schemas_tests.rs b/src/openhuman/screen_intelligence/schemas_tests.rs
deleted file mode 100644
index 09d4b2530..000000000
--- a/src/openhuman/screen_intelligence/schemas_tests.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-use super::*;
-
-#[test]
-fn catalog_counts_match_and_nonempty() {
-    let s = all_controller_schemas();
-    let h = all_registered_controllers();
-    assert_eq!(s.len(), h.len());
-    assert!(s.len() >= 10);
-}
-
-#[test]
-fn all_schemas_use_accessibility_namespace() {
-    for s in all_controller_schemas() {
-        assert_eq!(
-            s.namespace, "screen_intelligence",
-            "function {}",
-            s.function
-        );
-        assert!(!s.description.is_empty());
-        assert!(!s.outputs.is_empty());
-    }
-}
-
-#[test]
-fn unknown_function_returns_unknown_schema() {
-    let s = schemas("no_such_fn");
-    assert_eq!(s.function, "unknown");
-}
-
-#[test]
-fn every_known_key_resolves_to_non_unknown() {
-    let keys = [
-        "status",
-        "request_permissions",
-        "request_permission",
-        "refresh_permissions",
-        "start_session",
-        "stop_session",
-        "capture_now",
-        "capture_image_ref",
-        "input_action",
-        "vision_recent",
-        "vision_flush",
-        "capture_test",
-        "globe_listener_start",
-        "globe_listener_poll",
-        "globe_listener_stop",
-    ];
-    for k in keys {
-        let s = schemas(k);
-        assert_eq!(s.namespace, "screen_intelligence");
-        assert_ne!(s.function, "unknown", "key `{k}` fell through");
-    }
-}
-
-#[test]
-fn registered_controllers_use_accessibility_namespace() {
-    for h in all_registered_controllers() {
-        assert_eq!(h.schema.namespace, "screen_intelligence");
-        assert!(!h.schema.function.is_empty());
-    }
-}
-
-#[test]
-fn status_schema_has_no_inputs() {
-    let s = schemas("status");
-    assert!(s.inputs.is_empty());
-    assert_eq!(s.outputs.len(), 1);
-}
-
-#[test]
-fn request_permissions_schema_has_no_inputs() {
-    assert!(schemas("request_permissions").inputs.is_empty());
-}
-
-#[test]
-fn request_permission_requires_permission_input() {
-    let s = schemas("request_permission");
-    assert_eq!(s.inputs.len(), 1);
-    assert_eq!(s.inputs[0].name, "permission");
-    assert!(s.inputs[0].required);
-}
-
-#[test]
-fn refresh_permissions_schema_has_no_inputs() {
-    assert!(schemas("refresh_permissions").inputs.is_empty());
-}
-
-#[test]
-fn start_session_schema_requires_consent() {
-    let s = schemas("start_session");
-    let consent = s.inputs.iter().find(|f| f.name == "consent").unwrap();
-    assert!(consent.required);
-}
-
-#[test]
-fn stop_session_schema_has_optional_reason() {
-    let s = schemas("stop_session");
-    assert_eq!(s.inputs.len(), 1);
-    assert_eq!(s.inputs[0].name, "reason");
-    assert!(!s.inputs[0].required);
-}
-
-#[test]
-fn capture_now_schema_has_optional_inputs() {
-    let s = schemas("capture_now");
-    for input in &s.inputs {
-        assert!(
-            !input.required,
-            "capture_now input '{}' should be optional",
-            input.name
-        );
-    }
-}
-
-#[test]
-fn capture_image_ref_schema_has_no_inputs() {
-    let s = schemas("capture_image_ref");
-    assert!(s.inputs.is_empty());
-}
-
-#[test]
-fn input_action_schema_requires_action() {
-    let s = schemas("input_action");
-    let required: Vec<&str> = s
-        .inputs
-        .iter()
-        .filter(|f| f.required)
-        .map(|f| f.name)
-        .collect();
-    assert!(required.contains(&"action"));
-}
-
-#[test]
-fn vision_recent_schema() {
-    let s = schemas("vision_recent");
-    assert!(!s.description.is_empty());
-}
-
-#[test]
-fn vision_flush_schema_has_no_inputs() {
-    assert!(schemas("vision_flush").inputs.is_empty());
-}
-
-#[test]
-fn capture_test_schema() {
-    let s = schemas("capture_test");
-    assert_eq!(s.function, "capture_test");
-}
-
-#[test]
-fn globe_listener_start_schema() {
-    let s = schemas("globe_listener_start");
-    assert_eq!(s.function, "globe_listener_start");
-}
-
-#[test]
-fn globe_listener_poll_schema() {
-    let s = schemas("globe_listener_poll");
-    assert_eq!(s.function, "globe_listener_poll");
-}
-
-#[test]
-fn globe_listener_stop_schema() {
-    let s = schemas("globe_listener_stop");
-    assert_eq!(s.function, "globe_listener_stop");
-}
-
-#[test]
-fn schemas_and_controllers_match() {
-    let s = all_controller_schemas();
-    let c = all_registered_controllers();
-    for (schema, ctrl) in s.iter().zip(c.iter()) {
-        assert_eq!(schema.function, ctrl.schema.function);
-    }
-}
diff --git a/src/openhuman/screen_intelligence/server.rs b/src/openhuman/screen_intelligence/server.rs
deleted file mode 100644
index 3838081f5..000000000
--- a/src/openhuman/screen_intelligence/server.rs
+++ /dev/null
@@ -1,613 +0,0 @@
-//! Standalone screen intelligence server — capture → vision → persist.
-//!
-//! Can run as part of the core process or independently via the CLI.
-//! The server boots the accessibility engine, starts a capture + vision
-//! session, and blocks in a monitoring loop — logging captures, vision
-//! summaries, and context changes to stderr.  No HTTP surface; RPC is
-//! handled by the core server's `screen_intelligence.*` routes through
-//! the shared engine singleton.
-
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Arc;
-
-use log::{debug, error, info, warn};
-use tokio::sync::Mutex;
-use tokio_util::sync::CancellationToken;
-
-use crate::openhuman::config::Config;
-
-use super::global_engine;
-use super::state::AccessibilityEngine;
-use super::types::StartSessionParams;
-
-const LOG_PREFIX: &str = "[si_server]";
-
-/// Running state of the screen intelligence server.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ServerState {
-    /// Server is not running.
-    Stopped,
-    /// Server is running, engine ready, no active session.
-    Idle,
-    /// Active capture session (vision may or may not be enabled).
-    Running,
-}
-
-/// Status snapshot of the screen intelligence server.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct SiServerStatus {
-    pub state: ServerState,
-    pub capture_count: u64,
-    pub vision_count: u64,
-    pub last_error: Option<String>,
-}
-
-/// Configuration for the screen intelligence server.
-#[derive(Debug, Clone)]
-pub struct SiServerConfig {
-    /// Session TTL in seconds.
-    pub ttl_secs: u64,
-    /// Status log interval in seconds.
-    pub log_interval_secs: u64,
-    /// Keep screenshots on disk after vision processing.
-    pub keep_screenshots: bool,
-}
-
-impl Default for SiServerConfig {
-    fn default() -> Self {
-        Self {
-            ttl_secs: 300,
-            log_interval_secs: 5,
-            keep_screenshots: false,
-        }
-    }
-}
-
-/// The screen intelligence server runtime.
-pub struct SiServer {
-    state: Arc<Mutex<ServerState>>,
-    /// Wrapped in `std::sync::Mutex` so that `stop()` can cancel the current
-    /// token and `fresh_cancel()` can swap in a new one — enabling restart
-    /// after logout without recreating the singleton.
-    cancel: std::sync::Mutex<CancellationToken>,
-    config: SiServerConfig,
-    engine: Arc<AccessibilityEngine>,
-    capture_count: Arc<AtomicU64>,
-    vision_count: Arc<AtomicU64>,
-    last_error: Arc<Mutex<Option<String>>>,
-}
-
-impl SiServer {
-    pub fn new(config: SiServerConfig) -> Self {
-        Self {
-            state: Arc::new(Mutex::new(ServerState::Stopped)),
-            cancel: std::sync::Mutex::new(CancellationToken::new()),
-            config,
-            engine: global_engine(),
-            capture_count: Arc::new(AtomicU64::new(0)),
-            vision_count: Arc::new(AtomicU64::new(0)),
-            last_error: Arc::new(Mutex::new(None)),
-        }
-    }
-
-    /// Replace the internal cancellation token with a fresh one so the server
-    /// can be re-started after a previous `stop()`.  Returns a clone of the
-    /// new token for use in the run loop.
-    fn fresh_cancel(&self) -> CancellationToken {
-        let fresh = CancellationToken::new();
-        // SAFETY: lock held briefly, only swaps a small struct.
-        *self.cancel.lock().expect("cancel lock poisoned") = fresh.clone();
-        fresh
-    }
-
-    /// Get the current server status.
-    pub async fn status(&self) -> SiServerStatus {
-        SiServerStatus {
-            state: *self.state.lock().await,
-            capture_count: self.capture_count.load(Ordering::Relaxed),
-            vision_count: self.vision_count.load(Ordering::Relaxed),
-            last_error: self.last_error.lock().await.clone(),
-        }
-    }
-
-    /// Run the screen intelligence server. Blocks until stopped.
-    ///
-    /// This is the main entry point for both embedded and standalone modes.
-    /// It starts a capture + vision session, then blocks in a monitoring
-    /// loop that logs status until the session ends or Ctrl+C is received.
-    pub async fn run(&self, app_config: &Config) -> Result<(), String> {
-        // Replace the cancellation token so a previously-stopped server can
-        // be restarted within the same process (e.g. after logout → re-login).
-        let cancel = self.fresh_cancel();
-
-        info!(
-            "{LOG_PREFIX} starting: ttl={}s vision={} fps={} keep_screenshots={}",
-            self.config.ttl_secs,
-            app_config.screen_intelligence.vision_enabled,
-            app_config.screen_intelligence.baseline_fps,
-            app_config.screen_intelligence.keep_screenshots,
-        );
-
-        // Apply config to the global engine, optionally overriding keep_screenshots.
-        let mut si_config = app_config.screen_intelligence.clone();
-        if self.config.keep_screenshots {
-            si_config.keep_screenshots = true;
-        }
-        if let Err(e) = self.engine.apply_config(si_config).await {
-            warn!("{LOG_PREFIX} apply_config failed: {e}");
-        }
-
-        *self.state.lock().await = ServerState::Idle;
-
-        // Start capture + vision session.
-        let params = StartSessionParams {
-            consent: true,
-            ttl_secs: Some(self.config.ttl_secs),
-            screen_monitoring: Some(true),
-        };
-
-        match self.engine.start_session(params).await {
-            Ok(session) => {
-                *self.state.lock().await = ServerState::Running;
-                info!(
-                    "{LOG_PREFIX} session started: vision={} ttl={}s panic_hotkey={}",
-                    session.vision_enabled, session.ttl_secs, session.panic_hotkey,
-                );
-            }
-            Err(e) => {
-                if is_expected_benign_start_session_failure(&e) {
-                    info!("{LOG_PREFIX} failed to start session: {e}");
-                } else {
-                    error!("{LOG_PREFIX} failed to start session: {e}");
-                }
-                *self.last_error.lock().await = Some(e.clone());
-                *self.state.lock().await = ServerState::Stopped;
-                return Err(e);
-            }
-        }
-
-        // Main monitoring loop — log status until session ends or cancelled.
-        let mut tick = tokio::time::interval(std::time::Duration::from_secs(
-            self.config.log_interval_secs,
-        ));
-        let mut prev_capture_count: u64 = 0;
-        let mut prev_vision_persist: u64 = 0;
-        let mut prev_last_summary: Option<String> = None;
-
-        loop {
-            tokio::select! {
-                _ = tick.tick() => {}
-                _ = cancel.cancelled() => {
-                    debug!("{LOG_PREFIX} cancellation received");
-                    break;
-                }
-            }
-
-            let status = self.engine.status().await;
-
-            if !status.session.active {
-                info!(
-                    "{LOG_PREFIX} session ended: {}",
-                    status
-                        .session
-                        .stop_reason
-                        .unwrap_or_else(|| "unknown".into()),
-                );
-                break;
-            }
-
-            // Track counts.
-            self.capture_count
-                .store(status.session.capture_count, Ordering::Relaxed);
-            self.vision_count
-                .store(status.session.vision_persist_count, Ordering::Relaxed);
-
-            // Log capture progress when new captures arrive.
-            if status.session.capture_count != prev_capture_count {
-                info!(
-                    "{LOG_PREFIX} capture #{} — app={:?} window={:?}",
-                    status.session.capture_count,
-                    status.session.last_context.as_deref().unwrap_or("-"),
-                    status.session.last_window_title.as_deref().unwrap_or("-"),
-                );
-                prev_capture_count = status.session.capture_count;
-            }
-
-            // Log new vision summaries.
-            if status.session.vision_persist_count != prev_vision_persist {
-                info!(
-                    "{LOG_PREFIX} vision #{} persisted (key={:?})",
-                    status.session.vision_persist_count,
-                    status
-                        .session
-                        .last_vision_persisted_key
-                        .as_deref()
-                        .unwrap_or("-"),
-                );
-                prev_vision_persist = status.session.vision_persist_count;
-            }
-
-            // Print full vision output when a new summary arrives.
-            if status.session.last_vision_summary != prev_last_summary {
-                if status.session.last_vision_summary.is_some() {
-                    // Fetch the latest full summary from the engine.
-                    let recent = self.engine.vision_recent(Some(1)).await;
-                    if let Some(s) = recent.summaries.first() {
-                        let ts = chrono::DateTime::from_timestamp_millis(s.captured_at_ms)
-                            .map(|dt| dt.format("%H:%M:%S").to_string())
-                            .unwrap_or_else(|| "?".to_string());
-                        eprintln!();
-                        eprintln!(
-                            "  ┌─ #{} ─ {} ─ {} ──────────────────",
-                            status.session.vision_persist_count,
-                            s.app_name.as_deref().unwrap_or("?"),
-                            ts,
-                        );
-                        // Print the synthesized summary (key_text)
-                        for line in s.key_text.lines() {
-                            eprintln!("  │ {}", line);
-                        }
-                        eprintln!("  └────────────────────────────────────");
-                        eprintln!();
-                    }
-                }
-                prev_last_summary = status.session.last_vision_summary.clone();
-            }
-
-            // Log vision errors.
-            if let Some(ref err) = status.session.last_vision_persist_error {
-                warn!("{LOG_PREFIX} vision persist error: {err}");
-            }
-
-            // Periodic heartbeat at debug level.
-            debug!(
-                "{LOG_PREFIX} [heartbeat] captures={} vision_state={} queue={} persisted={} remaining={}s",
-                status.session.capture_count,
-                status.session.vision_state,
-                status.session.vision_queue_depth,
-                status.session.vision_persist_count,
-                status.session.remaining_ms.unwrap_or(0) / 1000,
-            );
-        }
-
-        // Cleanup.
-        let _ = self
-            .engine
-            .stop_session(Some("server_stopped".to_string()))
-            .await;
-        *self.state.lock().await = ServerState::Stopped;
-        info!(
-            "{LOG_PREFIX} stopped — total captures={} vision_summaries={}",
-            self.capture_count.load(Ordering::Relaxed),
-            self.vision_count.load(Ordering::Relaxed),
-        );
-
-        Ok(())
-    }
-
-    /// Stop the server and wait for it to reach `Stopped` state.
-    ///
-    /// Cancels the run-loop token and polls until the state transitions to
-    /// `Stopped` (or a 5-second timeout expires). This prevents a fast
-    /// logout → login cycle from seeing a stale `Idle`/`Running` state
-    /// and skipping the restart.
-    pub async fn stop(&self) {
-        info!("{LOG_PREFIX} stopping screen intelligence server");
-        self.cancel.lock().expect("cancel lock poisoned").cancel();
-
-        // Wait for the run-loop to observe cancellation and set Stopped.
-        for _ in 0..50 {
-            if *self.state.lock().await == ServerState::Stopped {
-                return;
-            }
-            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-        }
-        warn!("{LOG_PREFIX} stop timed out after 5s — state may not be Stopped");
-    }
-}
-
-// ── Global singleton ────────────────────────────────────────────────────
-
-static SI_SERVER: once_cell::sync::OnceCell<Arc<SiServer>> = once_cell::sync::OnceCell::new();
-
-/// Get or initialize the global server instance.
-pub fn global_server(config: SiServerConfig) -> Arc<SiServer> {
-    SI_SERVER
-        .get_or_init(|| Arc::new(SiServer::new(config)))
-        .clone()
-}
-
-/// Get the global server if already initialized.
-pub fn try_global_server() -> Option<Arc<SiServer>> {
-    SI_SERVER.get().cloned()
-}
-
-/// Start the embedded global screen intelligence server when config enables it.
-///
-/// Intended for core process startup. The server runs in the background
-/// and reuses the process-global singleton so RPC status/stop calls
-/// operate on the same instance.
-pub async fn start_if_enabled(app_config: &Config) {
-    if !app_config.screen_intelligence.enabled {
-        info!("{LOG_PREFIX} screen intelligence disabled in config, skipping embedded server");
-        return;
-    }
-
-    if !cfg!(target_os = "macos") {
-        info!("{LOG_PREFIX} screen intelligence accessibility engine is macOS-only in V1; embedded server autostart skipped on this platform");
-        return;
-    }
-
-    let server_config = SiServerConfig {
-        ttl_secs: app_config.screen_intelligence.session_ttl_secs,
-        log_interval_secs: 10,
-        keep_screenshots: app_config.screen_intelligence.keep_screenshots,
-    };
-
-    if let Some(existing) = try_global_server() {
-        let status = existing.status().await;
-        if status.state != ServerState::Stopped {
-            info!(
-                "{LOG_PREFIX} embedded server already running: state={:?}",
-                status.state,
-            );
-            return;
-        }
-    }
-
-    info!("{LOG_PREFIX} auto-start enabled, launching embedded screen intelligence server");
-
-    let server = global_server(server_config);
-    let config_for_run = app_config.clone();
-
-    tokio::spawn(async move {
-        if let Err(e) = server.run(&config_for_run).await {
-            if is_expected_benign_start_session_failure(&e) {
-                info!("{LOG_PREFIX} embedded server autostart skipped: {e}");
-            } else if e.contains("session already active") {
-                info!("{LOG_PREFIX} embedded server session already active (benign)");
-            } else {
-                error!("{LOG_PREFIX} embedded server exited with error: {e}");
-            }
-        }
-    });
-}
-
-/// True when an engine-side error is the documented "accessibility engine is
-/// macOS-only in V1" signal reaching us on a non-macOS host. Centralises the
-/// classifier so the log-level decision (`info!` vs `error!`) stays in sync
-/// across every site that consumes `engine::*` failures — currently
-/// `SiServer::run` (start_session error) and `start_if_enabled`'s spawned
-/// `server.run` future.
-fn is_expected_macos_only_failure(err: &str) -> bool {
-    !cfg!(target_os = "macos") && err.contains("macOS-only")
-}
-
-/// True when an engine-side `start_session` error is a benign idempotency
-/// signal — the engine already has a live session, so the embedded server's
-/// own `start_session` call is a duplicate, not a failure. Canonical wire
-/// shape from `engine::start_session`:
-///
-/// ```text
-/// "session already active"
-/// ```
-///
-/// Reaches the server when the engine session was created via a different
-/// entry point before the embedded `run()` got there — typically
-/// `screen_intelligence.enable` invoked over RPC, or a prior `run()` cycle
-/// that left the engine session in place across a server restart
-/// (OPENHUMAN-TAURI-5H). The session is *running*, so the right behaviour
-/// is to step aside, not log an error event to Sentry.
-fn is_expected_session_already_active_failure(err: &str) -> bool {
-    err.contains("session already active")
-}
-
-/// Union of the two known-benign `start_session` failure shapes (`macOS-only`
-/// on non-macOS hosts and `session already active`). Use this at every site
-/// that decides between `info!` and `error!` for a `SiServer::run` failure —
-/// keeps the two classifiers in lockstep across `SiServer::run` itself and
-/// `start_if_enabled`'s spawned future.
-fn is_expected_benign_start_session_failure(err: &str) -> bool {
-    is_expected_macos_only_failure(err) || is_expected_session_already_active_failure(err)
-}
-
-/// Run the screen intelligence server standalone (blocking). Intended for CLI usage.
-///
-/// Creates a fresh `SiServer` that is **not** registered in the global
-/// singleton. This keeps CLI-started instances isolated from the core RPC
-/// lifecycle.
-pub async fn run_standalone(
-    app_config: Config,
-    server_config: SiServerConfig,
-) -> Result<(), String> {
-    info!("{LOG_PREFIX} starting standalone screen intelligence server");
-    info!("{LOG_PREFIX} ttl: {}s", server_config.ttl_secs);
-    info!(
-        "{LOG_PREFIX} log_interval: {}s",
-        server_config.log_interval_secs
-    );
-    info!(
-        "{LOG_PREFIX} vision: {} (provider: {} model: {})",
-        app_config.screen_intelligence.vision_enabled,
-        app_config.local_ai.provider,
-        app_config.local_ai.vision_model_id,
-    );
-
-    let server = SiServer::new(server_config);
-
-    // Handle Ctrl+C gracefully.
-    let server_arc = Arc::new(server);
-    let server_for_signal = server_arc.clone();
-
-    tokio::spawn(async move {
-        if let Ok(()) = tokio::signal::ctrl_c().await {
-            info!("{LOG_PREFIX} Ctrl+C received, shutting down");
-            server_for_signal.stop().await;
-        }
-    });
-
-    server_arc.run(&app_config).await
-}
-
-#[cfg(test)]
-fn truncate(s: &str, max: usize) -> String {
-    if s.chars().count() > max {
-        format!("{}…", s.chars().take(max).collect::<String>())
-    } else {
-        s.to_string()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn default_server_config() {
-        let cfg = SiServerConfig::default();
-        assert_eq!(cfg.ttl_secs, 300);
-        assert_eq!(cfg.log_interval_secs, 5);
-    }
-
-    #[test]
-    fn server_state_serializes() {
-        let json = serde_json::to_string(&ServerState::Running).unwrap();
-        assert_eq!(json, "\"running\"");
-    }
-
-    #[tokio::test]
-    async fn server_status_initial() {
-        let server = SiServer::new(SiServerConfig::default());
-        let status = server.status().await;
-        assert_eq!(status.state, ServerState::Stopped);
-        assert_eq!(status.capture_count, 0);
-        assert_eq!(status.vision_count, 0);
-        assert!(status.last_error.is_none());
-    }
-
-    #[test]
-    fn truncate_short() {
-        assert_eq!(truncate("hello", 10), "hello");
-    }
-
-    #[test]
-    fn truncate_long() {
-        let result = truncate("hello world this is a long string", 10);
-        assert!(result.ends_with('…'));
-    }
-
-    #[tokio::test]
-    #[cfg(not(target_os = "macos"))]
-    async fn start_if_enabled_skips_on_non_macos() {
-        let mut config = Config::default();
-        config.screen_intelligence.enabled = true;
-
-        // Record pre-state. The global server is a `OnceLock`-style singleton —
-        // if no test in this binary has touched it yet, `try_global_server()`
-        // returns None. On non-macOS, `start_if_enabled` must NOT advance that
-        // None to Some — that's the no-op contract this PR enforces. A
-        // weaker test that only checked post-state would silently pass even
-        // if behavior regressed to "create-then-stop", which is the failure
-        // shape we're explicitly guarding against (per CodeRabbit review on
-        // #1542).
-        let pre_state = try_global_server();
-
-        start_if_enabled(&config).await;
-
-        let post_state = try_global_server();
-        if pre_state.is_none() {
-            assert!(
-                post_state.is_none(),
-                "non-macOS autostart must not initialize the global server"
-            );
-        } else if let Some(server) = post_state {
-            let status = server.status().await;
-            assert_eq!(status.state, ServerState::Stopped);
-        }
-    }
-
-    #[test]
-    fn is_expected_macos_only_failure_classifies_known_signal() {
-        // The classifier returns true ONLY when:
-        //   1. running on a non-macOS target, AND
-        //   2. the error text contains the engine's "macOS-only" marker.
-        // Anything else stays at `error!` level so genuine engine failures
-        // still surface in Sentry.
-        let macos_marker = "accessibility automation is macOS-only in V1";
-        let other_error = "session start failed: io error: broken pipe";
-
-        #[cfg(not(target_os = "macos"))]
-        {
-            assert!(is_expected_macos_only_failure(macos_marker));
-            assert!(!is_expected_macos_only_failure(other_error));
-        }
-        #[cfg(target_os = "macos")]
-        {
-            // On macOS the platform check is false up front — the marker is
-            // ignored. A "macOS-only" error reaching us on macOS would be a
-            // real bug worth surfacing at error! level.
-            assert!(!is_expected_macos_only_failure(macos_marker));
-            assert!(!is_expected_macos_only_failure(other_error));
-        }
-    }
-
-    #[test]
-    fn is_expected_session_already_active_failure_classifies_known_signal() {
-        // OPENHUMAN-TAURI-5H: the canonical wire shape returned by
-        // `engine::start_session` when the engine already has a live
-        // session. Must classify on every platform — the duplicate is
-        // benign idempotency regardless of host OS.
-        assert!(is_expected_session_already_active_failure(
-            "session already active"
-        ));
-        // Substring match so wrapped / prefixed forms still classify.
-        assert!(is_expected_session_already_active_failure(
-            "screen intelligence: session already active"
-        ));
-        // Unrelated session-domain errors must NOT classify — they're real
-        // failures that should still surface as Sentry events.
-        assert!(!is_expected_session_already_active_failure(
-            "accessibility permission is not granted"
-        ));
-        assert!(!is_expected_session_already_active_failure(
-            "session start failed: io error: broken pipe"
-        ));
-    }
-
-    #[test]
-    fn is_expected_benign_start_session_failure_is_union_of_classifiers() {
-        // The union helper is what every call site (`SiServer::run`,
-        // `start_if_enabled`'s spawned future) consumes. It must return
-        // `true` for either known-benign shape and `false` for genuine
-        // engine failures.
-        assert!(is_expected_benign_start_session_failure(
-            "session already active"
-        ));
-        assert!(!is_expected_benign_start_session_failure(
-            "accessibility permission is not granted"
-        ));
-        assert!(!is_expected_benign_start_session_failure(
-            "screen recording permission is not granted"
-        ));
-
-        #[cfg(not(target_os = "macos"))]
-        assert!(is_expected_benign_start_session_failure(
-            "accessibility automation is macOS-only in V1"
-        ));
-    }
-
-    #[tokio::test]
-    #[cfg(target_os = "macos")]
-    async fn start_if_enabled_continues_on_macos() {
-        let mut config = Config::default();
-        config.screen_intelligence.enabled = true;
-
-        // On macOS, it should at least initialize the global server.
-        // We don't necessarily want it to succeed in full run() if permissions are missing,
-        // but it should get past the platform check.
-        start_if_enabled(&config).await;
-
-        assert!(try_global_server().is_some());
-    }
-}
diff --git a/src/openhuman/screen_intelligence/state.rs b/src/openhuman/screen_intelligence/state.rs
deleted file mode 100644
index 2aa64c0d3..000000000
--- a/src/openhuman/screen_intelligence/state.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-//! Engine state types and global singleton.
-
-use crate::openhuman::accessibility::{AppContext, PermissionState, PermissionStatus};
-use crate::openhuman::config::ScreenIntelligenceConfig;
-use once_cell::sync::Lazy;
-use std::collections::VecDeque;
-use std::sync::Arc;
-use tokio::sync::Mutex;
-use tokio::task::JoinHandle;
-
-use super::types::{AccessibilityFeatures, CaptureFrame, VisionSummary};
-
-pub(crate) struct SessionRuntime {
-    pub(crate) started_at_ms: i64,
-    pub(crate) expires_at_ms: i64,
-    pub(crate) ttl_secs: u64,
-    pub(crate) panic_hotkey: String,
-    pub(crate) stop_reason: Option<String>,
-    pub(crate) last_capture_at_ms: Option<i64>,
-    pub(crate) capture_count: u64,
-    pub(crate) frames: VecDeque<CaptureFrame>,
-    pub(crate) last_context: Option<AppContext>,
-    pub(crate) task: Option<JoinHandle<()>>,
-    pub(crate) vision_enabled: bool,
-    pub(crate) vision_state: String,
-    pub(crate) vision_queue_depth: usize,
-    pub(crate) last_vision_at_ms: Option<i64>,
-    pub(crate) last_vision_summary: Option<String>,
-    pub(crate) vision_persist_count: u64,
-    pub(crate) last_vision_persisted_key: Option<String>,
-    pub(crate) last_vision_persist_error: Option<String>,
-    pub(crate) vision_summaries: VecDeque<VisionSummary>,
-    pub(crate) vision_task: Option<JoinHandle<()>>,
-    pub(crate) vision_tx: Option<tokio::sync::mpsc::UnboundedSender<CaptureFrame>>,
-}
-
-pub(crate) struct EngineState {
-    pub(crate) config: ScreenIntelligenceConfig,
-    pub(crate) permissions: PermissionStatus,
-    pub(crate) features: AccessibilityFeatures,
-    pub(crate) session: Option<SessionRuntime>,
-    pub(crate) last_error: Option<String>,
-    pub(crate) last_event: Option<String>,
-    pub(crate) autocomplete_context: String,
-}
-
-impl EngineState {
-    pub(crate) fn new(config: ScreenIntelligenceConfig) -> Self {
-        Self {
-            permissions: PermissionStatus {
-                screen_recording: PermissionState::Unknown,
-                accessibility: PermissionState::Unknown,
-                input_monitoring: PermissionState::Unknown,
-                microphone: PermissionState::Unknown,
-            },
-            features: AccessibilityFeatures {
-                screen_monitoring: true,
-            },
-            config,
-            session: None,
-            last_error: None,
-            last_event: None,
-            autocomplete_context: String::new(),
-        }
-    }
-}
-
-pub struct AccessibilityEngine {
-    pub(crate) inner: Mutex<EngineState>,
-}
-
-static ACCESSIBILITY_ENGINE: Lazy<Arc<AccessibilityEngine>> = Lazy::new(|| {
-    Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    })
-});
-
-pub fn global_engine() -> Arc<AccessibilityEngine> {
-    ACCESSIBILITY_ENGINE.clone()
-}
diff --git a/src/openhuman/screen_intelligence/tests.rs b/src/openhuman/screen_intelligence/tests.rs
deleted file mode 100644
index 8f018c07c..000000000
--- a/src/openhuman/screen_intelligence/tests.rs
+++ /dev/null
@@ -1,924 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-use tokio::sync::Mutex;
-use tokio::time::{self, Duration};
-
-use base64::{engine::general_purpose::STANDARD as B64, Engine};
-use image::codecs::png::PngEncoder;
-use image::{ImageBuffer, Rgb, RgbImage};
-use tempfile::tempdir;
-
-use super::helpers::{
-    generate_suggestions, parse_vision_summary_output, persist_vision_summary, truncate_tail,
-    validate_input_action, vision_summary_memory_key,
-};
-use super::state::{AccessibilityEngine, EngineState};
-use super::types::{CaptureFrame, InputActionParams, StartSessionParams, VisionSummary};
-use crate::openhuman::accessibility::{parse_foreground_output, AppContext};
-use crate::openhuman::config::{Config, ScreenIntelligenceConfig};
-use crate::openhuman::embeddings::NoopEmbedding;
-use crate::openhuman::memory_store::UnifiedMemory;
-
-struct EnvVarGuard {
-    key: &'static str,
-    old: Option<String>,
-}
-
-impl EnvVarGuard {
-    fn set_to_path(key: &'static str, path: &Path) -> Self {
-        let old = std::env::var(key).ok();
-        std::env::set_var(key, path.as_os_str());
-        Self { key, old }
-    }
-
-    fn set(key: &'static str, value: &str) -> Self {
-        let old = std::env::var(key).ok();
-        std::env::set_var(key, value);
-        Self { key, old }
-    }
-}
-
-impl Drop for EnvVarGuard {
-    fn drop(&mut self) {
-        match &self.old {
-            Some(value) => std::env::set_var(self.key, value),
-            None => std::env::remove_var(self.key),
-        }
-    }
-}
-
-fn screen_intelligence_env_lock() -> std::sync::MutexGuard<'static, ()> {
-    match crate::openhuman::config::TEST_ENV_LOCK.lock() {
-        Ok(guard) => guard,
-        Err(poisoned) => poisoned.into_inner(),
-    }
-}
-
-fn write_screen_intelligence_test_config(
-    workspace_root: &Path,
-    local_ai_enabled: bool,
-    local_ai_provider: &str,
-) {
-    let cfg = format!(
-        r#"default_temperature = 0.7
-
-[memory]
-backend = "sqlite"
-auto_save = true
-embedding_provider = "none"
-embedding_model = "none"
-embedding_dimensions = 0
-
-[local_ai]
-runtime_enabled = {local_ai_enabled}
-provider = "{local_ai_provider}"
-
-[secrets]
-encrypt = false
-"#
-    );
-    std::fs::create_dir_all(workspace_root).expect("mkdir test workspace root");
-    let config_path = workspace_root.join("config.toml");
-    std::fs::write(&config_path, &cfg).expect("write test config");
-    let _: Config = toml::from_str(&cfg).expect("test config should deserialize");
-}
-
-fn make_test_png_uri(width: u32, height: u32) -> String {
-    let img: RgbImage = ImageBuffer::from_fn(width, height, |x, y| {
-        Rgb([(x % 255) as u8, (y % 255) as u8, ((x + y) % 255) as u8])
-    });
-    let mut png_bytes: Vec<u8> = Vec::new();
-    img.write_with_encoder(PngEncoder::new(&mut png_bytes))
-        .expect("PNG encode");
-    format!("data:image/png;base64,{}", B64.encode(&png_bytes))
-}
-
-// ── parse_foreground_output ─────────────────────────────────────────────
-
-#[test]
-fn parse_foreground_output_valid_6_lines() {
-    let stdout = "Safari\nGitHub - Pull Requests\n100\n200\n1400\n900\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert_eq!(ctx.app_name.as_deref(), Some("Safari"));
-    assert_eq!(ctx.window_title.as_deref(), Some("GitHub - Pull Requests"));
-    let bounds = ctx.bounds.unwrap();
-    assert_eq!(
-        (bounds.x, bounds.y, bounds.width, bounds.height),
-        (100, 200, 1400, 900)
-    );
-}
-
-#[test]
-fn parse_foreground_output_missing_bounds() {
-    let stdout = "Finder\nDesktop\n\n\n\n\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert_eq!(ctx.app_name.as_deref(), Some("Finder"));
-    assert_eq!(ctx.window_title.as_deref(), Some("Desktop"));
-    assert!(ctx.bounds.is_none());
-}
-
-#[test]
-fn parse_foreground_output_empty_app_name() {
-    let stdout = "\nSome Window\n0\n0\n800\n600\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert!(ctx.app_name.is_none());
-    assert_eq!(ctx.window_title.as_deref(), Some("Some Window"));
-    assert!(ctx.bounds.is_some());
-}
-
-#[test]
-fn parse_foreground_output_non_numeric_coords() {
-    let stdout = "Terminal\nzsh\nabc\ndef\nghi\njkl\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert_eq!(ctx.app_name.as_deref(), Some("Terminal"));
-    assert!(ctx.bounds.is_none());
-}
-
-#[test]
-fn parse_foreground_output_extra_whitespace() {
-    let stdout = "  Code  \n  main.rs  \n  50  \n  75  \n  1200  \n  800  \n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert_eq!(ctx.app_name.as_deref(), Some("Code"));
-    assert_eq!(ctx.window_title.as_deref(), Some("main.rs"));
-    let bounds = ctx.bounds.unwrap();
-    assert_eq!(
-        (bounds.x, bounds.y, bounds.width, bounds.height),
-        (50, 75, 1200, 800)
-    );
-}
-
-#[test]
-fn parse_foreground_output_single_line() {
-    let stdout = "OnlyAppName\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert_eq!(ctx.app_name.as_deref(), Some("OnlyAppName"));
-    assert!(ctx.window_title.is_none());
-    assert!(ctx.bounds.is_none());
-}
-
-#[test]
-fn parse_foreground_output_zero_size_bounds() {
-    let stdout = "App\nWindow\n100\n200\n0\n0\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert!(ctx.bounds.is_none(), "zero-size bounds should be None");
-}
-
-#[test]
-fn parse_foreground_output_negative_size() {
-    let stdout = "App\nWindow\n100\n200\n-1\n600\n";
-    let ctx = parse_foreground_output(stdout).unwrap();
-    assert!(
-        ctx.bounds.is_none(),
-        "negative width should yield None bounds"
-    );
-}
-
-// ── parse_vision_summary_output ─────────────────────────────────────────
-
-fn test_frame() -> CaptureFrame {
-    CaptureFrame {
-        captured_at_ms: 1700000000000,
-        reason: "test".to_string(),
-        app_name: Some("TestApp".to_string()),
-        window_title: Some("TestWindow".to_string()),
-        image_ref: None,
-    }
-}
-
-#[test]
-fn parse_vision_valid_json() {
-    let raw = r#"{"ui_state": "editor open", "key_text": "fn main()", "actionable_notes": "Consider adding tests", "confidence": 0.85}"#;
-    let summary = parse_vision_summary_output(test_frame(), raw);
-    assert_eq!(summary.ui_state, "editor open");
-    assert_eq!(summary.key_text, "fn main()");
-    assert_eq!(summary.actionable_notes, "Consider adding tests");
-    assert!((summary.confidence - 0.85).abs() < 0.01);
-    assert_eq!(summary.app_name.as_deref(), Some("TestApp"));
-}
-
-#[test]
-fn parse_vision_malformed_json_falls_back() {
-    // Plain text mode: first line = ui_state
-    let raw = "this is not json at all";
-    let summary = parse_vision_summary_output(test_frame(), raw);
-    assert_eq!(summary.ui_state, "this is not json at all");
-    assert!((summary.confidence - 0.8).abs() < 0.01);
-}
-
-#[test]
-fn parse_vision_missing_fields() {
-    let raw = r#"{"ui_state": "active"}"#;
-    let summary = parse_vision_summary_output(test_frame(), raw);
-    assert_eq!(summary.ui_state, "active");
-    assert_eq!(summary.key_text, "");
-    // Default confidence is now 0.8 (consistent across JSON and plain-text branches).
-    assert!((summary.confidence - 0.8).abs() < 0.01);
-}
-
-#[test]
-fn parse_vision_confidence_clamping() {
-    let raw = r#"{"confidence": 1.5}"#;
-    let summary = parse_vision_summary_output(test_frame(), raw);
-    assert!((summary.confidence - 1.0).abs() < 0.01);
-
-    let raw2 = r#"{"confidence": -0.5}"#;
-    let summary2 = parse_vision_summary_output(test_frame(), raw2);
-    assert!((summary2.confidence - 0.0).abs() < 0.01);
-}
-
-#[test]
-fn parse_vision_empty_strings_use_fallback() {
-    // JSON with empty strings — JSON path still works, empty fields stay empty
-    let raw = r#"{"ui_state": "", "actionable_notes": ""}"#;
-    let summary = parse_vision_summary_output(test_frame(), raw);
-    assert_eq!(summary.ui_state, "");
-    assert_eq!(summary.actionable_notes, "");
-}
-
-// ── should_capture_context / rule_matches_context ───────────────────────
-
-#[test]
-fn denylist_blocks_matching_context() {
-    let engine = AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    };
-    let config = ScreenIntelligenceConfig {
-        denylist: vec!["1password".to_string(), "keychain".to_string()],
-        ..Default::default()
-    };
-    let ctx = AppContext {
-        app_name: Some("1Password 8".to_string()),
-        window_title: Some("Vault".to_string()),
-        bounds: None,
-        window_id: None,
-    };
-    assert!(
-        !engine.should_capture_context(&ctx, &config),
-        "1password should be blocked by denylist"
-    );
-}
-
-#[test]
-fn denylist_allows_non_matching_context() {
-    let engine = AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    };
-    let config = ScreenIntelligenceConfig {
-        denylist: vec!["1password".to_string()],
-        ..Default::default()
-    };
-    let ctx = AppContext {
-        app_name: Some("Safari".to_string()),
-        window_title: Some("GitHub".to_string()),
-        bounds: None,
-        window_id: None,
-    };
-    assert!(engine.should_capture_context(&ctx, &config));
-}
-
-#[test]
-fn whitelist_only_mode_blocks_unlisted() {
-    let engine = AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    };
-    let config = ScreenIntelligenceConfig {
-        policy_mode: "whitelist_only".to_string(),
-        allowlist: vec!["code".to_string()],
-        denylist: vec![],
-        ..Default::default()
-    };
-    let ctx = AppContext {
-        app_name: Some("Safari".to_string()),
-        window_title: Some("Web".to_string()),
-        bounds: None,
-        window_id: None,
-    };
-    assert!(
-        !engine.should_capture_context(&ctx, &config),
-        "whitelist_only should block unlisted apps"
-    );
-
-    let ctx_allowed = AppContext {
-        app_name: Some("Visual Studio Code".to_string()),
-        window_title: Some("main.rs".to_string()),
-        bounds: None,
-        window_id: None,
-    };
-    assert!(engine.should_capture_context(&ctx_allowed, &config));
-}
-
-#[test]
-fn denylist_matching_is_case_insensitive() {
-    let engine = AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    };
-    let config = ScreenIntelligenceConfig {
-        denylist: vec!["Keychain".to_string()],
-        ..Default::default()
-    };
-    let ctx = AppContext {
-        app_name: Some("KEYCHAIN Access".to_string()),
-        window_title: None,
-        bounds: None,
-        window_id: None,
-    };
-    assert!(!engine.should_capture_context(&ctx, &config));
-}
-
-// ── validate_input_action ───────────────────────────────────────────────
-
-#[test]
-fn validates_coordinates_and_actions() {
-    let ok = InputActionParams {
-        action: "mouse_move".to_string(),
-        x: Some(10),
-        y: Some(20),
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&ok).is_ok());
-
-    let bad = InputActionParams {
-        action: "mouse_click".to_string(),
-        x: Some(-1),
-        y: Some(20),
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&bad).is_err());
-
-    let unsupported = InputActionParams {
-        action: "open_portal".to_string(),
-        x: None,
-        y: None,
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&unsupported).is_err());
-}
-
-#[test]
-fn validate_key_type_empty_text() {
-    let params = InputActionParams {
-        action: "key_type".to_string(),
-        x: None,
-        y: None,
-        button: None,
-        text: Some("".to_string()),
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&params).is_err());
-}
-
-#[test]
-fn validate_key_press_whitespace_key() {
-    let params = InputActionParams {
-        action: "key_press".to_string(),
-        x: None,
-        y: None,
-        button: None,
-        text: None,
-        key: Some("   ".to_string()),
-        modifiers: None,
-    };
-    assert!(validate_input_action(&params).is_err());
-}
-
-#[test]
-fn validate_coordinates_at_boundaries() {
-    // 0,0 should be valid
-    let zero = InputActionParams {
-        action: "mouse_move".to_string(),
-        x: Some(0),
-        y: Some(0),
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&zero).is_ok());
-
-    // 10000,10000 should be valid
-    let max = InputActionParams {
-        action: "mouse_click".to_string(),
-        x: Some(10000),
-        y: Some(10000),
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&max).is_ok());
-
-    // 10001 should be invalid
-    let over = InputActionParams {
-        action: "mouse_move".to_string(),
-        x: Some(10001),
-        y: Some(0),
-        button: None,
-        text: None,
-        key: None,
-        modifiers: None,
-    };
-    assert!(validate_input_action(&over).is_err());
-}
-
-// ── truncate_tail ───────────────────────────────────────────────────────
-
-#[test]
-fn truncate_tail_within_limit() {
-    assert_eq!(truncate_tail("hello", 10), "hello");
-}
-
-#[test]
-fn truncate_tail_at_limit() {
-    assert_eq!(truncate_tail("hello", 5), "hello");
-}
-
-#[test]
-fn truncate_tail_over_limit() {
-    assert_eq!(truncate_tail("hello world", 5), "world");
-}
-
-// ── generate_suggestions ────────────────────────────────────────────────
-
-#[test]
-fn suggestions_for_known_keywords() {
-    let results = generate_suggestions("thanks", 3);
-    assert!(!results.is_empty());
-    assert!(results[0].value.contains("help"));
-
-    let results2 = generate_suggestions("let's schedule a meeting", 3);
-    assert!(results2.iter().any(|s| s.value.contains("10am")));
-}
-
-#[test]
-fn suggestions_for_empty_context() {
-    let results = generate_suggestions("", 3);
-    assert!(!results.is_empty(), "should return default suggestion");
-}
-
-#[test]
-fn suggestions_max_results_clamping() {
-    let results = generate_suggestions("thanks for the meeting, let's ship", 1);
-    assert_eq!(results.len(), 1, "should respect max_results");
-}
-
-// ── Session lifecycle tests (macOS-gated) ───────────────────────────────
-
-#[tokio::test]
-async fn session_lifecycle_transitions_and_ttl_expiry() {
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig {
-            baseline_fps: 8.0,
-            session_ttl_secs: 1,
-            denylist: vec!["1password".to_string()],
-            ..Default::default()
-        })),
-    });
-
-    let start = engine
-        .start_session(StartSessionParams {
-            consent: true,
-            ttl_secs: Some(1),
-            screen_monitoring: Some(true),
-        })
-        .await;
-
-    if cfg!(target_os = "macos") {
-        if start.is_ok() {
-            let active = engine.status().await;
-            assert!(active.session.active);
-            // ttl_secs is clamped to [30, 3600]; a 1s request becomes 30s wall-clock expiry.
-            assert_eq!(active.session.ttl_secs, 30);
-
-            let _ = engine
-                .stop_session(Some("test_session_end".to_string()))
-                .await;
-            let ended = engine.status().await;
-            assert!(!ended.session.active);
-        }
-    } else {
-        assert!(start.is_err());
-    }
-}
-
-#[tokio::test]
-async fn panic_stop_behavior_stops_session() {
-    if !cfg!(target_os = "macos") {
-        return;
-    }
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig {
-            baseline_fps: 6.0,
-            session_ttl_secs: 60,
-            ..Default::default()
-        })),
-    });
-
-    let started = engine
-        .start_session(StartSessionParams {
-            consent: true,
-            ttl_secs: Some(60),
-            screen_monitoring: Some(true),
-        })
-        .await;
-
-    if started.is_err() {
-        return;
-    }
-
-    let result = engine
-        .input_action(InputActionParams {
-            action: "panic_stop".to_string(),
-            x: None,
-            y: None,
-            button: None,
-            text: None,
-            key: None,
-            modifiers: None,
-        })
-        .await
-        .expect("panic action should return");
-
-    assert!(result.accepted);
-    assert!(!engine.status().await.session.active);
-}
-
-#[tokio::test]
-async fn capture_scheduler_adds_baseline_frames() {
-    if !cfg!(target_os = "macos") {
-        return;
-    }
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig {
-            baseline_fps: 6.0,
-            session_ttl_secs: 2,
-            ..Default::default()
-        })),
-    });
-
-    let started = engine
-        .start_session(StartSessionParams {
-            consent: true,
-            ttl_secs: Some(2),
-            screen_monitoring: Some(true),
-        })
-        .await;
-
-    if started.is_err() {
-        return;
-    }
-
-    time::sleep(Duration::from_millis(700)).await;
-
-    let status = engine.status().await;
-    // The capture worker requires a valid window_id (CGWindowID) to capture.
-    // In some environments (CI, headless, or when the foreground app doesn't
-    // expose a Quartz window) no frames will be captured — skip gracefully.
-    if status.session.frames_in_memory == 0 {
-        let _ = engine
-            .stop_session(Some("test_skip_no_window_id".to_string()))
-            .await;
-        return;
-    }
-    assert!(status.session.frames_in_memory >= 1);
-
-    let _ = engine.stop_session(Some("test_end".to_string())).await;
-}
-
-// ── capture_test (standalone, no session needed) ────────────────────────
-
-#[tokio::test]
-async fn capture_test_returns_diagnostics() {
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    });
-
-    let result = engine.capture_test().await;
-
-    // On macOS dev machines without Screen Recording permission
-    // granted to the cargo-test binary, `capture_test` blocks for
-    // ~30s waiting on the macOS permission ticker and then returns
-    // with a large `timing_ms`. That is an environment artefact,
-    // not a product bug — treat it as "skip strict assertions" so
-    // local runs stop failing while CI (Linux, no screen API at
-    // all) still exercises the non-macOS assertion below.
-    if cfg!(target_os = "macos") && result.timing_ms >= 10_000 {
-        eprintln!(
-            "[capture_test] capture_test() took {}ms — likely running \
-             without Screen Recording permission. Skipping strict \
-             assertions (this path passes in CI).",
-            result.timing_ms
-        );
-        return;
-    }
-
-    assert!(
-        result.capture_mode == "windowed" || result.capture_mode == "fullscreen",
-        "capture_mode should be windowed or fullscreen"
-    );
-
-    if !cfg!(target_os = "macos") {
-        assert!(!result.ok, "should fail on non-macOS");
-        assert_eq!(
-            result.error.as_deref(),
-            Some("screen capture is unsupported on this platform")
-        );
-    }
-}
-
-#[tokio::test]
-async fn capture_now_without_session_is_rejected_without_hanging() {
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    });
-
-    let result = engine
-        .capture_now()
-        .await
-        .expect("capture_now should not error");
-    assert!(
-        !result.accepted,
-        "capture_now should be rejected without a session"
-    );
-    assert!(
-        result.frame.is_none(),
-        "capture_now should not produce a frame without a session"
-    );
-}
-
-// ── save_screenshot_to_disk ─────────────────────────────────────────────
-
-#[test]
-fn save_screenshot_to_disk_writes_png_to_workspace() {
-    use base64::{engine::general_purpose::STANDARD as B64, Engine};
-    use image::codecs::png::PngEncoder;
-    use image::{ImageBuffer, Rgb, RgbImage};
-    use tempfile::tempdir;
-
-    let tmp = tempdir().expect("tempdir");
-
-    // Build a tiny 4x4 solid-colour PNG as data URI
-    let img: RgbImage = ImageBuffer::from_fn(4, 4, |_, _| Rgb([100u8, 149u8, 237u8]));
-    let mut png_bytes: Vec<u8> = Vec::new();
-    img.write_with_encoder(PngEncoder::new(&mut png_bytes))
-        .expect("PNG encode");
-    let image_ref = format!("data:image/png;base64,{}", B64.encode(&png_bytes));
-
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000200,
-        reason: "unit_test_save".to_string(),
-        app_name: Some("UnitTestApp".to_string()),
-        window_title: Some("Test Window".to_string()),
-        image_ref: Some(image_ref),
-    };
-
-    let result = AccessibilityEngine::save_screenshot_to_disk(tmp.path(), &frame);
-    assert!(
-        result.is_ok(),
-        "save_screenshot_to_disk should succeed: {:?}",
-        result
-    );
-
-    let path = result.unwrap();
-    assert!(
-        path.exists(),
-        "[screen_intelligence] saved PNG file should exist at {}",
-        path.display()
-    );
-    assert_eq!(
-        path.extension().and_then(|e| e.to_str()),
-        Some("png"),
-        "saved file should have .png extension"
-    );
-    let metadata = std::fs::metadata(&path).expect("file metadata");
-    assert!(metadata.len() > 0, "saved PNG should not be empty");
-    assert!(
-        path.to_string_lossy().contains("1700000000200"),
-        "filename should include capture timestamp"
-    );
-}
-
-#[test]
-fn save_screenshot_to_disk_rejects_frame_without_image_ref() {
-    use tempfile::tempdir;
-
-    let tmp = tempdir().expect("tempdir");
-
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000201,
-        reason: "unit_test_no_image".to_string(),
-        app_name: Some("TestApp".to_string()),
-        window_title: None,
-        image_ref: None, // no image payload
-    };
-
-    let result = AccessibilityEngine::save_screenshot_to_disk(tmp.path(), &frame);
-    assert!(
-        result.is_err(),
-        "[screen_intelligence] save_screenshot_to_disk should return Err when frame has no image_ref"
-    );
-    let err = result.unwrap_err();
-    assert!(!err.is_empty(), "error message should not be empty");
-}
-
-// ── deterministic vision pipeline (mocked local output) ────────────────────
-
-#[tokio::test]
-async fn analyze_and_persist_frame_writes_unified_memory_document() {
-    let _env_lock = screen_intelligence_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    let _mock = EnvVarGuard::set(
-        "OPENHUMAN_SCREEN_INTELLIGENCE_MOCK_VISION_JSON",
-        r#"{"ui_state":"editor","key_text":"fn main() {}","actionable_notes":"Rust source is open","confidence":0.93}"#,
-    );
-    write_screen_intelligence_test_config(tmp.path(), true, "ollama");
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    });
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000300,
-        reason: "pipeline_test".to_string(),
-        app_name: Some("PipelineApp".to_string()),
-        window_title: Some("Main.rs".to_string()),
-        image_ref: Some(make_test_png_uri(320, 200)),
-    };
-    let summary = engine
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect("analyze_and_persist_frame should succeed with mocked vision output");
-    assert_eq!(summary.ui_state, "editor");
-    assert_eq!(summary.actionable_notes, "Rust source is open");
-
-    let config = Config::load_or_init().await.expect("load config");
-    let mem = UnifiedMemory::new(
-        &config.workspace_dir,
-        Arc::new(NoopEmbedding),
-        config.memory.sqlite_open_timeout_secs,
-    )
-    .expect("memory init");
-    let list = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list documents");
-    let documents = list["documents"]
-        .as_array()
-        .expect("documents array should exist");
-    let key = vision_summary_memory_key(&summary);
-    assert!(
-        documents
-            .iter()
-            .any(|doc| doc["key"].as_str() == Some(&key)),
-        "expected persisted vision summary key in background namespace: {key}"
-    );
-}
-
-#[tokio::test]
-async fn persist_vision_summary_uses_pii_safe_document_key() {
-    let _env_lock = screen_intelligence_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    write_screen_intelligence_test_config(tmp.path(), true, "ollama");
-
-    let summary = VisionSummary {
-        id: "vision-1700000000300-abcde1234f".to_string(),
-        captured_at_ms: 1700000000300,
-        app_name: Some("PipelineApp".to_string()),
-        window_title: Some("Main.rs".to_string()),
-        ui_state: "editor".to_string(),
-        key_text: "fn main() {}".to_string(),
-        actionable_notes: "Rust source is open".to_string(),
-        confidence: 0.93,
-    };
-    let raw_key = format!("screen_intelligence_{}", summary.id);
-    assert!(
-        crate::openhuman::memory_store::safety::pii::has_likely_pii(&raw_key),
-        "test fixture must resemble formatted PII before safe-key rewriting"
-    );
-
-    let persisted = persist_vision_summary(summary.clone())
-        .await
-        .expect("internal screen-intelligence keys must not trip PII guards");
-    assert_eq!(persisted.namespace, "background");
-    assert!(
-        !crate::openhuman::memory_store::safety::pii::has_likely_pii(&persisted.key),
-        "rewritten memory key must stay below the PII boundary guard"
-    );
-    assert_ne!(
-        persisted.key, raw_key,
-        "memory key should not embed the raw vision id when it can resemble formatted PII"
-    );
-}
-
-#[tokio::test]
-async fn analyze_and_persist_frame_rejects_non_local_provider() {
-    let _env_lock = screen_intelligence_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    write_screen_intelligence_test_config(tmp.path(), true, "openai");
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    });
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000301,
-        reason: "provider_guard_test".to_string(),
-        app_name: Some("PipelineApp".to_string()),
-        window_title: Some("Guard".to_string()),
-        image_ref: Some(make_test_png_uri(160, 120)),
-    };
-
-    let err = engine
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect_err("non-local providers should be rejected");
-    assert!(
-        err.contains("provider 'ollama'"),
-        "unexpected error for non-local provider: {err}"
-    );
-}
-
-#[tokio::test]
-async fn analyze_and_persist_frame_rejects_disabled_local_ai() {
-    let _env_lock = screen_intelligence_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    write_screen_intelligence_test_config(tmp.path(), false, "ollama");
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig::default())),
-    });
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000302,
-        reason: "local_ai_disabled_test".to_string(),
-        app_name: Some("PipelineApp".to_string()),
-        window_title: Some("Guard".to_string()),
-        image_ref: Some(make_test_png_uri(160, 120)),
-    };
-
-    let err = engine
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect_err("disabled local ai should be rejected");
-    assert!(
-        err.contains("local_ai.runtime_enabled=true"),
-        "unexpected error when local ai is disabled: {err}"
-    );
-}
-
-#[tokio::test]
-async fn start_session_is_idempotent() {
-    if !cfg!(target_os = "macos") {
-        return;
-    }
-
-    let engine = Arc::new(AccessibilityEngine {
-        inner: Mutex::new(EngineState::new(ScreenIntelligenceConfig {
-            baseline_fps: 6.0,
-            session_ttl_secs: 60,
-            ..Default::default()
-        })),
-    });
-
-    // First start
-    let started = engine
-        .start_session(StartSessionParams {
-            consent: true,
-            ttl_secs: Some(60),
-            screen_monitoring: Some(true),
-        })
-        .await;
-
-    if started.is_err() {
-        // If we can't start the first session (e.g. no permissions in test env),
-        // we can't test idempotency properly here, but it shouldn't fail the test.
-        return;
-    }
-
-    // Second start - should succeed and return the same session status (active: true)
-    let second_start = engine
-        .start_session(StartSessionParams {
-            consent: true,
-            ttl_secs: Some(60),
-            screen_monitoring: Some(true),
-        })
-        .await;
-
-    assert!(second_start.is_ok(), "Second start_session should be Ok");
-    assert!(
-        second_start.unwrap().active,
-        "Second start_session should return active session status"
-    );
-}
diff --git a/src/openhuman/screen_intelligence/tools.rs b/src/openhuman/screen_intelligence/tools.rs
deleted file mode 100644
index 21476fb35..000000000
--- a/src/openhuman/screen_intelligence/tools.rs
+++ /dev/null
@@ -1,391 +0,0 @@
-//! LLM-callable wrappers over the `screen_intelligence` (accessibility) domain.
-//!
-//! These let the agent observe and drive the desktop: status, capture sessions,
-//! single captures, input automation, recent vision summaries, and the
-//! Globe/Fn hotkey listener. All delegate to the arg-less / payload functions
-//! in [`crate::openhuman::screen_intelligence::ops`] (which read the global
-//! engine + load config internally).
-//!
-//! Observation + capture/input tools are default-ON (capture requires a session
-//! the user started with consent). The OS permission-request tools —
-//! `screen_intelligence_request_permissions` / `_request_permission` — trigger
-//! system permission dialogs, so they are `Dangerous` and ship default-OFF via
-//! `tools/user_filter.rs` (`screen_permissions` toggle).
-
-use async_trait::async_trait;
-use serde_json::json;
-
-use crate::openhuman::screen_intelligence::ops;
-use crate::openhuman::screen_intelligence::types::{
-    InputActionParams, PermissionRequestParams, StartSessionParams, StopSessionParams,
-};
-use crate::openhuman::tools::traits::{PermissionLevel, Tool, ToolResult};
-
-macro_rules! emit {
-    ($outcome:expr, $name:literal) => {{
-        let outcome = $outcome.map_err(|e| anyhow::anyhow!(concat!($name, ": {}"), e))?;
-        Ok(ToolResult::success(serde_json::to_string(&outcome.value)?))
-    }};
-}
-
-/// Arg-less SI tool at a given permission level.
-macro_rules! argless_tool {
-    ($ty:ident, $name:literal, $fn:ident, $perm:expr, $conc:expr, $desc:literal) => {
-        pub struct $ty;
-        #[async_trait]
-        impl Tool for $ty {
-            fn name(&self) -> &str {
-                $name
-            }
-            fn description(&self) -> &str {
-                $desc
-            }
-            fn parameters_schema(&self) -> serde_json::Value {
-                json!({ "type": "object", "properties": {} })
-            }
-            fn permission_level(&self) -> PermissionLevel {
-                $perm
-            }
-            async fn execute(&self, _args: serde_json::Value) -> anyhow::Result<ToolResult> {
-                log::debug!(concat!("[tool][screen_intelligence] ", $name, " invoked"));
-                emit!(ops::$fn().await, $name)
-            }
-            fn is_concurrency_safe(&self, _args: &serde_json::Value) -> bool {
-                $conc
-            }
-        }
-    };
-}
-
-argless_tool!(
-    ScreenStatusTool,
-    "screen_intelligence_status",
-    accessibility_status,
-    PermissionLevel::ReadOnly,
-    true,
-    "Report screen-intelligence status: granted permissions, active session, and platform support."
-);
-argless_tool!(
-    ScreenCaptureImageRefTool,
-    "screen_intelligence_capture_image_ref",
-    accessibility_capture_image_ref,
-    PermissionLevel::ReadOnly,
-    false,
-    "Capture the current screen and return an image reference (no inline bytes)."
-);
-argless_tool!(
-    ScreenVisionFlushTool,
-    "screen_intelligence_vision_flush",
-    accessibility_vision_flush,
-    PermissionLevel::Execute,
-    false,
-    "Clear the cached recent-vision summaries."
-);
-argless_tool!(
-    ScreenRefreshPermissionsTool,
-    "screen_intelligence_refresh_permissions",
-    accessibility_refresh_permissions,
-    PermissionLevel::ReadOnly,
-    false,
-    "Re-detect current OS permission grants (does not prompt)."
-);
-argless_tool!(
-    ScreenCaptureNowTool,
-    "screen_intelligence_capture_now",
-    accessibility_capture_now,
-    PermissionLevel::Execute,
-    false,
-    "Capture a frame now within the active session and return its image reference."
-);
-argless_tool!(
-    ScreenCaptureTestTool,
-    "screen_intelligence_capture_test",
-    accessibility_capture_test,
-    PermissionLevel::Execute,
-    false,
-    "Run a standalone capture diagnostic (no session required)."
-);
-argless_tool!(
-    ScreenGlobeStartTool,
-    "screen_intelligence_globe_listener_start",
-    accessibility_globe_listener_start,
-    PermissionLevel::Execute,
-    false,
-    "Start the Globe/Fn hotkey listener."
-);
-argless_tool!(
-    ScreenGlobePollTool,
-    "screen_intelligence_globe_listener_poll",
-    accessibility_globe_listener_poll,
-    PermissionLevel::ReadOnly,
-    true,
-    "Poll for Globe/Fn hotkey events since the last poll."
-);
-argless_tool!(
-    ScreenGlobeStopTool,
-    "screen_intelligence_globe_listener_stop",
-    accessibility_globe_listener_stop,
-    PermissionLevel::Execute,
-    false,
-    "Stop the Globe/Fn hotkey listener."
-);
-
-/// Start a capture session (requires explicit consent).
-pub struct ScreenSessionStartTool;
-
-#[async_trait]
-impl Tool for ScreenSessionStartTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_session_start"
-    }
-
-    fn description(&self) -> &str {
-        "Start a screen-capture session. Requires `consent: true`; optional \
-         `ttl_secs` and `screen_monitoring`. Capture tools only work while a \
-         session is active."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({
-            "type": "object",
-            "properties": {
-                "consent": { "type": "boolean", "description": "Explicit user consent to capture (required true)." },
-                "ttl_secs": { "type": "integer", "minimum": 1 },
-                "screen_monitoring": { "type": "boolean" }
-            },
-            "required": ["consent"]
-        })
-    }
-
-    fn permission_level(&self) -> PermissionLevel {
-        PermissionLevel::Execute
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] session_start invoked");
-        let payload: StartSessionParams = serde_json::from_value(args)
-            .map_err(|e| anyhow::anyhow!("screen_intelligence_session_start: invalid args: {e}"))?;
-        emit!(
-            ops::accessibility_start_session(payload).await,
-            "screen_intelligence_session_start"
-        )
-    }
-}
-
-/// Stop the capture session.
-pub struct ScreenSessionStopTool;
-
-#[async_trait]
-impl Tool for ScreenSessionStopTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_session_stop"
-    }
-
-    fn description(&self) -> &str {
-        "Stop the active screen-capture session, with an optional `reason`."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({ "type": "object", "properties": { "reason": { "type": "string" } } })
-    }
-
-    fn permission_level(&self) -> PermissionLevel {
-        PermissionLevel::Execute
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] session_stop invoked");
-        let payload: StopSessionParams = serde_json::from_value(args)
-            .map_err(|e| anyhow::anyhow!("screen_intelligence_session_stop: invalid args: {e}"))?;
-        emit!(
-            ops::accessibility_stop_session(payload).await,
-            "screen_intelligence_session_stop"
-        )
-    }
-}
-
-/// Drive a click/type/key input action.
-pub struct ScreenInputActionTool;
-
-#[async_trait]
-impl Tool for ScreenInputActionTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_input_action"
-    }
-
-    fn description(&self) -> &str {
-        "Perform a desktop input action (click / type / key) via the \
-         accessibility engine. Takes an `InputActionParams` object."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({
-            "type": "object",
-            "description": "InputActionParams: the action kind plus its coordinates/text/keys.",
-            "additionalProperties": true
-        })
-    }
-
-    fn permission_level(&self) -> PermissionLevel {
-        PermissionLevel::Execute
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] input_action invoked");
-        let payload: InputActionParams = serde_json::from_value(args)
-            .map_err(|e| anyhow::anyhow!("screen_intelligence_input_action: invalid args: {e}"))?;
-        emit!(
-            ops::accessibility_input_action(payload).await,
-            "screen_intelligence_input_action"
-        )
-    }
-}
-
-/// Recent vision summaries.
-pub struct ScreenVisionRecentTool;
-
-#[async_trait]
-impl Tool for ScreenVisionRecentTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_vision_recent"
-    }
-
-    fn description(&self) -> &str {
-        "Return recent vision summaries from captured frames, optionally capped \
-         by `limit`."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({
-            "type": "object",
-            "properties": { "limit": { "type": "integer", "minimum": 1 } }
-        })
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] vision_recent invoked");
-        let limit = args
-            .get("limit")
-            .and_then(serde_json::Value::as_u64)
-            .map(|v| v as usize);
-        emit!(
-            ops::accessibility_vision_recent(limit).await,
-            "screen_intelligence_vision_recent"
-        )
-    }
-
-    fn is_concurrency_safe(&self, _args: &serde_json::Value) -> bool {
-        true
-    }
-}
-
-/// Request all OS permissions. Default-OFF, Dangerous.
-pub struct ScreenRequestPermissionsTool;
-
-#[async_trait]
-impl Tool for ScreenRequestPermissionsTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_request_permissions"
-    }
-
-    fn description(&self) -> &str {
-        "Trigger the OS permission prompts needed for screen intelligence \
-         (accessibility / input monitoring). Shows system dialogs. Default-OFF \
-         (opt-in)."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({ "type": "object", "properties": {} })
-    }
-
-    fn permission_level(&self) -> PermissionLevel {
-        PermissionLevel::Dangerous
-    }
-
-    async fn execute(&self, _args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] request_permissions invoked");
-        emit!(
-            ops::accessibility_request_permissions().await,
-            "screen_intelligence_request_permissions"
-        )
-    }
-}
-
-/// Request a single OS permission. Default-OFF, Dangerous.
-pub struct ScreenRequestPermissionTool;
-
-#[async_trait]
-impl Tool for ScreenRequestPermissionTool {
-    fn name(&self) -> &str {
-        "screen_intelligence_request_permission"
-    }
-
-    fn description(&self) -> &str {
-        "Trigger the OS permission prompt for a single `permission` kind. Shows \
-         a system dialog. Default-OFF (opt-in)."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({
-            "type": "object",
-            "properties": { "permission": { "type": "string", "description": "Permission kind." } },
-            "required": ["permission"]
-        })
-    }
-
-    fn permission_level(&self) -> PermissionLevel {
-        PermissionLevel::Dangerous
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        log::debug!("[tool][screen_intelligence] request_permission invoked");
-        let payload: PermissionRequestParams = serde_json::from_value(args).map_err(|e| {
-            anyhow::anyhow!("screen_intelligence_request_permission: invalid args: {e}")
-        })?;
-        emit!(
-            ops::accessibility_request_permission(payload).await,
-            "screen_intelligence_request_permission"
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::openhuman::tools::traits::ToolScope;
-
-    #[test]
-    fn names_and_levels() {
-        assert_eq!(ScreenStatusTool.name(), "screen_intelligence_status");
-        assert_eq!(
-            ScreenStatusTool.permission_level(),
-            PermissionLevel::ReadOnly
-        );
-        assert_eq!(
-            ScreenSessionStartTool.permission_level(),
-            PermissionLevel::Execute
-        );
-        assert_eq!(
-            ScreenInputActionTool.permission_level(),
-            PermissionLevel::Execute
-        );
-        assert_eq!(
-            ScreenRequestPermissionsTool.permission_level(),
-            PermissionLevel::Dangerous
-        );
-        assert_eq!(
-            ScreenRequestPermissionTool.permission_level(),
-            PermissionLevel::Dangerous
-        );
-        assert_eq!(ScreenStatusTool.scope(), ToolScope::All);
-    }
-
-    #[tokio::test]
-    async fn session_start_requires_consent() {
-        let err = ScreenSessionStartTool
-            .execute(json!({}))
-            .await
-            .expect_err("missing consent");
-        assert!(err.to_string().contains("session_start"));
-    }
-}
diff --git a/src/openhuman/screen_intelligence/types.rs b/src/openhuman/screen_intelligence/types.rs
deleted file mode 100644
index e83847813..000000000
--- a/src/openhuman/screen_intelligence/types.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use crate::openhuman::config::ScreenIntelligenceConfig;
-use serde::{Deserialize, Serialize};
-
-// Permission types are defined in the accessibility middleware; re-export for compatibility.
-pub use crate::openhuman::accessibility::{GlobeHotkeyPollResult, GlobeHotkeyStatus};
-pub use crate::openhuman::accessibility::{PermissionKind, PermissionState, PermissionStatus};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AccessibilityFeatures {
-    pub screen_monitoring: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SessionStatus {
-    pub active: bool,
-    pub started_at_ms: Option<i64>,
-    pub expires_at_ms: Option<i64>,
-    pub remaining_ms: Option<i64>,
-    pub ttl_secs: u64,
-    pub panic_hotkey: String,
-    pub stop_reason: Option<String>,
-    pub capture_count: u64,
-    pub frames_in_memory: usize,
-    pub last_capture_at_ms: Option<i64>,
-    pub last_context: Option<String>,
-    pub last_window_title: Option<String>,
-    pub vision_enabled: bool,
-    pub vision_state: String,
-    pub vision_queue_depth: usize,
-    pub last_vision_at_ms: Option<i64>,
-    pub last_vision_summary: Option<String>,
-    pub vision_persist_count: u64,
-    pub last_vision_persisted_key: Option<String>,
-    pub last_vision_persist_error: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AccessibilityHealth {
-    pub last_error: Option<String>,
-    pub last_event: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CoreProcessStatus {
-    pub pid: u32,
-    pub started_at_ms: i64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AccessibilityStatus {
-    pub platform_supported: bool,
-    pub permissions: PermissionStatus,
-    pub features: AccessibilityFeatures,
-    pub session: SessionStatus,
-    pub foreground_context: Option<AppContextInfo>,
-    pub config: ScreenIntelligenceConfig,
-    pub denylist: Vec<String>,
-    pub is_context_blocked: bool,
-    /// Absolute path of this core process. macOS privacy (TCC) is per executable; the UI should
-    /// show this so users enable the same binary in System Settings (see GH #133).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub permission_check_process_path: Option<String>,
-    /// Identity of the current core process so the UI can verify that a restart actually happened.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub core_process: Option<CoreProcessStatus>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct StartSessionParams {
-    pub consent: bool,
-    pub ttl_secs: Option<u64>,
-    pub screen_monitoring: Option<bool>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PermissionRequestParams {
-    pub permission: PermissionKind,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct StopSessionParams {
-    pub reason: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CaptureFrame {
-    pub captured_at_ms: i64,
-    pub reason: String,
-    pub app_name: Option<String>,
-    pub window_title: Option<String>,
-    pub image_ref: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CaptureNowResult {
-    pub accepted: bool,
-    pub frame: Option<CaptureFrame>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CaptureImageRefResult {
-    pub ok: bool,
-    pub image_ref: Option<String>,
-    pub mime_type: String,
-    pub bytes_estimate: Option<usize>,
-    pub message: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct VisionSummary {
-    pub id: String,
-    pub captured_at_ms: i64,
-    pub app_name: Option<String>,
-    pub window_title: Option<String>,
-    pub ui_state: String,
-    pub key_text: String,
-    pub actionable_notes: String,
-    pub confidence: f32,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct VisionRecentResult {
-    pub summaries: Vec<VisionSummary>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct VisionFlushResult {
-    pub accepted: bool,
-    pub summary: Option<VisionSummary>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct InputActionParams {
-    pub action: String,
-    pub x: Option<i32>,
-    pub y: Option<i32>,
-    pub button: Option<String>,
-    pub text: Option<String>,
-    pub key: Option<String>,
-    pub modifiers: Option<Vec<String>>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct InputActionResult {
-    pub accepted: bool,
-    pub blocked: bool,
-    pub reason: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutocompleteSuggestParams {
-    pub context: Option<String>,
-    pub max_results: Option<usize>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutocompleteSuggestion {
-    pub value: String,
-    pub confidence: f32,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutocompleteSuggestResult {
-    pub suggestions: Vec<AutocompleteSuggestion>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutocompleteCommitParams {
-    pub suggestion: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AutocompleteCommitResult {
-    pub committed: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AppContextInfo {
-    pub app_name: Option<String>,
-    pub window_title: Option<String>,
-    pub bounds_x: Option<i32>,
-    pub bounds_y: Option<i32>,
-    pub bounds_width: Option<i32>,
-    pub bounds_height: Option<i32>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CaptureTestResult {
-    pub ok: bool,
-    pub capture_mode: String,
-    pub context: Option<AppContextInfo>,
-    pub image_ref: Option<String>,
-    pub bytes_estimate: Option<usize>,
-    pub error: Option<String>,
-    pub timing_ms: u64,
-}
diff --git a/src/openhuman/screen_intelligence/vision.rs b/src/openhuman/screen_intelligence/vision.rs
deleted file mode 100644
index e6715364e..000000000
--- a/src/openhuman/screen_intelligence/vision.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-//! Vision query methods — recent summaries, flush, and analyze-and-persist.
-
-use super::helpers::push_ephemeral_vision_summary;
-use super::state::AccessibilityEngine;
-use super::types::{CaptureFrame, VisionFlushResult, VisionRecentResult, VisionSummary};
-
-impl AccessibilityEngine {
-    pub async fn vision_recent(&self, limit: Option<usize>) -> VisionRecentResult {
-        let state = self.inner.lock().await;
-        let max_items = limit.unwrap_or(10).clamp(1, 120);
-
-        let summaries = state
-            .session
-            .as_ref()
-            .map(|session| {
-                session
-                    .vision_summaries
-                    .iter()
-                    .rev()
-                    .take(max_items)
-                    .cloned()
-                    .collect::<Vec<_>>()
-            })
-            .unwrap_or_default();
-
-        VisionRecentResult { summaries }
-    }
-
-    pub async fn vision_flush(&self) -> Result<VisionFlushResult, String> {
-        let candidate = {
-            let mut state = self.inner.lock().await;
-            let Some(session) = state.session.as_mut() else {
-                return Ok(VisionFlushResult {
-                    accepted: false,
-                    summary: None,
-                });
-            };
-
-            let latest = session
-                .frames
-                .iter()
-                .rev()
-                .find(|f| f.image_ref.is_some())
-                .cloned();
-            if let Some(frame) = latest.clone() {
-                session.vision_state = "queued".to_string();
-                session.vision_queue_depth = session.vision_queue_depth.saturating_add(1);
-                Some(frame)
-            } else {
-                None
-            }
-        };
-
-        let Some(frame) = candidate else {
-            return Ok(VisionFlushResult {
-                accepted: false,
-                summary: None,
-            });
-        };
-
-        let summary = match super::processing_worker::analyze_frame(self, frame).await {
-            Ok(summary) => summary,
-            Err(err) => {
-                let mut state = self.inner.lock().await;
-                if let Some(session) = state.session.as_mut() {
-                    session.vision_queue_depth = session.vision_queue_depth.saturating_sub(1);
-                    session.vision_state = "error".to_string();
-                }
-                state.last_error = Some(format!("vision_flush_analysis_failed: {err}"));
-                return Err(format!("vision flush failed: {err}"));
-            }
-        };
-
-        let persist = super::helpers::persist_vision_summary(summary.clone())
-            .await
-            .map_err(|err| format!("vision summary persistence failed: {err}"));
-
-        {
-            let mut state = self.inner.lock().await;
-            if let Some(session) = state.session.as_mut() {
-                session.vision_queue_depth = session.vision_queue_depth.saturating_sub(1);
-                push_ephemeral_vision_summary(&mut session.vision_summaries, summary.clone());
-                session.last_vision_at_ms = Some(summary.captured_at_ms);
-                session.last_vision_summary = Some(summary.key_text.clone());
-                match &persist {
-                    Ok(result) => {
-                        session.vision_state = "ready".to_string();
-                        session.vision_persist_count =
-                            session.vision_persist_count.saturating_add(1);
-                        session.last_vision_persisted_key = Some(result.key.clone());
-                        session.last_vision_persist_error = None;
-                    }
-                    Err(err) => {
-                        session.vision_state = "error".to_string();
-                        session.last_vision_persist_error = Some(err.clone());
-                        state.last_error = Some(format!("vision_flush_persist_failed: {err}"));
-                    }
-                }
-            }
-        }
-
-        if let Err(err) = persist {
-            return Err(format!("vision flush failed: {err}"));
-        }
-
-        Ok(VisionFlushResult {
-            accepted: true,
-            summary: Some(summary),
-        })
-    }
-
-    /// Deterministic pipeline hook used by tests and diagnostics:
-    /// analyze one frame with the local vision model and persist the summary to memory.
-    pub async fn analyze_and_persist_frame(
-        &self,
-        frame: CaptureFrame,
-    ) -> Result<VisionSummary, String> {
-        let summary = super::processing_worker::analyze_frame(self, frame).await?;
-        let persisted = super::helpers::persist_vision_summary(summary.clone())
-            .await
-            .map_err(|err| format!("vision summary persistence failed: {err}"))?;
-        tracing::debug!(
-            "[screen_intelligence] analyze_and_persist_frame completed (namespace={} key={})",
-            persisted.namespace,
-            persisted.key
-        );
-        Ok(summary)
-    }
-}
diff --git a/src/openhuman/tools/README.md b/src/openhuman/tools/README.md
index 522d426cb..49bdb8c0d 100644
--- a/src/openhuman/tools/README.md
+++ b/src/openhuman/tools/README.md
@@ -29,10 +29,9 @@ The agent tool layer. Defines the core [`Tool`] trait every agent-callable capab
 | `src/openhuman/tools/orchestrator_tools.rs` | Synthesizes named per-subagent tools from the orchestrator's `subagents = [...]` definition; collapses skill wildcards into `delegate_to_integrations_agent`. |
 | `src/openhuman/tools/generated.rs` | `GeneratedToolDefinition` + wrapper for runtime/profile-supplied generated capability tools (provider/capability/risk metadata for policy). |
 | `src/openhuman/tools/user_filter.rs` | `filter_tools_by_user_preference` + UI-toggle-ID → Rust-tool-name map. Unmapped tools are always retained. |
-| `src/openhuman/tools/local_cli.rs` | Local CLI helpers (e.g. screenshot wrappers) that run tools against workspace config without the RPC server. |
 | `src/openhuman/tools/impl/mod.rs` | Aggregates and re-exports the built-in tool families. |
 | `src/openhuman/tools/impl/filesystem/` | `file_read`, `file_write`, `edit_file`, `apply_patch`, `grep`, `glob_search`, `list_files`, `read_diff`, `csv_export`, `git_operations`, `run_linter`, `run_tests`, `update_memory_md`. |
-| `src/openhuman/tools/impl/browser/` | `browser` (full automation, pluggable backend), `browser_open`, `screenshot`, `image_info`, image output, action parser, native backend, security. |
+| `src/openhuman/tools/impl/browser/` | `browser` (DOM-snapshot automation, pluggable backend), `browser_open`, `image_info`, action parser, native backend, security. |
 | `src/openhuman/tools/impl/computer/` | `mouse`, `keyboard` (native control, default-off), human-path resolution. |
 | `src/openhuman/tools/impl/network/` | `http_request`, `web_fetch`, `curl`, `gitbooks` (search/get-page), `mcp` (list servers/tools, call), `mcp_setup` (5 setup-agent tools), `polymarket` (+ orders, CLOB auth), `gmail_unsubscribe`, `url_guard`. |
 | `src/openhuman/search/` | Search engine registry and search-owned agent tools such as `web_search`. |
@@ -71,7 +70,7 @@ This module **owns** the cross-cutting built-in tools (the only ones that belong
 
 - **Filesystem**: `file_read`, `file_write`, `edit_file`, `apply_patch`, `grep`, `glob`/`glob_search`, `list_files`, `read_diff`, `csv_export`, `git_operations`, `run_linter`, `run_tests`, `update_memory_md`.
 - **System/process**: `shell`, `node_exec`, `npm_exec`, `install_tool`, `detect_tools`, `current_time`, `schedule`, `proxy_config`, `pushover`, `lsp`, `tool_stats`, `update_check`, `update_apply`.
-- **Browser/computer**: `browser`, `browser_open`, `screenshot`, `image_info`, `mouse`, `keyboard`.
+- **Browser/computer**: `browser`, `browser_open`, `image_info`, `mouse`, `keyboard`.
 - **Generic network**: `http_request`, `web_fetch`, `curl`, `gitbooks_search`/`gitbooks_get_page`, MCP bridge (`mcp` list/call), `mcp_setup` tools, `gmail_unsubscribe`.
 - **Search**: `web_search` and provider-specific search families are registered by `openhuman::search::registry`; `search.engine = "disabled"` suppresses this surface entirely.
 
diff --git a/src/openhuman/tools/impl/browser/action_parser.rs b/src/openhuman/tools/impl/browser/action_parser.rs
index a3bf36d2f..b8780c378 100644
--- a/src/openhuman/tools/impl/browser/action_parser.rs
+++ b/src/openhuman/tools/impl/browser/action_parser.rs
@@ -76,13 +76,6 @@ pub(crate) fn parse_browser_action(
         }
         "get_title" => Ok(BrowserAction::GetTitle),
         "get_url" => Ok(BrowserAction::GetUrl),
-        "screenshot" => Ok(BrowserAction::Screenshot {
-            path: args.get("path").and_then(|v| v.as_str()).map(String::from),
-            full_page: args
-                .get("full_page")
-                .and_then(serde_json::Value::as_bool)
-                .unwrap_or(false),
-        }),
         "wait" => Ok(BrowserAction::Wait {
             selector: args
                 .get("selector")
@@ -168,7 +161,6 @@ pub(crate) fn is_supported_browser_action(action: &str) -> bool {
             | "get_text"
             | "get_title"
             | "get_url"
-            | "screenshot"
             | "wait"
             | "press"
             | "hover"
@@ -181,14 +173,13 @@ pub(crate) fn is_supported_browser_action(action: &str) -> bool {
             | "mouse_drag"
             | "key_type"
             | "key_press"
-            | "screen_capture"
     )
 }
 
 pub(crate) fn is_computer_use_only_action(action: &str) -> bool {
     matches!(
         action,
-        "mouse_move" | "mouse_click" | "mouse_drag" | "key_type" | "key_press" | "screen_capture"
+        "mouse_move" | "mouse_click" | "mouse_drag" | "key_type" | "key_press"
     )
 }
 
diff --git a/src/openhuman/tools/impl/browser/browser.rs b/src/openhuman/tools/impl/browser/browser.rs
index 4fc03c52f..2244af425 100644
--- a/src/openhuman/tools/impl/browser/browser.rs
+++ b/src/openhuman/tools/impl/browser/browser.rs
@@ -431,18 +431,6 @@ impl BrowserTool {
                 self.to_result(resp)
             }
 
-            BrowserAction::Screenshot { path, full_page } => {
-                let mut args = vec!["screenshot"];
-                if let Some(ref p) = path {
-                    args.push(p);
-                }
-                if full_page {
-                    args.push("--full");
-                }
-                let resp = self.run_command(&args).await?;
-                self.to_result(resp)
-            }
-
             BrowserAction::Wait { selector, ms, text } => {
                 let mut args = vec!["wait"];
                 let ms_str;
@@ -758,7 +746,7 @@ impl Tool for BrowserTool {
         concat!(
             "Web/browser automation with pluggable backends (playwright, agent-browser, rust-native, computer_use). ",
             "Supports DOM actions plus optional OS-level actions (mouse_move, mouse_click, mouse_drag, ",
-            "key_type, key_press, screen_capture) through a computer-use sidecar. Use 'snapshot' to map ",
+            "key_type, key_press) through a computer-use sidecar. Use 'snapshot' to map ",
             "interactive elements to refs (@e1, @e2). Enforces browser.allowed_domains for open actions."
         )
     }
@@ -770,10 +758,10 @@ impl Tool for BrowserTool {
                 "action": {
                     "type": "string",
                     "enum": ["open", "snapshot", "click", "fill", "type", "get_text",
-                             "get_title", "get_url", "screenshot", "wait", "press",
+                             "get_title", "get_url", "wait", "press",
                              "hover", "scroll", "is_visible", "close", "find",
                              "mouse_move", "mouse_click", "mouse_drag", "key_type",
-                             "key_press", "screen_capture"],
+                             "key_press"],
                     "description": "Browser action to perform (OS-level actions require backend=computer_use)"
                 },
                 "url": {
@@ -846,14 +834,6 @@ impl Tool for BrowserTool {
                     "type": "integer",
                     "description": "For snapshot: limit tree depth"
                 },
-                "full_page": {
-                    "type": "boolean",
-                    "description": "For screenshot: capture full page"
-                },
-                "path": {
-                    "type": "string",
-                    "description": "File path for screenshot"
-                },
                 "ms": {
                     "type": "integer",
                     "description": "Milliseconds to wait"
@@ -889,14 +869,7 @@ impl Tool for BrowserTool {
             return Ok(ToolResult::error("Action blocked: rate limit exceeded"));
         }
 
-        let backend = match self.resolve_backend().await {
-            Ok(selected) => selected,
-            Err(error) => {
-                return Ok(ToolResult::error(error.to_string()));
-            }
-        };
-
-        // Parse action from args
+        // Reject unsupported actions before resolving or dispatching to a backend.
         let action_str = args
             .get("action")
             .and_then(|v| v.as_str())
@@ -906,6 +879,13 @@ impl Tool for BrowserTool {
             return Ok(ToolResult::error(format!("Unknown action: {action_str}")));
         }
 
+        let backend = match self.resolve_backend().await {
+            Ok(selected) => selected,
+            Err(error) => {
+                return Ok(ToolResult::error(error.to_string()));
+            }
+        };
+
         if backend == ResolvedBackend::ComputerUse {
             return self.execute_computer_use_action(action_str, &args).await;
         }
diff --git a/src/openhuman/tools/impl/browser/browser_tests.rs b/src/openhuman/tools/impl/browser/browser_tests.rs
index a768da1bf..a57c67ac7 100644
--- a/src/openhuman/tools/impl/browser/browser_tests.rs
+++ b/src/openhuman/tools/impl/browser/browser_tests.rs
@@ -369,7 +369,7 @@ fn computer_use_only_action_detection_is_correct() {
     assert!(is_computer_use_only_action("mouse_drag"));
     assert!(is_computer_use_only_action("key_type"));
     assert!(is_computer_use_only_action("key_press"));
-    assert!(is_computer_use_only_action("screen_capture"));
+    assert!(!is_computer_use_only_action("screen_capture"));
     assert!(!is_computer_use_only_action("open"));
     assert!(!is_computer_use_only_action("snapshot"));
 }
@@ -483,23 +483,33 @@ fn parse_get_title_and_get_url() {
 }
 
 #[test]
-fn parse_screenshot_optional_fields() {
-    let action = parse_browser_action("screenshot", &json!({})).unwrap();
-    if let BrowserAction::Screenshot { path, full_page } = action {
-        assert!(path.is_none());
-        assert!(!full_page);
-    } else {
-        panic!("expected Screenshot");
-    }
+fn parse_pixel_capture_actions_are_unsupported_while_snapshot_remains_supported() {
+    assert!(parse_browser_action("snapshot", &json!({})).is_ok());
+    assert!(parse_browser_action("screenshot", &json!({})).is_err());
+    assert!(parse_browser_action("screen_capture", &json!({})).is_err());
+}
 
-    let action2 = parse_browser_action(
-        "screenshot",
-        &json!({"path": "/tmp/s.png", "full_page": true}),
-    )
-    .unwrap();
-    if let BrowserAction::Screenshot { path, full_page } = action2 {
-        assert_eq!(path.as_deref(), Some("/tmp/s.png"));
-        assert!(full_page);
+#[tokio::test]
+async fn pixel_capture_actions_are_rejected_before_backend_dispatch() {
+    let security = Arc::new(SecurityPolicy::default());
+    let tool = BrowserTool::new_with_backend(
+        security,
+        vec!["*".into()],
+        None,
+        "computer_use".into(),
+        true,
+        "http://127.0.0.1:9515".into(),
+        None,
+        ComputerUseConfig {
+            endpoint: "http://public.example.test/".into(),
+            ..ComputerUseConfig::default()
+        },
+    );
+
+    for action in ["screenshot", "screen_capture"] {
+        let result = tool.execute(json!({ "action": action })).await.unwrap();
+        assert!(result.is_error);
+        assert_eq!(result.output(), format!("Unknown action: {action}"));
     }
 }
 
@@ -627,7 +637,6 @@ fn supported_action_detection_is_exhaustive() {
         "get_text",
         "get_title",
         "get_url",
-        "screenshot",
         "wait",
         "press",
         "hover",
@@ -640,7 +649,6 @@ fn supported_action_detection_is_exhaustive() {
         "mouse_drag",
         "key_type",
         "key_press",
-        "screen_capture",
     ];
     for action in supported {
         assert!(
@@ -649,6 +657,8 @@ fn supported_action_detection_is_exhaustive() {
         );
     }
     assert!(!is_supported_browser_action("teleport"));
+    assert!(!is_supported_browser_action("screenshot"));
+    assert!(!is_supported_browser_action("screen_capture"));
     assert!(!is_supported_browser_action(""));
 }
 
@@ -921,6 +931,14 @@ fn browser_tool_schema_has_required_action() {
     let schema = tool.parameters_schema();
     let required = schema["required"].as_array().unwrap();
     assert!(required.contains(&json!("action")));
+    let actions = schema["properties"]["action"]["enum"]
+        .as_array()
+        .expect("action enum");
+    assert!(actions.contains(&json!("snapshot")));
+    assert!(!actions.contains(&json!("screenshot")));
+    assert!(!actions.contains(&json!("screen_capture")));
+    assert!(schema["properties"].get("full_page").is_none());
+    assert!(schema["properties"].get("path").is_none());
 }
 
 #[test]
diff --git a/src/openhuman/tools/impl/browser/image_output.rs b/src/openhuman/tools/impl/browser/image_output.rs
deleted file mode 100644
index a5cc1f6fa..000000000
--- a/src/openhuman/tools/impl/browser/image_output.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-//! Parse screenshot tool stdout (saved path / data URLs) and write decoded images.
-
-use std::path::{Path, PathBuf};
-
-use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, Engine as _};
-
-pub fn extract_data_url(raw: &str) -> Option<String> {
-    raw.lines().find_map(|line| {
-        let trimmed = line.trim();
-        trimmed
-            .starts_with("data:image/")
-            .then(|| trimmed.to_string())
-    })
-}
-
-pub fn extract_saved_path(raw: &str) -> Option<PathBuf> {
-    const PREFIX: &str = "Screenshot saved to: ";
-    raw.lines()
-        .find_map(|line| line.strip_prefix(PREFIX).map(PathBuf::from))
-}
-
-pub fn decode_data_url_bytes(data_url: &str) -> Result<Vec<u8>, String> {
-    let (meta, payload) = data_url
-        .split_once(',')
-        .ok_or_else(|| "invalid data URL: missing comma separator".to_string())?;
-    if !meta.starts_with("data:image/") || !meta.ends_with(";base64") {
-        return Err("invalid data URL: expected data:image/*;base64,...".to_string());
-    }
-    BASE64_STANDARD
-        .decode(payload)
-        .map_err(|e| format!("failed to decode base64 image payload: {e}"))
-}
-
-pub fn write_bytes_to_path(path: &Path, bytes: &[u8]) -> Result<(), String> {
-    if let Some(parent) = path.parent() {
-        if !parent.as_os_str().is_empty() {
-            std::fs::create_dir_all(parent)
-                .map_err(|e| format!("failed to create output directory: {e}"))?;
-        }
-    }
-    std::fs::write(path, bytes).map_err(|e| format!("failed to write output file: {e}"))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use tempfile::TempDir;
-
-    const TINY_PNG_B64: &str =
-        "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-
-    #[test]
-    fn extract_data_url_finds_data_url_line() {
-        let raw = format!("some header\ndata:image/png;base64,{TINY_PNG_B64}\nsome footer");
-        let result = extract_data_url(&raw);
-        assert!(result.is_some());
-        assert!(result.unwrap().starts_with("data:image/png;base64,"));
-    }
-
-    #[test]
-    fn extract_data_url_returns_none_when_absent() {
-        assert!(extract_data_url("no data url here").is_none());
-    }
-
-    #[test]
-    fn extract_saved_path_parses_prefix() {
-        let raw = "Screenshot saved to: /tmp/shot.png";
-        let path = extract_saved_path(raw).unwrap();
-        assert_eq!(path, PathBuf::from("/tmp/shot.png"));
-    }
-
-    #[test]
-    fn extract_saved_path_returns_none_when_absent() {
-        assert!(extract_saved_path("nothing useful").is_none());
-    }
-
-    #[test]
-    fn decode_data_url_bytes_decodes_valid_png() {
-        let data_url = format!("data:image/png;base64,{TINY_PNG_B64}");
-        let bytes = decode_data_url_bytes(&data_url).unwrap();
-        // PNG magic bytes
-        assert_eq!(&bytes[0..4], b"\x89PNG");
-    }
-
-    #[test]
-    fn decode_data_url_bytes_rejects_missing_comma() {
-        let err = decode_data_url_bytes("data:image/png;base64").unwrap_err();
-        assert!(err.contains("missing comma"));
-    }
-
-    #[test]
-    fn decode_data_url_bytes_rejects_wrong_prefix() {
-        let err = decode_data_url_bytes("data:text/plain;base64,aGVsbG8=").unwrap_err();
-        assert!(err.contains("invalid data URL"));
-    }
-
-    #[test]
-    fn write_bytes_to_path_creates_file() {
-        let tmp = TempDir::new().unwrap();
-        let dest = tmp.path().join("out.png");
-        write_bytes_to_path(&dest, b"hello").unwrap();
-        assert_eq!(std::fs::read(&dest).unwrap(), b"hello");
-    }
-
-    #[test]
-    fn write_bytes_to_path_creates_parent_dirs() {
-        let tmp = TempDir::new().unwrap();
-        let dest = tmp.path().join("sub/dir/out.png");
-        write_bytes_to_path(&dest, b"data").unwrap();
-        assert!(dest.exists());
-    }
-}
diff --git a/src/openhuman/tools/impl/browser/mod.rs b/src/openhuman/tools/impl/browser/mod.rs
index 8693c8521..22f6e9ef5 100644
--- a/src/openhuman/tools/impl/browser/mod.rs
+++ b/src/openhuman/tools/impl/browser/mod.rs
@@ -2,14 +2,8 @@
 mod browser;
 mod browser_open;
 mod image_info;
-mod image_output;
 mod playwright_backend;
-mod screenshot;
 
 pub use browser::{BrowserAction, BrowserTool, ComputerUseConfig};
 pub use browser_open::BrowserOpenTool;
 pub use image_info::ImageInfoTool;
-pub use image_output::{
-    decode_data_url_bytes, extract_data_url, extract_saved_path, write_bytes_to_path,
-};
-pub use screenshot::ScreenshotTool;
diff --git a/src/openhuman/tools/impl/browser/native_backend.rs b/src/openhuman/tools/impl/browser/native_backend.rs
index f81f1ec96..82bd6759e 100644
--- a/src/openhuman/tools/impl/browser/native_backend.rs
+++ b/src/openhuman/tools/impl/browser/native_backend.rs
@@ -1,6 +1,5 @@
 use super::BrowserAction;
 use anyhow::{Context, Result};
-use base64::Engine;
 use fantoccini::actions::{InputSource, MouseActions, PointerAction};
 use fantoccini::key::Key;
 use fantoccini::{Client, ClientBuilder, Locator};
@@ -136,31 +135,6 @@ impl NativeBrowserState {
                     "url": url.as_str(),
                 }))
             }
-            BrowserAction::Screenshot { path, full_page } => {
-                let client = self.active_client()?;
-                let png = client
-                    .screenshot()
-                    .await
-                    .context("Failed to capture screenshot")?;
-                let mut payload = json!({
-                    "backend": "rust_native",
-                    "action": "screenshot",
-                    "full_page": full_page,
-                    "bytes": png.len(),
-                });
-
-                if let Some(path_str) = path {
-                    tokio::fs::write(&path_str, &png)
-                        .await
-                        .with_context(|| format!("Failed to write screenshot to {path_str}"))?;
-                    payload["path"] = Value::String(path_str);
-                } else {
-                    payload["png_base64"] =
-                        Value::String(base64::engine::general_purpose::STANDARD.encode(&png));
-                }
-
-                Ok(payload)
-            }
             BrowserAction::Wait { selector, ms, text } => {
                 let client = self.active_client()?;
                 if let Some(sel) = selector.as_ref() {
diff --git a/src/openhuman/tools/impl/browser/playwright_backend.rs b/src/openhuman/tools/impl/browser/playwright_backend.rs
index 235ef1eb6..2804c07db 100644
--- a/src/openhuman/tools/impl/browser/playwright_backend.rs
+++ b/src/openhuman/tools/impl/browser/playwright_backend.rs
@@ -354,9 +354,6 @@ fn action_to_args(action: BrowserAction, url_policy: Option<BrowserUrlPolicy>) -
         }
         BrowserAction::GetTitle => json!({ "action": "get_title" }),
         BrowserAction::GetUrl => json!({ "action": "get_url" }),
-        BrowserAction::Screenshot { path, full_page } => {
-            json!({ "action": "screenshot", "path": path, "full_page": full_page })
-        }
         BrowserAction::Wait { selector, ms, text } => {
             json!({ "action": "wait", "selector": selector, "ms": ms, "text": text })
         }
diff --git a/src/openhuman/tools/impl/browser/playwright_runner.mjs b/src/openhuman/tools/impl/browser/playwright_runner.mjs
index a7102e885..7b9e4175e 100644
--- a/src/openhuman/tools/impl/browser/playwright_runner.mjs
+++ b/src/openhuman/tools/impl/browser/playwright_runner.mjs
@@ -357,13 +357,6 @@ async function run(args) {
       return { backend: 'playwright', action: 'get_title', title: await current.title() };
     case 'get_url':
       return { backend: 'playwright', action: 'get_url', url: current.url() };
-    case 'screenshot': {
-      const png = await current.screenshot({ fullPage: Boolean(args.full_page) });
-      if (args.path) {
-        throw new Error('Playwright screenshot path writes require Rust-side path validation and are disabled');
-      }
-      return { backend: 'playwright', action: 'screenshot', png_base64: png.toString('base64'), bytes: png.length };
-    }
     case 'wait':
       if (args.selector) await current.locator(await selectorFor(args.selector)).first().waitFor();
       else if (args.text) await current.getByText(args.text).first().waitFor();
diff --git a/src/openhuman/tools/impl/browser/screenshot.rs b/src/openhuman/tools/impl/browser/screenshot.rs
deleted file mode 100644
index 853e0f627..000000000
--- a/src/openhuman/tools/impl/browser/screenshot.rs
+++ /dev/null
@@ -1,567 +0,0 @@
-use crate::openhuman::security::SecurityPolicy;
-use crate::openhuman::tools::traits::{Tool, ToolResult};
-use async_trait::async_trait;
-use serde_json::json;
-use std::fmt::Write;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::time::Duration;
-
-/// Maximum time to wait for a screenshot command to complete.
-const SCREENSHOT_TIMEOUT_SECS: u64 = 15;
-
-/// Tool for capturing screenshots using platform-native commands.
-///
-/// macOS: `screencapture`
-/// Linux: tries `gnome-screenshot`, `scrot`, `import` (`ImageMagick`) in order.
-pub struct ScreenshotTool {
-    security: Arc<SecurityPolicy>,
-}
-
-impl ScreenshotTool {
-    pub fn new(security: Arc<SecurityPolicy>) -> Self {
-        Self { security }
-    }
-
-    /// Determine the screenshot command for the current platform.
-    fn screenshot_command(output_path: &str) -> Option<Vec<String>> {
-        if std::env::consts::OS == "macos" {
-            Some(vec![
-                "screencapture".into(),
-                "-x".into(), // no sound
-                output_path.into(),
-            ])
-        } else if std::env::consts::OS == "linux" {
-            Some(vec![
-                "sh".into(),
-                "-c".into(),
-                format!(
-                    "if command -v gnome-screenshot >/dev/null 2>&1; then \
-                         gnome-screenshot -f '{output_path}'; \
-                     elif command -v scrot >/dev/null 2>&1; then \
-                         scrot '{output_path}'; \
-                     elif command -v import >/dev/null 2>&1; then \
-                         import -window root '{output_path}'; \
-                     else \
-                         echo 'NO_SCREENSHOT_TOOL' >&2; exit 1; \
-                     fi"
-                ),
-            ])
-        } else {
-            None
-        }
-    }
-
-    /// Execute the screenshot capture and return the result.
-    async fn capture(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        let timestamp = chrono::Utc::now().format("%Y%m%d_%H%M%S");
-        let filename = args
-            .get("filename")
-            .and_then(|v| v.as_str())
-            .map_or_else(|| format!("screenshot_{timestamp}.png"), String::from);
-
-        // Sanitize filename to prevent path traversal
-        let safe_name = PathBuf::from(&filename).file_name().map_or_else(
-            || format!("screenshot_{timestamp}.png"),
-            |n| n.to_string_lossy().to_string(),
-        );
-
-        // Reject filenames with shell-breaking characters to prevent injection in sh -c
-        const SHELL_UNSAFE: &[char] = &[
-            '\'', '"', '`', '$', '\\', ';', '|', '&', '\n', '\0', '(', ')',
-        ];
-        if safe_name.contains(SHELL_UNSAFE) {
-            return Ok(ToolResult::error(
-                "Filename contains characters unsafe for shell execution",
-            ));
-        }
-
-        let output_path = self.security.workspace_dir.join(&safe_name);
-        let output_str = output_path.to_string_lossy().to_string();
-
-        let Some(mut cmd_args) = Self::screenshot_command(&output_str) else {
-            return Ok(ToolResult::error(
-                "Screenshot not supported on this platform",
-            ));
-        };
-
-        // macOS region flags
-        if std::env::consts::OS == "macos" {
-            if let Some(region) = args.get("region").and_then(|v| v.as_str()) {
-                match region {
-                    "selection" => cmd_args.insert(1, "-s".into()),
-                    "window" => cmd_args.insert(1, "-w".into()),
-                    _ => {} // ignore unknown regions
-                }
-            }
-        }
-
-        let program = cmd_args.remove(0);
-        let result = tokio::time::timeout(
-            Duration::from_secs(SCREENSHOT_TIMEOUT_SECS),
-            tokio::process::Command::new(&program)
-                .args(&cmd_args)
-                .output(),
-        )
-        .await;
-
-        match result {
-            Ok(Ok(output)) => {
-                if !output.status.success() {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    if stderr.contains("NO_SCREENSHOT_TOOL") {
-                        return Ok(ToolResult::error(
-                                "No screenshot tool found. Install gnome-screenshot, scrot, or ImageMagick.",
-                            ));
-                    }
-                    return Ok(ToolResult::error(format!(
-                        "Screenshot command failed: {stderr}"
-                    )));
-                }
-
-                Self::read_and_encode(&output_path).await
-            }
-            Ok(Err(e)) => Ok(ToolResult::error(format!(
-                "Failed to execute screenshot command: {e}"
-            ))),
-            Err(_) => Ok(ToolResult::error(format!(
-                "Screenshot timed out after {SCREENSHOT_TIMEOUT_SECS}s"
-            ))),
-        }
-    }
-
-    /// Read the screenshot file and return a base64 data-URL the model can see.
-    ///
-    /// Full-screen Retina captures are multi-MB PNGs that blow the inline
-    /// budget. Rather than dropping the image (which leaves vision-driven
-    /// control blind), downscale oversized captures to a JPEG that fits — the
-    /// model can then actually see the screen. Reports the *shown* dimensions so
-    /// callers know the coordinate space they're reading.
-    async fn read_and_encode(output_path: &std::path::Path) -> anyhow::Result<ToolResult> {
-        // ~1.5 MB raw → ~2 MB base64, a safe inline payload size.
-        const MAX_RAW_BYTES: usize = 1_572_864;
-
-        let bytes = match tokio::fs::read(output_path).await {
-            Ok(b) => b,
-            Err(e) => {
-                return Ok(ToolResult::error(format!(
-                    "Failed to read screenshot file: {e}"
-                )))
-            }
-        };
-        let ext = output_path
-            .extension()
-            .and_then(|e| e.to_str())
-            .unwrap_or("png")
-            .to_lowercase();
-
-        // Fits as-is → return verbatim.
-        if bytes.len() <= MAX_RAW_BYTES {
-            let mime = match ext.as_str() {
-                "jpg" | "jpeg" => "image/jpeg",
-                "bmp" => "image/bmp",
-                "gif" => "image/gif",
-                "webp" => "image/webp",
-                _ => "image/png",
-            };
-            return Ok(Self::data_url_result(output_path, &bytes, mime, None));
-        }
-
-        // Too large → downscale to a JPEG that fits (CPU work off the runtime).
-        match tokio::task::spawn_blocking(move || downscale_to_jpeg(&bytes, MAX_RAW_BYTES)).await {
-            Ok(Ok((jpeg, w, h))) => Ok(Self::data_url_result(
-                output_path,
-                &jpeg,
-                "image/jpeg",
-                Some((w, h)),
-            )),
-            Ok(Err(e)) => Ok(ToolResult::success(format!(
-                "Screenshot saved to: {} (could not downscale for inline view: {e})",
-                output_path.display()
-            ))),
-            Err(e) => Ok(ToolResult::error(format!("downscale task failed: {e}"))),
-        }
-    }
-
-    /// Build a success result carrying a base64 data-URL of `data`.
-    fn data_url_result(
-        output_path: &std::path::Path,
-        data: &[u8],
-        mime: &str,
-        shown_dims: Option<(u32, u32)>,
-    ) -> ToolResult {
-        use base64::Engine;
-        let encoded = base64::engine::general_purpose::STANDARD.encode(data);
-        let mut msg = format!("Screenshot saved to: {}\n", output_path.display());
-        if let Some((w, h)) = shown_dims {
-            let _ = writeln!(
-                msg,
-                "Downscaled to {w}x{h}px for inline view (coordinates you read are in this {w}x{h} space)."
-            );
-        }
-        let _ = write!(msg, "data:{mime};base64,{encoded}");
-        ToolResult::success(msg)
-    }
-}
-
-/// Decode image bytes, downscale (preserving aspect ratio), and JPEG-encode so
-/// the result is ≤ `max_bytes`. Returns `(jpeg_bytes, width, height)`.
-fn downscale_to_jpeg(bytes: &[u8], max_bytes: usize) -> Result<(Vec<u8>, u32, u32), String> {
-    let img = image::load_from_memory(bytes).map_err(|e| format!("decode: {e}"))?;
-    let mut last: Option<(Vec<u8>, u32, u32)> = None;
-    for max_dim in [1568u32, 1280, 1024, 768, 600] {
-        // Drop alpha before JPEG-encoding: JPEG has no alpha channel, so an
-        // RGBA capture (PNG screenshots often carry one) would otherwise fail
-        // to encode and leave vision-driven control blind.
-        let thumb = img.thumbnail(max_dim, max_dim).to_rgb8(); // fits within max_dim², keeps aspect
-        let (w, h) = (thumb.width(), thumb.height());
-        let mut buf = std::io::Cursor::new(Vec::new());
-        image::codecs::jpeg::JpegEncoder::new_with_quality(&mut buf, 72)
-            .encode_image(&thumb)
-            .map_err(|e| format!("jpeg encode: {e}"))?;
-        let out = buf.into_inner();
-        if out.len() <= max_bytes {
-            return Ok((out, w, h));
-        }
-        last = Some((out, w, h));
-    }
-    last.ok_or_else(|| "could not produce a fitting JPEG".to_string())
-}
-
-#[async_trait]
-impl Tool for ScreenshotTool {
-    fn name(&self) -> &str {
-        "screenshot"
-    }
-
-    fn description(&self) -> &str {
-        "Capture a screenshot of the current screen. Returns the file path and base64-encoded PNG data."
-    }
-
-    fn parameters_schema(&self) -> serde_json::Value {
-        json!({
-            "type": "object",
-            "properties": {
-                "filename": {
-                    "type": "string",
-                    "description": "Optional filename (default: screenshot_<timestamp>.png). Saved in workspace."
-                },
-                "region": {
-                    "type": "string",
-                    "description": "Optional region for macOS: 'selection' for interactive crop, 'window' for front window. Ignored on Linux."
-                }
-            }
-        })
-    }
-
-    async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
-        if !self.security.can_act() {
-            return Ok(ToolResult::error(
-                "[policy-blocked] Action blocked: autonomy is read-only",
-            ));
-        }
-        self.capture(args).await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::openhuman::security::{AutonomyLevel, SecurityPolicy};
-
-    #[test]
-    fn downscale_to_jpeg_shrinks_oversized_capture() {
-        // A 1600x1200 PNG of noise is well over a tight budget; downscaling must
-        // produce a smaller JPEG that still decodes, so the model can see it.
-        let mut img = image::RgbImage::new(1600, 1200);
-        for (i, px) in img.pixels_mut().enumerate() {
-            *px = image::Rgb([(i % 251) as u8, (i % 253) as u8, (i % 247) as u8]);
-        }
-        let mut png = std::io::Cursor::new(Vec::new());
-        image::DynamicImage::ImageRgb8(img)
-            .write_to(&mut png, image::ImageFormat::Png)
-            .expect("encode png");
-        let png = png.into_inner();
-
-        let max = 400_000usize;
-        let (jpeg, w, h) = downscale_to_jpeg(&png, max).expect("downscale");
-        assert!(jpeg.len() <= max, "jpeg {} should be <= {max}", jpeg.len());
-        assert!(
-            w <= 1568 && h <= 1568,
-            "dims {w}x{h} should be capped to 1568"
-        );
-        assert!(
-            jpeg.len() < png.len(),
-            "jpeg should be smaller than source png"
-        );
-        // Result must be a valid, decodable image at the reported dims.
-        let decoded = image::load_from_memory(&jpeg).expect("jpeg decodes");
-        assert_eq!((decoded.width(), decoded.height()), (w, h));
-    }
-
-    #[test]
-    fn downscale_to_jpeg_handles_rgba_input() {
-        // PNG screenshots frequently carry an alpha channel. JPEG has none, so
-        // the encoder must run on RGB — otherwise an RGBA capture fails to
-        // encode and leaves vision-driven control blind.
-        let mut img = image::RgbaImage::new(1600, 1200);
-        for (i, px) in img.pixels_mut().enumerate() {
-            *px = image::Rgba([(i % 251) as u8, (i % 253) as u8, (i % 247) as u8, 128]);
-        }
-        let mut png = std::io::Cursor::new(Vec::new());
-        image::DynamicImage::ImageRgba8(img)
-            .write_to(&mut png, image::ImageFormat::Png)
-            .expect("encode png");
-        let png = png.into_inner();
-
-        let (jpeg, w, h) = downscale_to_jpeg(&png, 400_000).expect("rgba downscales");
-        let decoded = image::load_from_memory(&jpeg).expect("jpeg decodes");
-        assert_eq!((decoded.width(), decoded.height()), (w, h));
-    }
-
-    fn test_security() -> Arc<SecurityPolicy> {
-        Arc::new(SecurityPolicy {
-            autonomy: AutonomyLevel::Full,
-            workspace_dir: std::env::temp_dir(),
-            ..SecurityPolicy::default()
-        })
-    }
-
-    #[test]
-    fn screenshot_tool_name() {
-        let tool = ScreenshotTool::new(test_security());
-        assert_eq!(tool.name(), "screenshot");
-    }
-
-    #[test]
-    fn screenshot_tool_description() {
-        let tool = ScreenshotTool::new(test_security());
-        assert!(!tool.description().is_empty());
-        assert!(tool.description().contains("screenshot"));
-    }
-
-    #[test]
-    fn screenshot_tool_schema() {
-        let tool = ScreenshotTool::new(test_security());
-        let schema = tool.parameters_schema();
-        assert!(schema["properties"]["filename"].is_object());
-        assert!(schema["properties"]["region"].is_object());
-    }
-
-    #[test]
-    fn screenshot_tool_spec() {
-        let tool = ScreenshotTool::new(test_security());
-        let spec = tool.spec();
-        assert_eq!(spec.name, "screenshot");
-        assert!(spec.parameters.is_object());
-    }
-
-    #[test]
-    fn screenshot_command_exists() {
-        if !matches!(std::env::consts::OS, "macos" | "linux") {
-            return;
-        }
-        let cmd = ScreenshotTool::screenshot_command("/tmp/test.png");
-        assert!(cmd.is_some());
-        let args = cmd.unwrap();
-        assert!(!args.is_empty());
-    }
-
-    #[tokio::test]
-    async fn screenshot_rejects_shell_injection_filename() {
-        let tool = ScreenshotTool::new(test_security());
-        let result = tool
-            .execute(json!({"filename": "test'injection.png"}))
-            .await
-            .unwrap();
-        assert!(result.is_error);
-        assert!(result.output().contains("unsafe for shell execution"));
-    }
-
-    #[test]
-    fn screenshot_command_contains_output_path() {
-        if !matches!(std::env::consts::OS, "macos" | "linux") {
-            return;
-        }
-        let cmd = ScreenshotTool::screenshot_command("/tmp/my_screenshot.png").unwrap();
-        let joined = cmd.join(" ");
-        assert!(
-            joined.contains("/tmp/my_screenshot.png"),
-            "Command should contain the output path"
-        );
-    }
-
-    // ── execute blocked in read-only autonomy ─────────────────────────────────
-
-    #[tokio::test]
-    async fn screenshot_blocked_in_read_only_mode() {
-        use crate::openhuman::security::AutonomyLevel;
-        let readonly = Arc::new(SecurityPolicy {
-            autonomy: AutonomyLevel::ReadOnly,
-            workspace_dir: std::env::temp_dir(),
-            ..SecurityPolicy::default()
-        });
-        let tool = ScreenshotTool::new(readonly);
-        let result = tool.execute(serde_json::json!({})).await.unwrap();
-        assert!(result.is_error);
-        assert!(result.output().contains("read-only"));
-    }
-
-    // ── screenshot_command on unsupported platform returns None ───────────────
-
-    #[test]
-    fn screenshot_command_returns_none_for_unsupported_os() {
-        let result = ScreenshotTool::screenshot_command("/tmp/test.png");
-        if cfg!(any(target_os = "macos", target_os = "linux")) {
-            assert!(
-                result.is_some(),
-                "macOS/Linux must produce a screenshot command"
-            );
-        } else {
-            assert_eq!(
-                result, None,
-                "unsupported platforms must return None (no panic)"
-            );
-        }
-    }
-
-    // ── safe filename that has no shell-unsafe chars is allowed ──────────────
-
-    #[tokio::test]
-    async fn screenshot_accepts_safe_filename() {
-        // On unsupported platforms the tool will return an error about platform
-        // support, not about the filename being unsafe.  We just check there is
-        // no "unsafe for shell execution" error.
-        let tool = ScreenshotTool::new(test_security());
-        let result = tool
-            .execute(serde_json::json!({"filename": "safe_name.png"}))
-            .await
-            .unwrap();
-        if result.is_error {
-            assert!(
-                !result.output().contains("unsafe for shell execution"),
-                "safe filename should not trigger shell-injection guard, got: {}",
-                result.output()
-            );
-        }
-    }
-
-    // ── multiple unsafe chars are all rejected ────────────────────────────────
-
-    #[tokio::test]
-    async fn screenshot_rejects_all_unsafe_chars() {
-        let tool = ScreenshotTool::new(test_security());
-        // Backslash is a path separator on Windows, not a shell-injection risk there.
-        let mut chars = vec!['\'', '"', '`', '$', ';', '|', '&', '(', ')'];
-        if matches!(std::env::consts::OS, "macos" | "linux") {
-            chars.push('\\');
-        }
-        for ch in chars {
-            let filename = format!("test{ch}name.png");
-            let result = tool
-                .execute(serde_json::json!({"filename": filename}))
-                .await
-                .unwrap();
-            assert!(
-                result.is_error,
-                "expected error for filename with char '{ch}', got success"
-            );
-            assert!(
-                result.output().contains("unsafe for shell execution"),
-                "unexpected error message for char '{ch}': {}",
-                result.output()
-            );
-        }
-    }
-
-    // ── read_and_encode: file not found returns error ─────────────────────────
-
-    #[tokio::test]
-    async fn read_and_encode_file_not_found_returns_error() {
-        let result = ScreenshotTool::read_and_encode(std::path::Path::new(
-            "/tmp/openhuman_test_nonexistent_12345.png",
-        ))
-        .await
-        .unwrap();
-        assert!(result.is_error);
-        assert!(result.output().contains("Failed to read screenshot file"));
-    }
-
-    // ── read_and_encode: file within size limit is base64-encoded ─────────────
-
-    #[tokio::test]
-    async fn read_and_encode_small_file_is_encoded() {
-        use tokio::io::AsyncWriteExt;
-        let dir = tempfile::TempDir::new().unwrap();
-        let path = dir.path().join("test.png");
-        let mut f = tokio::fs::File::create(&path).await.unwrap();
-        // Minimal valid bytes (not a real PNG but enough for the encoding test)
-        f.write_all(b"\x89PNG\r\n\x1a\n").await.unwrap();
-        drop(f);
-
-        let result = ScreenshotTool::read_and_encode(&path).await.unwrap();
-        assert!(!result.is_error);
-        assert!(
-            result.output().contains("data:image/png;base64,"),
-            "output should contain base64 data URL"
-        );
-        assert!(
-            result.output().contains("Screenshot saved to:"),
-            "output should contain saved path"
-        );
-    }
-
-    // ── read_and_encode: JPEG extension picks correct MIME type ───────────────
-
-    #[tokio::test]
-    async fn read_and_encode_jpeg_uses_jpeg_mime() {
-        use tokio::io::AsyncWriteExt;
-        let dir = tempfile::TempDir::new().unwrap();
-        let path = dir.path().join("image.jpg");
-        let mut f = tokio::fs::File::create(&path).await.unwrap();
-        f.write_all(b"\xFF\xD8\xFF").await.unwrap();
-        drop(f);
-
-        let result = ScreenshotTool::read_and_encode(&path).await.unwrap();
-        assert!(!result.is_error);
-        assert!(result.output().contains("data:image/jpeg;base64,"));
-    }
-
-    // ── read_and_encode: large file returns saved-path-only message ───────────
-
-    #[tokio::test]
-    async fn read_and_encode_large_file_downscales_to_viewable_jpeg() {
-        // A large *real* PNG (over MAX_RAW_BYTES) must be downscaled to an inline
-        // JPEG data-URL the model can see — not dropped (the old behavior left
-        // vision-driven control blind).
-        let dir = tempfile::TempDir::new().unwrap();
-        let path = dir.path().join("big.png");
-        let mut img = image::RgbImage::new(2200, 1500);
-        for (i, px) in img.pixels_mut().enumerate() {
-            *px = image::Rgb([(i % 251) as u8, (i % 253) as u8, (i % 247) as u8]);
-        }
-        image::DynamicImage::ImageRgb8(img)
-            .save_with_format(&path, image::ImageFormat::Png)
-            .unwrap();
-        assert!(
-            tokio::fs::metadata(&path).await.unwrap().len() > 1_572_864,
-            "test PNG should exceed the inline budget"
-        );
-
-        let result = ScreenshotTool::read_and_encode(&path).await.unwrap();
-        assert!(
-            !result.is_error,
-            "should not error, got: {}",
-            result.output()
-        );
-        let out = result.output();
-        assert!(
-            out.contains("data:image/jpeg;base64,"),
-            "should inline a jpeg: {out}"
-        );
-        assert!(
-            out.contains("Downscaled to"),
-            "should report downscale: {out}"
-        );
-    }
-}
diff --git a/src/openhuman/tools/impl/browser/types.rs b/src/openhuman/tools/impl/browser/types.rs
index fb44bcf7a..d17b07487 100644
--- a/src/openhuman/tools/impl/browser/types.rs
+++ b/src/openhuman/tools/impl/browser/types.rs
@@ -130,13 +130,6 @@ pub enum BrowserAction {
     GetTitle,
     /// Get current URL
     GetUrl,
-    /// Take screenshot
-    Screenshot {
-        #[serde(default)]
-        path: Option<String>,
-        #[serde(default)]
-        full_page: bool,
-    },
     /// Wait for element or time
     Wait {
         #[serde(default)]
diff --git a/src/openhuman/tools/local_cli.rs b/src/openhuman/tools/local_cli.rs
deleted file mode 100644
index 66439c2dd..000000000
--- a/src/openhuman/tools/local_cli.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-//! Local CLI helpers for running tools with workspace config (no `core_server`).
-
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use serde_json::json;
-
-use crate::openhuman::config::rpc as config_rpc;
-use crate::openhuman::security::SecurityPolicy;
-
-use super::traits::Tool;
-use super::ScreenshotTool;
-use super::{decode_data_url_bytes, extract_data_url, extract_saved_path, write_bytes_to_path};
-
-#[derive(Debug, Default)]
-pub struct CliScreenshotArgs {
-    pub filename: Option<String>,
-    pub region: Option<String>,
-    pub output: Option<PathBuf>,
-    pub print_data_url: bool,
-}
-
-#[derive(Debug, Default)]
-pub struct CliScreenshotRefArgs {
-    pub output: Option<PathBuf>,
-    pub print_data_url: bool,
-}
-
-pub fn tools_wrappers_list_json() -> serde_json::Value {
-    json!({
-        "result": {
-            "wrappers": [
-                {
-                    "name": "screenshot",
-                    "description": "Capture a screenshot with screenshot tool wrapper."
-                },
-                {
-                    "name": "screenshot-ref",
-                    "description": "Capture data URL from screen intelligence capture_image_ref."
-                }
-            ]
-        },
-        "logs": ["tools wrappers listed"]
-    })
-}
-
-pub async fn run_cli_screenshot(args: CliScreenshotArgs) -> Result<serde_json::Value, String> {
-    let config = config_rpc::load_config_with_timeout().await?;
-    let security = Arc::new(SecurityPolicy::from_config(
-        &config.autonomy,
-        &config.workspace_dir,
-        &config.action_dir,
-    ));
-    let tool = ScreenshotTool::new(security);
-
-    let mut payload = serde_json::Map::new();
-    if let Some(filename) = args.filename {
-        payload.insert("filename".to_string(), json!(filename));
-    }
-    if let Some(region) = args.region {
-        payload.insert("region".to_string(), json!(region));
-    }
-
-    let tool_result = tool
-        .execute(serde_json::Value::Object(payload))
-        .await
-        .map_err(|e| format!("screenshot tool failed to execute: {e}"))?;
-
-    let mut logs = vec!["tools.screenshot executed".to_string()];
-
-    if let Some(output_path) = args.output.as_ref() {
-        if let Some(saved_path) = extract_saved_path(&tool_result.output()) {
-            std::fs::copy(&saved_path, output_path).map_err(|e| {
-                format!(
-                    "failed to copy screenshot from {} to {}: {e}",
-                    saved_path.display(),
-                    output_path.display()
-                )
-            })?;
-            logs.push(format!("copied screenshot to {}", output_path.display()));
-        } else if let Some(data_url) = extract_data_url(&tool_result.output()) {
-            let bytes = decode_data_url_bytes(&data_url)?;
-            write_bytes_to_path(output_path, &bytes)?;
-            logs.push(format!(
-                "decoded data URL and wrote {} bytes to {}",
-                bytes.len(),
-                output_path.display()
-            ));
-        } else {
-            return Err(
-                "screenshot tool response did not contain a saved path or image data URL"
-                    .to_string(),
-            );
-        }
-    }
-
-    let data_url = extract_data_url(&tool_result.output());
-    Ok(json!({
-        "result": {
-            "success": !tool_result.is_error,
-            "error": if tool_result.is_error { Some(tool_result.output()) } else { None::<String> },
-            "output_path": args.output.as_ref().map(|p| p.display().to_string()),
-            "tool_output": tool_result.output(),
-            "data_url": if args.print_data_url { data_url } else { None::<String> },
-        },
-        "logs": logs
-    }))
-}
-
-pub async fn run_cli_screenshot_ref(
-    args: CliScreenshotRefArgs,
-) -> Result<serde_json::Value, String> {
-    let crate::rpc::RpcOutcome {
-        value: payload,
-        mut logs,
-    } = crate::openhuman::screen_intelligence::rpc::accessibility_capture_image_ref().await?;
-    logs.push("tools.screenshot-ref executed".to_string());
-
-    if let Some(output_path) = args.output.as_ref() {
-        if let Some(data_url) = payload.image_ref.as_deref() {
-            let bytes = decode_data_url_bytes(data_url)?;
-            write_bytes_to_path(output_path, &bytes)?;
-            logs.push(format!(
-                "decoded image_ref and wrote {} bytes to {}",
-                bytes.len(),
-                output_path.display()
-            ));
-        } else {
-            return Err(
-                "screen intelligence capture_image_ref did not return image_ref".to_string(),
-            );
-        }
-    }
-
-    Ok(json!({
-        "result": {
-            "ok": payload.ok,
-            "mime_type": payload.mime_type,
-            "bytes_estimate": payload.bytes_estimate,
-            "message": payload.message,
-            "output_path": args.output.as_ref().map(|p| p.display().to_string()),
-            "image_ref": if args.print_data_url { payload.image_ref } else { None::<String> },
-        },
-        "logs": logs
-    }))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // ── CliScreenshotArgs ─────────────────────────────────────────────────────
-
-    #[test]
-    fn cli_screenshot_args_default_fields() {
-        let args = CliScreenshotArgs::default();
-        assert!(args.filename.is_none());
-        assert!(args.region.is_none());
-        assert!(args.output.is_none());
-        assert!(!args.print_data_url);
-    }
-
-    #[test]
-    fn cli_screenshot_args_debug_does_not_panic() {
-        let args = CliScreenshotArgs {
-            filename: Some("shot.png".into()),
-            region: Some("selection".into()),
-            output: Some(PathBuf::from("/tmp/out.png")),
-            print_data_url: true,
-        };
-        let dbg = format!("{args:?}");
-        assert!(dbg.contains("shot.png"));
-        assert!(dbg.contains("selection"));
-        assert!(dbg.contains("print_data_url: true"));
-    }
-
-    // ── CliScreenshotRefArgs ──────────────────────────────────────────────────
-
-    #[test]
-    fn cli_screenshot_ref_args_default_fields() {
-        let args = CliScreenshotRefArgs::default();
-        assert!(args.output.is_none());
-        assert!(!args.print_data_url);
-    }
-
-    #[test]
-    fn cli_screenshot_ref_args_debug_does_not_panic() {
-        let args = CliScreenshotRefArgs {
-            output: Some(PathBuf::from("/tmp/ref.png")),
-            print_data_url: false,
-        };
-        let dbg = format!("{args:?}");
-        assert!(dbg.contains("print_data_url: false"));
-    }
-
-    // ── tools_wrappers_list_json ──────────────────────────────────────────────
-
-    #[test]
-    fn tools_wrappers_list_json_shape() {
-        let v = tools_wrappers_list_json();
-
-        // Top-level keys
-        assert!(v["result"].is_object(), "should have a 'result' key");
-        assert!(v["logs"].is_array(), "should have a 'logs' array");
-
-        // Wrappers array
-        let wrappers = v["result"]["wrappers"]
-            .as_array()
-            .expect("wrappers is array");
-        assert_eq!(wrappers.len(), 2, "should list exactly 2 wrappers");
-
-        // First wrapper
-        assert_eq!(wrappers[0]["name"].as_str(), Some("screenshot"));
-        assert!(
-            wrappers[0]["description"]
-                .as_str()
-                .unwrap()
-                .contains("screenshot"),
-            "screenshot description should mention screenshot"
-        );
-
-        // Second wrapper
-        assert_eq!(wrappers[1]["name"].as_str(), Some("screenshot-ref"));
-        assert!(
-            wrappers[1]["description"]
-                .as_str()
-                .unwrap()
-                .contains("capture_image_ref"),
-            "screenshot-ref description should mention capture_image_ref"
-        );
-    }
-
-    #[test]
-    fn tools_wrappers_list_json_logs_populated() {
-        let v = tools_wrappers_list_json();
-        let logs = v["logs"].as_array().unwrap();
-        assert!(!logs.is_empty(), "logs should not be empty");
-        let first = logs[0].as_str().unwrap();
-        assert!(
-            first.contains("listed"),
-            "log entry should mention 'listed'"
-        );
-    }
-
-    #[test]
-    fn tools_wrappers_list_json_is_deterministic() {
-        let v1 = tools_wrappers_list_json();
-        let v2 = tools_wrappers_list_json();
-        assert_eq!(v1, v2);
-    }
-}
diff --git a/src/openhuman/tools/mod.rs b/src/openhuman/tools/mod.rs
index 40275ecf5..1439c5a3d 100644
--- a/src/openhuman/tools/mod.rs
+++ b/src/openhuman/tools/mod.rs
@@ -1,5 +1,4 @@
 pub mod generated;
-pub mod local_cli;
 pub mod ops;
 pub mod orchestrator_tools;
 pub mod policy;
@@ -48,7 +47,6 @@ pub use crate::openhuman::people::tools::*;
 pub use crate::openhuman::referral::tools::*;
 #[cfg(feature = "flows")]
 pub use crate::openhuman::rhai_workflows::tools::*;
-pub use crate::openhuman::screen_intelligence::tools::*;
 pub use crate::openhuman::search::tools::*;
 pub use crate::openhuman::security::tools::*;
 pub use crate::openhuman::service::tools::*;
diff --git a/src/openhuman/tools/ops.rs b/src/openhuman/tools/ops.rs
index aba7262b6..47957f01b 100644
--- a/src/openhuman/tools/ops.rs
+++ b/src/openhuman/tools/ops.rs
@@ -724,27 +724,10 @@ pub fn all_tools_with_runtime(
         Box::new(SessionGetUserTool::new(config.clone())),
         Box::new(OAuthConnectUrlTool::new(config.clone())),
         Box::new(OAuthListTool::new(config.clone())),
-        // Desktop perception, MCP registry, workspace persona. Observe/connect/
-        // call tools default-ON; OS permission prompts (screen_permissions),
-        // MCP install/uninstall (mcp_manage), and persona/workspace writers
+        // MCP registry and workspace persona. Observe/connect/call tools
+        // default-ON; MCP install/uninstall (mcp_manage), and persona/workspace writers
         // (workspace_manage) ship default-OFF via `tools::user_filter`.
         //
-        // Screen intelligence tools (always-on Platform family).
-        Box::new(ScreenStatusTool),
-        Box::new(ScreenCaptureImageRefTool),
-        Box::new(ScreenVisionRecentTool),
-        Box::new(ScreenVisionFlushTool),
-        Box::new(ScreenRefreshPermissionsTool),
-        Box::new(ScreenCaptureNowTool),
-        Box::new(ScreenCaptureTestTool),
-        Box::new(ScreenSessionStartTool),
-        Box::new(ScreenSessionStopTool),
-        Box::new(ScreenInputActionTool),
-        Box::new(ScreenGlobeStartTool),
-        Box::new(ScreenGlobePollTool),
-        Box::new(ScreenGlobeStopTool),
-        Box::new(ScreenRequestPermissionsTool),
-        Box::new(ScreenRequestPermissionTool),
         // MCP registry (dynamic, user-installed servers) — compiled out with
         // the `mcp` feature. Per-element attrs inside the `vec![]` mirror the
         // voice idiom used earlier in this same literal.
@@ -1064,8 +1047,7 @@ pub fn all_tools_with_runtime(
         tracing::debug!("[tools::ops] registered python_exec");
     }
 
-    // Vision tools are always available
-    tools.push(Box::new(ScreenshotTool::new(security.clone())));
+    // Image metadata is always available for user-provided images.
     tools.push(Box::new(ImageInfoTool::new(security.clone())));
 
     // Tool effectiveness stats (enabled when learning is on)
diff --git a/src/openhuman/tools/ops_tests.rs b/src/openhuman/tools/ops_tests.rs
index a5dbd1a16..23841e0f1 100644
--- a/src/openhuman/tools/ops_tests.rs
+++ b/src/openhuman/tools/ops_tests.rs
@@ -712,7 +712,6 @@ fn all_tools_default_registry_contains_expected_baseline_surface() {
             "web_search_tool",
             "node_exec",
             "npm_exec",
-            "screenshot",
             "image_info",
         ],
     );
@@ -2266,28 +2265,9 @@ fn money_default_off_tools_retained_when_opted_in() {
     }
 }
 
-// ── Theme: Desktop perception, MCP registry, workspace ──────────────────────
+// ── Theme: MCP registry and workspace ───────────────────────────────────────
 
 const DESKTOP_TOOLS: &[&str] = &[
-    // The 15 `screen_intelligence_*` tools are compiled out with the
-    // `desktop-automation` feature, so these expectations are gated per-element
-    // (same idiom as the `mcp_registry_*` block below) rather than gating the
-    // `desktop_tools_are_registered` test away wholesale.
-    "screen_intelligence_status",
-    "screen_intelligence_capture_image_ref",
-    "screen_intelligence_vision_recent",
-    "screen_intelligence_vision_flush",
-    "screen_intelligence_refresh_permissions",
-    "screen_intelligence_capture_now",
-    "screen_intelligence_capture_test",
-    "screen_intelligence_session_start",
-    "screen_intelligence_session_stop",
-    "screen_intelligence_input_action",
-    "screen_intelligence_globe_listener_start",
-    "screen_intelligence_globe_listener_poll",
-    "screen_intelligence_globe_listener_stop",
-    "screen_intelligence_request_permissions",
-    "screen_intelligence_request_permission",
     // The `mcp_registry_*` desktop surface is compiled out with the `mcp`
     // feature, so these expectations are gated per-element rather than gating
     // the three tests below away wholesale — the non-MCP desktop tools must
@@ -2319,8 +2299,6 @@ const DESKTOP_TOOLS: &[&str] = &[
 ];
 
 const DESKTOP_DEFAULT_OFF: &[&str] = &[
-    "screen_intelligence_request_permissions",
-    "screen_intelligence_request_permission",
     #[cfg(feature = "mcp")]
     "mcp_registry_install",
     #[cfg(feature = "mcp")]
@@ -2331,8 +2309,6 @@ const DESKTOP_DEFAULT_OFF: &[&str] = &[
 ];
 
 const DESKTOP_ALWAYS_ON: &[&str] = &[
-    "screen_intelligence_status",
-    "screen_intelligence_capture_now",
     #[cfg(feature = "mcp")]
     "mcp_registry_search",
     #[cfg(feature = "mcp")]
diff --git a/src/openhuman/tools/user_filter.rs b/src/openhuman/tools/user_filter.rs
index 55244c262..188c18fb7 100644
--- a/src/openhuman/tools/user_filter.rs
+++ b/src/openhuman/tools/user_filter.rs
@@ -55,11 +55,6 @@ const TOOL_FAMILIES: &[ToolFamily] = &[
         rust_names: &["file_write", "update_memory_md"],
         default_enabled: true,
     },
-    ToolFamily {
-        id: "screenshot",
-        rust_names: &["screenshot"],
-        default_enabled: true,
-    },
     ToolFamily {
         id: "image_info",
         rust_names: &["image_info"],
@@ -204,14 +199,6 @@ const TOOL_FAMILIES: &[ToolFamily] = &[
         ],
         default_enabled: false,
     },
-    ToolFamily {
-        id: "screen_permissions",
-        rust_names: &[
-            "screen_intelligence_request_permissions",
-            "screen_intelligence_request_permission",
-        ],
-        default_enabled: false,
-    },
     ToolFamily {
         id: "mcp_manage",
         rust_names: &["mcp_registry_install", "mcp_registry_uninstall"],
diff --git a/src/openhuman/voice/README.md b/src/openhuman/voice/README.md
index 5ba02da6d..2cc280fa7 100644
--- a/src/openhuman/voice/README.md
+++ b/src/openhuman/voice/README.md
@@ -79,7 +79,7 @@ No dedicated `store.rs`. State is persisted into the shared TOML `Config` via th
 
 - `crate::openhuman::inference` — local AI runtime (`local::global`, `whisper_engine`, model id/path resolution) and the relocated voice inference impls (`inference::voice::{cloud_transcribe, local_speech, local_transcribe, hallucination, postprocess, streaming}`); also `inference::provider::factory::lookup_key_for_slug` for provider API keys.
 - `crate::openhuman::config` — `Config`, `config::rpc::load_config_with_timeout`, voice-server / dictation config sections, and `config::schema::voice_providers` (`VoiceProviderCreds`, capability/auth/API-style enums).
-- `crate::openhuman::accessibility` (macOS only) — focused-app detection (`focused_text_context_verbose`) and the Swift globe-key listener (`globe_listener_start` / `globe_listener_poll`) used in place of rdev for the Fn key.
+- `crate::openhuman::accessibility` (macOS only) — focused-text inspection (`focused_text_context_verbose`) and the Swift globe-key listener (`globe_listener_start` / `globe_listener_poll`) used in place of rdev for the Fn key.
 - `crate::api` — `BackendOAuthClient`, `effective_backend_api_url`, `get_session_token` for backend-proxied reply-speech.
 - `crate::core::all` (`ControllerFuture`, `RegisteredController`), `crate::core::{ControllerSchema, FieldSchema, TypeSchema}`, `crate::core::logging` (CLI run init), and `crate::rpc::RpcOutcome`.
 - External crates: `cpal` + `hound` (capture/WAV), `rdev` (hotkeys), `enigo` + `arboard` (paste insertion), `reqwest` (external provider HTTP), `tokio`/`tokio-util`, `once_cell`.
diff --git a/src/openhuman/voice/bus.rs b/src/openhuman/voice/bus.rs
index bf6bc7a66..c597e7c36 100644
--- a/src/openhuman/voice/bus.rs
+++ b/src/openhuman/voice/bus.rs
@@ -1,6 +1,6 @@
-//! Voice domain event publishers. The PTT transcript-committed event is
-//! published here so the future screen-intelligence follow-up can subscribe
-//! and grab a frame on commit without coupling to the channel-web flow.
+//! Voice domain event publishers. Publishing the PTT transcript-committed
+//! event here lets downstream subscribers react without coupling to the
+//! channel-web flow.
 
 use crate::core::event_bus::{publish_global, DomainEvent, VoiceEvent};
 
diff --git a/tests/composio_list_tools_stack_overflow_regression.rs b/tests/composio_list_tools_stack_overflow_regression.rs
index 7353ddb0a..98d75d4e3 100644
--- a/tests/composio_list_tools_stack_overflow_regression.rs
+++ b/tests/composio_list_tools_stack_overflow_regression.rs
@@ -178,7 +178,6 @@ chat_onboarding_completed = true
 [observability]
 [autonomy]
 [runtime]
-[screen_intelligence]
 [autocomplete]
 [reliability]
 [scheduler]
diff --git a/tests/config_auth_app_state_connectivity_e2e.rs b/tests/config_auth_app_state_connectivity_e2e.rs
index 841563d16..1407fb5dd 100644
--- a/tests/config_auth_app_state_connectivity_e2e.rs
+++ b/tests/config_auth_app_state_connectivity_e2e.rs
@@ -2838,7 +2838,6 @@ async fn worker_a_controller_schemas_are_fully_exposed() {
                 "openhuman.config_update_model_settings",
                 "openhuman.config_update_runtime_settings",
                 "openhuman.config_update_sandbox_settings",
-                "openhuman.config_update_screen_intelligence_settings",
                 "openhuman.config_update_search_settings",
                 "openhuman.config_update_voice_server_settings",
                 "openhuman.config_workspace_onboarding_flag_exists",
@@ -3058,26 +3057,11 @@ async fn config_controller_mutations_round_trip_over_json_rpc() {
     for (id, method, params) in [
         (
             10_005,
-            "openhuman.config_update_screen_intelligence_settings",
-            json!({
-                "enabled": false,
-                "capture_policy": "off",
-                "baseline_fps": 0.5,
-                "vision_enabled": false,
-                "autocomplete_enabled": false,
-                "use_vision_model": false,
-                "keep_screenshots": false,
-                "allowlist": ["Finder"],
-                "denylist": ["Passwords"]
-            }),
-        ),
-        (
-            10_006,
             "openhuman.config_update_runtime_settings",
             json!({ "kind": "local", "reasoning_enabled": true }),
         ),
         (
-            10_007,
+            10_006,
             "openhuman.config_update_browser_settings",
             json!({ "enabled": true }),
         ),
@@ -3629,16 +3613,6 @@ async fn config_runtime_flags_settings_readbacks_and_validation_paths_are_exerci
         &rpc(
             &harness.rpc_base,
             11_019,
-            "openhuman.config_update_screen_intelligence_settings",
-            json!({ "baseline_fps": 99.0 }),
-        )
-        .await,
-        "update_screen_intelligence_settings clamps baseline",
-    );
-    ok(
-        &rpc(
-            &harness.rpc_base,
-            11_020,
             "openhuman.config_update_voice_server_settings",
             json!({
                 "min_duration_secs": -1.0,
@@ -3648,12 +3622,8 @@ async fn config_runtime_flags_settings_readbacks_and_validation_paths_are_exerci
         .await,
         "update_voice_server_settings clamps non-negative floats",
     );
-    let config = rpc(&harness.rpc_base, 11_021, "openhuman.config_get", json!({})).await;
+    let config = rpc(&harness.rpc_base, 11_020, "openhuman.config_get", json!({})).await;
     let config_payload = payload(&config, "config_get after clamps");
-    assert_eq!(
-        config_payload.pointer("/config/screen_intelligence/baseline_fps"),
-        Some(&json!(30.0))
-    );
     assert_eq!(
         config_payload.pointer("/config/voice_server/min_duration_secs"),
         Some(&json!(0.0))
diff --git a/tests/json_rpc_e2e.rs b/tests/json_rpc_e2e.rs
index 2f5a878c1..7a8327f15 100644
--- a/tests/json_rpc_e2e.rs
+++ b/tests/json_rpc_e2e.rs
@@ -974,6 +974,21 @@ fn assert_jsonrpc_error<'a>(v: &'a Value, context: &str) -> &'a Value {
         .unwrap_or_else(|| panic!("{context}: expected JSON-RPC error, got: {v}"))
 }
 
+fn assert_unknown_method(v: &Value, method: &str) {
+    let error = assert_jsonrpc_error(v, method);
+    let expected_message = format!("unknown method: {method}");
+    assert_eq!(
+        error.get("code").and_then(Value::as_i64),
+        Some(-32000),
+        "{method}: expected unknown-method server error: {v}"
+    );
+    assert_eq!(
+        error.get("message").and_then(Value::as_str),
+        Some(expected_message.as_str()),
+        "{method}: expected unknown-method message: {v}"
+    );
+}
+
 fn extract_string_outcome(result: &Value) -> String {
     if let Some(s) = result.as_str() {
         return s.to_string();
@@ -5374,7 +5389,7 @@ async fn json_rpc_rejects_non_object_params_with_clear_error() {
 }
 
 #[tokio::test]
-async fn json_rpc_screen_intelligence_capture_test_returns_stable_shape() {
+async fn json_rpc_removed_screen_intelligence_methods_are_not_found() {
     let _env_lock = json_rpc_e2e_env_lock();
     let tmp = tempdir().expect("tempdir");
     let home = tmp.path();
@@ -5393,62 +5408,13 @@ async fn json_rpc_screen_intelligence_capture_test_returns_stable_shape() {
     let rpc_base = format!("http://{}", rpc_addr);
     tokio::time::sleep(Duration::from_millis(100)).await;
 
-    let capture = post_json_rpc(
-        &rpc_base,
-        1002,
-        "openhuman.screen_intelligence_capture_test",
-        json!({}),
-    )
-    .await;
-    let capture_outer = assert_no_jsonrpc_error(&capture, "screen_intelligence_capture_test");
-    let capture_result = capture_outer.get("result").unwrap_or(capture_outer);
-
-    assert!(
-        capture_result.get("ok").and_then(Value::as_bool).is_some(),
-        "expected bool ok field: {capture_result}"
-    );
-    assert!(
-        matches!(
-            capture_result.get("capture_mode").and_then(Value::as_str),
-            Some("windowed" | "fullscreen")
-        ),
-        "expected capture_mode field: {capture_result}"
-    );
-    assert!(
-        capture_result
-            .get("timing_ms")
-            .and_then(Value::as_u64)
-            .is_some(),
-        "expected timing_ms field: {capture_result}"
-    );
-
-    let ok = capture_result
-        .get("ok")
-        .and_then(Value::as_bool)
-        .expect("ok should be bool");
-    let image_ref = capture_result.get("image_ref").and_then(Value::as_str);
-    let error = capture_result.get("error").and_then(Value::as_str);
-
-    if ok {
-        assert!(
-            image_ref
-                .map(|value| value.starts_with("data:image/png;base64,"))
-                .unwrap_or(false),
-            "successful capture should include a PNG data URL: {capture_result}"
-        );
-        assert!(
-            error.is_none(),
-            "successful capture should not include an error"
-        );
-    } else {
-        assert!(
-            image_ref.is_none(),
-            "failed capture should not include image data"
-        );
-        assert!(
-            error.is_some(),
-            "failed capture should include an error message"
-        );
+    for (id, method) in [
+        (1002, "openhuman.screen_intelligence_status"),
+        (1003, "openhuman.screen_intelligence_capture_now"),
+        (1004, "openhuman.config_update_screen_intelligence_settings"),
+    ] {
+        let response = post_json_rpc(&rpc_base, id, method, json!({})).await;
+        assert_unknown_method(&response, method);
     }
 
     mock_join.abort();
@@ -5554,100 +5520,6 @@ async fn json_rpc_subconscious_status_exposes_instances_and_trigger_takes_kind()
     mock_join.abort();
 }
 
-#[tokio::test]
-async fn json_rpc_screen_intelligence_status_returns_stable_shape() {
-    let _env_lock = json_rpc_e2e_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let home = tmp.path();
-    let openhuman_home = home.join(".openhuman");
-
-    let _home_guard = EnvVarGuard::set_to_path("HOME", home);
-    let _workspace_guard = EnvVarGuard::unset("OPENHUMAN_WORKSPACE");
-    let _backend_url_guard = EnvVarGuard::unset("BACKEND_URL");
-    let _vite_backend_guard = EnvVarGuard::unset("VITE_BACKEND_URL");
-
-    let (mock_addr, mock_join) = serve_on_ephemeral(mock_upstream_router()).await;
-    let mock_origin = format!("http://{}", mock_addr);
-    write_min_config(&openhuman_home, &mock_origin);
-
-    let (rpc_addr, rpc_join) = serve_on_ephemeral(build_core_http_router(false)).await;
-    let rpc_base = format!("http://{}", rpc_addr);
-    tokio::time::sleep(Duration::from_millis(100)).await;
-
-    let status = post_json_rpc(
-        &rpc_base,
-        1003,
-        "openhuman.screen_intelligence_status",
-        json!({}),
-    )
-    .await;
-    let result = assert_no_jsonrpc_error(&status, "screen_intelligence_status");
-    let status_result = result.get("result").unwrap_or(result);
-
-    // Required top-level fields
-    assert!(
-        status_result
-            .get("platform_supported")
-            .and_then(Value::as_bool)
-            .is_some(),
-        "expected bool platform_supported: {status_result}"
-    );
-    assert!(
-        status_result
-            .get("is_context_blocked")
-            .and_then(Value::as_bool)
-            .is_some(),
-        "expected bool is_context_blocked: {status_result}"
-    );
-
-    // session block
-    let session = status_result
-        .get("session")
-        .expect("expected session object");
-    assert!(
-        session.get("active").and_then(Value::as_bool).is_some(),
-        "expected bool session.active: {status_result}"
-    );
-    assert_eq!(
-        session.get("active").and_then(Value::as_bool),
-        Some(false),
-        "session should not be active without start_session: {status_result}"
-    );
-    assert!(
-        session
-            .get("capture_count")
-            .and_then(Value::as_u64)
-            .is_some(),
-        "expected u64 session.capture_count: {status_result}"
-    );
-    assert!(
-        session
-            .get("vision_persist_count")
-            .and_then(Value::as_u64)
-            .is_some(),
-        "expected u64 session.vision_persist_count: {status_result}"
-    );
-    assert!(
-        session.get("last_vision_persist_error").is_some(),
-        "expected nullable session.last_vision_persist_error: {status_result}"
-    );
-
-    // permissions block
-    let perms = status_result
-        .get("permissions")
-        .expect("expected permissions object");
-    assert!(
-        perms
-            .get("screen_recording")
-            .and_then(Value::as_str)
-            .is_some(),
-        "expected string permissions.screen_recording: {status_result}"
-    );
-
-    mock_join.abort();
-    rpc_join.abort();
-}
-
 #[tokio::test]
 async fn json_rpc_app_state_snapshot_returns_runtime_shape() {
     let _env_lock = json_rpc_e2e_env_lock();
@@ -5705,13 +5577,6 @@ async fn json_rpc_app_state_snapshot_returns_runtime_shape() {
     );
 
     let runtime = body.get("runtime").expect("expected runtime object");
-    assert!(
-        runtime
-            .get("screenIntelligence")
-            .and_then(Value::as_object)
-            .is_some(),
-        "expected runtime.screenIntelligence object: {runtime}"
-    );
     assert!(
         runtime.get("localAi").and_then(Value::as_object).is_some(),
         "expected runtime.localAi object: {runtime}"
@@ -7054,50 +6919,6 @@ encrypt = false
     rpc_join.abort();
 }
 
-#[tokio::test]
-async fn json_rpc_screen_intelligence_vision_recent_returns_empty_without_session() {
-    let _env_lock = json_rpc_e2e_env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let home = tmp.path();
-    let openhuman_home = home.join(".openhuman");
-
-    let _home_guard = EnvVarGuard::set_to_path("HOME", home);
-    let _workspace_guard = EnvVarGuard::unset("OPENHUMAN_WORKSPACE");
-    let _backend_url_guard = EnvVarGuard::unset("BACKEND_URL");
-    let _vite_backend_guard = EnvVarGuard::unset("VITE_BACKEND_URL");
-
-    let (mock_addr, mock_join) = serve_on_ephemeral(mock_upstream_router()).await;
-    let mock_origin = format!("http://{}", mock_addr);
-    write_min_config(&openhuman_home, &mock_origin);
-
-    let (rpc_addr, rpc_join) = serve_on_ephemeral(build_core_http_router(false)).await;
-    let rpc_base = format!("http://{}", rpc_addr);
-    tokio::time::sleep(Duration::from_millis(100)).await;
-
-    let recent = post_json_rpc(
-        &rpc_base,
-        1004,
-        "openhuman.screen_intelligence_vision_recent",
-        json!({ "limit": 10 }),
-    )
-    .await;
-    let result = assert_no_jsonrpc_error(&recent, "screen_intelligence_vision_recent");
-    let recent_result = result.get("result").unwrap_or(result);
-
-    let summaries = recent_result
-        .get("summaries")
-        .and_then(Value::as_array)
-        .expect("expected summaries array: {recent_result}");
-    assert!(
-        summaries.is_empty(),
-        "vision_recent should return empty list without an active session, got {} items",
-        summaries.len()
-    );
-
-    mock_join.abort();
-    rpc_join.abort();
-}
-
 // ---------------------------------------------------------------------------
 // Local AI device profile, presets, and apply preset
 // ---------------------------------------------------------------------------
diff --git a/tests/raw_coverage/tools_agent_credentials_state_raw_coverage_e2e.rs b/tests/raw_coverage/tools_agent_credentials_state_raw_coverage_e2e.rs
index 580d5388b..2e6e8d81f 100644
--- a/tests/raw_coverage/tools_agent_credentials_state_raw_coverage_e2e.rs
+++ b/tests/raw_coverage/tools_agent_credentials_state_raw_coverage_e2e.rs
@@ -542,7 +542,7 @@ async fn round16_browser_computer_use_validation_and_sidecar_paths() {
     }
 
     let bad_endpoint = browser_tool("https://public.example.test/".into(), &harness.workspace)
-        .execute(json!({ "action": "screen_capture" }))
+        .execute(json!({ "action": "mouse_move", "x": 1, "y": 1 }))
         .await
         .expect("public endpoint is rejected as a tool result");
     assert!(bad_endpoint.is_error);
diff --git a/tests/raw_coverage/tools_approval_channels_raw_coverage_e2e.rs b/tests/raw_coverage/tools_approval_channels_raw_coverage_e2e.rs
index 7034df0b4..e784774ac 100644
--- a/tests/raw_coverage/tools_approval_channels_raw_coverage_e2e.rs
+++ b/tests/raw_coverage/tools_approval_channels_raw_coverage_e2e.rs
@@ -98,12 +98,10 @@ use openhuman_core::openhuman::tools::generated::{
     admit_generated_tool_definitions, generated_tools_from_definitions, GeneratedToolAdapter,
     GeneratedToolAdmissionConfig, GeneratedToolDefinition, GeneratedToolRisk,
 };
-use openhuman_core::openhuman::tools::local_cli::tools_wrappers_list_json;
 use openhuman_core::openhuman::tools::orchestrator_tools::collect_orchestrator_tools;
 use openhuman_core::openhuman::tools::{
     all_tools, all_tools_controller_schemas, all_tools_registered_controllers,
-    decode_data_url_bytes, default_tools, extract_data_url, extract_saved_path,
-    write_bytes_to_path, ApplyPatchTool, BrowserAction, BrowserTool, CleaningStrategy,
+    default_tools, ApplyPatchTool, BrowserTool, CleaningStrategy,
     ComputerUseConfig, CsvExportTool, CurrentTimeTool, DefaultToolPolicy, DetectToolsTool,
     EditFileTool, FileReadTool, FileWriteTool, GitbooksGetPageTool, GitbooksSearchTool, GlobTool,
     GrepTool, InsertSqlRecordTool, ListFilesTool, LspTool, NodeExecTool, NpmExecTool,
@@ -1425,7 +1423,6 @@ fn tools_and_tool_registry_public_surfaces_cover_schema_and_assembly_paths() {
         "gitbooks_search",
         "gitbooks_get_page",
         "tool_stats",
-        "screenshot",
         "image_info",
     ] {
         assert!(
@@ -1443,14 +1440,6 @@ fn tools_and_tool_registry_public_surfaces_cover_schema_and_assembly_paths() {
     assert_eq!(baseline[0].scope(), ToolScope::All);
     assert_eq!(baseline[0].permission_level(), PermissionLevel::Execute);
 
-    let wrappers = tools_wrappers_list_json();
-    assert!(wrappers
-        .pointer("/result/wrappers")
-        .and_then(Value::as_array)
-        .expect("wrapper list")
-        .iter()
-        .any(|wrapper| wrapper.get("name").and_then(Value::as_str) == Some("screenshot")));
-
     let tool_schemas = all_tools_controller_schemas();
     let tool_controllers = all_tools_registered_controllers();
     assert_eq!(tool_schemas.len(), tool_controllers.len());
@@ -1573,31 +1562,6 @@ fn tools_and_tool_registry_public_surfaces_cover_schema_and_assembly_paths() {
     assert!(default_tool.generated_runtime_context(&json!({})).is_none());
     assert!(default_tool.max_result_size_chars().is_none());
 
-    let png_data_url = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-    let raw_screenshot = format!(
-        "noise\nScreenshot saved to: {}\n{png_data_url}\n",
-        dir.path().join("shot.png").display()
-    );
-    assert_eq!(
-        extract_data_url(&raw_screenshot).as_deref(),
-        Some(png_data_url)
-    );
-    assert_eq!(
-        extract_saved_path(&raw_screenshot).as_deref(),
-        Some(dir.path().join("shot.png").as_path())
-    );
-    let decoded = decode_data_url_bytes(png_data_url).expect("decode png");
-    assert_eq!(&decoded[..4], b"\x89PNG");
-    assert!(decode_data_url_bytes("data:text/plain;base64,aGVsbG8=")
-        .expect_err("non-image data URL rejected")
-        .contains("invalid data URL"));
-    let nested = dir.path().join("screens").join("nested").join("shot.png");
-    write_bytes_to_path(&nested, &decoded).expect("write screenshot bytes");
-    assert_eq!(
-        std::fs::read(&nested).expect("read screenshot bytes"),
-        decoded
-    );
-
     let computer = ComputerUseConfig {
         api_key: Some("secret-key".into()),
         window_allowlist: vec!["OpenHuman".into()],
@@ -1608,13 +1572,6 @@ fn tools_and_tool_registry_public_surfaces_cover_schema_and_assembly_paths() {
     let debug = format!("{computer:?}");
     assert!(debug.contains("[REDACTED]"));
     assert!(!debug.contains("secret-key"));
-    let action = serde_json::to_value(BrowserAction::Screenshot {
-        path: Some("shot.png".into()),
-        full_page: true,
-    })
-    .expect("serialize browser action");
-    assert_eq!(action.pointer("/screenshot/path"), Some(&json!("shot.png")));
-    assert_eq!(action.pointer("/screenshot/full_page"), Some(&json!(true)));
 }
 
 #[tokio::test]
@@ -1767,7 +1724,6 @@ async fn browser_tool_with_agent_browser_shim_covers_action_parser_and_command_p
         json!({ "action": "get_text", "selector": "main" }),
         json!({ "action": "get_title" }),
         json!({ "action": "get_url" }),
-        json!({ "action": "screenshot", "path": "shot.png", "full_page": true }),
         json!({ "action": "wait", "selector": ".ready" }),
         json!({ "action": "wait", "ms": 25 }),
         json!({ "action": "wait", "text": "Loaded" }),
diff --git a/tests/raw_coverage/tools_channels_raw_coverage_e2e.rs b/tests/raw_coverage/tools_channels_raw_coverage_e2e.rs
index 71f1195f1..3742e67e2 100644
--- a/tests/raw_coverage/tools_channels_raw_coverage_e2e.rs
+++ b/tests/raw_coverage/tools_channels_raw_coverage_e2e.rs
@@ -49,12 +49,10 @@ use openhuman_core::openhuman::tools::generated::{
     admit_generated_tool_definitions, generated_tools_from_definitions, GeneratedToolAdapter,
     GeneratedToolAdmissionConfig, GeneratedToolDefinition, GeneratedToolRisk,
 };
-use openhuman_core::openhuman::tools::local_cli::tools_wrappers_list_json;
 use openhuman_core::openhuman::tools::{
     all_tools, all_tools_controller_schemas, all_tools_registered_controllers,
-    decode_data_url_bytes, default_tools, extract_data_url, extract_saved_path,
-    write_bytes_to_path, DefaultToolPolicy, PermissionLevel, PolicyDecision, ToolCategory,
-    ToolPolicy, ToolResult, ToolScope,
+    default_tools, DefaultToolPolicy, PermissionLevel, PolicyDecision, ToolCategory, ToolPolicy,
+    ToolResult, ToolScope,
 };
 
 #[path = "tools_approval_channels_raw_coverage_e2e.rs"]
@@ -385,29 +383,6 @@ fn tool_registries_schemas_and_local_helpers_cover_safe_branches() {
         .collect::<BTreeSet<_>>();
     assert_eq!(schema_names, registered_names);
 
-    let wrappers = tools_wrappers_list_json();
-    assert_eq!(wrappers["result"]["wrappers"][0]["name"], "screenshot");
-    assert_eq!(wrappers["logs"][0], "tools wrappers listed");
-
-    let raw = "Screenshot saved to: /tmp/shot.png\ndata:image/png;base64,aGVsbG8=";
-    assert_eq!(
-        extract_saved_path(raw).unwrap().display().to_string(),
-        "/tmp/shot.png"
-    );
-    assert_eq!(
-        extract_data_url(raw).as_deref(),
-        Some("data:image/png;base64,aGVsbG8=")
-    );
-    assert_eq!(
-        decode_data_url_bytes("data:image/png;base64,aGVsbG8=").unwrap(),
-        b"hello"
-    );
-    assert!(decode_data_url_bytes("data:text/plain;base64,aGVsbG8=").is_err());
-
-    let out = config.workspace_dir.join("nested").join("bytes.bin");
-    write_bytes_to_path(&out, b"abc").expect("write bytes");
-    assert_eq!(std::fs::read(out).expect("read bytes"), b"abc");
-
     let policy = DefaultToolPolicy;
     assert_eq!(
         policy.evaluate("anything", &json!({"arg": true})),
diff --git a/tests/screen_intelligence_vision_e2e.rs b/tests/screen_intelligence_vision_e2e.rs
deleted file mode 100644
index e22491a38..000000000
--- a/tests/screen_intelligence_vision_e2e.rs
+++ /dev/null
@@ -1,810 +0,0 @@
-//! E2E tests for the screen-intelligence vision pipeline.
-//!
-//! ## Platform support
-//!
-//! | Test group                          | Linux CI | macOS local |
-//! |-------------------------------------|----------|-------------|
-//! | Compression + image processing      | ✅        | ✅           |
-//! | Memory persistence (UnifiedMemory)  | ✅        | ✅           |
-//! | Screenshot save/cleanup (disk I/O)  | ✅        | ✅           |
-//! | Real screen capture (permission)    | ❌        | ✅ (manual)  |
-//! | Local LLM vision analysis           | ❌        | ✅ (manual)  |
-//!
-//! ### Running
-//! ```
-//! cargo test --test screen_intelligence_vision_e2e
-//! ```
-//! Cross-platform CI tests use `OPENHUMAN_SCREEN_INTELLIGENCE_MOCK_VISION_JSON` to validate the
-//! real engine pipeline without requiring macOS permissions or a running Ollama server.
-//!
-//! ### macOS E2E checklist (manual, requires Screen Recording permission)
-//! 1. Grant Screen Recording to the `openhuman-core` binary in System Settings › Privacy & Security.
-//! 2. Run: `cargo test --test screen_intelligence_vision_e2e -- --nocapture`
-//! 3. Ensure Ollama is running with a vision-capable model (e.g. `ollama run minicpm-v`).
-//! 4. Call `openhuman.screen_intelligence_capture_test` via `cargo test --test json_rpc_e2e json_rpc_screen_intelligence`.
-//! 5. Run ignored real-capture test:
-//!    `cargo test --test screen_intelligence_vision_e2e macos_real_capture_cycle_persists_summary -- --ignored --nocapture`
-
-use std::path::Path;
-use std::sync::{Arc, Mutex, OnceLock};
-
-use base64::{engine::general_purpose::STANDARD as B64, Engine};
-use image::codecs::jpeg::JpegEncoder;
-use image::codecs::png::PngEncoder;
-use image::imageops::FilterType;
-use image::{ImageBuffer, Rgb, RgbImage};
-use tempfile::tempdir;
-
-use openhuman_core::openhuman::embeddings::NoopEmbedding;
-use openhuman_core::openhuman::memory_store::types::NamespaceDocumentInput;
-use openhuman_core::openhuman::memory_store::UnifiedMemory;
-use openhuman_core::openhuman::screen_intelligence::CaptureFrame;
-use openhuman_core::openhuman::screen_intelligence::{
-    global_engine, AccessibilityEngine, VisionSummary,
-};
-
-// ── Env isolation ────────────────────────────────────────────────────
-
-struct EnvVarGuard {
-    key: &'static str,
-    old: Option<String>,
-}
-
-impl EnvVarGuard {
-    fn set_to_path(key: &'static str, path: &Path) -> Self {
-        let old = std::env::var(key).ok();
-        std::env::set_var(key, path.as_os_str());
-        Self { key, old }
-    }
-
-    fn set(key: &'static str, value: &str) -> Self {
-        let old = std::env::var(key).ok();
-        std::env::set_var(key, value);
-        Self { key, old }
-    }
-
-    fn unset(key: &'static str) -> Self {
-        let old = std::env::var(key).ok();
-        std::env::remove_var(key);
-        Self { key, old }
-    }
-}
-
-impl Drop for EnvVarGuard {
-    fn drop(&mut self) {
-        match &self.old {
-            Some(v) => std::env::set_var(self.key, v),
-            None => std::env::remove_var(self.key),
-        }
-    }
-}
-
-static ENV_LOCK: OnceLock<Mutex<()>> = OnceLock::new();
-
-fn env_lock() -> std::sync::MutexGuard<'static, ()> {
-    match ENV_LOCK.get_or_init(|| Mutex::new(())).lock() {
-        Ok(guard) => guard,
-        Err(poisoned) => poisoned.into_inner(),
-    }
-}
-
-fn expected_vision_summary_memory_key_for_json(summary: &serde_json::Value) -> String {
-    expected_vision_summary_memory_key(
-        summary["id"].as_str().expect("summary id"),
-        summary["captured_at_ms"]
-            .as_i64()
-            .expect("summary captured_at_ms"),
-    )
-}
-
-fn expected_vision_summary_memory_key_for_summary(summary: &VisionSummary) -> String {
-    expected_vision_summary_memory_key(&summary.id, summary.captured_at_ms)
-}
-
-fn expected_vision_summary_memory_key(id: &str, captured_at_ms: i64) -> String {
-    format!(
-        "screen_intelligence_{}_{}",
-        captured_at_ms,
-        stable_decimal_hash(id)
-    )
-}
-
-fn stable_decimal_hash(value: &str) -> u64 {
-    let mut hash = 0xcbf29ce484222325u64;
-    for byte in value.as_bytes() {
-        hash ^= u64::from(*byte);
-        hash = hash.wrapping_mul(0x100000001b3);
-    }
-    hash
-}
-
-// ── Helpers ──────────────────────────────────────────────────────────
-
-/// Create a synthetic PNG data-URI simulating a desktop screenshot.
-fn make_test_png_uri(width: u32, height: u32) -> String {
-    let img: RgbImage = ImageBuffer::from_fn(width, height, |x, y| {
-        Rgb([
-            (x % 256) as u8,
-            (y % 256) as u8,
-            ((x * 3 + y * 7) % 256) as u8,
-        ])
-    });
-    let mut png_bytes: Vec<u8> = Vec::new();
-    let encoder = PngEncoder::new(&mut png_bytes);
-    img.write_with_encoder(encoder).expect("PNG encode");
-    let b64 = B64.encode(&png_bytes);
-    format!("data:image/png;base64,{b64}")
-}
-
-fn make_capture_frame(image_ref: Option<String>) -> CaptureFrame {
-    CaptureFrame {
-        captured_at_ms: chrono::Utc::now().timestamp_millis(),
-        reason: "e2e_test".to_string(),
-        app_name: Some("TestApp".to_string()),
-        window_title: Some("E2E Test Window".to_string()),
-        image_ref,
-    }
-}
-
-/// Open a UnifiedMemory backed by NoopEmbedding in a temp dir.
-fn open_test_memory(dir: &Path) -> UnifiedMemory {
-    let embedder: Arc<dyn openhuman_core::openhuman::embeddings::EmbeddingProvider> =
-        Arc::new(NoopEmbedding);
-    UnifiedMemory::new(dir, embedder, Some(5)).expect("UnifiedMemory::new")
-}
-
-fn write_screen_intelligence_test_config(
-    root: &Path,
-    local_ai_enabled: bool,
-    local_ai_provider: &str,
-) {
-    let cfg = format!(
-        r#"default_temperature = 0.7
-
-[memory]
-backend = "sqlite"
-auto_save = true
-embedding_provider = "none"
-embedding_model = "none"
-embedding_dimensions = 0
-
-[local_ai]
-runtime_enabled = {local_ai_enabled}
-provider = "{local_ai_provider}"
-
-[screen_intelligence]
-keep_screenshots = false
-
-[secrets]
-encrypt = false
-"#
-    );
-    std::fs::create_dir_all(root).expect("mkdir test root");
-    std::fs::write(root.join("config.toml"), &cfg).expect("write config");
-    let _: openhuman_core::openhuman::config::Config =
-        toml::from_str(&cfg).expect("test config should deserialize");
-}
-
-/// Simulate what `parse_vision_summary_output` does, but from public types.
-fn mock_vision_summary(frame: &CaptureFrame, raw_llm: &str) -> serde_json::Value {
-    let value: serde_json::Value = serde_json::from_str(raw_llm).unwrap_or_else(|_| {
-        serde_json::json!({
-            "ui_state": "UI state unavailable",
-            "key_text": "",
-            "actionable_notes": raw_llm.trim(),
-            "confidence": 0.66,
-        })
-    });
-    serde_json::json!({
-        "id": format!("vision-{}-e2e", frame.captured_at_ms),
-        "captured_at_ms": frame.captured_at_ms,
-        "app_name": frame.app_name,
-        "window_title": frame.window_title,
-        "ui_state": value.get("ui_state").and_then(|v| v.as_str()).unwrap_or("UI state unavailable"),
-        "key_text": value.get("key_text").and_then(|v| v.as_str()).unwrap_or(""),
-        "actionable_notes": value.get("actionable_notes").and_then(|v| v.as_str()).unwrap_or(raw_llm.trim()),
-        "confidence": value.get("confidence").and_then(|v| v.as_f64()).unwrap_or(0.66),
-    })
-}
-
-// ── Tests ────────────────────────────────────────────────────────────
-
-/// Full pipeline: compress screenshot -> simulate LLM response -> persist to memory -> query back.
-#[tokio::test]
-async fn vision_pipeline_compress_parse_persist() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _home = EnvVarGuard::set_to_path("HOME", tmp.path());
-
-    // ── Step 1: Generate a 1920x1080 screenshot ─────────────────────
-    let image_ref = make_test_png_uri(1920, 1080);
-    let original_b64_len = image_ref.len();
-    assert!(
-        original_b64_len > 10_000,
-        "test image should be non-trivial"
-    );
-
-    // ── Step 2: Compress (same logic as image_processing module) ─────
-    let b64_payload = image_ref
-        .find(";base64,")
-        .map(|pos| &image_ref[pos + 8..])
-        .unwrap_or(&image_ref);
-    let raw_bytes = B64.decode(b64_payload).expect("decode original");
-    let original_size = raw_bytes.len();
-
-    let img = image::load_from_memory(&raw_bytes).expect("load image");
-    assert_eq!(img.width(), 1920);
-    assert_eq!(img.height(), 1080);
-
-    // Resize to 1024 on long edge
-    let max_dim = 1024u32;
-    let scale = max_dim as f64 / img.width().max(img.height()) as f64;
-    let new_w = (img.width() as f64 * scale).round() as u32;
-    let new_h = (img.height() as f64 * scale).round() as u32;
-    let resized = img.resize_exact(new_w, new_h, FilterType::Lanczos3);
-    assert!(resized.width() <= max_dim);
-    assert!(resized.height() <= max_dim);
-
-    // JPEG encode
-    let rgb = resized.to_rgb8();
-    let mut jpeg_buf: Vec<u8> = Vec::new();
-    let encoder = JpegEncoder::new_with_quality(&mut jpeg_buf, 72);
-    rgb.write_with_encoder(encoder).expect("JPEG encode");
-    let compressed_size = jpeg_buf.len();
-    assert!(
-        compressed_size < original_size,
-        "compressed ({compressed_size}) should be smaller than original ({original_size})"
-    );
-
-    let compressed_uri = format!("data:image/jpeg;base64,{}", B64.encode(&jpeg_buf));
-    assert!(compressed_uri.len() < original_b64_len);
-
-    // ── Step 3: Simulate LLM vision response ────────────────────────
-    let frame = make_capture_frame(Some(image_ref));
-    let mock_llm_response = r#"{"ui_state": "code editor with terminal", "key_text": "fn main() { println!(\"hello\"); }", "actionable_notes": "User is editing Rust code in a split-pane layout", "confidence": 0.91}"#;
-    let summary = mock_vision_summary(&frame, mock_llm_response);
-
-    assert_eq!(
-        summary["ui_state"].as_str().unwrap(),
-        "code editor with terminal"
-    );
-    assert!((summary["confidence"].as_f64().unwrap() - 0.91).abs() < 0.01);
-
-    // ── Step 4: Persist to memory ───────────────────────────────────
-    let mem = open_test_memory(tmp.path());
-    let content = serde_json::to_string(&summary).expect("serialize summary");
-    let key = expected_vision_summary_memory_key_for_json(&summary);
-    mem.upsert_document(NamespaceDocumentInput {
-        namespace: "background".to_string(),
-        key: key.clone(),
-        title: key.clone(),
-        content: content.clone(),
-        source_type: "screenshot".to_string(),
-        priority: "medium".to_string(),
-        tags: vec!["screen_intelligence".to_string()],
-        metadata: serde_json::json!({}),
-        category: "screen_intelligence".to_string(),
-        session_id: None,
-        document_id: None,
-        taint: openhuman_core::openhuman::memory::MemoryTaint::Internal,
-    })
-    .await
-    .expect("upsert_document");
-
-    // ── Step 5: Query back from memory ──────────────────────────────
-    let result_json = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list_documents");
-    let docs = result_json["documents"]
-        .as_array()
-        .expect("documents array");
-    assert!(!docs.is_empty(), "should find the persisted vision summary");
-    let found = docs.iter().any(|d| d["key"].as_str() == Some(&key));
-    assert!(found, "should find document by key: {key}");
-}
-
-/// Multiple screenshots persisted and queryable.
-#[tokio::test]
-async fn multiple_vision_summaries_persist_and_query() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _home = EnvVarGuard::set_to_path("HOME", tmp.path());
-
-    let mem = open_test_memory(tmp.path());
-
-    let scenarios = vec![
-        (
-            "Safari",
-            "GitHub PR Review",
-            0.88,
-            "User reviewing pull request diffs",
-        ),
-        (
-            "VSCode",
-            "main.rs - editor",
-            0.92,
-            "Rust code editing with LSP diagnostics",
-        ),
-        (
-            "Terminal",
-            "cargo test output",
-            0.85,
-            "Test results showing 19 passed",
-        ),
-    ];
-
-    for (i, (app, window, confidence, notes)) in scenarios.iter().enumerate() {
-        let ts = chrono::Utc::now().timestamp_millis() + i as i64;
-        let summary = serde_json::json!({
-            "id": format!("vision-{ts}-{app}"),
-            "captured_at_ms": ts,
-            "app_name": app,
-            "window_title": window,
-            "ui_state": "active",
-            "key_text": "",
-            "actionable_notes": notes,
-            "confidence": confidence,
-        });
-
-        let content = serde_json::to_string(&summary).expect("serialize");
-        let key = expected_vision_summary_memory_key_for_json(&summary);
-        mem.upsert_document(NamespaceDocumentInput {
-            namespace: "background".to_string(),
-            key,
-            title: format!("{app} - {window}"),
-            content,
-            source_type: "screenshot".to_string(),
-            priority: "medium".to_string(),
-            tags: vec!["screen_intelligence".to_string()],
-            metadata: serde_json::json!({}),
-            category: "screen_intelligence".to_string(),
-            session_id: None,
-            document_id: None,
-            taint: openhuman_core::openhuman::memory::MemoryTaint::Internal,
-        })
-        .await
-        .expect("upsert");
-    }
-
-    let result_json = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list_documents");
-    let docs = result_json["documents"]
-        .as_array()
-        .expect("documents array");
-    assert_eq!(
-        docs.len(),
-        3,
-        "should have 3 persisted summaries, got {}",
-        docs.len()
-    );
-}
-
-/// Malformed LLM response still produces a usable summary (fallback path).
-#[test]
-fn malformed_llm_response_handled_gracefully() {
-    let frame = make_capture_frame(None);
-    let broken = "Sorry, I cannot analyze this image due to unclear content.";
-    let summary = mock_vision_summary(&frame, broken);
-
-    assert_eq!(
-        summary["ui_state"].as_str().unwrap(),
-        "UI state unavailable"
-    );
-    assert!(summary["actionable_notes"]
-        .as_str()
-        .unwrap()
-        .contains("Sorry"));
-    assert!((summary["confidence"].as_f64().unwrap() - 0.66).abs() < 0.01);
-}
-
-/// Compression pipeline handles various image sizes without panicking.
-#[test]
-fn compression_handles_various_sizes() {
-    let sizes = vec![
-        (64, 64),     // tiny
-        (800, 600),   // small desktop
-        (1920, 1080), // full HD
-        (3840, 2160), // 4K
-        (100, 2000),  // tall narrow
-        (3000, 50),   // wide short
-    ];
-
-    let max_dim = 1024u32;
-    for (w, h) in sizes {
-        let uri = make_test_png_uri(w, h);
-        let b64_payload = uri
-            .find(";base64,")
-            .map(|pos| &uri[pos + 8..])
-            .unwrap_or(&uri);
-        let raw = B64.decode(b64_payload).expect("decode");
-        let img = image::load_from_memory(&raw).expect("load");
-        assert_eq!(img.width(), w, "width mismatch for {w}x{h}");
-        assert_eq!(img.height(), h, "height mismatch for {w}x{h}");
-
-        if w > max_dim || h > max_dim {
-            let scale = max_dim as f64 / w.max(h) as f64;
-            let nw = (w as f64 * scale).round() as u32;
-            let nh = (h as f64 * scale).round() as u32;
-            let resized = img.resize_exact(nw, nh, FilterType::Lanczos3);
-            assert!(
-                resized.width() <= max_dim,
-                "resized width exceeds max for {w}x{h}"
-            );
-            assert!(
-                resized.height() <= max_dim,
-                "resized height exceeds max for {w}x{h}"
-            );
-
-            let rgb = resized.to_rgb8();
-            let mut buf: Vec<u8> = Vec::new();
-            let enc = JpegEncoder::new_with_quality(&mut buf, 72);
-            rgb.write_with_encoder(enc)
-                .unwrap_or_else(|e| panic!("JPEG encode failed for {w}x{h}: {e}"));
-            assert!(
-                !buf.is_empty(),
-                "JPEG output should not be empty for {w}x{h}"
-            );
-        }
-    }
-}
-
-/// Vision summary upsert is idempotent (same key overwrites, not duplicates).
-#[tokio::test]
-async fn vision_summary_upsert_is_idempotent() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _home = EnvVarGuard::set_to_path("HOME", tmp.path());
-
-    let mem = open_test_memory(tmp.path());
-    let key = "screen_intelligence_vision-12345-upsert-test".to_string();
-
-    // First insert
-    mem.upsert_document(NamespaceDocumentInput {
-        namespace: "background".to_string(),
-        key: key.clone(),
-        title: key.clone(),
-        content: r#"{"version": 1}"#.to_string(),
-        source_type: "screenshot".to_string(),
-        priority: "medium".to_string(),
-        tags: vec!["screen_intelligence".to_string()],
-        metadata: serde_json::json!({}),
-        category: "screen_intelligence".to_string(),
-        session_id: None,
-        document_id: None,
-        taint: openhuman_core::openhuman::memory::MemoryTaint::Internal,
-    })
-    .await
-    .expect("first upsert");
-
-    // Second insert with same key, different content
-    mem.upsert_document(NamespaceDocumentInput {
-        namespace: "background".to_string(),
-        key: key.clone(),
-        title: key.clone(),
-        content: r#"{"version": 2}"#.to_string(),
-        source_type: "screenshot".to_string(),
-        priority: "medium".to_string(),
-        tags: vec!["screen_intelligence".to_string()],
-        metadata: serde_json::json!({}),
-        category: "screen_intelligence".to_string(),
-        session_id: None,
-        document_id: None,
-        taint: openhuman_core::openhuman::memory::MemoryTaint::Internal,
-    })
-    .await
-    .expect("second upsert");
-
-    let result_json = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list_documents");
-    let docs = result_json["documents"]
-        .as_array()
-        .expect("documents array");
-    let matching: Vec<_> = docs
-        .iter()
-        .filter(|d| d["key"].as_str() == Some(&key))
-        .collect();
-    assert_eq!(
-        matching.len(),
-        1,
-        "upsert should overwrite, not duplicate: found {} docs",
-        matching.len()
-    );
-}
-
-/// Verify that compression produces significant savings on realistic images.
-#[test]
-fn compression_savings_on_realistic_screenshot() {
-    let uri = make_test_png_uri(2560, 1440); // QHD resolution
-    let b64_payload = uri.find(";base64,").map(|pos| &uri[pos + 8..]).unwrap();
-    let raw = B64.decode(b64_payload).expect("decode");
-    let original_size = raw.len();
-
-    let img = image::load_from_memory(&raw).expect("load");
-    let scale = 1024.0 / img.width().max(img.height()) as f64;
-    let nw = (img.width() as f64 * scale).round() as u32;
-    let nh = (img.height() as f64 * scale).round() as u32;
-    let resized = img.resize_exact(nw, nh, FilterType::Lanczos3);
-
-    let rgb = resized.to_rgb8();
-    let mut jpeg_buf: Vec<u8> = Vec::new();
-    let enc = JpegEncoder::new_with_quality(&mut jpeg_buf, 72);
-    rgb.write_with_encoder(enc).expect("JPEG encode");
-
-    let ratio = jpeg_buf.len() as f64 / original_size as f64;
-    assert!(
-        ratio < 0.5,
-        "compression ratio should be under 50%, got {:.1}%",
-        ratio * 100.0
-    );
-}
-
-/// save_screenshot_to_disk writes a valid PNG file to the workspace directory.
-#[test]
-fn save_screenshot_to_disk_creates_png_file() {
-    let png_uri = make_test_png_uri(32, 32);
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000001,
-        reason: "e2e_disk_save_test".to_string(),
-        app_name: Some("DiskSaveApp".to_string()),
-        window_title: Some("E2E Save Test".to_string()),
-        image_ref: Some(png_uri),
-    };
-
-    let tmp = tempdir().expect("tempdir");
-    let result = AccessibilityEngine::save_screenshot_to_disk(tmp.path(), &frame);
-
-    assert!(
-        result.is_ok(),
-        "[screen_intelligence] save_screenshot_to_disk should succeed: {:?}",
-        result
-    );
-    let saved_path = result.unwrap();
-    assert!(
-        saved_path.exists(),
-        "[screen_intelligence] saved PNG file should exist at {}",
-        saved_path.display()
-    );
-    assert_eq!(
-        saved_path.extension().and_then(|e| e.to_str()),
-        Some("png"),
-        "saved file should have .png extension"
-    );
-    let metadata = std::fs::metadata(&saved_path).expect("file metadata");
-    assert!(metadata.len() > 0, "saved PNG should not be empty");
-}
-
-/// Simulates the keep_screenshots=false cleanup path: save then immediately remove.
-#[test]
-fn save_screenshot_to_disk_cleanup_simulates_keep_screenshots_false() {
-    let png_uri = make_test_png_uri(32, 32);
-    let frame = CaptureFrame {
-        captured_at_ms: 1700000000002,
-        reason: "e2e_cleanup_test".to_string(),
-        app_name: Some("CleanupApp".to_string()),
-        window_title: Some("E2E Cleanup Test".to_string()),
-        image_ref: Some(png_uri),
-    };
-
-    let tmp = tempdir().expect("tempdir");
-    let result = AccessibilityEngine::save_screenshot_to_disk(tmp.path(), &frame);
-    assert!(
-        result.is_ok(),
-        "[screen_intelligence] save should succeed before cleanup: {:?}",
-        result
-    );
-
-    let saved_path = result.unwrap();
-    assert!(saved_path.exists(), "file should exist before cleanup");
-
-    // Simulate what the vision worker does when keep_screenshots=false
-    std::fs::remove_file(&saved_path).expect("remove_file should succeed");
-
-    assert!(
-        !saved_path.exists(),
-        "[screen_intelligence] file should no longer exist after cleanup: {}",
-        saved_path.display()
-    );
-}
-
-/// VisionSummary struct serializes and deserializes correctly, and is queryable after persistence.
-///
-/// Tests two things independently:
-/// 1. `VisionSummary` serde roundtrip in memory (proves struct attributes are correct).
-/// 2. Persisting to UnifiedMemory and verifying the key is listed (proves `persist_vision_summary`
-///    writes to the right namespace with the right key format).
-#[tokio::test]
-async fn vision_summary_struct_persist_and_deserialize_roundtrip() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _home = EnvVarGuard::set_to_path("HOME", tmp.path());
-
-    let summary = VisionSummary {
-        id: "vision-1700000000100-roundtrip-test".to_string(),
-        captured_at_ms: 1700000000100,
-        app_name: Some("RoundtripApp".to_string()),
-        window_title: Some("Roundtrip Test Window".to_string()),
-        ui_state: "code editor with Rust file open".to_string(),
-        key_text: "fn main() {}".to_string(),
-        actionable_notes: "Developer is writing Rust code".to_string(),
-        confidence: 0.93,
-    };
-
-    // ── Step 1: serde roundtrip in memory (no DB) ──────────────────────────
-    // This proves VisionSummary has correct Serialize/Deserialize attributes and
-    // that the JSON format matches what persist_vision_summary stores.
-    let serialized = serde_json::to_string(&summary).expect("serialize VisionSummary");
-    let deserialized: VisionSummary =
-        serde_json::from_str(&serialized).expect("deserialize VisionSummary");
-
-    assert_eq!(deserialized.id, summary.id, "id roundtrip");
-    assert_eq!(
-        deserialized.ui_state, summary.ui_state,
-        "ui_state roundtrip"
-    );
-    assert_eq!(
-        deserialized.key_text, summary.key_text,
-        "key_text roundtrip"
-    );
-    assert_eq!(
-        deserialized.actionable_notes, summary.actionable_notes,
-        "actionable_notes roundtrip"
-    );
-    assert_eq!(
-        deserialized.app_name, summary.app_name,
-        "app_name roundtrip"
-    );
-    assert!(
-        (deserialized.confidence - summary.confidence).abs() < 0.01,
-        "confidence roundtrip: expected {}, got {}",
-        summary.confidence,
-        deserialized.confidence
-    );
-
-    // ── Step 2: persist to UnifiedMemory, verify queryable by key ─────────
-    // Mirrors the PII-safe key contract used by persist_vision_summary().
-    let mem = open_test_memory(tmp.path());
-    let key = expected_vision_summary_memory_key_for_summary(&summary);
-    mem.upsert_document(NamespaceDocumentInput {
-        namespace: "background".to_string(),
-        key: key.clone(),
-        title: key.clone(),
-        content: serialized,
-        source_type: "screenshot".to_string(),
-        priority: "medium".to_string(),
-        tags: vec!["screen_intelligence".to_string()],
-        metadata: serde_json::json!({}),
-        category: "screen_intelligence".to_string(),
-        session_id: None,
-        document_id: None,
-        taint: openhuman_core::openhuman::memory::MemoryTaint::Internal,
-    })
-    .await
-    .expect("upsert_document");
-
-    let result_json = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list_documents");
-    let docs = result_json["documents"]
-        .as_array()
-        .expect("documents array");
-
-    assert!(
-        docs.iter().any(|d| d["key"].as_str() == Some(&key)),
-        "[screen_intelligence] persisted VisionSummary should be queryable by key: {key}"
-    );
-}
-
-/// Exercises the real engine pipeline (compress -> parse -> persist) with mocked local-vision
-/// output so Linux CI can validate behavior without macOS permissions or Ollama runtime.
-#[tokio::test]
-async fn engine_pipeline_with_mocked_local_vision_persists_to_memory() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    let _mock = EnvVarGuard::set(
-        "OPENHUMAN_SCREEN_INTELLIGENCE_MOCK_VISION_JSON",
-        r#"{"ui_state":"browser with docs","key_text":"README.md","actionable_notes":"User is reading project docs","confidence":0.89}"#,
-    );
-    write_screen_intelligence_test_config(tmp.path(), true, "ollama");
-
-    let frame = make_capture_frame(Some(make_test_png_uri(960, 540)));
-    let summary = global_engine()
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect("mocked engine pipeline should succeed");
-    assert_eq!(summary.ui_state, "browser with docs");
-
-    let config = openhuman_core::openhuman::config::Config::load_or_init()
-        .await
-        .expect("load config");
-    let mem = open_test_memory(&config.workspace_dir);
-    let docs = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list documents")["documents"]
-        .as_array()
-        .cloned()
-        .expect("documents array");
-    let key = expected_vision_summary_memory_key_for_summary(&summary);
-    assert!(
-        docs.iter().any(|doc| doc["key"].as_str() == Some(&key)),
-        "expected persisted summary key in memory: {key}"
-    );
-}
-
-/// Ensures screen-intelligence vision refuses non-local providers to avoid remote fallback.
-#[tokio::test]
-async fn engine_pipeline_rejects_non_local_provider() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    write_screen_intelligence_test_config(tmp.path(), true, "openai");
-
-    let frame = make_capture_frame(Some(make_test_png_uri(320, 240)));
-    let err = global_engine()
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect_err("non-local providers should be rejected");
-    assert!(
-        err.contains("provider 'ollama'"),
-        "unexpected provider guard error: {err}"
-    );
-}
-
-/// Manual macOS-only smoke test for the real capture -> local vision -> memory persistence chain.
-/// Run manually with:
-/// `cargo test --test screen_intelligence_vision_e2e macos_real_capture_cycle_persists_summary -- --ignored --nocapture`
-#[cfg(target_os = "macos")]
-#[tokio::test]
-#[ignore = "requires Screen Recording permission + local Ollama vision model"]
-async fn macos_real_capture_cycle_persists_summary() {
-    let _lock = env_lock();
-    let tmp = tempdir().expect("tempdir");
-    let _workspace = EnvVarGuard::set_to_path("OPENHUMAN_WORKSPACE", tmp.path());
-    let _mock = EnvVarGuard::unset("OPENHUMAN_SCREEN_INTELLIGENCE_MOCK_VISION_JSON");
-    write_screen_intelligence_test_config(tmp.path(), true, "ollama");
-
-    let capture = global_engine().capture_test().await;
-    assert!(
-        capture.ok,
-        "capture_test failed; ensure Screen Recording permission is granted: {:?}",
-        capture.error
-    );
-    let image_ref = capture
-        .image_ref
-        .clone()
-        .expect("capture_test should return image_ref on success");
-    let frame = make_capture_frame(Some(image_ref));
-
-    let summary = global_engine()
-        .analyze_and_persist_frame(frame)
-        .await
-        .expect("real local-vision inference should succeed");
-    assert!(
-        !summary.actionable_notes.is_empty(),
-        "summary should include actionable notes"
-    );
-
-    let config = openhuman_core::openhuman::config::Config::load_or_init()
-        .await
-        .expect("load config");
-    let mem = open_test_memory(&config.workspace_dir);
-    let docs = mem
-        .list_documents(Some("background"))
-        .await
-        .expect("list documents")["documents"]
-        .as_array()
-        .cloned()
-        .expect("documents array");
-    let key = expected_vision_summary_memory_key_for_summary(&summary);
-    assert!(
-        docs.iter().any(|doc| doc["key"].as_str() == Some(&key)),
-        "expected persisted summary key after real capture cycle: {key}"
-    );
-}