From ac53897468221b462670b68a1396a0a029171525 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 13 Oct 2026 01:49:46 -0700 Subject: [PATCH 1/4] fix(startup): an Orca started from an Orca terminal does not carry that pane's identity When Orca itself is launched from a shell inside one of its terminal panes (a dev build, `orca serve`, or the app run from a pane), its environment carries that pane's identity: ORCA_PANE_KEY, ORCA_TAB_ID, ORCA_WORKTREE_ID, the launch token, the pane's hook route, and so on. Every child the new Orca spawns inherited it. Native-chat Claude and Codex sessions passed it straight through, so their hooks reported the chat's conversation as that pane's agent, the pane saved it, and on the next restart the pane resumed the chat's conversation as a terminal agent in the pane's own workspace (#26417). Both host entry points already drop one piece of the launching terminal's identity (its runtime source stamp). They now drop all of it, from one list: pane identity and its scrub-safe aliases, the pane's workspace hints and terminal handle, the pane's hook route, a chat session's caller identity, and a chat's visuals folder. Orca never sets any of these on itself, so nothing it needs is lost; terminals still get their own identity explicitly at spawn. The native-chat launch parity oracle now models the host's environment after startup, and records that no agent's child carries the parent pane's keys. --- src/main/orcad/orcad-entry.ts | 6 +- ...tructured-agent-launch-parity.test.ts.snap | 219 ------------------ .../structured-agent-launch-parity.test.ts | 13 +- src/main/startup/configure-process.test.ts | 11 +- src/main/startup/configure-process.ts | 6 +- .../inherited-launch-identity-env.test.ts | 37 +++ .../startup/inherited-launch-identity-env.ts | 43 ++++ 7 files changed, 105 insertions(+), 230 deletions(-) create mode 100644 src/main/startup/inherited-launch-identity-env.test.ts create mode 100644 src/main/startup/inherited-launch-identity-env.ts diff --git a/src/main/orcad/orcad-entry.ts b/src/main/orcad/orcad-entry.ts index bf607e4a2baa..cb1ec8c3284a 100644 --- a/src/main/orcad/orcad-entry.ts +++ b/src/main/orcad/orcad-entry.ts @@ -38,7 +38,7 @@ import { changedAiVaultSearchSettings, type AiVaultSearchSettings } from '../../shared/ai-vault-search-settings' -import { stampRuntimeSourceEnv } from '../../shared/runtime-source-env' +import { dropInheritedLaunchIdentityEnv } from '../startup/inherited-launch-identity-env' export { parseArgs } @@ -134,8 +134,8 @@ export type OrcadHandle = { */ export async function startOrcad(options: OrcadOptions = {}): Promise { installOrcadHostAdapters() - // Why: an orcad started from an Orca terminal must not fence its own CLI children to that Orca. - stampRuntimeSourceEnv(process.env, null) + // Why: an orcad started from an Orca terminal or chat is neither, and must not fence its CLI children to that Orca. + dropInheritedLaunchIdentityEnv(process.env) const { readiness, instance, stop } = await startOrcadWithHost( resolveUserDataPath(), (registerCleanup) => startOrcadRuntime(options, registerCleanup), diff --git a/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap b/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap index 6a47a2c718a7..fab4c0a1c2ca 100644 --- a/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap +++ b/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap @@ -40,29 +40,15 @@ exports[`native-chat launch parity > claude floating fresh 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000003", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/993224b4fe85990df64db926ca5c0346", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude", "PATH": "/bin:/orca-cli/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -125,29 +111,15 @@ exports[`native-chat launch parity > claude floating resumed 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000004", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/008bf60b9309e6141ae7eb98acb2a35d", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude", "PATH": "/bin:/orca-cli/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -208,29 +180,15 @@ exports[`native-chat launch parity > claude worktree fresh 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000001", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/11e594f481958c10e3015d0bf0447a22", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude", "PATH": "/bin:/orca-cli/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -293,29 +251,15 @@ exports[`native-chat launch parity > claude worktree fresh configured 1`] = ` "HOME": "/home", "INHERITED_ONLY": "overlay", "LANG": "C", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000031", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/eaed3477e8b61885d231829e3d12e45d", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -369,28 +313,15 @@ exports[`native-chat launch parity > claude worktree fresh worker 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000005", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", "ORCA_TERMINAL_HANDLE": "structworker_00000000-0000-4000-8000-000000000005", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude", "PATH": "/bin:/orca-cli/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -451,29 +382,15 @@ exports[`native-chat launch parity > claude worktree resumed 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000002", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/e79acd97ac88086665d85a762f43d533", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude", "PATH": "/bin:/orca-cli/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -536,29 +453,15 @@ exports[`native-chat launch parity > claude worktree resumed configured 1`] = ` "HOME": "/home", "INHERITED_ONLY": "overlay", "LANG": "C", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000032", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/b0c5ad35009f2e02d85f43df8b152891", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "claude-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -594,29 +497,15 @@ exports[`native-chat launch parity > codex floating fresh 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000008", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/fe9eeff554ea6c98aca483076d97614a", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -663,29 +552,15 @@ exports[`native-chat launch parity > codex floating resumed 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000009", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/f3e028aaa6530055f01a5e1e849f6765", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -730,29 +605,15 @@ exports[`native-chat launch parity > codex worktree fresh 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000006", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/a8353ed0bde97e7845f0996d60267ea5", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -797,29 +658,15 @@ exports[`native-chat launch parity > codex worktree fresh configured 1`] = ` "HOME": "/home", "INHERITED_ONLY": "overlay", "LANG": "C", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000033", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/0a57e3c82f8be1ecdb1249602bb0e48d", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -863,28 +710,15 @@ exports[`native-chat launch parity > codex worktree fresh worker 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000010", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", "ORCA_TERMINAL_HANDLE": "structworker_00000000-0000-4000-8000-000000000010", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -931,29 +765,15 @@ exports[`native-chat launch parity > codex worktree resumed 1`] = ` "HOME": "/home", "INHERITED_ONLY": "process", "LANG": "en_US.UTF-8", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000007", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/6b7be92641aec20b00f9c40280433e0a", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -998,29 +818,15 @@ exports[`native-chat launch parity > codex worktree resumed configured 1`] = ` "HOME": "/home", "INHERITED_ONLY": "overlay", "LANG": "C", - "ORCA_AGENT_HOOK_ENDPOINT": "parent-orca_agent_hook_endpoint", - "ORCA_AGENT_HOOK_ENV": "parent-orca_agent_hook_env", - "ORCA_AGENT_HOOK_PORT": "parent-orca_agent_hook_port", - "ORCA_AGENT_HOOK_TOKEN": "parent-orca_agent_hook_token", - "ORCA_AGENT_HOOK_TRANSPORT": "parent-orca_agent_hook_transport", - "ORCA_AGENT_HOOK_VERSION": "parent-orca_agent_hook_version", - "ORCA_AGENT_LAUNCH": "parent-scrub-safe-launch", - "ORCA_AGENT_LAUNCH_TOKEN": "parent-launch-token", - "ORCA_AGENT_PANE": "parent-scrub-safe-pane", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000034", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", "ORCA_CHAT_VISUALS_DIR": "/state/native-chat-visuals/4c105fab16e20f574f686cfe2d55d927", - "ORCA_CLAUDE_AGENT_STATUS_SETTINGS": "parent-orca_claude_agent_status_settings", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", - "ORCA_PANE_KEY": "tab_parent:parent-pane", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TAB_ID": "tab_parent", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", - "ORCA_WORKTREE_ID": "parent-worktree", "PARITY_OVERLAY": "codex-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", @@ -1075,7 +881,6 @@ exports[`native-chat launch parity > grok floating fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1144,7 +949,6 @@ exports[`native-chat launch parity > grok floating resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1211,7 +1015,6 @@ exports[`native-chat launch parity > grok worktree fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1277,7 +1080,6 @@ exports[`native-chat launch parity > grok worktree fresh configured 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1408,7 +1210,6 @@ exports[`native-chat launch parity > grok worktree resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1474,7 +1275,6 @@ exports[`native-chat launch parity > grok worktree resumed configured 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "grok-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1537,7 +1337,6 @@ exports[`native-chat launch parity > omp floating fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1604,7 +1403,6 @@ exports[`native-chat launch parity > omp floating resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1669,7 +1467,6 @@ exports[`native-chat launch parity > omp worktree fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1734,7 +1531,6 @@ exports[`native-chat launch parity > omp worktree fresh configured 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1861,7 +1657,6 @@ exports[`native-chat launch parity > omp worktree resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1926,7 +1721,6 @@ exports[`native-chat launch parity > omp worktree resumed configured 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", "ORCA_OPENCODE_CONFIG_DIR": "/parent/opencode-overlay", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "omp-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -1989,7 +1783,6 @@ exports[`native-chat launch parity > opencode floating fresh 1`] = ` "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2061,7 +1854,6 @@ exports[`native-chat launch parity > opencode floating resumed 1`] = ` "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2131,7 +1923,6 @@ exports[`native-chat launch parity > opencode worktree fresh 1`] = ` "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2201,7 +1992,6 @@ exports[`native-chat launch parity > opencode worktree fresh configured 1`] = ` "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2339,7 +2129,6 @@ exports[`native-chat launch parity > opencode worktree resumed 1`] = ` "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2409,7 +2198,6 @@ exports[`native-chat launch parity > opencode worktree resumed configured 1`] = "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_STRUCTURED_SESSION": "1", - "ORCA_TERMINAL_HANDLE": "term_parent", "ORCA_USER_DATA_PATH": "/user-data", "PARITY_OVERLAY": "opencode-configured", "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", @@ -2472,7 +2260,6 @@ exports[`native-chat launch parity > pi floating fresh 1`] = ` "LANG": "en_US.UTF-8", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000028", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2540,7 +2327,6 @@ exports[`native-chat launch parity > pi floating resumed 1`] = ` "LANG": "en_US.UTF-8", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000029", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2604,7 +2390,6 @@ exports[`native-chat launch parity > pi worktree fresh 1`] = ` "LANG": "en_US.UTF-8", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000026", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2668,7 +2453,6 @@ exports[`native-chat launch parity > pi worktree fresh configured 1`] = ` "LANG": "C", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000041", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2731,7 +2515,6 @@ exports[`native-chat launch parity > pi worktree fresh worker 1`] = ` "LANG": "en_US.UTF-8", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000030", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2797,7 +2580,6 @@ exports[`native-chat launch parity > pi worktree resumed 1`] = ` "LANG": "en_US.UTF-8", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000027", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", @@ -2863,7 +2645,6 @@ exports[`native-chat launch parity > pi worktree resumed configured 1`] = ` "LANG": "C", "ORCA_AGENT_SESSION_ID": "00000000-0000-4000-8000-000000000042", "ORCA_AGENT_SESSION_SPAWN_TOKEN": "parity-spawn-token", - "ORCA_CHAT_VISUALS_DIR": "/parent/visuals", "ORCA_CLI_BIN_DIR": "/orca-cli/bin", "ORCA_CLI_COMMAND": "/orca-cli/bin/orca", "ORCA_DATA_ACCOUNT_PROVIDER": "parent-account", diff --git a/src/main/runtime/structured-agent-launch-parity.test.ts b/src/main/runtime/structured-agent-launch-parity.test.ts index 7f4faca8242f..39313fa6465b 100644 --- a/src/main/runtime/structured-agent-launch-parity.test.ts +++ b/src/main/runtime/structured-agent-launch-parity.test.ts @@ -132,6 +132,7 @@ import { ORCA_AGENT_SESSION_CALLER_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' import { NATIVE_CHAT_VISUALS_DIR_ENV } from '../native-chat/native-chat-visuals-delivery' +import { dropInheritedLaunchIdentityEnv } from '../startup/inherited-launch-identity-env' import type { StructuredAgentSessionAcquireInput } from '../native-chat/agent-session-wire/structured-agent-session-adapter' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database' @@ -293,6 +294,14 @@ function settingsFor(launch: LaunchCase): Partial { } } +/** This Orca's environment when it was started from a parent Orca pane, after startup dropped + * that pane's identity as every host entry does. */ +function hostEnvironment(): Record { + const env = inheritedEnvironment() + dropInheritedLaunchIdentityEnv(env) + return env +} + /** Every pane, hook, caller, handle, visuals and auth key a parent Orca pane could hand down. */ function inheritedEnvironment(): Record { const env: Record = { @@ -552,7 +561,7 @@ beforeAll(async () => { for (const directory of ['worktree', 'floating', 'floating-pinned', 'home', 'state']) { await mkdir(join(root, directory), { recursive: true }) } - process.env = inheritedEnvironment() + process.env = hostEnvironment() installAppEnvironment() settings = defaultSettings() // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the host wiring reads only the store's getSettings method. @@ -593,7 +602,7 @@ beforeAll(async () => { // and each case inherits the same environment whatever ran before it. beforeEach(() => { installAppEnvironment() - process.env = inheritedEnvironment() + process.env = hostEnvironment() }) afterAll(async () => { diff --git a/src/main/startup/configure-process.test.ts b/src/main/startup/configure-process.test.ts index c0d8123f3a7a..57604787b2d8 100644 --- a/src/main/startup/configure-process.test.ts +++ b/src/main/startup/configure-process.test.ts @@ -394,23 +394,28 @@ describe('configureOrcaUserDataPathEnv', () => { expect(configuredUserDataPath).toBe('/tmp/current-orca-user-data') }) - it('drops a runtime source inherited from the Orca terminal that started this Orca', async () => { + it('drops a runtime source and pane inherited from the Orca terminal that started this Orca', async () => { const { app } = await import('electron') const { configureOrcaUserDataPathEnv } = await import('./configure-process') const saved = { ...process.env } process.env.ORCA_RUNTIME_SOURCE_ID = 'parent-source' process.env.ORCA_RUNTIME_SOURCE_INCARNATION = 'parent-runtime' + process.env.ORCA_PANE_KEY = 'tab-parent:leaf-parent' app.setPath('userData', '/tmp/current-orca-user-data') let inherited: (string | undefined)[] = [] try { configureOrcaUserDataPathEnv() - inherited = [process.env.ORCA_RUNTIME_SOURCE_ID, process.env.ORCA_RUNTIME_SOURCE_INCARNATION] + inherited = [ + process.env.ORCA_RUNTIME_SOURCE_ID, + process.env.ORCA_RUNTIME_SOURCE_INCARNATION, + process.env.ORCA_PANE_KEY + ] } finally { process.env = saved } - expect(inherited).toEqual([undefined, undefined]) + expect(inherited).toEqual([undefined, undefined, undefined]) }) }) diff --git a/src/main/startup/configure-process.ts b/src/main/startup/configure-process.ts index f7e9125ae5a2..7139767d2f03 100644 --- a/src/main/startup/configure-process.ts +++ b/src/main/startup/configure-process.ts @@ -8,7 +8,7 @@ import { getMainE2EConfig } from '../e2e-config' import { DISABLED_CHROMIUM_FEATURES } from './disabled-chromium-features' import { readHttp1CompatibilityMarker } from './http1-compatibility-marker' import { checkServeUserDataPath } from './serve-user-data-path-guard' -import { stampRuntimeSourceEnv } from '../../shared/runtime-source-env' +import { dropInheritedLaunchIdentityEnv } from './inherited-launch-identity-env' import { isLinuxWaylandSession } from '../../shared/linux-wayland-session' import { hasMissingProfileStateDatabaseWithRetainedAuthority, @@ -245,8 +245,8 @@ export function configureOrcaUserDataPathEnv(): void { } // Why: relaunches can inherit a stale ORCA_USER_DATA_PATH; canonicalize before CLI-shared modules build runtime-home paths. process.env.ORCA_USER_DATA_PATH = userDataPath - // Why: an Orca started from another Orca's terminal must not fence its own CLI children to the parent. - stampRuntimeSourceEnv(process.env, null) + // Why: an Orca started from an Orca terminal or chat is neither, and must not fence its CLI children to the parent. + dropInheritedLaunchIdentityEnv(process.env) } export function shouldInstallManagedHooks(isDev: boolean): boolean { diff --git a/src/main/startup/inherited-launch-identity-env.test.ts b/src/main/startup/inherited-launch-identity-env.test.ts new file mode 100644 index 000000000000..3c58e7465033 --- /dev/null +++ b/src/main/startup/inherited-launch-identity-env.test.ts @@ -0,0 +1,37 @@ +import { describe, expect, it } from 'vitest' +import { dropInheritedLaunchIdentityEnv } from './inherited-launch-identity-env' + +describe('dropInheritedLaunchIdentityEnv', () => { + it('drops the pane and chat identity of the Orca terminal that started this host', () => { + const parentIdentity = { + ORCA_PANE_KEY: 'tab-parent:leaf-parent', + ORCA_TAB_ID: 'tab-parent', + ORCA_WORKTREE_ID: 'global-floating-terminal', + ORCA_WORKSPACE_ID: 'global-floating-terminal', + ORCA_PROJECT_GROUP_ID: 'parent-group', + ORCA_WORKSPACE_ROOT: '/parent/folder', + ORCA_AGENT_LAUNCH_TOKEN: 'parent-launch', + ORCA_AGENT_PANE: 'tab-parent:leaf-parent', + ORCA_AGENT_LAUNCH: 'parent-launch', + ORCA_TERMINAL_HANDLE: 'term_parent', + ORCA_AGENT_HOOK_PORT: '4100', + ORCA_AGENT_HOOK_TOKEN: 'parent-hook-token', + ORCA_AGENT_HOOK_ENDPOINT: '/parent/endpoint.env', + ORCA_AGENT_SESSION_ID: 'parent-chat', + ORCA_STRUCTURED_SESSION: '1', + ORCA_AGENT_SESSION_SPAWN_TOKEN: 'parent-spawn', + ORCA_CHAT_VISUALS_DIR: '/parent/visuals', + ORCA_RUNTIME_SOURCE_ID: 'parent-source', + ORCA_RUNTIME_SOURCE_INCARNATION: 'parent-runtime' + } + const env: Record = { + ...parentIdentity, + PATH: '/usr/bin', + ORCA_USER_DATA_PATH: '/this/profile' + } + + dropInheritedLaunchIdentityEnv(env) + + expect(env).toEqual({ PATH: '/usr/bin', ORCA_USER_DATA_PATH: '/this/profile' }) + }) +}) diff --git a/src/main/startup/inherited-launch-identity-env.ts b/src/main/startup/inherited-launch-identity-env.ts new file mode 100644 index 000000000000..d65116150a0c --- /dev/null +++ b/src/main/startup/inherited-launch-identity-env.ts @@ -0,0 +1,43 @@ +import { stampRuntimeSourceEnv } from '../../shared/runtime-source-env' +import { + ORCA_SCRUB_SAFE_LAUNCH_ENV, + ORCA_SCRUB_SAFE_PANE_ENV +} from '../../shared/agent-hook-scrub-safe-env' +import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session-caller-env' +import { + AGENT_HOOK_RUNTIME_ENV_KEYS, + ORCA_AGENT_SESSION_CALLER_ENV_KEYS +} from '../ipc/pty/host-env/spawn-env-keys' +import { NATIVE_CHAT_VISUALS_DIR_ENV } from '../native-chat/native-chat-visuals-delivery' + +/** + * What an Orca spawn names its child by: a terminal pane's identity, workspace hints and hook route, + * a chat session's caller identity, and a chat's visuals folder. Orca never sets these on itself, so + * a host that holds one at startup was launched from inside that pane or chat (`pnpm dev`, `orca + * serve` or the app run from an Orca terminal), and every child it spawns would claim to be it. + */ +const INHERITED_LAUNCH_IDENTITY_ENV_KEYS = [ + 'ORCA_PANE_KEY', + 'ORCA_TAB_ID', + 'ORCA_WORKTREE_ID', + 'ORCA_WORKSPACE_ID', + 'ORCA_PROJECT_GROUP_ID', + 'ORCA_WORKSPACE_ROOT', + 'ORCA_AGENT_LAUNCH_TOKEN', + 'ORCA_TERMINAL_HANDLE', + ORCA_SCRUB_SAFE_PANE_ENV, + ORCA_SCRUB_SAFE_LAUNCH_ENV, + ...AGENT_HOOK_RUNTIME_ENV_KEYS, + ...ORCA_AGENT_SESSION_CALLER_ENV_KEYS, + ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV, + NATIVE_CHAT_VISUALS_DIR_ENV +] as const + +/** Drops the launching pane's or chat's identity from a host's own environment, once at startup, + * so nothing the host spawns inherits it. */ +export function dropInheritedLaunchIdentityEnv(env: Record): void { + for (const key of INHERITED_LAUNCH_IDENTITY_ENV_KEYS) { + delete env[key] + } + stampRuntimeSourceEnv(env, null) +} From 1766ed5c8ba50535188562a20966733ecae830b9 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 13 Oct 2026 02:23:54 -0700 Subject: [PATCH 2/4] fix(chat): every native-chat child's seal strips a pane's identity The seal that names a native-chat child stripped the pane identity and hook route only for agents that asked (ACP and Pi). Claude and Codex asked for nothing, so a pane key reaching their environment from any source other than the host's own (a settings env overlay or a shell profile) still reached the child and its hooks. The seal now always strips them, for every agent and from the composed environment as well as the inherited one, keeping only the session's own identity and a registered worker's handle. The key list is shared with the host startup drop, and ACP and Pi no longer carry their own copies. The pane's workspace hints and terminal handle join the list, so an ordinary chat no longer carries a pane's handle either. --- ...p-structured-launch-resolution-omp.test.ts | 7 +- .../acp/acp-structured-launch-resolution.ts | 2 - src/main/ipc/pty/host-env/spawn-env-keys.ts | 18 ++ src/main/pi/rpc-launch-resolution.ts | 8 +- src/main/pi/rpc-launch.test.ts | 9 +- src/main/pi/rpc-launch.ts | 6 - ...tructured-agent-launch-parity.test.ts.snap | 238 +++++++++++++++++- .../structured-session-child-env.test.ts | 30 +++ .../runtime/structured-session-child-env.ts | 41 +-- .../startup/inherited-launch-identity-env.ts | 18 +- 10 files changed, 312 insertions(+), 65 deletions(-) diff --git a/src/main/acp/acp-structured-launch-resolution-omp.test.ts b/src/main/acp/acp-structured-launch-resolution-omp.test.ts index c432ef1337d3..6a2f3bc25c23 100644 --- a/src/main/acp/acp-structured-launch-resolution-omp.test.ts +++ b/src/main/acp/acp-structured-launch-resolution-omp.test.ts @@ -63,11 +63,8 @@ describe('OMP ACP launch resolution', () => { ANTHROPIC_API_KEY: 'sk-test' } const launch = await resolver(ompRecord(), { launchEnv: userEnv })({ identity }) - // Only the shared pane and hook keys, and an inherited visuals folder: this chat has none. - expect(launch.envToDelete).toEqual([ - ...STRUCTURED_CHILD_ENV_TO_DELETE, - NATIVE_CHAT_VISUALS_DIR_ENV - ]) + // Only an inherited visuals folder (this chat has none); the seal strips pane and hook keys. + expect(launch.envToDelete).toEqual([NATIVE_CHAT_VISUALS_DIR_ENV]) const child = createProviderSpawnSpec( { command: launch.command, diff --git a/src/main/acp/acp-structured-launch-resolution.ts b/src/main/acp/acp-structured-launch-resolution.ts index 2f820c0c4196..6e2615844ee8 100644 --- a/src/main/acp/acp-structured-launch-resolution.ts +++ b/src/main/acp/acp-structured-launch-resolution.ts @@ -28,7 +28,6 @@ import { spelledProviderTimelineItemKey } from '../native-chat/agent-session-timeline/provider-timeline-identity' import type { StructuredAgentLaunchPartResolver } from '../runtime/structured-agent-launch-composition' -import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/structured-session-child-env' import { NATIVE_CHAT_VISUALS_DIR_ENV, withNativeChatVisualsEnv @@ -230,7 +229,6 @@ export function acpStructuredLaunchPart( }, env: withNativeChatVisualsEnv({ ...env, ...skill?.env }, skill ? visuals : null), inheritedEnvToDelete: [ - ...STRUCTURED_CHILD_ENV_TO_DELETE, ...envToDelete, // Without visuals, a folder Orca itself inherited (started from a chat) names another chat's. ...(skill ? [] : [NATIVE_CHAT_VISUALS_DIR_ENV]) diff --git a/src/main/ipc/pty/host-env/spawn-env-keys.ts b/src/main/ipc/pty/host-env/spawn-env-keys.ts index ed070c7d043d..90621eb92b9e 100644 --- a/src/main/ipc/pty/host-env/spawn-env-keys.ts +++ b/src/main/ipc/pty/host-env/spawn-env-keys.ts @@ -1,6 +1,24 @@ import { ORCA_AGENT_SESSION_ID_ENV } from '../../../../shared/agent-session-caller-env' +import { + ORCA_SCRUB_SAFE_LAUNCH_ENV, + ORCA_SCRUB_SAFE_PANE_ENV +} from '../../../../shared/agent-hook-scrub-safe-env' import { ORCA_STRUCTURED_SESSION_ENV } from '../../../../shared/structured-session-marker' +// Why: what an Orca pane names its shell by; any other process holding them was handed another pane's identity. +export const ORCA_PANE_IDENTITY_ENV_KEYS = [ + 'ORCA_PANE_KEY', + 'ORCA_TAB_ID', + 'ORCA_WORKTREE_ID', + 'ORCA_WORKSPACE_ID', + 'ORCA_PROJECT_GROUP_ID', + 'ORCA_WORKSPACE_ROOT', + 'ORCA_AGENT_LAUNCH_TOKEN', + ORCA_SCRUB_SAFE_PANE_ENV, + ORCA_SCRUB_SAFE_LAUNCH_ENV, + 'ORCA_TERMINAL_HANDLE' +] as const + export const AGENT_HOOK_RUNTIME_ENV_KEYS = [ 'ORCA_AGENT_HOOK_PORT', 'ORCA_AGENT_HOOK_TOKEN', diff --git a/src/main/pi/rpc-launch-resolution.ts b/src/main/pi/rpc-launch-resolution.ts index d1abf1af1ea8..e588d7ebb074 100644 --- a/src/main/pi/rpc-launch-resolution.ts +++ b/src/main/pi/rpc-launch-resolution.ts @@ -16,11 +16,7 @@ import { } from '../native-chat/structured-agent-command-resolution' import type { StructuredAgentLaunchPartResolver } from '../runtime/structured-agent-launch-composition' import { isWindowsProcessStartTimeAvailable } from '../windows/windows-process-table' -import { - PI_RPC_SESSION_ENV_TO_DELETE, - withoutPiCallerEnv, - type PiRpcLaunchOptions -} from './rpc-launch' +import { withoutPiCallerEnv, type PiRpcLaunchOptions } from './rpc-launch' export type PiRpcResolvedLaunch = PiRpcLaunchOptions & { previous: AgentSessionProviderHandleLink | null @@ -152,7 +148,7 @@ export function piRpcLaunchPart( ...(replacement ? { replacement } : {}) }, env: withoutPiCallerEnv(env), - inheritedEnvToDelete: PI_RPC_SESSION_ENV_TO_DELETE + inheritedEnvToDelete: [] } } } diff --git a/src/main/pi/rpc-launch.test.ts b/src/main/pi/rpc-launch.test.ts index 782a7b129256..f674f25cf956 100644 --- a/src/main/pi/rpc-launch.test.ts +++ b/src/main/pi/rpc-launch.test.ts @@ -1,12 +1,7 @@ import { describe, expect, it } from 'vitest' import { resolveProviderChildEnv } from '../provider-process/provider-process-launch' import { sealStructuredSessionChild } from '../runtime/structured-session-child-env' -import { - buildPiRpcLaunch, - PI_RPC_SESSION_ENV_TO_DELETE, - piRpcSessionlessEnvironment, - withoutPiCallerEnv -} from './rpc-launch' +import { buildPiRpcLaunch, piRpcSessionlessEnvironment, withoutPiCallerEnv } from './rpc-launch' const options = { command: 'host-resolved-pi', cwd: '/host/folder', fullAccess: true } describe('Pi RPC launch', () => { @@ -111,7 +106,7 @@ describe('Pi RPC launch', () => { sessionId: 'this-session', spawnToken: 'this-token', env: withoutPiCallerEnv(inherited), - inheritedEnvToDelete: PI_RPC_SESSION_ENV_TO_DELETE + inheritedEnvToDelete: [] }) }), inherited diff --git a/src/main/pi/rpc-launch.ts b/src/main/pi/rpc-launch.ts index b5836287701d..1cb8dfa8be59 100644 --- a/src/main/pi/rpc-launch.ts +++ b/src/main/pi/rpc-launch.ts @@ -21,12 +21,6 @@ const CALLER_ENV_TO_DELETE = [ ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV ] -/** What a structured Pi session strips from its inheritance; the seal keeps a worker's handle. */ -export const PI_RPC_SESSION_ENV_TO_DELETE: readonly string[] = [ - ...STRUCTURED_CHILD_ENV_TO_DELETE, - 'ORCA_TERMINAL_HANDLE' -] - /** `env` naming no caller: a structured session's seal names its own. */ export function withoutPiCallerEnv(env: Readonly>): Record { const next = { ...env } diff --git a/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap b/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap index fab4c0a1c2ca..2ae38cb53865 100644 --- a/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap +++ b/src/main/runtime/__snapshots__/structured-agent-launch-parity.test.ts.snap @@ -511,7 +511,25 @@ exports[`native-chat launch parity > codex floating fresh 1`] = ` "SHELL_ONLY": "shell", "SHELL_UNLISTED": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/floating", @@ -566,7 +584,25 @@ exports[`native-chat launch parity > codex floating resumed 1`] = ` "SHELL_ONLY": "shell", "SHELL_UNLISTED": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/floating-pinned", @@ -619,7 +655,25 @@ exports[`native-chat launch parity > codex worktree fresh 1`] = ` "SHELL_ONLY": "shell", "SHELL_UNLISTED": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/worktree", @@ -671,7 +725,25 @@ exports[`native-chat launch parity > codex worktree fresh configured 1`] = ` "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/worktree", @@ -725,7 +797,23 @@ exports[`native-chat launch parity > codex worktree fresh worker 1`] = ` "SHELL_UNLISTED": "shell", }, "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", "ORCA_CHAT_VISUALS_DIR", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", ], "supervisor": { "closeRequest": "stdin-end", @@ -779,7 +867,25 @@ exports[`native-chat launch parity > codex worktree resumed 1`] = ` "SHELL_ONLY": "shell", "SHELL_UNLISTED": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/worktree", @@ -831,7 +937,25 @@ exports[`native-chat launch parity > codex worktree resumed configured 1`] = ` "PATH": "/orca-cli/bin:/bin:/opt/login-shell/bin:/usr/bin:/bin", "SHELL_ONLY": "shell", }, - "envToDelete": [], + "envToDelete": [ + "ORCA_AGENT_HOOK_ENDPOINT", + "ORCA_AGENT_HOOK_ENV", + "ORCA_AGENT_HOOK_PORT", + "ORCA_AGENT_HOOK_TOKEN", + "ORCA_AGENT_HOOK_TRANSPORT", + "ORCA_AGENT_HOOK_VERSION", + "ORCA_AGENT_LAUNCH", + "ORCA_AGENT_LAUNCH_TOKEN", + "ORCA_AGENT_PANE", + "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", + "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", + "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", + "ORCA_WORKTREE_ID", + ], "supervisor": { "closeRequest": "stdin-end", "cwd": "/worktree", @@ -899,7 +1023,11 @@ exports[`native-chat launch parity > grok floating fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -967,7 +1095,11 @@ exports[`native-chat launch parity > grok floating resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1033,7 +1165,11 @@ exports[`native-chat launch parity > grok worktree fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1097,7 +1233,11 @@ exports[`native-chat launch parity > grok worktree fresh configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1162,7 +1302,10 @@ exports[`native-chat launch parity > grok worktree fresh worker 1`] = ` "ORCA_CHAT_VISUALS_DIR", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1228,7 +1371,11 @@ exports[`native-chat launch parity > grok worktree resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1292,7 +1439,11 @@ exports[`native-chat launch parity > grok worktree resumed configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1356,7 +1507,11 @@ exports[`native-chat launch parity > omp floating fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1422,7 +1577,11 @@ exports[`native-chat launch parity > omp floating resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1486,7 +1645,11 @@ exports[`native-chat launch parity > omp worktree fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1549,7 +1712,11 @@ exports[`native-chat launch parity > omp worktree fresh configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1612,7 +1779,10 @@ exports[`native-chat launch parity > omp worktree fresh worker 1`] = ` "ORCA_CHAT_VISUALS_DIR", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1676,7 +1846,11 @@ exports[`native-chat launch parity > omp worktree resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1739,7 +1913,11 @@ exports[`native-chat launch parity > omp worktree resumed configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -1806,7 +1984,11 @@ exports[`native-chat launch parity > opencode floating fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -1877,7 +2059,11 @@ exports[`native-chat launch parity > opencode floating resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -1946,7 +2132,11 @@ exports[`native-chat launch parity > opencode worktree fresh 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -2014,7 +2204,11 @@ exports[`native-chat launch parity > opencode worktree fresh configured 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -2083,7 +2277,10 @@ exports[`native-chat launch parity > opencode worktree fresh worker 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -2152,7 +2349,11 @@ exports[`native-chat launch parity > opencode worktree resumed 1`] = ` "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -2220,7 +2421,11 @@ exports[`native-chat launch parity > opencode worktree resumed configured 1`] = "ORCA_DATA_ACCOUNT_PROVIDER", "ORCA_OPENCODE_CONFIG_DIR", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", "XDG_DATA_HOME", "XDG_STATE_HOME", @@ -2284,8 +2489,11 @@ exports[`native-chat launch parity > pi floating fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2351,8 +2559,11 @@ exports[`native-chat launch parity > pi floating resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2414,8 +2625,11 @@ exports[`native-chat launch parity > pi worktree fresh 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2476,8 +2690,11 @@ exports[`native-chat launch parity > pi worktree fresh configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2540,7 +2757,10 @@ exports[`native-chat launch parity > pi worktree fresh worker 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2604,8 +2824,11 @@ exports[`native-chat launch parity > pi worktree resumed 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { @@ -2668,8 +2891,11 @@ exports[`native-chat launch parity > pi worktree resumed configured 1`] = ` "ORCA_AGENT_PANE", "ORCA_CLAUDE_AGENT_STATUS_SETTINGS", "ORCA_PANE_KEY", + "ORCA_PROJECT_GROUP_ID", "ORCA_TAB_ID", "ORCA_TERMINAL_HANDLE", + "ORCA_WORKSPACE_ID", + "ORCA_WORKSPACE_ROOT", "ORCA_WORKTREE_ID", ], "supervisor": { diff --git a/src/main/runtime/structured-session-child-env.test.ts b/src/main/runtime/structured-session-child-env.test.ts index 81fe971c13d9..964890ea5e4f 100644 --- a/src/main/runtime/structured-session-child-env.test.ts +++ b/src/main/runtime/structured-session-child-env.test.ts @@ -9,6 +9,7 @@ import { SEALED_TEST_SPAWN_TOKEN, sealedChildEnv } from './structured-session-child-env.test-support' +import { sealStructuredSessionChild } from './structured-session-child-env' import { mintStructuredWorkerHandle, mintStructuredWorkerPaneKey, @@ -193,6 +194,35 @@ describe('sealStructuredSessionChild identity', () => { expect(Object.keys(env).filter((key) => key.includes('PANE'))).toEqual([]) }) + it.each(['chat', 'worker'] as const)( + 'strips a pane identity a settings or shell overlay supplies, for a %s of any agent', + (kind) => { + installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA }) + const handle = kind === 'worker' ? registerWorker() : null + const sealed = sealStructuredSessionChild({ + sessionId: SESSION_ID, + spawnToken: SEALED_TEST_SPAWN_TOKEN, + env: { + PATH: '/usr/bin', + ORCA_PANE_KEY: 'tab-parent:leaf-parent', + ORCA_WORKSPACE_ID: 'global-floating-terminal', + ORCA_TERMINAL_HANDLE: 'term_parent', + ORCA_AGENT_HOOK_PORT: '4100' + }, + // An agent that asks for no deletions of its own still loses the pane identity. + inheritedEnvToDelete: [] + }) + expect(sealed.env).not.toHaveProperty('ORCA_PANE_KEY') + expect(sealed.env).not.toHaveProperty('ORCA_WORKSPACE_ID') + expect(sealed.env).not.toHaveProperty('ORCA_AGENT_HOOK_PORT') + expect(sealed.env.ORCA_TERMINAL_HANDLE).toBe(handle ?? undefined) + expect(sealed.envToDelete).toEqual( + expect.arrayContaining(['ORCA_PANE_KEY', 'ORCA_WORKSPACE_ID', 'ORCA_AGENT_HOOK_PORT']) + ) + expect(sealed.envToDelete.includes('ORCA_TERMINAL_HANDLE')).toBe(handle === null) + } + ) + it('never names the WSL-scoped launcher, because a structured worker cannot run in WSL', () => { // `orca-ide` is the literal the PTY lane exports for WSL only. A structured session that // resolves to a WSL distro is refused a host scope, so it never becomes a worker at all — diff --git a/src/main/runtime/structured-session-child-env.ts b/src/main/runtime/structured-session-child-env.ts index 30c51e89155a..c4e13f0b56fb 100644 --- a/src/main/runtime/structured-session-child-env.ts +++ b/src/main/runtime/structured-session-child-env.ts @@ -52,27 +52,22 @@ import { ORCA_AGENT_SESSION_ID_ENV, ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session-caller-env' -import { - ORCA_SCRUB_SAFE_LAUNCH_ENV, - ORCA_SCRUB_SAFE_PANE_ENV -} from '../../shared/agent-hook-scrub-safe-env' import { ORCA_STRUCTURED_SESSION_ENV } from '../../shared/structured-session-marker' import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution' import { prependOrcaCliDirToChildPath } from '../cli/orca-cli-child-path' -import { AGENT_HOOK_RUNTIME_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' +import { + AGENT_HOOK_RUNTIME_ENV_KEYS, + ORCA_PANE_IDENTITY_ENV_KEYS +} from '../ipc/pty/host-env/spawn-env-keys' import { resolveStructuredWorkerIdentityForSession } from './structured-worker-authority' /** - * A pane's identity in the inherited environment would let the agent's own Orca status hooks - * report for this session too; the structured session is its one status producer. + * A pane's identity would let the agent's own Orca status hooks report for this session too; the + * structured session is its one status producer. The seal strips it for every agent, from whatever + * environment source supplied it, so no agent can opt out. */ export const STRUCTURED_CHILD_ENV_TO_DELETE: readonly string[] = [ - 'ORCA_PANE_KEY', - 'ORCA_TAB_ID', - 'ORCA_WORKTREE_ID', - 'ORCA_AGENT_LAUNCH_TOKEN', - ORCA_SCRUB_SAFE_PANE_ENV, - ORCA_SCRUB_SAFE_LAUNCH_ENV, + ...ORCA_PANE_IDENTITY_ENV_KEYS, ...AGENT_HOOK_RUNTIME_ENV_KEYS ] @@ -83,9 +78,9 @@ export type SealedStructuredSessionChild = { } /** - * `env` named as this session's child. `inheritedEnvToDelete` is required so every agent states - * what it strips, none included; a key the seal itself names the child by is never stripped (a - * registered worker keeps its handle). `cliRuntimeCommand`: a Node CLI whose own directory goes + * `env` named as this session's child. `inheritedEnvToDelete` is what the agent strips beyond + * STRUCTURED_CHILD_ENV_TO_DELETE, none included; a key the seal itself names the child by is never + * stripped (a registered worker keeps its handle). `cliRuntimeCommand`: a Node CLI whose own directory goes * first on PATH, after the identity's, so it runs on the runtime beside it. */ export function sealStructuredSessionChild(input: { @@ -95,7 +90,7 @@ export function sealStructuredSessionChild(input: { inheritedEnvToDelete: readonly string[] cliRuntimeCommand?: string }): SealedStructuredSessionChild { - const identity = childIdentity(input.sessionId, input.env) + const identity = childIdentity(input.sessionId, withoutPaneIdentity(input.env)) const named = new Set([ ORCA_AGENT_SESSION_ID_ENV, ORCA_STRUCTURED_SESSION_ENV, @@ -107,8 +102,18 @@ export function sealStructuredSessionChild(input: { : identity.env return { env: { ...env, [ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV]: input.spawnToken }, - envToDelete: input.inheritedEnvToDelete.filter((key) => !named.has(key)) + envToDelete: [ + ...new Set([...STRUCTURED_CHILD_ENV_TO_DELETE, ...input.inheritedEnvToDelete]) + ].filter((key) => !named.has(key)) + } +} + +function withoutPaneIdentity(env: Record): Record { + const next = { ...env } + for (const key of STRUCTURED_CHILD_ENV_TO_DELETE) { + delete next[key] } + return next } function childIdentity( diff --git a/src/main/startup/inherited-launch-identity-env.ts b/src/main/startup/inherited-launch-identity-env.ts index d65116150a0c..d0171aa9f955 100644 --- a/src/main/startup/inherited-launch-identity-env.ts +++ b/src/main/startup/inherited-launch-identity-env.ts @@ -1,12 +1,9 @@ import { stampRuntimeSourceEnv } from '../../shared/runtime-source-env' -import { - ORCA_SCRUB_SAFE_LAUNCH_ENV, - ORCA_SCRUB_SAFE_PANE_ENV -} from '../../shared/agent-hook-scrub-safe-env' import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session-caller-env' import { AGENT_HOOK_RUNTIME_ENV_KEYS, - ORCA_AGENT_SESSION_CALLER_ENV_KEYS + ORCA_AGENT_SESSION_CALLER_ENV_KEYS, + ORCA_PANE_IDENTITY_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' import { NATIVE_CHAT_VISUALS_DIR_ENV } from '../native-chat/native-chat-visuals-delivery' @@ -17,16 +14,7 @@ import { NATIVE_CHAT_VISUALS_DIR_ENV } from '../native-chat/native-chat-visuals- * serve` or the app run from an Orca terminal), and every child it spawns would claim to be it. */ const INHERITED_LAUNCH_IDENTITY_ENV_KEYS = [ - 'ORCA_PANE_KEY', - 'ORCA_TAB_ID', - 'ORCA_WORKTREE_ID', - 'ORCA_WORKSPACE_ID', - 'ORCA_PROJECT_GROUP_ID', - 'ORCA_WORKSPACE_ROOT', - 'ORCA_AGENT_LAUNCH_TOKEN', - 'ORCA_TERMINAL_HANDLE', - ORCA_SCRUB_SAFE_PANE_ENV, - ORCA_SCRUB_SAFE_LAUNCH_ENV, + ...ORCA_PANE_IDENTITY_ENV_KEYS, ...AGENT_HOOK_RUNTIME_ENV_KEYS, ...ORCA_AGENT_SESSION_CALLER_ENV_KEYS, ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV, From b74dc7c1aa53b0083a4079142a69a11a932bffa6 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 13 Oct 2026 03:24:40 -0700 Subject: [PATCH 3/4] fix(chat): strip a pane's identity in any casing on Windows Windows reads a child's environment case-insensitively, so an orca_pane_key from a settings overlay or shell snapshot still named a pane after the seal and the final provider merge deleted only the exact uppercase names. One case-aware delete now backs the seal and both final merges. --- .../claude/claude-stream-json-connection.ts | 5 ++-- .../provider-process-launch.test.ts | 16 +++++++++++- .../provider-process-launch.ts | 25 ++++++++++++++++--- .../structured-session-child-env.test.ts | 25 +++++++++++++++++++ .../runtime/structured-session-child-env.ts | 5 ++-- 5 files changed, 66 insertions(+), 10 deletions(-) diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts index 828a58e043ab..46bcff84e00e 100644 --- a/src/main/claude/claude-stream-json-connection.ts +++ b/src/main/claude/claude-stream-json-connection.ts @@ -21,6 +21,7 @@ import { import type { ClaudeStructuredSdkOptions } from './claude-structured-launch-resolution' import { providerStderrForDisplay } from '../provider-process/provider-spawn-failure-report' import { withMissingProviderExecutable } from '../provider-process/provider-executable-missing' +import { deleteProviderChildEnvKeys } from '../provider-process/provider-process-launch' export { ClaudeControlRequestError } @@ -59,9 +60,7 @@ export type ClaudeStreamJsonLaunch = { } function withoutKeys(env: Record, keys: readonly string[]): Record { - for (const key of keys) { - delete env[key] - } + deleteProviderChildEnvKeys(env, keys) return env } diff --git a/src/main/provider-process/provider-process-launch.test.ts b/src/main/provider-process/provider-process-launch.test.ts index 0eb40592a50a..1dfb3e512fb9 100644 --- a/src/main/provider-process/provider-process-launch.test.ts +++ b/src/main/provider-process/provider-process-launch.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { resolveProviderChildEnv } from './provider-process-launch' +import { deleteProviderChildEnvKeys, resolveProviderChildEnv } from './provider-process-launch' describe('resolveProviderChildEnv', () => { it('overlays the launch env on the inherited env, then strips deleted keys', () => { @@ -25,3 +25,17 @@ describe('resolveProviderChildEnv', () => { expect(childEnv).not.toBe(baseEnv) }) }) + +describe('deleteProviderChildEnvKeys', () => { + it('deletes every casing on Windows and only the exact key elsewhere', () => { + const env = () => ({ ORCA_PANE_KEY: 'a', orca_pane_key: 'b', Path: 'C:\\Windows' }) + + const windows = env() + deleteProviderChildEnvKeys(windows, ['ORCA_PANE_KEY'], 'win32') + const posix = env() + deleteProviderChildEnvKeys(posix, ['ORCA_PANE_KEY'], 'linux') + + expect(windows).toEqual({ Path: 'C:\\Windows' }) + expect(posix).toEqual({ orca_pane_key: 'b', Path: 'C:\\Windows' }) + }) +}) diff --git a/src/main/provider-process/provider-process-launch.ts b/src/main/provider-process/provider-process-launch.ts index f7c527cd5824..0093ef9d0df5 100644 --- a/src/main/provider-process/provider-process-launch.ts +++ b/src/main/provider-process/provider-process-launch.ts @@ -15,8 +15,27 @@ export function resolveProviderChildEnv( baseEnv: NodeJS.ProcessEnv ): NodeJS.ProcessEnv { const childEnv: NodeJS.ProcessEnv = { ...baseEnv, ...launch.env } - for (const key of launch.envToDelete ?? []) { - delete childEnv[key] - } + deleteProviderChildEnvKeys(childEnv, launch.envToDelete ?? []) return childEnv } + +/** Deletes `keys` from a plain env object; on Windows in any casing, since the child reads its + * environment case-insensitively and an `orca_pane_key` would still name a pane there. */ +export function deleteProviderChildEnvKeys( + env: Record, + keys: readonly string[], + platform: NodeJS.Platform = process.platform +): void { + if (platform !== 'win32') { + for (const key of keys) { + delete env[key] + } + return + } + const doomed = new Set(keys.map((key) => key.toUpperCase())) + for (const key of Object.keys(env)) { + if (doomed.has(key.toUpperCase())) { + delete env[key] + } + } +} diff --git a/src/main/runtime/structured-session-child-env.test.ts b/src/main/runtime/structured-session-child-env.test.ts index 964890ea5e4f..c5ca2269bc05 100644 --- a/src/main/runtime/structured-session-child-env.test.ts +++ b/src/main/runtime/structured-session-child-env.test.ts @@ -9,6 +9,7 @@ import { SEALED_TEST_SPAWN_TOKEN, sealedChildEnv } from './structured-session-child-env.test-support' +import { resolveProviderChildEnv } from '../provider-process/provider-process-launch' import { sealStructuredSessionChild } from './structured-session-child-env' import { mintStructuredWorkerHandle, @@ -223,6 +224,30 @@ describe('sealStructuredSessionChild identity', () => { } ) + it('on Windows, strips a pane identity spelled in any case, through the final provider merge', () => { + // Windows reads a child's environment case-insensitively, so `orca_pane_key` still names a pane. + pinPlatform('win32') + installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA }) + const foreign = { + orca_pane_key: 'tab-parent:leaf-parent', + Orca_Agent_Hook_Endpoint: 'C:\\hook-endpoint', + orca_terminal_handle: 'term_parent' + } + const sealed = sealStructuredSessionChild({ + sessionId: SESSION_ID, + spawnToken: SEALED_TEST_SPAWN_TOKEN, + env: { Path: 'C:\\Windows', ...foreign }, + inheritedEnvToDelete: [] + }) + const child = resolveProviderChildEnv(sealed, { SystemRoot: 'C:\\Windows', ...foreign }) + + const named = Object.keys(child).filter((key) => + /pane_key|hook_endpoint|terminal_handle/i.test(key) + ) + expect(named).toEqual([]) + expect(child.ORCA_AGENT_SESSION_ID).toBe(SESSION_ID) + }) + it('never names the WSL-scoped launcher, because a structured worker cannot run in WSL', () => { // `orca-ide` is the literal the PTY lane exports for WSL only. A structured session that // resolves to a WSL distro is refused a host scope, so it never becomes a worker at all — diff --git a/src/main/runtime/structured-session-child-env.ts b/src/main/runtime/structured-session-child-env.ts index c4e13f0b56fb..c524c3b71638 100644 --- a/src/main/runtime/structured-session-child-env.ts +++ b/src/main/runtime/structured-session-child-env.ts @@ -59,6 +59,7 @@ import { AGENT_HOOK_RUNTIME_ENV_KEYS, ORCA_PANE_IDENTITY_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' +import { deleteProviderChildEnvKeys } from '../provider-process/provider-process-launch' import { resolveStructuredWorkerIdentityForSession } from './structured-worker-authority' /** @@ -110,9 +111,7 @@ export function sealStructuredSessionChild(input: { function withoutPaneIdentity(env: Record): Record { const next = { ...env } - for (const key of STRUCTURED_CHILD_ENV_TO_DELETE) { - delete next[key] - } + deleteProviderChildEnvKeys(next, STRUCTURED_CHILD_ENV_TO_DELETE) return next } From 79caac9e854744adf4721e701722e8194ea4b0cc Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 13 Oct 2026 03:47:16 -0700 Subject: [PATCH 4/4] fix(chat): strip a pane's identity in any casing only in the chat seal The final provider merges delete a caller's own keys too, so deleting those in any casing on Windows also removed deliberate lowercase overrides (an OpenCode config dir, say). Only the seal needs it, for the pane and hook keys an overlay supplies; the inherited host env is already clean in every casing after startup. --- .../claude/claude-stream-json-connection.ts | 5 ++-- .../provider-process-launch.test.ts | 16 +----------- .../provider-process-launch.ts | 25 +++---------------- .../structured-session-child-env.test.ts | 20 +++++++++------ .../runtime/structured-session-child-env.ts | 17 ++++++++++--- 5 files changed, 32 insertions(+), 51 deletions(-) diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts index 46bcff84e00e..828a58e043ab 100644 --- a/src/main/claude/claude-stream-json-connection.ts +++ b/src/main/claude/claude-stream-json-connection.ts @@ -21,7 +21,6 @@ import { import type { ClaudeStructuredSdkOptions } from './claude-structured-launch-resolution' import { providerStderrForDisplay } from '../provider-process/provider-spawn-failure-report' import { withMissingProviderExecutable } from '../provider-process/provider-executable-missing' -import { deleteProviderChildEnvKeys } from '../provider-process/provider-process-launch' export { ClaudeControlRequestError } @@ -60,7 +59,9 @@ export type ClaudeStreamJsonLaunch = { } function withoutKeys(env: Record, keys: readonly string[]): Record { - deleteProviderChildEnvKeys(env, keys) + for (const key of keys) { + delete env[key] + } return env } diff --git a/src/main/provider-process/provider-process-launch.test.ts b/src/main/provider-process/provider-process-launch.test.ts index 1dfb3e512fb9..0eb40592a50a 100644 --- a/src/main/provider-process/provider-process-launch.test.ts +++ b/src/main/provider-process/provider-process-launch.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { deleteProviderChildEnvKeys, resolveProviderChildEnv } from './provider-process-launch' +import { resolveProviderChildEnv } from './provider-process-launch' describe('resolveProviderChildEnv', () => { it('overlays the launch env on the inherited env, then strips deleted keys', () => { @@ -25,17 +25,3 @@ describe('resolveProviderChildEnv', () => { expect(childEnv).not.toBe(baseEnv) }) }) - -describe('deleteProviderChildEnvKeys', () => { - it('deletes every casing on Windows and only the exact key elsewhere', () => { - const env = () => ({ ORCA_PANE_KEY: 'a', orca_pane_key: 'b', Path: 'C:\\Windows' }) - - const windows = env() - deleteProviderChildEnvKeys(windows, ['ORCA_PANE_KEY'], 'win32') - const posix = env() - deleteProviderChildEnvKeys(posix, ['ORCA_PANE_KEY'], 'linux') - - expect(windows).toEqual({ Path: 'C:\\Windows' }) - expect(posix).toEqual({ orca_pane_key: 'b', Path: 'C:\\Windows' }) - }) -}) diff --git a/src/main/provider-process/provider-process-launch.ts b/src/main/provider-process/provider-process-launch.ts index 0093ef9d0df5..f7c527cd5824 100644 --- a/src/main/provider-process/provider-process-launch.ts +++ b/src/main/provider-process/provider-process-launch.ts @@ -15,27 +15,8 @@ export function resolveProviderChildEnv( baseEnv: NodeJS.ProcessEnv ): NodeJS.ProcessEnv { const childEnv: NodeJS.ProcessEnv = { ...baseEnv, ...launch.env } - deleteProviderChildEnvKeys(childEnv, launch.envToDelete ?? []) - return childEnv -} - -/** Deletes `keys` from a plain env object; on Windows in any casing, since the child reads its - * environment case-insensitively and an `orca_pane_key` would still name a pane there. */ -export function deleteProviderChildEnvKeys( - env: Record, - keys: readonly string[], - platform: NodeJS.Platform = process.platform -): void { - if (platform !== 'win32') { - for (const key of keys) { - delete env[key] - } - return - } - const doomed = new Set(keys.map((key) => key.toUpperCase())) - for (const key of Object.keys(env)) { - if (doomed.has(key.toUpperCase())) { - delete env[key] - } + for (const key of launch.envToDelete ?? []) { + delete childEnv[key] } + return childEnv } diff --git a/src/main/runtime/structured-session-child-env.test.ts b/src/main/runtime/structured-session-child-env.test.ts index c5ca2269bc05..25fba26cc4c5 100644 --- a/src/main/runtime/structured-session-child-env.test.ts +++ b/src/main/runtime/structured-session-child-env.test.ts @@ -224,27 +224,31 @@ describe('sealStructuredSessionChild identity', () => { } ) - it('on Windows, strips a pane identity spelled in any case, through the final provider merge', () => { + it('on Windows, strips a pane identity an overlay spells in any case, and nothing else', () => { // Windows reads a child's environment case-insensitively, so `orca_pane_key` still names a pane. pinPlatform('win32') installFakeAppEnvironment({ isPackaged: () => false, getPath: () => USER_DATA }) - const foreign = { - orca_pane_key: 'tab-parent:leaf-parent', - Orca_Agent_Hook_Endpoint: 'C:\\hook-endpoint', - orca_terminal_handle: 'term_parent' - } const sealed = sealStructuredSessionChild({ sessionId: SESSION_ID, spawnToken: SEALED_TEST_SPAWN_TOKEN, - env: { Path: 'C:\\Windows', ...foreign }, + env: { + Path: 'C:\\Windows', + orca_pane_key: 'tab-parent:leaf-parent', + Orca_Agent_Hook_Endpoint: 'C:\\hook-endpoint', + orca_terminal_handle: 'term_parent', + // A caller's deliberate lowercase override is not identity and stays. + opencode_config_dir: 'C:\\opencode' + }, inheritedEnvToDelete: [] }) - const child = resolveProviderChildEnv(sealed, { SystemRoot: 'C:\\Windows', ...foreign }) + // The host env reached here after startup dropped the identity in every casing. + const child = resolveProviderChildEnv(sealed, { SystemRoot: 'C:\\Windows' }) const named = Object.keys(child).filter((key) => /pane_key|hook_endpoint|terminal_handle/i.test(key) ) expect(named).toEqual([]) + expect(child.opencode_config_dir).toBe('C:\\opencode') expect(child.ORCA_AGENT_SESSION_ID).toBe(SESSION_ID) }) diff --git a/src/main/runtime/structured-session-child-env.ts b/src/main/runtime/structured-session-child-env.ts index c524c3b71638..92cffa87a957 100644 --- a/src/main/runtime/structured-session-child-env.ts +++ b/src/main/runtime/structured-session-child-env.ts @@ -59,7 +59,6 @@ import { AGENT_HOOK_RUNTIME_ENV_KEYS, ORCA_PANE_IDENTITY_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys' -import { deleteProviderChildEnvKeys } from '../provider-process/provider-process-launch' import { resolveStructuredWorkerIdentityForSession } from './structured-worker-authority' /** @@ -109,10 +108,20 @@ export function sealStructuredSessionChild(input: { } } +/** On Windows in any casing: the child reads its environment case-insensitively, so an + * `orca_pane_key` from a settings or shell overlay still names a pane there. The inherited host + * env needs no such pass; startup already dropped these keys from Windows' case-insensitive env. */ function withoutPaneIdentity(env: Record): Record { - const next = { ...env } - deleteProviderChildEnvKeys(next, STRUCTURED_CHILD_ENV_TO_DELETE) - return next + const identityKeys = new Set( + STRUCTURED_CHILD_ENV_TO_DELETE.map((key) => + process.platform === 'win32' ? key.toUpperCase() : key + ) + ) + return Object.fromEntries( + Object.entries(env).filter( + ([key]) => !identityKeys.has(process.platform === 'win32' ? key.toUpperCase() : key) + ) + ) } function childIdentity(