diff --git a/config/main-layout-writer-baseline.txt b/config/main-layout-writer-baseline.txt index aa8dc523cd2..67e119c5cb1 100644 --- a/config/main-layout-writer-baseline.txt +++ b/config/main-layout-writer-baseline.txt @@ -56,8 +56,8 @@ 2 src/main/runtime/orca-runtime-apply-mobile-session-tab-navigation.ts 2 src/main/runtime/session-graph/session-graph-promotion.ts 2 src/main/runtime/orca-runtime-build-headless-mobile-session-browser-tabs.ts +1 src/main/runtime/workspaces/session-hosts/get-runtime-id.ts 1 src/main/runtime/session-tabs/structured-session-tab-close.ts -1 src/main/runtime/orca-runtime-get-runtime-id.ts 2 src/main/runtime/workspaces/workspace-file-session-targets.ts 1 src/main/runtime/session-tabs/terminal-surface-retirements.ts 1 src/main/runtime/client/runtime-client-state.ts diff --git a/config/scripts/pr-e2e-route-contracts.test.mjs b/config/scripts/pr-e2e-route-contracts.test.mjs index 3b4474ba4e9..6dcbc55a3ee 100644 --- a/config/scripts/pr-e2e-route-contracts.test.mjs +++ b/config/scripts/pr-e2e-route-contracts.test.mjs @@ -149,6 +149,7 @@ describe('pr-e2e-layout-oracle-routing', () => { 'src/main/runtime/session-tabs/mobile-session-hydration.ts', 'src/main/runtime/session-tabs/mobile-session-reconciliation.ts', 'src/main/runtime/session-tabs/mobile-session-preservation.ts', + 'src/main/runtime/workspaces/session-hosts/get-runtime-id.ts', 'src/main/runtime/mobile-session-layout-projection.ts', 'src/main/runtime/headless-runtime-graph.ts', 'src/main/persistence/loading-store/session-host-partitions.ts', diff --git a/config/scripts/pr-layout-oracle-route.mjs b/config/scripts/pr-layout-oracle-route.mjs index f3180299607..ecde72eb4d2 100644 --- a/config/scripts/pr-layout-oracle-route.mjs +++ b/config/scripts/pr-layout-oracle-route.mjs @@ -42,6 +42,7 @@ const LAYOUT_ORACLE_PREFIXES = [ 'src/main/runtime/session-tabs/mobile-session-hydration.ts', 'src/main/runtime/session-tabs/mobile-session-reconciliation.ts', 'src/main/runtime/session-tabs/mobile-session-preservation.ts', + 'src/main/runtime/workspaces/session-hosts/get-runtime-id.ts', 'src/renderer/src/components/terminal/terminal-tab-actions.ts', 'src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts', 'src/shared/rpc-contract/workspace-layout-params.ts', diff --git a/config/ts-nocheck-baseline.txt b/config/ts-nocheck-baseline.txt index 92d021cb80e..5077356ac8d 100644 --- a/config/ts-nocheck-baseline.txt +++ b/config/ts-nocheck-baseline.txt @@ -11,9 +11,7 @@ src/main/runtime/orca-runtime-deliver-pending-messages.ts src/main/runtime/orca-runtime-automation-operations.ts src/main/runtime/orca-runtime-file-commands.ts src/main/runtime/orca-runtime-fit-override-listeners.ts -src/main/runtime/orca-runtime-focus-terminal.ts src/main/runtime/orca-runtime-get-agent-session-execution-namespace.ts -src/main/runtime/orca-runtime-get-runtime-id.ts src/main/runtime/orca-runtime-has-exact-persisted-terminal-surface-identity.ts src/main/runtime/orca-runtime-has-live-or-persisted-serve-or-ssh-owned-pty-binding.ts src/main/runtime/orca-runtime-linear-commands.ts diff --git a/src/main/runtime/orca-runtime-get-status.ts b/src/main/runtime/orca-runtime-get-status.ts index a88eac44678..8da950285e6 100644 --- a/src/main/runtime/orca-runtime-get-status.ts +++ b/src/main/runtime/orca-runtime-get-status.ts @@ -1,4 +1,4 @@ -import { OrcaRuntimeWithGetRuntimeId } from './orca-runtime-get-runtime-id' +import { OrcaRuntimeWithGetRuntimeId } from './workspaces/session-hosts/get-runtime-id' import type { RuntimeDegradation, RuntimeStatus } from '../../shared/runtime-types' import { runtimeBrowserCommandsFactoryIsHeadless, diff --git a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts index 8d1990bdf20..e74f00a1428 100644 --- a/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts +++ b/src/main/runtime/session-tabs/explicit-terminal-close-stops.ts @@ -1,4 +1,4 @@ -import { OrcaRuntimeWithFocusTerminal } from '../orca-runtime-focus-terminal' +import { OrcaRuntimeWithFocusTerminal } from '../terminal/focus/focus-terminal' import { EXPLICIT_TERMINAL_CLOSE_STOP_TIMEOUT_MS } from '../orca-runtime-core' import { SSH_PROVIDER_UNREGISTERED_REASON } from '../../../shared/pty-liveness-verdict' import type { RuntimeTerminalClose } from '../../../shared/runtime-types' diff --git a/src/main/runtime/orca-runtime-focus-terminal.ts b/src/main/runtime/terminal/focus/focus-terminal.ts similarity index 90% rename from src/main/runtime/orca-runtime-focus-terminal.ts rename to src/main/runtime/terminal/focus/focus-terminal.ts index 9a41433ecce..786206500fa 100644 --- a/src/main/runtime/orca-runtime-focus-terminal.ts +++ b/src/main/runtime/terminal/focus/focus-terminal.ts @@ -1,11 +1,10 @@ -// @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests. -import { OrcaRuntimeWithWaitForLeafPtyId } from './terminal/view/renderer-terminal-snapshot' -import type { RuntimeTerminalFocus } from '../../shared/runtime-types' -import { parsePaneKey } from '../../shared/stable-pane-id' -import { getLatestPtyTitle } from './runtime-worktree-status-projection' -import { copySleepingAgentLaunchConfig } from './runtime-agent-launch-resolution' +import { OrcaRuntimeWithWaitForLeafPtyId } from '../view/renderer-terminal-snapshot' +import type { RuntimeTerminalFocus } from '../../../../shared/runtime-types' +import { parsePaneKey } from '../../../../shared/stable-pane-id' +import { getLatestPtyTitle } from '../../runtime-worktree-status-projection' +import { copySleepingAgentLaunchConfig } from '../../runtime-agent-launch-resolution' -export class OrcaRuntimeWithFocusTerminal extends OrcaRuntimeWithWaitForLeafPtyId { +export abstract class OrcaRuntimeWithFocusTerminal extends OrcaRuntimeWithWaitForLeafPtyId { async focusTerminal( handle: string, options: { navigateHost?: boolean } = {} diff --git a/src/main/runtime/orca-runtime-get-runtime-id.ts b/src/main/runtime/workspaces/session-hosts/get-runtime-id.ts similarity index 88% rename from src/main/runtime/orca-runtime-get-runtime-id.ts rename to src/main/runtime/workspaces/session-hosts/get-runtime-id.ts index ef6ee540744..c21c5431d0c 100644 --- a/src/main/runtime/orca-runtime-get-runtime-id.ts +++ b/src/main/runtime/workspaces/session-hosts/get-runtime-id.ts @@ -1,23 +1,22 @@ -// @ts-nocheck -- mechanically split from OrcaRuntimeService; behavior is covered by AST equivalence and characterization tests. -import { OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity } from './orca-runtime-has-exact-persisted-terminal-surface-identity' +import { OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity } from '../../orca-runtime-has-exact-persisted-terminal-surface-identity' import type { OrchestrationEnvironmentCallOptions, OrchestrationWorkerServer -} from './orchestration/environment-transport' -import type { RuntimeOrchestrationEnvelope } from '../../shared/runtime-rpc-envelope' -import type { ExecutionHostId } from '../../shared/execution-host' +} from '../../orchestration/environment-transport' +import type { RuntimeOrchestrationEnvelope } from '../../../../shared/runtime-rpc-envelope' +import type { ExecutionHostId } from '../../../../shared/execution-host' import { LOCAL_EXECUTION_HOST_ID, getRepoExecutionHostId, parseExecutionHostId, toSshExecutionHostId -} from '../../shared/execution-host' -import type { RuntimeTerminalSummary } from '../../shared/runtime-types' -import type { ResolvedWorktree } from './runtime-worktree-path-identity' -import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants' -import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types' +} from '../../../../shared/execution-host' +import type { RuntimeTerminalSummary } from '../../../../shared/runtime-types' +import type { ResolvedWorktree } from '../../runtime-worktree-path-identity' +import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants' +import type { WorkspaceSessionState } from '../../../../shared/workspace-session-state-types' -export class OrcaRuntimeWithGetRuntimeId extends OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity { +export abstract class OrcaRuntimeWithGetRuntimeId extends OrcaRuntimeWithHasExactPersistedTerminalSurfaceIdentity { getRuntimeId(): string { return this.runtimeId }