refactor(shared): move orcad-migration-* into src/shared/orcad-migration/ (#30536)

Pure git mv plus import and path-literal rewrites. Two files #29339 edits stay put:
orcad-migration-dormant-state-validation.ts and orcad-migration-manifest-contract.test.ts.

Co-authored-by: Claude <noreply@anthropic.com>

config/scripts/ci-shard-timings.json

@@ -11691,12 +11691,12 @@
       "src/shared/orca-yaml-bounds.test.ts": 169,
       "src/shared/orcad-artifacts.test.ts": 84,
       "src/shared/orcad-build-identity.test.ts": 46,
-      "src/shared/orcad-migration-dormant-session-validation.test.ts": 314,
+      "src/shared/orcad-migration/orcad-migration-dormant-session-validation.test.ts": 314,
       "src/shared/orcad-migration-manifest-contract.test.ts": 351,
-      "src/shared/orcad-migration-manifest.test.ts": 393,
-      "src/shared/orcad-migration-scrollback.test.ts": 240,
-      "src/shared/orcad-migration-source-kind.test.ts": 362,
-      "src/shared/orcad-migration-staged-catalog-validation.test.ts": 299,
+      "src/shared/orcad-migration/orcad-migration-manifest.test.ts": 393,
+      "src/shared/orcad-migration/orcad-migration-scrollback.test.ts": 240,
+      "src/shared/orcad-migration/orcad-migration-source-kind.test.ts": 362,
+      "src/shared/orcad-migration/orcad-migration-staged-catalog-validation.test.ts": 299,
       "src/shared/orcad-profile-preflight.test.ts": 220,
       "src/shared/orcad-stop-request.test.ts": 239,
       "src/shared/orchestration-ask-timeout.test.ts": 30,

src/main/managed-server/lifecycle/orcad-managed-migration-status.ts

@@ -2,7 +2,7 @@
 import {
   isRetainedOrcadMigrationSourceCutover,
   type OrcadMigrationSourceCutover
-} from '../../../shared/orcad-migration-source-cutover'
+} from '../../../shared/orcad-migration/orcad-migration-source-cutover'
 import {
   getOrcadSshDeployment,
   type KnownRuntimeEnvironment

src/main/managed-server/lifecycle/orcad-runtime-conversion.ts

@@ -9,7 +9,7 @@
  */
 import { randomUUID } from 'node:crypto'
 import type { OrcadManagedConversionResult } from '../../../shared/orcad-managed-runtime'
-import type { OrcadMigrationSourceCutover } from '../../../shared/orcad-migration-source-cutover'
+import type { OrcadMigrationSourceCutover } from '../../../shared/orcad-migration/orcad-migration-source-cutover'
 import { recordManagedOrcadMigration } from '../../../shared/runtime-environment-managed-orcad-store'
 import { listEnvironments } from '../../../shared/runtime-environment-store'
 import {

src/main/orcad/orcad-migration-manifest-digest.ts

@@ -3,7 +3,7 @@ import {
   orcadMigrationManifestHashInput,
   serializeOrcadMigrationValue,
   type OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 
 export function computeOrcadMigrationManifestSha256(
   manifest: Omit<OrcadMigrationManifest, 'manifestSha256'>

src/main/orcad/orcad-migration-wsl-destination.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { OrcadMigrationManifestSource } from '../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifestSource } from '../../shared/orcad-migration/orcad-migration-manifest'
 import {
   assertOrcadMigrationSourceServedHere,
   ORCAD_MIGRATION_SOURCE_NOT_THIS_HOST,

src/main/orcad/orcad-migration-wsl-destination.ts

@@ -2,8 +2,8 @@
  * Only the orcad an Orca desktop launched inside a distro may receive that distro's projects: the
  * move keeps every file where it is, so any other host would own paths it cannot see.
  */
-import type { OrcadMigrationManifestSource } from '../../shared/orcad-migration-manifest'
-import { isOrcadMigrationLocalWslSource } from '../../shared/orcad-migration-source-kind'
+import type { OrcadMigrationManifestSource } from '../../shared/orcad-migration/orcad-migration-manifest'
+import { isOrcadMigrationLocalWslSource } from '../../shared/orcad-migration/orcad-migration-source-kind'
 import { isWslHostOrcadProcess } from '../ipc/wsl-guest-windows-drive-path'
 
 export const ORCAD_MIGRATION_SOURCE_NOT_THIS_HOST = 'orcad_migration_source_not_this_host'

src/main/persistence-orcad-migration-blobs.test.ts

@@ -3,7 +3,7 @@ import { createHash } from 'node:crypto'
 import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration-blob-transfer'
+import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration/orcad-migration-blob-transfer'
 import { getOrcadMigrationReceivedBlobPath } from './persistence/migrating-orcad-catalog/orcad-migration-blob-staging'
 import { manifest } from './persistence-orcad-migration-catalog-fixture'
 import { createStore, testState } from './persistence-test-harness'

src/main/persistence-orcad-migration-catalog-fixture.ts

@@ -1,10 +1,10 @@
 import type { FolderWorkspace } from '../shared/folder-workspace-types'
 import type { Automation, AutomationRun } from '../shared/automations-types'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../shared/orcad-migration-manifest-validation'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifest
-} from '../shared/orcad-migration-manifest'
+} from '../shared/orcad-migration/orcad-migration-manifest'
 import type { ProjectGroup } from '../shared/project-group-types'
 import type { Repo } from '../shared/repo-types'
 import { getDefaultWorkspaceSession } from '../shared/constants'

src/main/persistence-orcad-migration-catalog.test.ts

@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { MAX_ORCAD_MIGRATION_STAGED_CATALOGS } from '../shared/orcad-migration-staged-catalog-validation'
+import { MAX_ORCAD_MIGRATION_STAGED_CATALOGS } from '../shared/orcad-migration/orcad-migration-staged-catalog-validation'
 import { getDefaultWorkspaceSession } from '../shared/constants'
 import { folderWorkspaceKey, worktreeWorkspaceKey } from '../shared/workspace-scope'
 import { MAX_RETIREMENT_NAMESPACES } from './worktree-retirement-namespace'

src/main/persistence-orcad-migration-shell-history-fixture.ts

@@ -1,8 +1,8 @@
 import { createHash } from 'node:crypto'
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
-import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../shared/orcad-migration-manifest'
+import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../shared/orcad-migration/orcad-migration-manifest'
 import { folderWorkspaceKey } from '../shared/workspace-scope'
 import { getOrcadMigrationReceivedBlobPath } from './persistence/migrating-orcad-catalog/orcad-migration-blob-staging'
 import { buildWslMoveShellHistoryBlobs } from './persistence/moving-wsl-projects/wsl-move-shell-history-blobs'

src/main/persistence-orcad-migration-terminal-restore-hints.test.ts

@@ -3,8 +3,8 @@ import { createHash } from 'node:crypto'
 import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../shared/orcad-migration-manifest'
+import type { OrcadMigrationBlobDescriptor } from '../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../shared/orcad-migration/orcad-migration-manifest'
 import { getOrcadMigrationReceivedBlobPath } from './persistence/migrating-orcad-catalog/orcad-migration-blob-staging'
 import { buildWslMoveRestoreHintsBlob } from './persistence/moving-wsl-projects/wsl-move-restore-hints-blob'
 import {

src/main/persistence/__fixtures__/wsl-mover/wsl-move-cutover-fixture.ts

@@ -1,5 +1,5 @@
 /** A valid WSL move journal record whose manifest is bound to it. */
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../../shared/orcad-migration-manifest-validation'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import {
   wslMoveJournalKey,
   type WslMoveCutover,

src/main/persistence/loading-store/normalize-loaded-profile-state.ts

@@ -3,9 +3,9 @@ import type { SshRemotePtyLease } from '../../../shared/ssh-types'
 import { normalizeFeatureInteractionTelemetryBuckets } from '../../../shared/feature-interactions'
 import { normalizeFolderWorkspaceDiffComments } from '../../folder-workspace-diff-comments'
 import { normalizeFolderWorkspaces } from '../../../shared/folder-workspaces'
-import { normalizeOrcadMigrationEvictedReceipts } from '../../../shared/orcad-migration-evicted-receipts'
-import { normalizeOrcadMigrationImportReceipts } from '../../../shared/orcad-migration-manifest-validation'
-import { normalizeOrcadMigrationStagedCatalogs } from '../../../shared/orcad-migration-staged-catalog-validation'
+import { normalizeOrcadMigrationEvictedReceipts } from '../../../shared/orcad-migration/orcad-migration-evicted-receipts'
+import { normalizeOrcadMigrationImportReceipts } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import { normalizeOrcadMigrationStagedCatalogs } from '../../../shared/orcad-migration/orcad-migration-staged-catalog-validation'
 import { normalizeWorkspaceLineageByChildKey } from '../applying-settings/ui-interaction-merge'
 import {
   normalizeSshRemotePtyLease,

src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts

@@ -1,20 +1,20 @@
-import { MAX_ORCAD_MIGRATION_STAGED_CATALOGS } from '../../../shared/orcad-migration-staged-catalog-validation'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
+import { MAX_ORCAD_MIGRATION_STAGED_CATALOGS } from '../../../shared/orcad-migration/orcad-migration-staged-catalog-validation'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationImportReceipt,
   OrcadMigrationManifest
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type {
   OrcadMigrationSnapshotChunkRequest,
   OrcadMigrationSnapshotChunkResult
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import type {
   OrcadMigrationBlobChunkRequest,
   OrcadMigrationBlobChunkResult,
   OrcadMigrationBlobDescriptor
-} from '../../../shared/orcad-migration-blob-transfer'
+} from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import type { RepoLifecycleOperations } from '../loading-store/repo-lifecycle-operations'
 import type { StoreRuntimeState } from '../loading-store/store-runtime-state'
 import type { WriteSchedulingOperations } from '../loading-store/write-scheduling'

src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
-import { MAX_ORCAD_MIGRATION_IMPORT_RECEIPTS } from '../../../shared/orcad-migration-manifest-validation'
+import { MAX_ORCAD_MIGRATION_IMPORT_RECEIPTS } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import { manifest } from '../../persistence-orcad-migration-catalog-fixture'
 import {
   expireOrcadMigrationStages,

src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.ts

@@ -3,12 +3,12 @@
  * read as committed for as long as a client could ask, and an abandoned stage must not hold the
  * server awake or take a staging slot forever.
  */
-import { MAX_ORCAD_MIGRATION_IMPORT_RECEIPTS } from '../../../shared/orcad-migration-manifest-validation'
+import { MAX_ORCAD_MIGRATION_IMPORT_RECEIPTS } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationImportReceipt,
   OrcadMigrationManifest
-} from '../../../shared/orcad-migration-manifest'
-import { MAX_ORCAD_MIGRATION_EVICTED_RECEIPTS } from '../../../shared/orcad-migration-evicted-receipts'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { MAX_ORCAD_MIGRATION_EVICTED_RECEIPTS } from '../../../shared/orcad-migration/orcad-migration-evicted-receipts'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 
 // A client resumes a stage within minutes; a week only covers a host left offline meanwhile.

src/main/persistence/migrating-orcad-catalog/orcad-catalog-records.ts

@@ -3,7 +3,7 @@ import {
   serializeOrcadMigrationValue,
   type OrcadMigrationImportReceipt,
   type OrcadMigrationManifest
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import type { Repo } from '../../../shared/repo-types'
 import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path'

src/main/persistence/migrating-orcad-catalog/orcad-catalog-row-identity.ts

@@ -1,5 +1,5 @@
 /** Catalog merges retain known rows and reject conflicting imported configuration. */
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { Repo } from '../../../shared/repo-types'
 
 export function selectNewRows<T extends { id: string }>(

src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
-import type { OrcadMigrationClientStatePayload } from '../../../shared/orcad-migration-client-state'
+import type { OrcadMigrationClientStatePayload } from '../../../shared/orcad-migration/orcad-migration-client-state'
 import {
   applyPreparedOrcadMigrationClientState,
   prepareOrcadMigrationClientState

src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.ts

@@ -3,8 +3,8 @@ import { hostStableKey, parseHostStableKey } from '../../../shared/automation-ow
 import type {
   OrcadMigrationClientStatePayload,
   OrcadMigrationUiRoutingState
-} from '../../../shared/orcad-migration-client-state'
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-client-state'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
 
 export type PreparedOrcadMigrationClientState = {
   incoming: OrcadMigrationClientStatePayload | undefined

src/main/persistence/migrating-orcad-catalog/orcad-destination-workspace-session.ts

@@ -1,5 +1,5 @@
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
-import { isRecord } from '../../../shared/orcad-migration-manifest-fields'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { isRecord } from '../../../shared/orcad-migration/orcad-migration-manifest-fields'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { SESSION_FOCUS_FIELDS } from '../../../shared/workspace-session-host-field-ownership'

src/main/persistence/migrating-orcad-catalog/orcad-destination-worktree-metadata.ts

@@ -1,6 +1,6 @@
 import type { PersistedState } from '../../../shared/persisted-state-types'
-import type { OrcadMigrationDormantStatePayload } from '../../../shared/orcad-migration-manifest'
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationDormantStatePayload } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { canonicalWorktreeIdentity } from '../../../shared/worktree/identity'
 import { composeWorktreeHostIdentity } from '../../../shared/worktree/host-qualified-identity'
 import { omitDefaultWorktreeMetaFields } from '../../../shared/worktree/meta-persisted-defaults'

src/main/persistence/migrating-orcad-catalog/orcad-dormant-metadata-defaults.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { fillDefaultWorktreeMetaFields } from '../../../shared/worktree/meta-persisted-defaults'
 import { prepareOrcadMigrationDormantState } from './orcad-dormant-state-records'
 

src/main/persistence/migrating-orcad-catalog/orcad-dormant-state-records.ts

@@ -1,7 +1,7 @@
 import type {
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifest
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { SparsePreset } from '../../../shared/worktree/create-types'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../shared/worktree/lineage-types'

src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-install-persistence.ts

@@ -1,5 +1,5 @@
-import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { parsePaneKey } from '../../../shared/stable-pane-id'
 import { getHistoryRoot } from '../../terminal-history-paths'

src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-installers.ts

@@ -5,13 +5,13 @@
  */
 import { readFileSync, rmSync } from 'node:fs'
 import { dirname } from 'node:path'
-import type { OrcadMigrationBlobKind } from '../../../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationBlobKind } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import {
   ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_KEY,
   parseOrcadMigrationTerminalRestoreHintsText,
   type OrcadMigrationTerminalRestoreHint
-} from '../../../shared/orcad-migration-terminal-restore-hints'
+} from '../../../shared/orcad-migration/orcad-migration-terminal-restore-hints'
 import { syncDirectoryDurablySync } from '../../durable-file-write'
 import {
   getOrcadMigrationReceivedBlobPath,

src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.test.ts

@@ -3,9 +3,9 @@ import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, mkdirSync
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import type { OrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration-blob-transfer'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import {
   abortOrcadMigrationBlobs,
   assertOrcadMigrationBlobSetMatches,

src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.ts

@@ -19,8 +19,8 @@ import {
   type OrcadMigrationBlobDescriptor,
   type OrcadMigrationBlobKind,
   type OrcadMigrationBlobUploadState
-} from '../../../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { syncDirectoryDurablySync } from '../../durable-file-write'
 import {
   appendOrcadMigrationStagedChunk,

src/main/persistence/migrating-orcad-catalog/orcad-migration-shell-history-format.ts

@@ -6,7 +6,7 @@
  * catalog does not list every git worktree a terminal ever ran in.
  */
 import { z } from 'zod'
-import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration-blob-transfer'
+import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import { hashWorktreeId } from '../../terminal-history-id'
 
 /** fish keeps its history in the distro's own fish data dir, not Orca's store, so it never moves. */

src/main/persistence/migrating-orcad-catalog/orcad-migration-staged-file.ts

@@ -19,7 +19,7 @@ import {
   writeSync
 } from 'node:fs'
 import { join } from 'node:path'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { syncDirectoryDurablySync } from '../../durable-file-write'
 
 export const ORCAD_MIGRATION_STAGING_DIRECTORY = '.orcad-migration-staging'

src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.test.ts

@@ -12,12 +12,12 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { getDefaultWorkspaceSession } from '../../../shared/constants'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type {
   OrcadMigrationSnapshotChunkRequest,
   OrcadMigrationTerminalScrollbackSnapshot
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import {
   getTerminalScrollbackSnapshotPath,
   type TerminalScrollbackSnapshotStorage

src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.ts

@@ -1,13 +1,13 @@
 import { mkdirSync } from 'node:fs'
 import { join } from 'node:path'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import {
   decodeOrcadMigrationSnapshotChunk,
   type OrcadMigrationSnapshotChunkRequest,
   type OrcadMigrationSnapshotChunkResult,
   type OrcadMigrationSnapshotUploadState,
   type OrcadMigrationTerminalScrollbackSnapshot
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import { syncDirectoryDurablySync } from '../../durable-file-write'
 import {
   getTerminalScrollbackSnapshotPath,

src/main/persistence/migrating-orcad-catalog/orcad-shell-history-installer.ts

@@ -17,8 +17,8 @@ import {
   statSync
 } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
-import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { projectGroupIdFromRepoId } from '../../../shared/folder-workspace-worktree'
 import { folderWorkspaceKey } from '../../../shared/workspace-scope'
 import { splitWorktreeId } from '../../../shared/worktree/id'

src/main/persistence/migrating-orcad-catalog/orcad-source-automation-state.ts

@@ -8,7 +8,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { TaskSourceContext, WorkspaceRunContext } from '../../../shared/task-source-context'
 import {

src/main/persistence/migrating-orcad-catalog/orcad-source-automation-subtraction.ts

@@ -1,5 +1,5 @@
 import { getAutomationRunRepoId } from '../../../shared/automation-run-identity'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { createOrcadMigrationSourceScope, orcadMigrationOwnsRepoId } from './orcad-source-scope'
 

src/main/persistence/migrating-orcad-catalog/orcad-source-catalog-subtraction.ts

@@ -4,8 +4,8 @@
  * the migration references it. The live profile is never passed here.
  */
 import type { StoreRuntimeState } from '../loading-store/store-runtime-state'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
-import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration-source-kind'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration/orcad-migration-source-kind'
 import { orcadSourceFolderWorkspaceIds, repoBelongsToOrcadSource } from './orcad-source-ownership'
 
 export function subtractOrcadSourceCatalogState(

src/main/persistence/migrating-orcad-catalog/orcad-source-catalog.ts

@@ -1,4 +1,4 @@
-import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import type { SshTarget } from '../../../shared/ssh-types'
 import type { Store } from '../../persistence'

src/main/persistence/migrating-orcad-catalog/orcad-source-client-browser-intents.ts

@@ -1,4 +1,4 @@
-import type { OrcadMigrationClientHostedBrowserCloseIntent } from '../../../shared/orcad-migration-client-state'
+import type { OrcadMigrationClientHostedBrowserCloseIntent } from '../../../shared/orcad-migration/orcad-migration-client-state'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import {

src/main/persistence/migrating-orcad-catalog/orcad-source-client-focus-census.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
 import type { ExecutionHostId } from '../../../shared/execution-host'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { Repo } from '../../../shared/repo-types'
 import type { SshTarget } from '../../../shared/ssh-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { getDefaultPersistedState, getDefaultWorkspaceSession } from '../../../shared/constants'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.ts

@@ -3,11 +3,11 @@ import { parsePersistedAutomationHostFilter } from '../../../shared/automation-h
 import type {
   OrcadMigrationClientStatePayload,
   OrcadMigrationUiRoutingState
-} from '../../../shared/orcad-migration-client-state'
+} from '../../../shared/orcad-migration/orcad-migration-client-state'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type {
   PersistedMobileClientTabSelection,
   PersistedState

src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { orcadMigrationCutoverFixture } from '../../ssh/orcad-migration-cutover-fixture'
 import { subtractOrcadMigrationClientState } from './orcad-source-client-subtraction'
 

src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.ts

@@ -1,11 +1,11 @@
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
-import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration-source-kind'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration/orcad-migration-source-kind'
 import { parsePersistedAutomationHostFilter } from '../../../shared/automation-host-filter'
 import { hostStableKey } from '../../../shared/automation-owner-key'
 import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
 import { composeWorktreeHostIdentity } from '../../../shared/worktree/host-qualified-identity'
-import type { OrcadMigrationClientStatePayload } from '../../../shared/orcad-migration-client-state'
+import type { OrcadMigrationClientStatePayload } from '../../../shared/orcad-migration/orcad-migration-client-state'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import {
   MAX_CLIENT_HOSTED_BROWSER_CLOSE_INTENTS,

src/main/persistence/migrating-orcad-catalog/orcad-source-delta-view.ts

@@ -8,7 +8,7 @@ import type {
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifest,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { FolderWorkspace } from '../../../shared/folder-workspace-types'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import type { Repo } from '../../../shared/repo-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
 import type { FolderWorkspace } from '../../../shared/folder-workspace-types'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { Repo } from '../../../shared/repo-types'
 import type { SshTarget } from '../../../shared/ssh-types'
 import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'

src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.ts

@@ -1,8 +1,8 @@
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import {
   ORCAD_MIGRATION_DEPENDENCY_KINDS,
   type OrcadMigrationDependencyKind
-} from '../../../shared/orcad-migration-preflight'
+} from '../../../shared/orcad-migration/orcad-migration-preflight'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { TerminalScrollbackSnapshotStorage } from '../../terminal-scrollback-snapshots'
 import {

src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-state.ts

@@ -2,8 +2,8 @@ import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
-import type { OrcadMigrationDependencyKind } from '../../../shared/orcad-migration-preflight'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
+import type { OrcadMigrationDependencyKind } from '../../../shared/orcad-migration/orcad-migration-preflight'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { TerminalScrollbackSnapshotStorage } from '../../terminal-scrollback-snapshots'
 import { projectHostSetupProjectionFromRepos } from '../../../shared/project-host-setup-projection'

src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-subtraction.ts

@@ -1,4 +1,4 @@
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { subtractOrcadSourceWorktreeMetadata } from './orcad-source-worktree-metadata'
 import { subtractOrcadMigrationSourceAutomationState } from './orcad-source-automation-subtraction'

src/main/persistence/migrating-orcad-catalog/orcad-source-export.ts

@@ -7,13 +7,13 @@
 import {
   ORCAD_MIGRATION_SCROLLBACK_CHUNK_BYTES,
   type OrcadMigrationTerminalScrollbackSnapshot
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifest,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { assertOrcadMigrationManifestDigest } from '../../orcad/orcad-migration-manifest-digest'
 import type { StoreRuntimeState } from '../loading-store/store-runtime-state'
 import {

src/main/persistence/migrating-orcad-catalog/orcad-source-host-qualified-scope.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { Repo } from '../../../shared/repo-types'
 import type { Tab } from '../../../shared/tab-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-legacy-key-scope.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { Repo } from '../../../shared/repo-types'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-retired-worktree-names.ts

@@ -3,7 +3,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationDormantStatePayload
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import {
   isEmptyRetiredNameRegistry,

src/main/persistence/migrating-orcad-catalog/orcad-source-scope.ts

@@ -1,9 +1,9 @@
-import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration-source-kind'
+import { requireOrcadMigrationSshSource } from '../../../shared/orcad-migration/orcad-migration-source-kind'
 import { LOCAL_EXECUTION_HOST_ID, toSshExecutionHostId } from '../../../shared/execution-host'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import {
   getExecutionHostIdFromWorktreeHostIdentity,

src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-retention.ts

@@ -1,4 +1,4 @@
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { StoreRuntimeState } from '../loading-store/store-runtime-state'
 import {
   readTerminalScrollbackStoredBytesSync,

src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration-scrollback'
+import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import { hasDuplicateOrcadMigrationScrollbackDescriptors } from './orcad-source-scrollback-state'
 
 const FIRST: OrcadMigrationTerminalScrollbackSnapshot = {

src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.ts

@@ -1,9 +1,9 @@
 import { createHash } from 'node:crypto'
-import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration-scrollback'
+import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import {
   MAX_ORCAD_MIGRATION_SCROLLBACK_SNAPSHOTS,
   MAX_ORCAD_MIGRATION_SCROLLBACK_TOTAL_BYTES
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../../../shared/terminal-scrollback-limits'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'

src/main/persistence/migrating-orcad-catalog/orcad-source-session-copy-resolution.ts

@@ -1,8 +1,8 @@
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
-import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
+import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import { keepUnsavedDrafts } from '../../../shared/workspace-session-draft-retention'

src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-fragments.ts

@@ -1,4 +1,4 @@
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { mergeWorkspaceSessions } from '../../orca-profiles/profile-project-session-state'
 import { SESSION_FIELDS_PRUNED_BY_OWNER_KEY } from '../../orca-profiles/profile-project-session-field-disposition'

src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-subtraction.ts

@@ -10,7 +10,7 @@ import {
 } from './orcad-source-scope'
 import { LOCAL_EXECUTION_HOST_ID, parseExecutionHostId } from '../../../shared/execution-host'
 import { collectSessionOwnerKeys } from './orcad-source-workspace-session-fragments'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 
 /** On a copy of the profile only, like every subtraction the delta view runs. */

src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session.ts

@@ -1,10 +1,10 @@
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifestSource
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
-import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration-scrollback'
+import type { OrcadMigrationTerminalScrollbackSnapshot } from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import {
   extractSessionOwnersForTransfer,
   hasTransferredSessionState

src/main/persistence/migrating-orcad-catalog/orcad-source-worktree-metadata.ts

@@ -1,7 +1,7 @@
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
-import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
+import { serializeOrcadMigrationValue } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { canonicalWorktreeIdentity } from '../../../shared/worktree/identity'
 import {
   getExecutionHostIdFromWorktreeHostIdentity,

src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultWorkspaceSession } from '../../../shared/constants'
-import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { assertOrcadMigrationStagedCatalogClaims } from './orcad-staged-catalog-claims'
 
 const LEAF = '11111111-1111-4111-8111-111111111111'

src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.ts

@@ -2,7 +2,7 @@ import { normalizeRuntimePathForComparison } from '../../../shared/cross-platfor
 import type {
   OrcadMigrationManifest,
   OrcadMigrationStagedCatalog
-} from '../../../shared/orcad-migration-manifest'
+} from '../../../shared/orcad-migration/orcad-migration-manifest'
 import { collectOrcadMigrationSessionEntityOwners } from './orcad-destination-workspace-session'
 
 export function assertOrcadMigrationStagedCatalogClaims(

src/main/persistence/migrating-orcad-catalog/orcad-terminal-restore-hint-store.ts

@@ -12,7 +12,7 @@ import {
   isOrcadMigrationTerminalRestoreHintCwd,
   isOrcadMigrationTerminalRestoreHintPaneKey,
   type OrcadMigrationTerminalRestoreHint
-} from '../../../shared/orcad-migration-terminal-restore-hints'
+} from '../../../shared/orcad-migration/orcad-migration-terminal-restore-hints'
 import { ensureOrcadMigrationDirectory } from './orcad-migration-staged-file'
 
 const STORE_VERSION = 2

src/main/persistence/moving-wsl-projects/wsl-move-cutover-journal.ts

@@ -8,7 +8,7 @@ import {
   parseWslMoveCutover,
   type WslMoveCutover
 } from '../../../shared/wsl-move/wsl-move-cutover'
-import { isRecord } from '../../../shared/orcad-migration-manifest-fields'
+import { isRecord } from '../../../shared/orcad-migration/orcad-migration-manifest-fields'
 import { assertOrcadMigrationManifestDigest } from '../../orcad/orcad-migration-manifest-digest'
 import {
   createMigrationJournalDirectory,

src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.test.ts

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto'
 import { describe, expect, it } from 'vitest'
-import { parseOrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration-blob-transfer'
-import { parseOrcadMigrationTerminalRestoreHintsText } from '../../../shared/orcad-migration-terminal-restore-hints'
+import { parseOrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import { parseOrcadMigrationTerminalRestoreHintsText } from '../../../shared/orcad-migration/orcad-migration-terminal-restore-hints'
 import { buildWslMoveRestoreHintsBlob } from './wsl-move-restore-hints-blob'
 
 const hints = [

src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.ts

@@ -3,15 +3,15 @@
  * descriptor the destination checks them against, and the source the blob sender reads from.
  */
 import { createHash } from 'node:crypto'
-import type { OrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration-blob-transfer'
-import { sameOrcadMigrationBlob } from '../../../shared/orcad-migration-blob-transfer'
+import type { OrcadMigrationBlobDescriptor } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
+import { sameOrcadMigrationBlob } from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import {
   MAX_ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_BYTES,
   ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_KEY,
   ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_VERSION,
   parseOrcadMigrationTerminalRestoreHintsDocument,
   type OrcadMigrationTerminalRestoreHint
-} from '../../../shared/orcad-migration-terminal-restore-hints'
+} from '../../../shared/orcad-migration/orcad-migration-terminal-restore-hints'
 import type { OrcadMigrationBlobSource } from '../../ssh/orcad-migration-blob-coordinator'
 
 export type WslMoveRestoreHintsBlob = {

src/main/persistence/moving-wsl-projects/wsl-move-scope.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { FolderWorkspace } from '../../../shared/folder-workspace-types'
-import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration-manifest'
+import type { OrcadMigrationCatalogPayload } from '../../../shared/orcad-migration/orcad-migration-manifest'
 import type { Repo } from '../../../shared/repo-types'
 import { rewriteOrcadMigrationPayloadPaths } from '../../ssh/orcad-migration-path-rewrite'
 import { createUncToLinuxPathRewriter } from './wsl-move-path-rewriter'

src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.test.ts

@@ -14,7 +14,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   parseOrcadMigrationBlobDescriptor,
   type OrcadMigrationBlobDescriptor
-} from '../../../shared/orcad-migration-blob-transfer'
+} from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import { rewriteOrcadMigrationWorktreeId } from '../../ssh/orcad-migration-path-rewrite'
 import { hashWorktreeId } from '../../terminal-history-id'
 import { parseOrcadMigrationShellHistoryHeader } from '../migrating-orcad-catalog/orcad-migration-shell-history-format'

src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.ts

@@ -11,7 +11,7 @@ import {
   orcadMigrationBlobIdentity,
   sameOrcadMigrationBlob,
   type OrcadMigrationBlobDescriptor
-} from '../../../shared/orcad-migration-blob-transfer'
+} from '../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import type { OrcadMigrationBlobSource } from '../../ssh/orcad-migration-blob-coordinator'
 import { getHistoryRootWsl } from '../../terminal-history-paths'
 import { hashWorktreeId } from '../../terminal-history-id'

src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   MAX_ORCAD_MIGRATION_SCROLLBACK_SNAPSHOTS,
   MAX_ORCAD_MIGRATION_SCROLLBACK_TOTAL_BYTES
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../../../shared/terminal-scrollback-limits'
 import { assessWslMoveTerminals, type WslMovePaneFacts } from './wsl-move-terminal-gate'
 

src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.ts

@@ -8,7 +8,7 @@ import type { AgentStatusState } from '../../../shared/agent-status-types'
 import {
   MAX_ORCAD_MIGRATION_SCROLLBACK_SNAPSHOTS,
   MAX_ORCAD_MIGRATION_SCROLLBACK_TOTAL_BYTES
-} from '../../../shared/orcad-migration-scrollback'
+} from '../../../shared/orcad-migration/orcad-migration-scrollback'
 import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../../../shared/terminal-scrollback-limits'
 
 export type WslMovePaneFacts = {

src/main/runtime/orca-runtime-get-status.ts

@@ -8,7 +8,7 @@ import {
 import { isBrowserIdentityModeStoreInitialized } from '../browser/browser-identity-mode-store'
 import { servesLocalWslMigrationSource } from '../orcad/orcad-migration-wsl-destination'
 import { ORCAD_MIGRATION_LOCAL_WSL_SOURCE_RUNTIME_CAPABILITY } from '../../shared/orcad-runtime-capabilities'
-import { advertisedOrcadMigrationBlobCapabilities } from '../../shared/orcad-migration-blob-transfer'
+import { advertisedOrcadMigrationBlobCapabilities } from '../../shared/orcad-migration/orcad-migration-blob-transfer'
 import type { RuntimeCapability } from '../../shared/protocol-version'
 import {
   BROWSER_CERTIFICATE_TRUST_RUNTIME_CAPABILITY,

src/main/runtime/orca-runtime-migration-catalog.ts

@@ -2,16 +2,16 @@ import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import type {
   OrcadMigrationSnapshotChunkRequest,
   OrcadMigrationSnapshotChunkResult
-} from '../../shared/orcad-migration-scrollback'
+} from '../../shared/orcad-migration/orcad-migration-scrollback'
 import type {
   OrcadMigrationBlobChunkRequest,
   OrcadMigrationBlobChunkResult,
   OrcadMigrationBlobDescriptor
-} from '../../shared/orcad-migration-blob-transfer'
+} from '../../shared/orcad-migration/orcad-migration-blob-transfer'
 import {
   abortStagedOrcadMigrationCatalogDurably,
   commitStagedOrcadMigrationCatalogDurably,

src/main/runtime/orcad-migration-catalog-import.test.ts

@@ -3,7 +3,7 @@ import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import {
   abortStagedOrcadMigrationCatalogDurably,
   commitStagedOrcadMigrationCatalogDurably,

src/main/runtime/orcad-migration-catalog-import.ts

@@ -2,8 +2,8 @@ import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
-import type { OrcadMigrationBlobDescriptor } from '../../shared/orcad-migration-blob-transfer'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
+import type { OrcadMigrationBlobDescriptor } from '../../shared/orcad-migration/orcad-migration-blob-transfer'
 import type { Store } from '../persistence'
 
 /** A moved history waits while a shell runs in its worktree: that shell would overwrite it. */

src/main/runtime/rpc/methods/orcad-migration.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../../../shared/orcad-migration/orcad-migration-manifest'
 import { computeOrcadMigrationManifestSha256 } from '../../../orcad/orcad-migration-manifest-digest'
 import type { OrcaRuntimeService } from '../../orca-runtime'
 import { eraseRpcMethods, isStreamingMethod, type RpcContext } from '../core'

src/main/runtime/rpc/methods/orcad-migration.ts

@@ -3,9 +3,9 @@ import {
   OrcadMigrationCatalogParams,
   OrcadMigrationCommitCatalogParams
 } from '../../../../shared/rpc-contract/orcad-migration-params'
-import { parseOrcadMigrationManifest } from '../../../../shared/orcad-migration-manifest-validation'
-import { OrcadMigrationSnapshotChunkRequestSchema } from '../../../../shared/orcad-migration-scrollback'
-import { OrcadMigrationBlobChunkRequestSchema } from '../../../../shared/orcad-migration-blob-transfer'
+import { parseOrcadMigrationManifest } from '../../../../shared/orcad-migration/orcad-migration-manifest-validation'
+import { OrcadMigrationSnapshotChunkRequestSchema } from '../../../../shared/orcad-migration/orcad-migration-scrollback'
+import { OrcadMigrationBlobChunkRequestSchema } from '../../../../shared/orcad-migration/orcad-migration-blob-transfer'
 import { assertOrcadMigrationManifestDigest } from '../../../orcad/orcad-migration-manifest-digest'
 import { assertOrcadMigrationSourceServedHere } from '../../../orcad/orcad-migration-wsl-destination'
 import { defineMethod, type RpcContext } from '../core'

src/main/runtime/runtime-migration-catalog-capabilities.test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, it, vi } from 'vitest'
 import { OrcaRuntimeService } from './orca-runtime-test-mocks.spec'
 import { store } from './orca-runtime-test-fixtures.spec'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 
 const manifest: OrcadMigrationManifest = {
   version: ORCAD_MIGRATION_MANIFEST_VERSION,

src/main/ssh/legacy-relay/README.md

@@ -23,7 +23,7 @@ nobody is prompted.
 **Touches** `ipc/ssh.ts`, `ipc/ssh-connect-flow.ts`, `ipc/ssh-host-server-on-connect-wiring.ts`,
 `ipc/ssh-session-teardown.ts`, the conversion gate's `bridged` verdict
 (`orcad-migration-terminal-gate.ts`, `-source-fence.ts`, `-source-assertions.ts`,
-`orcad-runtime-conversion.ts`, `shared/orcad-migration-source-cutover.ts`), the preload
+`orcad-runtime-conversion.ts`, `shared/orcad-migration/orcad-migration-source-cutover.ts`), the preload
 `legacy-relay-bridge-api.ts`, and the renderer's `pty-input-recovery.ts` and
 `deferred-session-attach.ts`.
 

src/main/ssh/orcad-catalog-durable-mutation.ts

@@ -1,4 +1,4 @@
-import type { OrcadMigrationCatalogState } from '../../shared/orcad-migration-manifest'
+import type { OrcadMigrationCatalogState } from '../../shared/orcad-migration/orcad-migration-manifest'
 
 export async function resolveDurableOrcadCatalogMutation(
   mutate: () => Promise<OrcadMigrationCatalogState>,

src/main/ssh/orcad-migration-blob-coordinator.test.ts

@@ -7,12 +7,12 @@ import {
   ORCAD_MIGRATION_BLOB_CHUNK_BYTES,
   requiredMigrationBlobCapabilities,
   type OrcadMigrationBlobDescriptor
-} from '../../shared/orcad-migration-blob-transfer'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
+} from '../../shared/orcad-migration/orcad-migration-blob-transfer'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import { ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY } from '../../shared/orcad-runtime-capabilities'
 import {
   commitOrcadMigrationBlobs,

src/main/ssh/orcad-migration-blob-coordinator.ts

@@ -15,11 +15,11 @@ import {
   orcadMigrationBlobIdentity,
   orcadMigrationBlobKindUnsupportedBlocker,
   sameOrcadMigrationBlob
-} from '../../shared/orcad-migration-blob-transfer'
+} from '../../shared/orcad-migration/orcad-migration-blob-transfer'
 import type {
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 
 export type OrcadMigrationBlobSource = {
   /** Up to `maxBytes` bytes of the blob starting at `offset`, exactly as the descriptor hashed. */

src/main/ssh/orcad-migration-catalog-client-blob-kind.test.ts

@@ -2,9 +2,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
   OrcadMigrationBlobChunkRequest,
   OrcadMigrationBlobDescriptor
-} from '../../shared/orcad-migration-blob-transfer'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-blob-transfer'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest'
 import {
   ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY,
   ORCAD_MIGRATION_CATALOG_RUNTIME_CAPABILITY

src/main/ssh/orcad-migration-catalog-client-extra-agent-args.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest'
 import { computeOrcadMigrationManifestSha256 } from '../orcad/orcad-migration-manifest-digest'
 import { DORMANT_AUTOMATION } from '../persistence-orcad-migration-catalog-fixture'
 import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../shared/pairing'

src/main/ssh/orcad-migration-catalog-client-frame-budget.test.ts

@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { OrcadMigrationBlobDescriptor } from '../../shared/orcad-migration-blob-transfer'
-import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest'
+import type { OrcadMigrationBlobDescriptor } from '../../shared/orcad-migration/orcad-migration-blob-transfer'
+import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest'
 import {
   MAX_ORCAD_MIGRATION_MANIFEST_BYTES,
   ORCAD_MIGRATION_MANIFEST_VERSION
-} from '../../shared/orcad-migration-manifest-validation'
+} from '../../shared/orcad-migration/orcad-migration-manifest-validation'
 import {
   ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY,
   ORCAD_MIGRATION_CATALOG_RUNTIME_CAPABILITY

src/main/ssh/orcad-migration-catalog-client-source-kind.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest'
-import { ORCAD_MIGRATION_SOURCE_KIND_UNKNOWN } from '../../shared/orcad-migration-source-kind'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest'
+import { ORCAD_MIGRATION_SOURCE_KIND_UNKNOWN } from '../../shared/orcad-migration/orcad-migration-source-kind'
 import {
   ORCAD_MIGRATION_CATALOG_RUNTIME_CAPABILITY,
   ORCAD_MIGRATION_LOCAL_WSL_SOURCE_RUNTIME_CAPABILITY

src/main/ssh/orcad-migration-catalog-client.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest'
 import { computeOrcadMigrationManifestSha256 } from '../orcad/orcad-migration-manifest-digest'
 import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../shared/pairing'
 

src/main/ssh/orcad-migration-catalog-client.ts

@@ -3,17 +3,17 @@ import { pairedRuntimeConnectionFromOffer } from '../../shared/paired-runtime-co
 import {
   parseOrcadMigrationCatalogAbortResult,
   parseOrcadMigrationCatalogState
-} from '../../shared/orcad-migration-catalog-state'
+} from '../../shared/orcad-migration/orcad-migration-catalog-state'
 import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import {
   parseOrcadMigrationSnapshotChunkResult,
   type OrcadMigrationSnapshotChunkRequest,
   type OrcadMigrationSnapshotChunkResult
-} from '../../shared/orcad-migration-scrollback'
+} from '../../shared/orcad-migration/orcad-migration-scrollback'
 import {
   findUnsupportedMigrationBlobKind,
   orcadMigrationBlobKindUnsupportedBlocker,
@@ -21,7 +21,7 @@ import {
   type OrcadMigrationBlobChunkRequest,
   type OrcadMigrationBlobChunkResult,
   type OrcadMigrationBlobDescriptor
-} from '../../shared/orcad-migration-blob-transfer'
+} from '../../shared/orcad-migration/orcad-migration-blob-transfer'
 import { parsePairingCode } from '../../shared/pairing'
 import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/electron-remote-runtime-client-capabilities'
 import { ORCAD_MIGRATION_CATALOG_RUNTIME_CAPABILITY } from '../../shared/orcad-runtime-capabilities'
@@ -31,7 +31,7 @@ import { describeOversizedOrcadMigrationPayload } from './orcad-migration-manife
 import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
 import { AUTOMATION_EXTRA_AGENT_ARGS_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
 import { hasExtraAgentArgs } from '../../shared/automation-extra-agent-args'
-import { requiredOrcadMigrationSourceCapability } from '../../shared/orcad-migration-source-kind'
+import { requiredOrcadMigrationSourceCapability } from '../../shared/orcad-migration/orcad-migration-source-kind'
 import type { OrcadServerRepository } from './orcad-migration-repository-link'
 
 type OrcadCatalogMigrationOperation = 'abort' | 'commit' | 'stage' | 'state'

src/main/ssh/orcad-migration-cutover-coordinator.ts

@@ -11,15 +11,15 @@ import type {
   OrcadMigrationCatalogAbortResult,
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import type {
   OrcadMigrationSnapshotChunkRequest,
   OrcadMigrationSnapshotChunkResult
-} from '../../shared/orcad-migration-scrollback'
+} from '../../shared/orcad-migration/orcad-migration-scrollback'
 import type {
   OrcadMigrationSourceCutover,
   OrcadMigrationSourceCutoverPhase
-} from '../../shared/orcad-migration-source-cutover'
+} from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import { resolveDurableOrcadCatalogMutation } from './orcad-catalog-durable-mutation'
 import { ORCAD_MIGRATION_DESTINATION_UNSUPPORTED } from './orcad-migration-catalog-client'
 import {

src/main/ssh/orcad-migration-cutover-fixture.ts

@@ -1,5 +1,5 @@
-import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration-manifest-validation'
-import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover'
+import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
+import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import { computeOrcadMigrationManifestSha256 } from '../orcad/orcad-migration-manifest-digest'
 
 /** A valid journal entry whose manifest is bound to its target, generation and destination. */

src/main/ssh/orcad-migration-cutover-journal.test.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { writeSecureJsonFileWithinLimit } from '../../shared/bounded-secure-json-file'
-import { parseOrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover'
+import { parseOrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import { orcadMigrationCutoverFixture as cutover } from './orcad-migration-cutover-fixture'
 import {
   findOrcadMigrationSourceCutoverForTarget,

src/main/ssh/orcad-migration-cutover-journal.ts

@@ -11,7 +11,7 @@ import {
   isRetainedOrcadMigrationSourceCutover,
   parseOrcadMigrationSourceCutover,
   type OrcadMigrationSourceCutover
-} from '../../shared/orcad-migration-source-cutover'
+} from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import {
   createMigrationJournalDirectory,
   orderMigrationJournalChain

src/main/ssh/orcad-migration-delta-move.ts

@@ -10,7 +10,7 @@
 import {
   ORCAD_MIGRATION_SOURCE_CUTOVER_VERSION,
   type OrcadMigrationSourceCutover
-} from '../../shared/orcad-migration-source-cutover'
+} from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import type { OrcadDeltaMoveResult } from '../../shared/orcad-managed-runtime'
 import { recordManagedOrcadMigration } from '../../shared/runtime-environment-managed-orcad-store'
 import type { KnownRuntimeEnvironment } from '../../shared/runtime-environments'

src/main/ssh/orcad-migration-delta-plan.ts

@@ -10,9 +10,9 @@ import type { OrcadDeltaMovePreview, OrcadDeltaMoveRow } from '../../shared/orca
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
-import { isRetainedOrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover'
-import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
+import { isRetainedOrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover'
+import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover'
 import type { SshTarget } from '../../shared/ssh-types'
 import type { Store } from '../persistence'
 import { collectOrcadMigrationSourceCatalog } from '../persistence/migrating-orcad-catalog/orcad-source-catalog'

src/main/ssh/orcad-migration-destination-fake.ts

@@ -2,7 +2,7 @@ import { vi, type Mock } from 'vitest'
 import type {
   OrcadMigrationCatalogState,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import type { OrcadMigrationDestinationCatalog } from './orcad-migration-cutover-coordinator'
 
 type Catalog = OrcadMigrationDestinationCatalog

src/main/ssh/orcad-migration-manifest-export.ts

@@ -10,12 +10,12 @@ import {
   MAX_ORCAD_MIGRATION_MANIFEST_BYTES,
   ORCAD_MIGRATION_MANIFEST_VERSION,
   parseOrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest-validation'
+} from '../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationCatalogPayload,
   OrcadMigrationDormantStatePayload,
   OrcadMigrationManifest
-} from '../../shared/orcad-migration-manifest'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
 import type { SshTarget } from '../../shared/ssh-types'
 import type { Store } from '../persistence'
 import { collectOrcadMigrationSourceCatalog } from '../persistence/migrating-orcad-catalog/orcad-source-catalog'

src/main/ssh/orcad-migration-manifest-golden.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultWorkspaceSession } from '../../shared/constants'
-import { parseOrcadMigrationManifest } from '../../shared/orcad-migration-manifest-validation'
+import { parseOrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type { SshTarget } from '../../shared/ssh-types'
 import { assertOrcadMigrationManifestDigest } from '../orcad/orcad-migration-manifest-digest'
 import { emptyDormantPayload } from '../persistence/migrating-orcad-catalog/orcad-source-dormant-state'

src/main/ssh/orcad-migration-path-rewrite.test.ts

@@ -2,8 +2,8 @@ import { describe, expect, it } from 'vitest'
 import {
   serializeOrcadMigrationValue,
   type OrcadMigrationCatalogPayload
-} from '../../shared/orcad-migration-manifest'
-import { isRecord } from '../../shared/orcad-migration-manifest-fields'
+} from '../../shared/orcad-migration/orcad-migration-manifest'
+import { isRecord } from '../../shared/orcad-migration/orcad-migration-manifest-fields'
 import { ownedEditorFileId } from '../../shared/workspace-session-pane-ownership'
 import {
   ORCAD_MIGRATION_PATH_FIELDS,

src/main/ssh/orcad-migration-path-rewrite.ts

@@ -3,8 +3,8 @@
  * paths differ on the destination (a local WSL distro reached through `\\wsl.localhost`) supplies a
  * rewriter; the relay-era SSH host uses the identity, which leaves the payload byte-identical.
  */
-import type { OrcadMigrationCatalogPayload } from '../../shared/orcad-migration-manifest'
-import { isRecord } from '../../shared/orcad-migration-manifest-fields'
+import type { OrcadMigrationCatalogPayload } from '../../shared/orcad-migration/orcad-migration-manifest'
+import { isRecord } from '../../shared/orcad-migration/orcad-migration-manifest-fields'
 import { PTY_SESSION_ID_SEPARATOR } from '../../shared/pty-session-id-format'
 import { parseWorkspaceKey } from '../../shared/workspace-scope'
 import {