refactor(main): group agent runtime code by defining owner (#38565)

2026-11-14 01:47:24 +00:00 · 2026-11-05 06:45:18 -08:00
parent afe06c366a
commit 8417fa890a
357 changed files with 1332 additions and 1320 deletions
@@ -15,7 +15,7 @@ on:
      - 'src/main/window/main-window-state-lifecycle*'
      - 'src/main/window/dashboard-popout-window*'
      - 'src/packages/process-host/**'
-      - 'src/main/runtime/structured-agent-cli-writers*'
+      - 'src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers*'
      - 'src/main/providers/macos-tcc-login-shell*'
      - 'src/shared/process-table-snapshot*'
      - 'src/shared/darwin-process-table-capture*'
@@ -62,4 +62,4 @@ jobs:
        env:
          ORCA_MACOS_LOGIN_CENSUS_CI: '1'
          ORCA_BACKGROUND_LAUNCH: '1'
-        run: pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/structured-agent-cli-writers.test.ts
+        run: pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts
@@ -860,7 +860,7 @@ jobs:
            src/main/pty/history/terminal-history-fish-session.node-pty.test.ts \
            src/main/pty/shell-startup/zsh-scoped-histfile.live-shell.test.ts \
            src/main/pty/shell-startup/zsh-startup-hook-user-config-equivalence.live-shell.test.ts \
-            src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts \
+            src/main/runtime/agent-session/environment/structured-session-cli-login-shell.live-shell.test.ts \
            src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts \
            src/shared/fish-query-reply-child-stdin.node-pty.test.ts \
            src/shared/fish-wsl-cwd-report.node-pty.test.ts \
@@ -76,7 +76,7 @@
 1 test-no-polling-loop:src/main/pty/process-retirement/windows-live-tree-kill.win32.test.ts
 1 test-no-polling-loop:src/main/runtime/orchestration-codex-real-pty.integration.test.ts
 1 test-no-polling-loop:src/main/runtime/remote-runtime-request-connection.integration.test.ts
-1 test-no-polling-loop:src/main/runtime/structured-agent-shell-environment.test.ts
+1 test-no-polling-loop:src/main/runtime/agent-session/environment/structured-agent-shell-environment.test.ts
 1 test-no-polling-loop:src/main/skills/skill-process-contention-child.test.ts
 1 test-no-polling-loop:src/main/skills/skill-process-contention.integration.test.ts
 1 test-no-polling-loop:src/main/ssh/connection/ssh-connection-host-key-store-wiring.test.ts
@@ -247,7 +247,7 @@
 1 test-no-real-time-wait:src/main/runtime/agent-session/structured-agent-session-provider-operations-while-starting.test.ts
 1 test-no-real-time-wait:src/main/runtime/agent-session/structured-agent-session-runtime-exit.test.ts
 1 test-no-real-time-wait:src/main/runtime/agent-session/structured-agent-session-runtime.test.ts
-1 test-no-real-time-wait:src/main/runtime/claude-structured-idle-releases-unknown.test.ts
+1 test-no-real-time-wait:src/main/runtime/agent-session/lifecycle/claude-structured-idle-releases-unknown.test.ts
 1 test-no-real-time-wait:src/main/runtime/terminal/wait/launched-agent-crash-guard.live-shell.test.ts
 1 test-no-real-time-wait:src/main/runtime/terminal/wait/launched-agent-shell-handoff-readiness.test.ts
 1 test-no-real-time-wait:src/main/runtime/mobile-desktop-relay/mobile-desktop-relay.integration.test.ts
@@ -490,7 +490,7 @@
 1 test-no-wall-clock:src/main/runtime/agent-session/structured-agent-session-provider-operations-while-starting.test.ts
 1 test-no-wall-clock:src/main/runtime/agent-state-rules/agent-state-rules-engine.test.ts
 1 test-no-wall-clock:src/main/runtime/antigravity-readiness-transcripts.test.ts
-1 test-no-wall-clock:src/main/runtime/claude-structured-session-integration.test.ts
+1 test-no-wall-clock:src/main/runtime/agent-session/lifecycle/claude-structured-session-integration.test.ts
 1 test-no-wall-clock:src/main/runtime/mobile-cloud-relay/mobile-relay-e2ee.integration.test.ts
 1 test-no-wall-clock:src/main/runtime/mobile-cloud-relay/relay-http-client.test.ts
 1 test-no-wall-clock:src/main/runtime/mobile-store-orphaned-temp-cleanup.test.ts
@@ -509,7 +509,7 @@
 1 test-no-wall-clock:src/main/runtime/rpc/methods/orchestration/worker/worker-list-pagination.test.ts
 1 test-no-wall-clock:src/main/runtime/rpc/methods/pairing.test.ts
 1 test-no-wall-clock:src/main/runtime/runtime-mobile-codex-side-title.test.ts
-1 test-no-wall-clock:src/main/runtime/structured-agent-launch-support.test.ts
+1 test-no-wall-clock:src/main/runtime/agent-session/launch/structured-agent-launch-support.test.ts
 1 test-no-wall-clock:src/main/runtime/structured-child-records-switch.test.ts
 1 test-no-wall-clock:src/main/runtime/structured-codex-child-work-runtime.test.ts
 1 test-no-wall-clock:src/main/runtime/terminal-pane-recovery-liveness-gate.test.ts
@@ -1220,7 +1220,7 @@
 4 test-no-real-time-wait:src/main/daemon/sessions/testing/session-shell-recovery.test.ts
 4 test-no-real-time-wait:src/main/git/refs/maintenance/repo-ref-maintenance-real-git.test.ts
 4 test-no-real-time-wait:src/main/orcad/orcad-stop-request-listener.test.ts
-4 test-no-real-time-wait:src/main/runtime/structured-agent-shell-environment.test.ts
+4 test-no-real-time-wait:src/main/runtime/agent-session/environment/structured-agent-shell-environment.test.ts
 4 test-no-real-time-wait:src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts
 4 test-no-real-time-wait:src/main/ssh/connection/ssh-connection-host-key-store-wiring.test.ts
 4 test-no-real-time-wait:src/renderer/src/components/activity/activity-auto-mark-read-loop.react185.test.tsx
@@ -1240,13 +1240,13 @@
      "invariant": "A fresh PTY launch of an agent with a trust preset pre-trusts its workspace root (for Codex, whose lookup keys on its start folder, the folder it starts in, including a floating terminal's) before the provider spawn, in both spawn builders, on the host that runs the agent: main for local and WSL launches, the SSH relay on its own disk for SSH launches. It never waits past the preset's deadline: 20 s for local Codex, the short budget for every other write, local or on the relay. A failed or abandoned write lets the launch proceed untrusted, so the agent asks. Restored or reattached panes, spawns with no launch command and the setting turned off are never trusted; for an agent whose trust on a home covers the folders below it (Claude, Copilot, Qoder), no writer stores a path that is a root, a home or a folder above one, and an unknown home writes nothing; Codex, Cursor and Antigravity, whose trust on a home covers only the home, trust it as they did before; and a WSL launch never writes the Windows home. A structured Codex chat, which has no PTY, pre-trusts its folder the same way when it is created, under the same setting.",
      "oracle": "A pending local Codex write keeps the dispatcher unresolved past the short budget and settles after the long deadline. A pending Claude write settles at the short deadline with a warning, and a real Claude grant writes the config selected by the launch environment. Actual host-writer artifacts establish ordinary-folder admission and home/root/ancestor/symlink/missing-segment refusal, including an unknown home, with exact Codex worktree, subfolder and home keys. Other retained assertions are named in assertionRefs; removed mock-routing assertions provide no current protection.",
      "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts src/main/agent-launch/trust/agent-workspace-trust.test.ts src/main/agent-launch/trust/execution-host-workspace-trust.test.ts src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts"
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts src/main/agent-launch/trust/agent-workspace-trust.test.ts src/main/agent-launch/trust/execution-host-workspace-trust.test.ts src/main/runtime/agent-session/launch/orca-runtime-structured-agent-session-create-intent.test.ts"
      ],
      "testFiles": [
        "src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts",
        "src/main/agent-launch/trust/agent-workspace-trust.test.ts",
        "src/main/agent-launch/trust/execution-host-workspace-trust.test.ts",
-        "src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts"
+        "src/main/runtime/agent-session/launch/orca-runtime-structured-agent-session-create-intent.test.ts"
      ],
      "assertionRefs": [
        {
@@ -1273,7 +1273,7 @@
          ]
        },
        {
-          "file": "src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts",
+          "file": "src/main/runtime/agent-session/launch/orca-runtime-structured-agent-session-create-intent.test.ts",
          "assertions": [
            "pre-trusts the chat folder in the account home launch preparation selected",
            "writes nothing with the setting off, and still prepares the launch"
@@ -1285,7 +1285,7 @@
          "date": "2026-09-29",
          "runner": "local",
          "platform": "macos",
-          "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts src/main/agent-launch/trust/agent-workspace-trust.test.ts src/main/agent-launch/trust/execution-host-workspace-trust.test.ts src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts",
+          "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts src/main/agent-launch/trust/agent-workspace-trust.test.ts src/main/agent-launch/trust/execution-host-workspace-trust.test.ts src/main/runtime/agent-session/launch/orca-runtime-structured-agent-session-create-intent.test.ts",
          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/pty/spawn-options-agent-workspace-trust.test.ts src/main/agent-workspace-trust-spawn.test.ts src/main/agent-workspace-trust.test.ts src/main/execution-host-workspace-trust.test.ts src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts",
          "result": "passed",
          "durationSeconds": 4.16,
@@ -9344,7 +9344,7 @@
        "pnpm exec vitest run --config config/vitest.config.ts tests/e2e/completed-worker-retirement-resume.unit.test.ts --reporter=verbose",
        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/resume-sleeping-agent-session.test.ts src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts src/main/daemon/terminal-host/testing/terminal-host.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/ipc/pty/pty-pane-materialization-race.test.ts src/main/ipc/pty/pty-persisted-incarnation-repair.test.ts src/main/ipc/pty/pty-pane-reservation-settlement.test.ts src/main/runtime/orca-runtime.test.ts src/renderer/src/lib/pane-manager/pane-fit.test.ts src/renderer/src/components/terminal-pane/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts",
        "pnpm exec electron-vite build --mode e2e && SKIP_BUILD=1 pnpm exec playwright test tests/e2e/live-background-terminal-mount-authority.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/structured-agent-cli-writers.test.ts src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts src/main/providers/agent-foreground-process-git-bash.win32.test.ts"
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts src/main/providers/agent-foreground-process-git-bash.win32.test.ts"
      ],
      "testFiles": [
        "src/renderer/src/lib/resume-sleeping-agent-session.test.ts",
@@ -9360,13 +9360,13 @@
        "src/renderer/src/components/terminal-pane/pty-connection-hidden-replay.test.ts",
        "src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-host-session-launch.test.ts",
        "tests/e2e/live-background-terminal-mount-authority.spec.ts",
-        "src/main/runtime/structured-agent-cli-writers.test.ts",
+        "src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts",
        "src/main/runtime/rpc/methods/structured-agent-session-adoption-replay.test.ts",
        "src/main/providers/agent-foreground-process-git-bash.win32.test.ts"
      ],
      "assertionRefs": [
        {
-          "file": "src/main/runtime/structured-agent-cli-writers.test.ts",
+          "file": "src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts",
          "assertions": [
            "accepts exact exited or unchanged shell-only proof, never loss of evidence",
            "inspects the terminal a conversation leaves, whatever its rows now say"
@@ -4754,15 +4754,15 @@
      "src/main/runtime/terminal/launch/claude-agent-teams-shim-env.test.ts": 84,
      "src/main/runtime/claude-dialog-interactive-wait.test.ts": 3975,
      "src/main/runtime/claude-open-dialog-hold.test.ts": 44,
-      "src/main/runtime/claude-structured-exit-mid-response.test.ts": 2509,
-      "src/main/runtime/claude-structured-failed-start-resume.test.ts": 2454,
-      "src/main/runtime/claude-structured-idle-releases-unknown.test.ts": 2419,
-      "src/main/runtime/claude-structured-resumed-start-failure.test.ts": 4153,
-      "src/main/runtime/claude-structured-retired-saved-model.test.ts": 3066,
-      "src/main/runtime/claude-structured-send-restart-dies-before-dispatch.test.ts": 24656,
-      "src/main/runtime/claude-structured-session-integration.test.ts": 5405,
-      "src/main/runtime/claude-structured-startup-fault-is-not-an-exit.test.ts": 2741,
-      "src/main/runtime/claude-structured-startup-unanswered-control-request.test.ts": 2665,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-exit-mid-response.test.ts": 2509,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-failed-start-resume.test.ts": 2454,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-idle-releases-unknown.test.ts": 2419,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-resumed-start-failure.test.ts": 4153,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-retired-saved-model.test.ts": 3066,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-send-restart-dies-before-dispatch.test.ts": 24656,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-session-integration.test.ts": 5405,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-startup-fault-is-not-an-exit.test.ts": 2741,
+      "src/main/runtime/agent-session/lifecycle/claude-structured-startup-unanswered-control-request.test.ts": 2665,
      "src/main/runtime/claude-trust-dialog-transcript.test.ts": 5400,
      "src/main/runtime/claude-worker-start-readiness.test.ts": 4076,
      "src/main/runtime/cli-terminal-create-host-session-binding.test.ts": 4827,
@@ -4955,9 +4955,9 @@
      "src/main/runtime/orca-runtime-serve-browser-restore.test.ts": 4469,
      "src/main/runtime/orca-runtime-session-tabs-path-alias.test.ts": 4827,
      "src/main/runtime/orca-runtime-skill-recovery.test.ts": 4007,
-      "src/main/runtime/orca-runtime-structured-agent-registration-seam.test.ts": 4596,
-      "src/main/runtime/orca-runtime-structured-agent-session-create-intent.test.ts": 4338,
-      "src/main/runtime/orca-runtime-structured-session-restore.test.ts": 4836,
+      "src/main/runtime/agent-session/installation/orca-runtime-structured-agent-registration-seam.test.ts": 4596,
+      "src/main/runtime/agent-session/launch/orca-runtime-structured-agent-session-create-intent.test.ts": 4338,
+      "src/main/runtime/agent-session/lifecycle/orca-runtime-structured-session-restore.test.ts": 4836,
      "src/main/runtime/orca-runtime-structured-status-sink-wiring.test.ts": 4286,
      "src/main/runtime/orca-runtime-tail-wait-memo.test.ts": 178,
      "src/main/runtime/terminal/surface/orca-runtime-terminal-close-continuity.test.ts": 4439,
@@ -5707,53 +5707,53 @@
      "src/main/runtime/sidebar-inputs/workspace-rows-producer.test.ts": 4181,
      "src/main/runtime/sidebar-inputs/workspace-viewers.test.ts": 65,
      "src/main/runtime/stale-title-display-surfaces.test.ts": 4456,
-      "src/main/runtime/structured-agent-availability.test.ts": 602,
-      "src/main/runtime/structured-agent-cli-writers.test.ts": 140,
-      "src/main/runtime/structured-agent-create-support-opencode-rig.test.ts": 978,
-      "src/main/runtime/structured-agent-install-refresh.test.ts": 733,
-      "src/main/runtime/structured-agent-launch-parity.test.ts": 5073,
-      "src/main/runtime/structured-agent-launch-support-probe-omp.test.ts": 939,
-      "src/main/runtime/structured-agent-launch-support-probe.test.ts": 954,
-      "src/main/runtime/structured-agent-launch-support.test.ts": 1103,
-      "src/main/runtime/structured-agent-model-catalog-discovery.test.ts": 1301,
-      "src/main/runtime/structured-agent-model-catalog-first-frame.test.ts": 1353,
-      "src/main/runtime/structured-agent-new-chat-effort-at-rest.test.ts": 1210,
-      "src/main/runtime/structured-agent-session-claude-kill-evidence.test.ts": 4777,
-      "src/main/runtime/structured-agent-session-codex-goal-stop-settings.test.ts": 25129,
-      "src/main/runtime/structured-agent-session-codex-stop-evidence.test.ts": 4415,
-      "src/main/runtime/structured-agent-session-history-close-race.test.ts": 5020,
-      "src/main/runtime/structured-agent-session-pi-kill-retry.test.ts": 2663,
-      "src/main/runtime/structured-agent-session-provider-naming-shutdown.test.ts": 1987,
-      "src/main/runtime/structured-agent-session-tab-authority.test.ts": 11047,
-      "src/main/runtime/structured-agent-shell-environment-catalog.test.ts": 720,
-      "src/main/runtime/structured-agent-shell-environment.test.ts": 760,
-      "src/main/runtime/structured-chat-coordinator-mail.test.ts": 38220,
-      "src/main/runtime/structured-chat-dispatch-worker-lifecycle.test.ts": 9312,
-      "src/main/runtime/structured-chat-dispatch-worker-mail.test.ts": 6125,
-      "src/main/runtime/structured-chat-dispatch-worker.test.ts": 6981,
-      "src/main/runtime/structured-chat-naming-contract.test.ts": 876,
-      "src/main/runtime/structured-chat-naming-runtime.test.ts": 1605,
-      "src/main/runtime/structured-chat-tab-compatibility.test.ts": 6560,
-      "src/main/runtime/structured-chat-worker-helpers.test.ts": 8057,
-      "src/main/runtime/structured-chat-worker-reuse.test.ts": 6372,
-      "src/main/runtime/structured-chat-worker-start-unknown.test.ts": 7813,
-      "src/main/runtime/structured-chat-worker-start.test.ts": 6239,
+      "src/main/runtime/agent-session/launch/structured-agent-availability.test.ts": 602,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts": 140,
+      "src/main/runtime/agent-session/launch/structured-agent-create-support-opencode-rig.test.ts": 978,
+      "src/main/runtime/agent-session/launch/structured-agent-install-refresh.test.ts": 733,
+      "src/main/runtime/agent-session/launch/structured-agent-launch-parity.test.ts": 5073,
+      "src/main/runtime/agent-session/launch/structured-agent-launch-support-probe-omp.test.ts": 939,
+      "src/main/runtime/agent-session/launch/structured-agent-launch-support-probe.test.ts": 954,
+      "src/main/runtime/agent-session/launch/structured-agent-launch-support.test.ts": 1103,
+      "src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery.test.ts": 1301,
+      "src/main/runtime/agent-session/model-catalog/structured-agent-model-catalog-first-frame.test.ts": 1353,
+      "src/main/runtime/agent-session/launch/structured-agent-new-chat-effort-at-rest.test.ts": 1210,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-claude-kill-evidence.test.ts": 4777,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-codex-goal-stop-settings.test.ts": 25129,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-codex-stop-evidence.test.ts": 4415,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-history-close-race.test.ts": 5020,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-pi-kill-retry.test.ts": 2663,
+      "src/main/runtime/agent-session/naming/structured-agent-session-provider-naming-shutdown.test.ts": 1987,
+      "src/main/runtime/agent-session/lifecycle/structured-agent-session-tab-authority.test.ts": 11047,
+      "src/main/runtime/agent-session/environment/structured-agent-shell-environment-catalog.test.ts": 720,
+      "src/main/runtime/agent-session/environment/structured-agent-shell-environment.test.ts": 760,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts": 38220,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker-lifecycle.test.ts": 9312,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker-mail.test.ts": 6125,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-dispatch-worker.test.ts": 6981,
+      "src/main/runtime/agent-session/naming/structured-chat-naming-contract.test.ts": 876,
+      "src/main/runtime/agent-session/naming/structured-chat-naming-runtime.test.ts": 1605,
+      "src/main/runtime/agent-session/lifecycle/structured-chat-tab-compatibility.test.ts": 6560,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-helpers.test.ts": 8057,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-reuse.test.ts": 6372,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-start-unknown.test.ts": 7813,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-worker-start.test.ts": 6239,
      "src/main/runtime/structured-child-records-switch.test.ts": 3855,
-      "src/main/runtime/structured-claude-naming-lifetime.test.ts": 3991,
-      "src/main/runtime/structured-claude-naming-occurrences.test.ts": 3523,
-      "src/main/runtime/structured-claude-pending-rewind.test.ts": 2212,
-      "src/main/runtime/structured-claude-thinking-display-refusal.test.ts": 1295,
+      "src/main/runtime/agent-session/naming/structured-claude-naming-lifetime.test.ts": 3991,
+      "src/main/runtime/agent-session/naming/structured-claude-naming-occurrences.test.ts": 3523,
+      "src/main/runtime/agent-session/lifecycle/structured-claude-pending-rewind.test.ts": 2212,
+      "src/main/runtime/agent-session/lifecycle/structured-claude-thinking-display-refusal.test.ts": 1295,
      "src/main/runtime/structured-codex-child-work-runtime.test.ts": 5959,
      "src/main/runtime/structured-conversation-tab-title.test.ts": 35,
-      "src/main/runtime/structured-session-child-env.test.ts": 294,
-      "src/main/runtime/structured-session-cli-login-shell.test.ts": 307,
+      "src/main/runtime/agent-session/environment/structured-session-child-env.test.ts": 294,
+      "src/main/runtime/agent-session/environment/structured-session-cli-login-shell.test.ts": 307,
      "src/main/runtime/workspaces/removal/structured-session-worktree-teardown.test.ts": 476,
-      "src/main/runtime/structured-worker-agent-presence.test.ts": 172,
-      "src/main/runtime/structured-worker-at-rest.test.ts": 2297,
-      "src/main/runtime/structured-worker-authority.test.ts": 231,
-      "src/main/runtime/structured-worker-cleared-session.test.ts": 6104,
-      "src/main/runtime/structured-worker-hook-attestation.test.ts": 3455,
-      "src/main/runtime/structured-worker-identity.test.ts": 274,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-agent-presence.test.ts": 172,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-at-rest.test.ts": 2297,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-authority.test.ts": 231,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-cleared-session.test.ts": 6104,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-hook-attestation.test.ts": 3455,
+      "src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-identity.test.ts": 274,
      "src/main/runtime/terminal-agent-fenced-keys.test.ts": 74,
      "src/main/runtime/terminal-agent-interrupt.test.ts": 54,
      "src/main/runtime/terminal-agent-phone-push.test.ts": 172,
@@ -36,7 +36,7 @@ export const UNIT_EXCLUDE = [
  'src/main/pty/history/terminal-history-fish-session.node-pty.test.ts',
  'src/main/pty/shell-startup/zsh-scoped-histfile.live-shell.test.ts',
  'src/main/pty/shell-startup/zsh-startup-hook-user-config-equivalence.live-shell.test.ts',
-  'src/main/runtime/structured-session-cli-login-shell.live-shell.test.ts',
+  'src/main/runtime/agent-session/environment/structured-session-cli-login-shell.live-shell.test.ts',
  'src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts',
  'src/shared/fish-query-reply-child-stdin.node-pty.test.ts',
  'src/shared/fish-wsl-cwd-report.node-pty.test.ts',
@@ -6,7 +6,7 @@ const NODE_RUNTIME_INCLUDE = [
  'src/main/linear/linear-request-recovery.test.ts',
  'src/main/linear/linear-issue-detail-deadline.test.ts',
  'tests/e2e/linear-cli-recovery.unit.test.ts',
-  'src/main/runtime/structured-agent-cli-writers.test.ts',
+  'src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts',
  'config/scripts/test-runtime/sqlite-admission/vitest-sqlite-runtime-boundary.test.ts',
  'config/scripts/ci/workflow-contracts/cloud-security-history-workflow.test.mjs',
  'config/scripts/skills/recipe-contracts/skill-recipe-shell.test.mjs',
@@ -30,7 +30,10 @@ function typedFiles(directory) {

 describe('typecheck project coverage', () => {
  it('checks the real CLI coordinator-mail integration in exactly one mixed project', () => {
-    const file = resolve(root, 'src/main/runtime/structured-chat-coordinator-mail.test.ts')
+    const file = resolve(
+      root,
+      'src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts'
+    )
    expect(
      projects.filter((project) => project.files.has(file)).map((project) => project.config)
    ).toEqual(['config/tsconfig.test.pane-launch.json'])
@@ -9,9 +9,9 @@ export const SHELL_PREFIXES = [
  'src/main/daemon/pty-subprocess/testing/node-pty-fd-leak.test.ts',
  'src/main/providers/local-pty/local-pty-shell-ready',
  'src/main/pty/',
-  'src/main/runtime/structured-session-cli-login-shell',
-  'src/main/runtime/structured-session-login-shell-test-harness',
-  'src/main/runtime/structured-session-child-env',
+  'src/main/runtime/agent-session/environment/structured-session-cli-login-shell',
+  'src/main/runtime/agent-session/environment/structured-session-login-shell-test-harness',
+  'src/main/runtime/agent-session/environment/structured-session-child-env',
  'src/renderer/src/components/terminal-pane/fish-color-scheme',
  'src/shared/fish-',
  'src/shared/terminal/pty/ingress/pty-reply-echo-shapes',
@@ -35,7 +35,9 @@
    "../src/wsl-guest/**/*",
    "../src/types/**/*"
  ],
-  "exclude": ["../src/main/runtime/structured-chat-coordinator-mail.test.ts"],
+  "exclude": [
+    "../src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts"
+  ],
  "compilerOptions": {
    "composite": true,
    "types": ["electron-vite/node"]
@@ -1,7 +1,7 @@
 {
  "extends": "./tsconfig.web.json",
  "include": [
-    "../src/main/runtime/structured-chat-coordinator-mail.test.ts",
+    "../src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts",
    "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx",
    "../src/renderer/src/components/terminal-pane/pty-agent-pane-launch.test.ts",
    "../src/renderer/src/components/github-item-dialog/load-item-details/work-item-details-target-contract.test.tsx",
@@ -4,7 +4,7 @@ import {
  isLegacyAgentSessionAccountHome,
  type AgentSessionAccountHome
 } from '../../shared/agent-session/lifecycle/agent-session-account-home'
-import { resolveStructuredEnvAccountHomePath } from '../runtime/structured-agent-account-home'
+import { resolveStructuredEnvAccountHomePath } from '../runtime/agent-session/environment/structured-agent-account-home'

 type AccountPin = { accountHomeVariable: string } | { accountLocatorKind: 'opencode' }

@@ -11,7 +11,7 @@ import type { AgentCliVersionReader } from '../agent-launch/preflight/agent-cli-
 import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
 import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session/lifecycle/agent-session-caller-env'
 import { ORCA_AGENT_SESSION_CALLER_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys'
-import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/structured-session-child-env'
+import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env'
 import {
  LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV,
  NATIVE_CHAT_SCRATCH_DIR_ENV
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import type {
  ScriptedAgentChild,
  ScriptedAgentChildFactory
-} from '../runtime/structured-agent-scripted-child.test-fixture'
+} from '../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture'
 import { FakeAcpChild, GROK_CONFIG_OPTIONS } from './acp-structured-adapter.test-support'
 import type { FakeFrame } from './acp-scripted-agent.test-support'
 import type { AcpLaunchSpec } from './acp-launch-specs'
@@ -11,7 +11,7 @@ import { GROK, GROK_CONFIG_OPTIONS, PROVIDER_SESSION } from './acp-structured-ad
 import { ACP_HANDLE_TRANSPORT } from './acp-structured-agent-definitions'
 import { restoreJournal } from '../native-chat/agent-session-journal/journal-open'
 import { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store'
-import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createAcpStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import {
  attachParams,
  openHostRig,
@@ -1,4 +1,4 @@
-import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createAcpStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { describe, expect, it, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record'
 import { agentSessionRecordFixture } from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture'
@@ -8,7 +8,7 @@ import { createProviderSpawnSpec } from '../provider-process/provider-process-su
 import { openCodeAcpAccountBinding } from '../opencode/opencode-structured-account-home'
 import { scrubOpenCodeAcpEnvironment } from '../opencode/opencode-acp-environment'
 import { acpLaunchSpecFor, type AcpLaunchSpec } from './acp-launch-specs'
-import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/structured-session-child-env'
+import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env'
 import { AgentCliInstallationError } from '../native-chat/agent-cli-installation-error'

 const PROFILE = '123e4567-e89b-42d3-a456-426614174000'
@@ -1,4 +1,4 @@
-import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createAcpStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -31,7 +31,7 @@ import {
 } from '../native-chat/agent-session-timeline/provider-timeline-identity'
 import { createProviderSpawnSpec } from '../provider-process/provider-process-supervisor'
 import { acpLaunchSpecFor } from './acp-launch-specs'
-import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/structured-session-child-env'
+import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env'
 import { acpSessionNotRestoredItem } from './acp-session-reopen-failure'

 const GROK = acpLaunchSpecFor('grok')!
@@ -36,8 +36,8 @@ import {
  providerTimelineKeyPart,
  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 type { StructuredAgentLaunchPartResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition'
+import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env'
 import {
  LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV,
  NATIVE_CHAT_SCRATCH_DIR_ENV,
@@ -8,7 +8,7 @@ import {
  RUNTIME_RELEASE_RECEIPT,
  writeRuntimeReleaseReceipt
 } from '../node-runtime/managed-runtime-release'
-import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createAcpStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { GROK, openAcpAdapterRig } from './acp-structured-adapter.test-support'

 afterEach(() => closeProviderTimelineRigs())
@@ -24,7 +24,7 @@ import {
  type AcpAdapterRig
 } from './acp-structured-adapter.test-support'
 import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
-import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createAcpStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'

 afterEach(async () => {
@@ -9,7 +9,7 @@ import { acpStructuredAgentDefinition } from './acp-structured-agent-definitions
 import { StructuredAgentRegistry } from '../native-chat/agent-session-wire/structured-agent-registry'
 import { StructuredAgentSessionAdapterRouter } from '../native-chat/agent-session-wire/structured-agent-session-adapter-router'
 import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import { structuredChatNamingDeps } from '../runtime/structured-chat-naming-runtime'
+import { structuredChatNamingDeps } from '../runtime/agent-session/naming/structured-chat-naming-runtime'
 import { agentSessionRecordFixture } from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture'
 import { getDefaultSettings } from '../../shared/constants'
 import { FakeAcpChild } from './acp-scripted-connection.test-fixture'
@@ -8,7 +8,7 @@ import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session
 import { ProviderAcquisitionStarts } from '../provider-process/provider-acquisition-starts'
 import { removeAntigravitySignInSessionFiles } from '../antigravity/antigravity-sign-in-session-files'
 import { SOURCE_CONTROL_GENERATION_TIMEOUT_MS } from '../text-generation/source-control-generation-limits'
-import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/structured-session-child-env'
+import { STRUCTURED_CHILD_ENV_TO_DELETE } from '../runtime/agent-session/environment/structured-session-child-env'
 import { resolveAcpLaunchInvocation } from './acp-structured-launch-resolution'
 import { prepareAcpLaunch } from './acp-structured-launch-preparation'
 import { acpPrivateTempConnect } from './acp-private-temp'
@@ -6,7 +6,7 @@ import type {
  AgentLaunchModeReceipt
 } from '../../shared/agent-launch/contracts/agent-launch-intent'
 import { RUNTIME_CAPABILITIES } from '../../shared/protocol-version'
-import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/structured-agent-runtime-metadata'
+import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/agent-session/installation/structured-agent-runtime-metadata'
 import {
  nativeChatPreferenceFor,
  resolveStructuredNativeChatSupport,
@@ -9,7 +9,7 @@ import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/ag
 import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
 import { prepareStructuredChatCliFork } from './structured-chat-cli-fork'
-import { structuredAgentRuntimeRegistration } from '../runtime/structured-agent-runtime-registrations'
+import { structuredAgentRuntimeRegistration } from '../runtime/agent-session/installation/structured-agent-runtime-registrations'
 import { prepareLegacySharedCodexSessionResume } from '../codex/history/resume/codex-legacy-session-resume'
 import { AiVaultPrepareSessionResumeParams } from '../../shared/rpc-contract/ai-vault-params'

@@ -17,7 +17,7 @@ import type {
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { isWslUncPath } from '../../shared/wsl-paths'
 import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
-import { structuredAgentRuntimeMetadata } from '../runtime/structured-agent-runtime-metadata'
+import { structuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-metadata'
 import { readPiSessionHeader } from '../pi/rpc-launch-resolution'
 import { copyStructuredChatRecordConversation } from './structured-chat-conversation-copy'
 import { isAiVaultAgent } from './session-list-result-validation'
@@ -11,7 +11,7 @@ import {
  projectStructuredAiVaultSessions
 } from './structured-session-ownership'
 import { installOwnership, listResult } from './structured-session-ownership.test-support'
-import { STRUCTURED_AGENT_RUNTIME_REGISTRATIONS } from '../runtime/structured-agent-runtime-registrations'
+import { STRUCTURED_AGENT_RUNTIME_REGISTRATIONS } from '../runtime/agent-session/installation/structured-agent-runtime-registrations'

 const OPENCODE_ID = 'ses_2f9aB3cD4eF5gH6iJ7kL8mN9oP'
 const GROK_ID = '019fd600-1a2b-7c3d-8e4f-5a6b7c8d9e0f'
@@ -33,8 +33,8 @@ import {
  type StructuredAgentResumeInvocation,
  type StructuredAgentSessionHistory
 } from '../native-chat/structured-agent-cli-conversations'
-import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/structured-agent-runtime-metadata'
-import type { StructuredAgentRuntimeMetadata } from '../runtime/structured-agent-runtime-registration-types'
+import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/agent-session/installation/structured-agent-runtime-metadata'
+import type { StructuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-registration-types'
 import { commandName, commandProgramIndex, shellCommands } from './shell-command-words'

 /** Hide chat-owned rows from clients unable to open that agent’s chat. */
@@ -1,5 +1,5 @@
-import { structuredAgentHostLaunchSources } from '../runtime/structured-agent-launch-support'
-import { captureHostShellEnvironment } from '../runtime/structured-agent-shell-environment'
+import { structuredAgentHostLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-support'
+import { captureHostShellEnvironment } from '../runtime/agent-session/environment/structured-agent-shell-environment'
 import * as profileStorage from '../orca-profiles/profile-storage-paths'
 // The chat sign-in against a scripted Antigravity server.

@@ -17,7 +17,7 @@ import { prepareAcpLaunch } from '../acp/acp-structured-launch-preparation'
 import { AcpAgentError, AcpConnectionClosedError } from '../acp/acp-errors'
 import { captureSignInModelPublisher } from './antigravity-sign-in-models'
 import { isAgentSessionPreSpawnError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import type { structuredAgentHostLaunchSources } from '../runtime/structured-agent-launch-support'
+import type { structuredAgentHostLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-support'
 import {
  AntigravitySignInCloseUnprovenError,
  AntigravitySignInSentence,
@@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
 import { resolveClaudeStructuredInvocation } from '../claude/structured/launch/claude-structured-launch-resolution'
 import { resolveClaudeStructuredLaunchHome } from '../claude/structured/launch/claude-structured-launch-home'
-import { resolveStructuredClaudeAccountHomePath } from '../runtime/structured-agent-account-home'
+import { resolveStructuredClaudeAccountHomePath } from '../runtime/agent-session/environment/structured-agent-account-home'
 import {
  installClaudeProfileRouter,
  withClaudeProfileTerminalEnv
@@ -1,5 +1,5 @@
 import { createClaudeCodeProcessSpawn } from './claude-agent-sdk-process-spawn'
-import { createClaudeStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -1,7 +1,7 @@
 import type { ClaudeAccountRecipe } from '../../shared/agent-session/lifecycle/agent-session-acquired-account'
 import type { ClaudeProfileRouter } from '../claude-accounts/claude-profile-router'
 import { applyClaudeEnvPatch } from '../claude-accounts/environment'
-import { resolveStructuredClaudeAccountHomePath } from '../runtime/structured-agent-account-home'
+import { resolveStructuredClaudeAccountHomePath } from '../runtime/agent-session/environment/structured-agent-account-home'

 /** The account a launch runs under is the current selection; the receipt records what it used. */
 export async function prepareClaudeLaunchAccount(
@@ -5,7 +5,7 @@ import { expect, it, vi } from 'vitest'
 import { ClaudeProfileRouter } from '../claude-accounts/claude-profile-router'
 import * as installedRouter from '../claude-accounts/claude-profile-installed-router'
 import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'
-import type { StructuredAgentLaunchSources } from '../runtime/structured-agent-launch-composition'
+import type { StructuredAgentLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-composition'
 import { claudeNamingInvocation } from './claude-naming-invocation'

 it('captures configured command, overlay and pure selected-account policy before awaited input resolution', async ({
@@ -3,7 +3,7 @@ import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session
 import { getClaudeProfileRouter } from '../claude-accounts/claude-profile-installed-router'
 import { applyClaudeEnvPatch } from '../claude-accounts/environment'
 import { agentSessionPinnedLaunchDirectory } from '../runtime/agent-session/records/agent-session-record-launch-directory'
-import type { StructuredAgentLaunchSources } from '../runtime/structured-agent-launch-composition'
+import type { StructuredAgentLaunchSources } from '../runtime/agent-session/launch/structured-agent-launch-composition'
 import { resolveStructuredAgentCommand } from '../native-chat/structured-agent-command-resolution'
 import {
  claudeChildEnv,
@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { claudeProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
 import { AgentSessionRewindRecordSchema } from '../../shared/agent-session/lifecycle/agent-session-rewind'
 import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'
-import { createClaudeStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { resolveClaudeRewindFork } from './claude-rewind-fork'
 import { claudeSessionIdForRewind } from './structured/claude-structured-session-id'

@@ -11,8 +11,8 @@ import type {
 import type {
  ScriptedAgentChild,
  ScriptedAgentChildFactory
-} from '../runtime/structured-agent-scripted-child.test-fixture'
-import { scriptedClaudeExitError } from '../runtime/structured-claude-scripted-runtime-test-support'
+} from '../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture'
+import { scriptedClaudeExitError } from '../runtime/agent-session/installation/structured-claude-scripted-runtime-test-support'
 import { result, says } from './claude-captured-frame-builders.test-fixture'

 type Spawned = {
@@ -1,4 +1,4 @@
-import { createClaudeStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdir, mkdtemp, rm } from 'node:fs/promises'
 import { homedir, tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -12,7 +12,7 @@ import type {
  openClaudeStreamJsonConnection
 } from '../claude-stream-json-connection'
 import type { ClaudeStructuredLaunch } from './launch/claude-structured-launch-resolution'
-import type { StructuredLaunchRequest } from '../../runtime/structured-agent-launch-composition'
+import type { StructuredLaunchRequest } from '../../runtime/agent-session/launch/structured-agent-launch-composition'
 import type { ClaudeJournalTranslator } from '../claude-journal-translator-contract'
 import type { ClaudePendingPrompt, ClaudePromptRegistry } from '../claude-prompt-registry'
 import { cancelProcessAcquisition } from '@orca/process-host/cancel-process-acquisition'
@@ -4,7 +4,7 @@ import { join } from 'node:path'
 import { createTrackedJournalOpener } from '../../native-chat/agent-session-journal/journal-host-database-test-support'
 import { createDeferredStructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/structured-agent-session-event-sink'
 import { testEventSinkLogging } from '../../native-chat/agent-session-wire/structured-agent-session-logger-test-support'
-import { createClaudeStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import {
  agentSessionLeaseFixture,
@@ -1,4 +1,4 @@
-import { createClaudeStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve as resolvePath } from 'node:path'
@@ -15,8 +15,8 @@ import {
  type ClaudeProfileRouterSettings
 } from '../../../claude-accounts/claude-profile-router'
 import { installClaudeProfileRouter } from '../../../claude-accounts/claude-profile-installed-router'
-import { resolveStructuredClaudeAccountHomePath } from '../../../runtime/structured-agent-account-home'
-import { structuredAgentRuntimeMetadata } from '../../../runtime/structured-agent-runtime-metadata'
+import { resolveStructuredClaudeAccountHomePath } from '../../../runtime/agent-session/environment/structured-agent-account-home'
+import { structuredAgentRuntimeMetadata } from '../../../runtime/agent-session/installation/structured-agent-runtime-metadata'

 const roots: string[] = []
 afterEach(() => {
@@ -1,5 +1,5 @@
 import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture'
-import { createClaudeStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { chmodSync, mkdtempSync, mkdirSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { delimiter, dirname, join } from 'node:path'
@@ -30,7 +30,7 @@ import type { ClaudeCliFlagCheck, ClaudeCliFlagSupport } from '../../claude-cli-
 import { resolveClaudeLaunchFlags } from './claude-structured-launch-flags'
 import { withNativeChatVisualsEnv } from '../../../native-chat/native-chat-visuals-delivery'
 import { claudeLaunchResumesTranscript } from './claude-structured-launch-home'
-import type { StructuredAgentLaunchPartResolver } from '../../../runtime/structured-agent-launch-composition'
+import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition'
 import { claudeSessionIdForOrcaSession } from '../claude-structured-session-id'
 import {
  pendingAgentSessionRewindFork,
@@ -1,4 +1,4 @@
-import { createClaudeStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { describe, expect, it, vi } from 'vitest'
 import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity'
 import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture'
@@ -50,7 +50,7 @@ async function wireCodexAccountKey(settings: ReturnType<typeof createSettings>)
  const { mainProcessState } = await import('../startup/main-process-state')
  const { codexStructuredLaunchHomeResolvers } = await import('../startup/codex-launch-preparation')
  const { structuredAgentRuntimeRegistration } =
-    await import('../runtime/structured-agent-runtime-registrations')
+    await import('../runtime/agent-session/installation/structured-agent-runtime-registrations')
  const { agentModelCatalogFingerprint } =
    await import('../native-chat/agent-model-catalog/agent-model-catalog-fingerprint')
  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the harness store implements the settings read/update surface the service uses.
@@ -8,7 +8,7 @@ import {
  type AgentCliVersionReader
 } from '../../../agent-launch/preflight/agent-cli-version-probe'
 import { AgentCliInstallationError } from '../../../native-chat/agent-cli-installation-error'
-import type { StructuredAgentLaunchResolver } from '../../../runtime/structured-agent-launch-composition'
+import type { StructuredAgentLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition'
 import {
  resolveProviderChildEnv,
  type ProviderProcessLaunch
@@ -16,7 +16,7 @@ import { requireSupportedCodexCli, withSupportedCodexCli } from './codex-cli-ins
 import {
  createCodexStructuredLaunchResolver,
  TEST_SPAWN_TOKEN
-} from '../../../runtime/structured-agent-launch-composition.test-support'
+} from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { resolveProviderChildEnv } from '../../../provider-process/provider-process-launch'
 import { identityFor } from '../session-lifecycle/codex-structured-session-adapter-fixture'
 import { openCodexAppServerConnection } from '../../app-server/codex-app-server-connection'
@@ -4,8 +4,8 @@ import { tmpdir } from 'node:os'
 import { delimiter, join } from 'node:path'
 import { openCodexAppServerConnection } from '../../app-server/codex-app-server-connection'
 import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../../../shared/agent-session/lifecycle/agent-session-caller-env'
-import { sealStructuredSessionChild } from '../../../runtime/structured-session-child-env'
-import { createCodexStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { sealStructuredSessionChild } from '../../../runtime/agent-session/environment/structured-session-child-env'
+import { createCodexStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture'
 import type { AgentSessionJournalIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity'
 import {
@@ -13,7 +13,7 @@ import {
  mintStructuredWorkerPaneKey,
  structuredWorkerIdentities,
  structuredWorkerProcessIncarnation
-} from '../../../runtime/structured-worker-identity'
+} from '../../../runtime/orchestration/terminal-authority/structured-sessions/structured-worker-identity'

 const DEV_CLI_BIN_FIRST = /^[^:;]*[\\/]cli[\\/]bin[:;]/
 const DEV_CLI_BIN_DIR = /^[^:;]*[\\/]cli[\\/]bin$/
@@ -2,7 +2,7 @@ import { agentSessionRecordFixture } from '../../../native-chat/agent-session-re
 import {
  createCodexStructuredLaunchResolver,
  TEST_SPAWN_TOKEN
-} from '../../../runtime/structured-agent-launch-composition.test-support'
+} from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -17,7 +17,7 @@ import {
 import { requireLegacyAgentSessionAccountHome } from '../../../../shared/agent-session/lifecycle/agent-session-account-home'
 import { agentSessionProviderHandleChainHead } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle'
 import { resolveCodexCommand } from '../../../codex-cli/command'
-import type { StructuredAgentLaunchPartResolver } from '../../../runtime/structured-agent-launch-composition'
+import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition'
 import type { CodexStructuredLaunch } from '../session-lifecycle/codex-structured-session-state'
 import { codexStructuredPermissionPolicy } from '../../../../shared/codex-permission-policy'
 import { codexStructuredLaunchArgs } from './codex-structured-launch-args'
@@ -12,7 +12,7 @@ import {
  identityFor,
  THREAD_ID
 } from '../session-lifecycle/codex-structured-session-adapter-fixture'
-import { createCodexStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { createCodexStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture'
 import { codexProviderHandle } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
 import { prepareCodexThreadForVisuals } from './codex-structured-visuals'
@@ -2,7 +2,7 @@ import {
  providerDiagnostic,
  withProviderDiagnostic
 } from '../../../../shared/agent-session/failures/agent-session-failure'
-import type { ScriptedAgentChild } from '../../../runtime/structured-agent-scripted-child.test-fixture'
+import type { ScriptedAgentChild } from '../../../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture'
 import type { CodexAppServerConnection } from '../../app-server/codex-app-server-connection-types'
 import type { openCodexAppServerConnection } from '../../app-server/codex-app-server-connection'
 import { CodexAppServerRequestError } from '../../app-server/codex-app-server-request-error'
@@ -22,7 +22,7 @@ import type {
 } from './codex-structured-session-state'
 import { codexProviderHandle } from '../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
 import { AgentModelCatalogStore } from '../../../native-chat/agent-model-catalog/agent-model-catalog-store'
-import { createCodexStructuredLaunchResolver } from '../../../runtime/structured-agent-launch-composition.test-support'
+import { createCodexStructuredLaunchResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { agentSessionRecordFixture } from '../../../native-chat/agent-session-record-test-fixture'

 describe('CodexStructuredSessionAdapter.acquire', () => {
@@ -24,7 +24,7 @@ import type { CodexSkillReport } from '../catalog/codex-structured-skill-report'
 import type { CodexJournalTranslator } from '../journal/codex-structured-journal-contracts'
 import type { StructuredAgentSessionLifecycleEvent } from '../../../native-chat/agent-session-wire/structured-agent-session-adapter'
 import type { CodexStructuredPermissionPolicy } from '../../../../shared/codex-permission-policy'
-import type { StructuredLaunchRequest } from '../../../runtime/structured-agent-launch-composition'
+import type { StructuredLaunchRequest } from '../../../runtime/agent-session/launch/structured-agent-launch-composition'
 import type { AgentModelCatalogStore } from '../../../native-chat/agent-model-catalog/agent-model-catalog-store'
 import type { AgentModelCatalogSessionAccess } from '../../../native-chat/agent-model-catalog/agent-model-catalog-lister'
 import type { StructuredAgentSessionProviderOpen } from '../../../native-chat/agent-session-wire/structured-agent-session-provider-open-contract'
@@ -59,7 +59,7 @@ vi.mock('child_process', () => {
  }
 })

-vi.mock('../runtime/structured-agent-shell-environment', () => ({
+vi.mock('../runtime/agent-session/environment/structured-agent-shell-environment', () => ({
  captureHostShellEnvironment: vi.fn(async (beforeCapture?: () => Promise<unknown>) =>
    beforeCapture?.()
  )
@@ -6,7 +6,7 @@ import { registerPtyHandlers } from './register-handlers'
 import { existsSyncMock, statSyncMock } from './pty-ipc-mock-registry'
 import type { PtyIpcSuiteFixtures } from './pty-ipc-test-harness'
 import { OrcaRuntimeService } from '../../runtime/orca-runtime'
-import type { TerminalWorkspaceLaunchScope } from '../../runtime/runtime-legacy-worker-terminal-recovery-types'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime/orchestration/terminal-authority/structured-sessions/runtime-legacy-worker-terminal-recovery-types'
 import {
  IDENTITY_ENV_KEYS,
  launchWorkspaceId,
@@ -33,7 +33,7 @@ import type {
 import { localProvider } from '../provider/registry'
 import type { PaneResumeOutcome } from '../../../../shared/workspace-layout/workspace-layout-published'
 import type { StartupCwdFallback } from '../../../../shared/startup-cwd-fallback'
-import type { TerminalWorkspaceLaunchScope } from '../../../runtime/runtime-legacy-worker-terminal-recovery-types'
+import type { TerminalWorkspaceLaunchScope } from '../../../runtime/orchestration/terminal-authority/structured-sessions/runtime-legacy-worker-terminal-recovery-types'

 export type RuntimePtySpawnState = {
  deps: PtyRuntimeControllerDeps
@@ -8,7 +8,7 @@ import {
  resolveTerminalStartupCwd,
  type TerminalStartupCwdMissingDirFallback
 } from '../../../shared/shell/launch/terminal-startup-cwd'
-import type { TerminalWorkspaceLaunchScope } from '../../runtime/runtime-legacy-worker-terminal-recovery-types'
+import type { TerminalWorkspaceLaunchScope } from '../../runtime/orchestration/terminal-authority/structured-sessions/runtime-legacy-worker-terminal-recovery-types'
 import { isWslUncPath, toWindowsWslPath } from '../../../shared/wsl-paths'
 import type { CodexAccountSelectionTarget } from '../../codex-accounts/runtime-selection'
 import { resolveWslSessionContext } from '../../daemon/pty-subprocess/wsl-session-context'
@@ -8,7 +8,7 @@ import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import { ClaudeProfileRouter } from '../../claude-accounts/claude-profile-router'
 import { installClaudeProfileRouter } from '../../claude-accounts/claude-profile-installed-router'
-import { resolveStructuredClaudeAccountHomePath } from '../../runtime/structured-agent-account-home'
+import { resolveStructuredClaudeAccountHomePath } from '../../runtime/agent-session/environment/structured-agent-account-home'

 import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record'
 import { agentModelCatalogFingerprintForRecord } from './agent-model-catalog-fingerprint'
@@ -27,7 +27,7 @@ import {
  NO_STRUCTURED_AGENTS,
  structuredAgentsDeclaringNothing
 } from './structured-agent-session-adapter-router-test-support'
-import { structuredAgentRuntimeRegistration } from '../../runtime/structured-agent-runtime-registrations'
+import { structuredAgentRuntimeRegistration } from '../../runtime/agent-session/installation/structured-agent-runtime-registrations'
 import { writeOpenCodeSqliteDatabase } from '../../ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture'

 vi.mock(
@@ -2,7 +2,7 @@ import { rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import { expect, vi } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session/lifecycle/agent-session-mutation-envelope'
-import { modelCatalogHostDeps } from '../../runtime/structured-agent-model-catalog-wiring'
+import { modelCatalogHostDeps } from '../../runtime/agent-session/model-catalog/structured-agent-model-catalog-wiring'
 import {
  agentModelCatalogFingerprint,
  agentModelCatalogScopeFingerprint
@@ -11,8 +11,8 @@ import { claudeProfileMarkerPath } from '../../claude-accounts/claude-profile-pa
 import { CLAUDE_STRUCTURED_AGENT } from '../../claude/structured/claude-structured-agent-definition'
 import { claudeInitializationAuthError } from '../../claude/structured/claude-structured-init-proof'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
-import { resolveStructuredClaudeAccountHomePath } from '../../runtime/structured-agent-account-home'
-import { createClaudeStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
+import { resolveStructuredClaudeAccountHomePath } from '../../runtime/agent-session/environment/structured-agent-account-home'
+import { createClaudeStructuredLaunchResolver } from '../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'

 const savedAccount = (id: string) => ({
@@ -13,7 +13,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import { structuredAgentSessionCommandTurn } from '../../../shared/agent-session/view/structured-agent-session-command-turn-identity'
 import { structuredAgentSessionCommandWasStopped } from './structured-agent-session-command-turn'
 import type * as CommandTurnModule from './structured-agent-session-command-turn'
@@ -14,7 +14,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import {
  HOST_TEST_NOW as NOW,
@@ -15,7 +15,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -19,7 +19,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -23,7 +23,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -4,7 +4,7 @@ import {
  PROVIDER_SESSION_ID,
  fakeClaude
 } from '../../claude/structured/claude-structured-session-test-support'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import { withObservedProviderExit } from './structured-agent-session-failure-text'
 import { HOST_TEST_SESSION as SESSION } from './structured-agent-session-host-test-data'
 import type { StructuredAgentSessionSinkBarrier } from './structured-agent-session-event-sink'
@@ -13,7 +13,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -16,7 +16,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -17,7 +17,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -15,7 +15,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -25,7 +25,7 @@ import {
 import { claudeStartupSettled } from '../../claude/structured/claude-structured-startup-settled-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -24,7 +24,7 @@ import {
 import { claudeProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
 import { adoptedDirectoryProbes } from '../agent-session-journal/adopted-directory-probe'
 import { resolveAgentSessionLaunchDirectory } from '../../runtime/agent-session/agent-session-launch-directory'
-import { createClaudeStructuredLaunchResolver } from '../../runtime/structured-agent-launch-composition.test-support'
+import { createClaudeStructuredLaunchResolver } from '../../runtime/agent-session/launch/structured-agent-launch-composition.test-support'

 import { fixture } from './structured-agent-session-create-adoption-contract-test-fixture'

@@ -25,7 +25,7 @@ import {
  codexLegacyMirrorRecords,
  writeCodexHistoryFixture
 } from '../agent-session-journal/codex-history-test-fixture'
-import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import { structuredAgentRuntimeMetadata } from '../../runtime/agent-session/installation/structured-agent-runtime-metadata'
 import {
  resolveStructuredAgentSessionAdoptionForCreate,
  structuredAgentSessionAdoptAttach
@@ -1,7 +1,7 @@
 import {
  composeStructuredLaunch,
  composeStructuredLaunchRead
-} from '../../runtime/structured-agent-launch-composition'
+} from '../../runtime/agent-session/launch/structured-agent-launch-composition'
 import { CODEX_STRUCTURED_AGENT } from '../../codex/structured/launch/codex-structured-agent-definition'
 import { afterEach, expect, it, vi } from 'vitest'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
@@ -16,7 +16,7 @@ import {
 import type { ClaudeProfileSetupReport } from '../../claude-accounts/claude-profile-setup'
 import { prepareClaudeLaunchAccount } from '../../claude/claude-launch-account'
 import { CLAUDE_STRUCTURED_AGENT } from '../../claude/structured/claude-structured-agent-definition'
-import { resolveStructuredClaudeAccountHomePath } from '../../runtime/structured-agent-account-home'
+import { resolveStructuredClaudeAccountHomePath } from '../../runtime/agent-session/environment/structured-agent-account-home'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { agentSessionFailureFact } from '../../../shared/agent-session/failures/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words'
@@ -11,7 +11,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import {
  HOST_TEST_NOW as NOW,
@@ -1,4 +1,4 @@
-import type { StructuredAgentSessionRuntimeDeps } from '../../runtime/structured-agent-session-runtime-contract'
+import type { StructuredAgentSessionRuntimeDeps } from '../../runtime/agent-session/installation/structured-agent-session-runtime-contract'
 import { admitStructuredAgentSessionInput } from './structured-agent-session-input-admission'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session/lifecycle/agent-session-mutation-envelope'
@@ -18,8 +18,8 @@ import {
  HOST_TEST_THREAD
 } from './structured-agent-session-host-test-data'
 import * as loginShell from '../../startup/login-shell-environment'
-import { createStructuredAgentEnvironmentResolvers } from '../../runtime/structured-agent-shell-environment'
-import { codexModelCatalogDiscovery } from '../../runtime/structured-agent-model-catalog-discovery'
+import { createStructuredAgentEnvironmentResolvers } from '../../runtime/agent-session/environment/structured-agent-shell-environment'
+import { codexModelCatalogDiscovery } from '../../runtime/agent-session/model-catalog/structured-agent-model-catalog-discovery'
 import { createAgentModelCatalogService } from '../agent-model-catalog/agent-model-catalog-service'
 import { AgentModelCatalogStore } from '../agent-model-catalog/agent-model-catalog-store'
 import {
@@ -21,8 +21,8 @@ import {
  mintStructuredWorkerPaneKey,
  structuredWorkerIdentities,
  structuredWorkerProcessIncarnation
-} from '../../runtime/structured-worker-identity'
-import { structuredWorkerOwesWork } from '../../runtime/structured-worker-custody'
+} from '../../runtime/orchestration/terminal-authority/structured-sessions/structured-worker-identity'
+import { structuredWorkerOwesWork } from '../../runtime/orchestration/terminal-authority/structured-sessions/structured-worker-custody'
 import { createRestTestRig, REST_TEST_CALLER } from './structured-agent-session-rest-test-rig'
 import {
  hostTestAttachParams,
@@ -13,7 +13,7 @@ import {
  agentModelCatalogFingerprint,
  agentModelCatalogScopeFingerprint
 } from '../agent-model-catalog/agent-model-catalog-fingerprint'
-import { structuredAgentModelCatalogAccountReads } from '../../runtime/structured-agent-model-catalog-wiring'
+import { structuredAgentModelCatalogAccountReads } from '../../runtime/agent-session/model-catalog/structured-agent-model-catalog-wiring'
 import {
  createReceivingCallerFixture,
  PARENT
@@ -10,7 +10,7 @@ import type {
 import { agentSessionFailureWords } from '../../../shared/agent-session/failures/agent-session-failure-words'
 import { agentSessionRecordFixture } from '../../../shared/agent-session/lifecycle/agent-session-record.test-fixture'
 import { readStructuredSessionRecovery } from './structured-agent-session-recovery-read'
-import * as recoveryOptions from '../../runtime/structured-session-recovery-options'
+import * as recoveryOptions from '../../runtime/agent-session/lifecycle/structured-session-recovery-options'

 it('does no discovery on ordinary reads and drops preparation superseded by a send', async () => {
  const prepare = vi.spyOn(recoveryOptions, 'structuredSessionRecoveryOptions')
@@ -2,7 +2,7 @@ import { latestNativeChatUsageLimitCut } from '../../../shared/native-chat/nativ
 import {
  structuredSessionRecoveryOptions,
  type RecoveryContextCache
-} from '../../runtime/structured-session-recovery-options'
+} from '../../runtime/agent-session/lifecycle/structured-session-recovery-options'
 import { withoutInheritedClaudeConfigDir } from '../../claude/claude-config-dir-pin'
 import type {
  StructuredAgentSessionHostDeps,
@@ -16,7 +16,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import {
  closeTestJournalHostDatabases,
  openTestJournalHostDatabase
@@ -27,7 +27,7 @@ import {
  hostTestOperationId,
  resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
-import { structuredAgentRuntimeRegistration } from '../../runtime/structured-agent-runtime-registrations'
+import { structuredAgentRuntimeRegistration } from '../../runtime/agent-session/installation/structured-agent-runtime-registrations'
 import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'

 let root: string
@@ -11,7 +11,7 @@ import {
 } from '../../claude/structured/claude-structured-session-test-support'
 import type { AgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session/records/agent-session-record-store-test-harness'
-import { structuredClaudeLifecycleEvent } from '../../runtime/structured-claude-runtime-adapter'
+import { structuredClaudeLifecycleEvent } from '../../runtime/agent-session/installation/structured-claude-runtime-adapter'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import {
  HOST_TEST_NOW as NOW,
@@ -4,7 +4,7 @@ import type {
 } from '../../../shared/agent-session/lifecycle/agent-session-conversation-view'
 import type { StructuredAgentId } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle'
 import { agentSessionOwnerObservationVerdict } from '../../../shared/agent-session/lifecycle/agent-session-lease-adjudication'
-import { structuredAgentRuntimeMetadata } from '../../runtime/structured-agent-runtime-metadata'
+import { structuredAgentRuntimeMetadata } from '../../runtime/agent-session/installation/structured-agent-runtime-metadata'
 import {
  keysMayMatch,
  recordConversationKey,
@@ -6,7 +6,7 @@ import {
  createClaudeStructuredLaunchResolver,
  createCodexStructuredLaunchResolver,
  createPiRpcLaunchResolver
-} from '../runtime/structured-agent-launch-composition.test-support'
+} from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { acpLaunchSpecFor } from '../acp/acp-launch-specs'
 import { buildPiRpcLaunch } from '../pi/rpc-launch'

@@ -1,7 +1,7 @@
 import {
  createClaudeStructuredLaunchResolver,
  createCodexStructuredLaunchResolver
-} from '../runtime/structured-agent-launch-composition.test-support'
+} from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { existsSync, mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -16,7 +16,7 @@ import {
 } from './native-chat-visuals-delivery'
 import { nativeChatScratchFolderFor, nativeChatScratchRootFor } from './native-chat-scratch-folder'
 import { buildClaudeChildProcessEnv } from '../claude/claude-child-process-environment'
-import { createCodexStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createCodexStructuredLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { agentSessionRecordFixture } from './agent-session-record-test-fixture'
 import type { AgentSessionJournalIdentity } from '../../shared/agent-session/journal/agent-session-journal-identity'
 import { resolveProviderChildEnv } from '../provider-process/provider-process-launch'
@@ -16,7 +16,7 @@ import {
 import {
  STRUCTURED_AGENT_RUNTIME_REGISTRATIONS,
  structuredAgentRuntimeRegistration
-} from '../runtime/structured-agent-runtime-registrations'
+} from '../runtime/agent-session/installation/structured-agent-runtime-registrations'
 import { resolveStructuredAgentSessionAdoptionForCreate } from '../runtime/agent-session/structured-agent-session-create-adoption'
 import { prepareLegacyTranscriptImport } from './agent-session-journal/journal-legacy-import'
 import type { AgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home'
@@ -1,7 +1,7 @@
 import { cancelLocalGeneration } from '../text-generation/source-control-generation-lanes'
 import { AgentSessionJournal } from './agent-session-journal/journal-store'
 import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session/lifecycle/agent-session-mutation-envelope'
-import { structuredChatNamingDeps } from '../runtime/structured-chat-naming-runtime'
+import { structuredChatNamingDeps } from '../runtime/agent-session/naming/structured-chat-naming-runtime'
 import { getDefaultSettings } from '../../shared/constants'
 import { normalizeSourceControlAiSettings } from '../../shared/source-control/ai/settings/source-control-ai-settings'
 import { setStructuredAgentSessionHost } from './agent-session-wire/structured-agent-session-registry'
@@ -11,7 +11,7 @@ import { resetAiVaultSessionListCacheForTests } from '../ai-vault/cached-session
 import { OrcaRuntimeService } from '../runtime/orca-runtime'
 import { RpcDispatcher } from '../runtime/rpc/dispatcher'
 import { AI_VAULT_METHODS } from '../runtime/rpc/methods/ai-vault'
-import { structuredChatNamingDeps } from '../runtime/structured-chat-naming-runtime'
+import { structuredChatNamingDeps } from '../runtime/agent-session/naming/structured-chat-naming-runtime'
 import { createStructuredChatNamingHandler } from './structured-chat-naming'
 import { setStructuredAgentSessionHost } from './agent-session-wire/structured-agent-session-registry'
 import {
@@ -3,12 +3,12 @@ import { OrchestrationDb } from '../runtime/orchestration/db'
 import {
  structuredWorkerOpenTaskTitle,
  structuredWorkerOwesWork
-} from '../runtime/structured-worker-custody'
+} from '../runtime/orchestration/terminal-authority/structured-sessions/structured-worker-custody'
 import {
  mintStructuredWorkerHandle,
  mintStructuredWorkerPaneKey,
  structuredWorkerProcessIncarnation
-} from '../runtime/structured-worker-identity'
+} from '../runtime/orchestration/terminal-authority/structured-sessions/structured-worker-identity'
 import { describe, expect, it, onTestFinished, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record'
 import { agentSessionRecordFixture } from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture'
@@ -8,7 +8,7 @@ import {
 } from '../../shared/agent-session/lifecycle/agent-session-account-home'
 import type { AgentSessionProviderHandleLink } from '../../shared/agent-session/lifecycle/agent-session-provider-handle'
 import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record'
-import { structuredAgentRuntimeMetadata } from '../runtime/structured-agent-runtime-metadata'
+import { structuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-metadata'
 import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator'

 /** One conversation wherever it is named: the agents sharing its ids, its id (null: a targetless
@@ -16,7 +16,7 @@ import { createCodexRuntimeHomeLaunchPreparation } from '../codex/configuration/
 import { createCodexSessionResumeLaunchPreparation } from '../codex/history/resume/codex-session-resume-launch-preparation'
 import { prepareCodexAiVaultSessionResume } from '../codex/history/resume/codex-ai-vault-session-resume'
 import { resolveHostCodexSessionSourceHome } from '../codex/history/rollouts/codex-session-source-home'
-import { resolveHostAgentBaseEnvironment } from '../runtime/structured-agent-shell-environment'
+import { resolveHostAgentBaseEnvironment } from '../runtime/agent-session/environment/structured-agent-shell-environment'
 import { isWslHostOrcadProcess } from '../ipc/wsl-guest-windows-drive-path'
 import type { OrcadRuntimeCleanup } from './orcad-runtime-lifetime'

@@ -4,7 +4,7 @@ import { join, resolve } from 'node:path'
 import { expect, it } from 'vitest'
 import { installFakeAppEnvironment } from '../../../config/scripts/test-runtime/environment/vitest-host-ports-setup'
 import { runProcess, spawnProcess } from '@orca/process-host'
-import { sealedChildEnv } from '../runtime/structured-session-child-env.test-support'
+import { sealedChildEnv } from '../runtime/agent-session/environment/structured-session-child-env.test-support'
 import { resolveBundledOrcadRuntime } from './orcad-bundled-runtime'
 import { ORCAD_NODE_RUNTIME_MARKER_FILENAME } from '../../shared/orcad-artifacts'
 import { skipForMissingInputs } from './orcad-node-slot-fixture'
@@ -6,7 +6,7 @@ import {
  readOrcadHostAccountLaunchEnv,
  restoreOrcadHostAccountLaunchEnv
 } from './orcad-host-account-launch-env-store'
-import { RuntimeAccountController } from '../runtime/runtime-account-controller'
+import { RuntimeAccountController } from '../runtime/agent-session/environment/runtime-account-controller'

 const dirs: string[] = []
 function userData(): string {
@@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { HostAccountLaunchEnv } from '../../shared/host-account-launch-env'
 import { wslClaudeProfile } from '../claude-accounts/claude-profile-wsl-paths'
 import { provisionWslClaudeAccountProfile } from '../claude-accounts/claude-profile-wsl-provision'
-import { RuntimeAccountController } from '../runtime/runtime-account-controller'
+import { RuntimeAccountController } from '../runtime/agent-session/environment/runtime-account-controller'
 import { createWslHostClaudeProfileRefresh } from './orcad-wsl-host-claude-profile-refresh'

 const DISTRO = 'orca-acct-test'
@@ -10,7 +10,7 @@ import {
 } from '../jsonl-rpc/agent-connection'
 import { JsonlRpcResponseError, type JsonlRpcRecord } from '../jsonl-rpc/peer'
 import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
-import type { ScriptedAgentChild } from '../runtime/structured-agent-scripted-child.test-fixture'
+import type { ScriptedAgentChild } from '../runtime/agent-session/installation/structured-agent-scripted-child.test-fixture'
 import type { PiRpcConnection } from './rpc-session'

 type PiScriptOptions = {
@@ -1,4 +1,4 @@
-import { createPiRpcLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support'
+import { createPiRpcLaunchResolver } from '../runtime/agent-session/launch/structured-agent-launch-composition.test-support'
 import { mkdtemp, mkdir, writeFile, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
--- a/Show More
+++ b/Show More