diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json index a5115154bdc..dd0f11ba04b 100644 --- a/config/scripts/ci-shard-timings.json +++ b/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, diff --git a/src/main/managed-server/lifecycle/orcad-managed-migration-status.ts b/src/main/managed-server/lifecycle/orcad-managed-migration-status.ts index f6add6dfa95..bdb229ecfbf 100644 --- a/src/main/managed-server/lifecycle/orcad-managed-migration-status.ts +++ b/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 diff --git a/src/main/managed-server/lifecycle/orcad-runtime-conversion.ts b/src/main/managed-server/lifecycle/orcad-runtime-conversion.ts index 809743a2b54..e101fec29cc 100644 --- a/src/main/managed-server/lifecycle/orcad-runtime-conversion.ts +++ b/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 { diff --git a/src/main/orcad/orcad-migration-manifest-digest.ts b/src/main/orcad/orcad-migration-manifest-digest.ts index c70b42527c8..21b12ceaea2 100644 --- a/src/main/orcad/orcad-migration-manifest-digest.ts +++ b/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 diff --git a/src/main/orcad/orcad-migration-wsl-destination.test.ts b/src/main/orcad/orcad-migration-wsl-destination.test.ts index 3610dcb2153..853dd7dac1e 100644 --- a/src/main/orcad/orcad-migration-wsl-destination.test.ts +++ b/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, diff --git a/src/main/orcad/orcad-migration-wsl-destination.ts b/src/main/orcad/orcad-migration-wsl-destination.ts index d297b1ce757..bc4dc799a07 100644 --- a/src/main/orcad/orcad-migration-wsl-destination.ts +++ b/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' diff --git a/src/main/persistence-orcad-migration-blobs.test.ts b/src/main/persistence-orcad-migration-blobs.test.ts index 1b7ac054de3..731e4e5087b 100644 --- a/src/main/persistence-orcad-migration-blobs.test.ts +++ b/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' diff --git a/src/main/persistence-orcad-migration-catalog-fixture.ts b/src/main/persistence-orcad-migration-catalog-fixture.ts index f03646c9819..c5085ce9b91 100644 --- a/src/main/persistence-orcad-migration-catalog-fixture.ts +++ b/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' diff --git a/src/main/persistence-orcad-migration-catalog.test.ts b/src/main/persistence-orcad-migration-catalog.test.ts index a52364d3707..b6e99250c34 100644 --- a/src/main/persistence-orcad-migration-catalog.test.ts +++ b/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' diff --git a/src/main/persistence-orcad-migration-shell-history-fixture.ts b/src/main/persistence-orcad-migration-shell-history-fixture.ts index 404f7b245ef..4345ef39c7d 100644 --- a/src/main/persistence-orcad-migration-shell-history-fixture.ts +++ b/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' diff --git a/src/main/persistence-orcad-migration-terminal-restore-hints.test.ts b/src/main/persistence-orcad-migration-terminal-restore-hints.test.ts index a4e6a8795b9..4b285ee3632 100644 --- a/src/main/persistence-orcad-migration-terminal-restore-hints.test.ts +++ b/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 { diff --git a/src/main/persistence/__fixtures__/wsl-mover/wsl-move-cutover-fixture.ts b/src/main/persistence/__fixtures__/wsl-mover/wsl-move-cutover-fixture.ts index 8e4c2045f88..9b465ee9714 100644 --- a/src/main/persistence/__fixtures__/wsl-mover/wsl-move-cutover-fixture.ts +++ b/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, diff --git a/src/main/persistence/loading-store/normalize-loaded-profile-state.ts b/src/main/persistence/loading-store/normalize-loaded-profile-state.ts index 384ea81846d..2f2d1ef991f 100644 --- a/src/main/persistence/loading-store/normalize-loaded-profile-state.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts index 53df949e454..9b116791d95 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.test.ts index 8d819bbbfe9..aa401463f29 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.test.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.ts index 9933bd158c8..dc0cbbb3401 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-receipt-ledger.ts +++ b/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. diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-records.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-records.ts index 22686d7d69c..f70f9815afb 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-records.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-row-identity.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-row-identity.ts index 6dc47a5da20..e279c999629 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-row-identity.ts +++ b/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( diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.test.ts index 2c8d4f8e80a..41cc7546184 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.test.ts +++ b/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 diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.ts b/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.ts index 2d1d3e02d26..1fdb67f57b7 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.ts +++ b/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 diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-destination-workspace-session.ts b/src/main/persistence/migrating-orcad-catalog/orcad-destination-workspace-session.ts index 09a42df978b..92727ebecce 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-destination-workspace-session.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-destination-worktree-metadata.ts b/src/main/persistence/migrating-orcad-catalog/orcad-destination-worktree-metadata.ts index 7315229a873..105f043d1da 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-destination-worktree-metadata.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-dormant-metadata-defaults.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-dormant-metadata-defaults.test.ts index bdddd017d28..f7009f0f974 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-dormant-metadata-defaults.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-dormant-state-records.ts b/src/main/persistence/migrating-orcad-catalog/orcad-dormant-state-records.ts index 4a0af58276a..62f5749c101 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-dormant-state-records.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-install-persistence.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-install-persistence.ts index 055909ba4bd..cba07a969eb 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-install-persistence.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-installers.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-installers.ts index 494e8ff6bc5..32c771cdb29 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-installers.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.test.ts index 6c411f039da..edd4334cc85 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.test.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.ts index f76dc4ea0a4..c6cbbd49718 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-blob-staging.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-shell-history-format.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-shell-history-format.ts index cb8e17132ec..7d3ad833f50 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-shell-history-format.ts +++ b/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. */ diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-migration-staged-file.ts b/src/main/persistence/migrating-orcad-catalog/orcad-migration-staged-file.ts index 10bddc41058..bf6fd3319da 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-migration-staged-file.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.test.ts index b10c38a2062..c21d7d85739 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.test.ts +++ b/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 diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.ts b/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.ts index cd55576a43c..f6c591a544d 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-scrollback-snapshot-transfer.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-shell-history-installer.ts b/src/main/persistence/migrating-orcad-catalog/orcad-shell-history-installer.ts index f480d50de1e..af36709ea4b 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-shell-history-installer.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-state.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-state.ts index 6ff14758448..55eff314c74 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-state.ts +++ b/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 { diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-subtraction.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-subtraction.ts index a8604c71988..fa33ae05d89 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-automation-subtraction.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog-subtraction.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog-subtraction.ts index 7ddd4eb3adf..cd4ce9cd0fe 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog-subtraction.ts +++ b/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( diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog.ts index b1686908475..7619181cfb5 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-catalog.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-browser-intents.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-browser-intents.ts index 46c1d2247e5..6aa439040f6 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-browser-intents.ts +++ b/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 { diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-focus-census.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-focus-census.test.ts index 43db720daad..640970a7f31 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-focus-census.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.test.ts index 1e856879789..601f552a13c 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.ts index 1a7f3b9fb0b..d0bcd44d589 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-state.ts +++ b/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 diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.test.ts index ad02faddceb..f980a305217 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.ts index 4bdd2c95b78..0ffc3d18445 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-client-subtraction.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-delta-view.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-delta-view.ts index 4247dd13f71..99ec45a0042 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-delta-view.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.test.ts index 752225131e5..52c4030f72d 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.ts index 7c7e312784c..f162300e621 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-dependency-census.ts +++ b/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 { diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-state.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-state.ts index 76dd28d53ad..8e44f400d86 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-state.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-subtraction.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-subtraction.ts index 131e3f2fc64..8ff057887ea 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-dormant-subtraction.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-export.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-export.ts index d3220bd0178..55514d3645c 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-export.ts +++ b/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 { diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-host-qualified-scope.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-host-qualified-scope.test.ts index ae34491839a..7f35fd343a4 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-host-qualified-scope.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-legacy-key-scope.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-legacy-key-scope.test.ts index 29dc1de0725..7b92fa704fc 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-legacy-key-scope.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-retired-worktree-names.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-retired-worktree-names.ts index f63c300a22d..968629b6697 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-retired-worktree-names.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-scope.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-scope.ts index 05918a10b4a..9e179f49f9f 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-scope.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-retention.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-retention.ts index 42be8878911..eb74f360344 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-retention.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.test.ts index 516365f8fa3..6e58013c091 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.test.ts +++ b/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 = { diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.ts index 6216661e19a..d721e570670 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-scrollback-state.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-session-copy-resolution.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-session-copy-resolution.ts index 2342f7cb3e2..16189c10d42 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-session-copy-resolution.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-fragments.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-fragments.ts index 54ff9060306..98d22712bcc 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-fragments.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-subtraction.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-subtraction.ts index 146cf2ee8de..fbca696acb4 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session-subtraction.ts +++ b/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. */ diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session.ts index 3ebc679673c..4934dccb66a 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-workspace-session.ts +++ b/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 diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-source-worktree-metadata.ts b/src/main/persistence/migrating-orcad-catalog/orcad-source-worktree-metadata.ts index ba2bfc9b2d0..60aed3b19c7 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-source-worktree-metadata.ts +++ b/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, diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.test.ts index 80f270835a6..05a063e7222 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.test.ts +++ b/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' diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.ts b/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.ts index 631a7662157..7c0c92b555b 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-staged-catalog-claims.ts +++ b/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( diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-terminal-restore-hint-store.ts b/src/main/persistence/migrating-orcad-catalog/orcad-terminal-restore-hint-store.ts index 11296ea2c4f..8e66d4f133b 100644 --- a/src/main/persistence/migrating-orcad-catalog/orcad-terminal-restore-hint-store.ts +++ b/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 diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-cutover-journal.ts b/src/main/persistence/moving-wsl-projects/wsl-move-cutover-journal.ts index 15e10cf5f85..158a855e23d 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-cutover-journal.ts +++ b/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, diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.test.ts b/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.test.ts index 0deb18ecc19..a569c954d66 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.test.ts +++ b/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 = [ diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.ts b/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.ts index 5ab0bed0d0f..dd917ba0e2c 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-restore-hints-blob.ts +++ b/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 = { diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-scope.test.ts b/src/main/persistence/moving-wsl-projects/wsl-move-scope.test.ts index dce4093584e..ed683c7a38e 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-scope.test.ts +++ b/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' diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.test.ts b/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.test.ts index 7c2c325c6cc..067caa8b416 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.test.ts +++ b/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' diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.ts b/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.ts index dd08768c5d9..840a11e4a9b 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-shell-history-blobs.ts +++ b/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' diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.test.ts b/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.test.ts index 6878335c783..7fc396d959f 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.test.ts +++ b/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' diff --git a/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.ts b/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.ts index 36a55decb24..9e9267d6113 100644 --- a/src/main/persistence/moving-wsl-projects/wsl-move-terminal-gate.ts +++ b/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 = { diff --git a/src/main/runtime/orca-runtime-get-status.ts b/src/main/runtime/orca-runtime-get-status.ts index e45f0da734f..42dc46ac733 100644 --- a/src/main/runtime/orca-runtime-get-status.ts +++ b/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, diff --git a/src/main/runtime/orca-runtime-migration-catalog.ts b/src/main/runtime/orca-runtime-migration-catalog.ts index d9d9c9bf0c6..4ad0cda66a9 100644 --- a/src/main/runtime/orca-runtime-migration-catalog.ts +++ b/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, diff --git a/src/main/runtime/orcad-migration-catalog-import.test.ts b/src/main/runtime/orcad-migration-catalog-import.test.ts index 287deb17617..98571aa99b0 100644 --- a/src/main/runtime/orcad-migration-catalog-import.test.ts +++ b/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, diff --git a/src/main/runtime/orcad-migration-catalog-import.ts b/src/main/runtime/orcad-migration-catalog-import.ts index efb34eb45d4..426314f5c40 100644 --- a/src/main/runtime/orcad-migration-catalog-import.ts +++ b/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. */ diff --git a/src/main/runtime/rpc/methods/orcad-migration.test.ts b/src/main/runtime/rpc/methods/orcad-migration.test.ts index 45821700841..af768e6932e 100644 --- a/src/main/runtime/rpc/methods/orcad-migration.test.ts +++ b/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' diff --git a/src/main/runtime/rpc/methods/orcad-migration.ts b/src/main/runtime/rpc/methods/orcad-migration.ts index e710e8053cb..1d3f7b30848 100644 --- a/src/main/runtime/rpc/methods/orcad-migration.ts +++ b/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' diff --git a/src/main/runtime/runtime-migration-catalog-capabilities.test.ts b/src/main/runtime/runtime-migration-catalog-capabilities.test.ts index b56c706668b..49f1185ab83 100644 --- a/src/main/runtime/runtime-migration-catalog-capabilities.test.ts +++ b/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, diff --git a/src/main/ssh/legacy-relay/README.md b/src/main/ssh/legacy-relay/README.md index 452fcccecf6..81d51d14eed 100644 --- a/src/main/ssh/legacy-relay/README.md +++ b/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`. diff --git a/src/main/ssh/orcad-catalog-durable-mutation.ts b/src/main/ssh/orcad-catalog-durable-mutation.ts index f392fc74c99..04dbc171f19 100644 --- a/src/main/ssh/orcad-catalog-durable-mutation.ts +++ b/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, diff --git a/src/main/ssh/orcad-migration-blob-coordinator.test.ts b/src/main/ssh/orcad-migration-blob-coordinator.test.ts index 3e4965186ca..ca5ce7a2b24 100644 --- a/src/main/ssh/orcad-migration-blob-coordinator.test.ts +++ b/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, diff --git a/src/main/ssh/orcad-migration-blob-coordinator.ts b/src/main/ssh/orcad-migration-blob-coordinator.ts index c358f5e7b38..7c6c4befdc9 100644 --- a/src/main/ssh/orcad-migration-blob-coordinator.ts +++ b/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. */ diff --git a/src/main/ssh/orcad-migration-catalog-client-blob-kind.test.ts b/src/main/ssh/orcad-migration-catalog-client-blob-kind.test.ts index 66454894a7a..d4540bf4178 100644 --- a/src/main/ssh/orcad-migration-catalog-client-blob-kind.test.ts +++ b/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 diff --git a/src/main/ssh/orcad-migration-catalog-client-extra-agent-args.test.ts b/src/main/ssh/orcad-migration-catalog-client-extra-agent-args.test.ts index dbe11125dd2..e1432c32f2c 100644 --- a/src/main/ssh/orcad-migration-catalog-client-extra-agent-args.test.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-catalog-client-frame-budget.test.ts b/src/main/ssh/orcad-migration-catalog-client-frame-budget.test.ts index c2c8967036e..cd523ce9112 100644 --- a/src/main/ssh/orcad-migration-catalog-client-frame-budget.test.ts +++ b/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 diff --git a/src/main/ssh/orcad-migration-catalog-client-source-kind.test.ts b/src/main/ssh/orcad-migration-catalog-client-source-kind.test.ts index 77858f08446..e35be45ba95 100644 --- a/src/main/ssh/orcad-migration-catalog-client-source-kind.test.ts +++ b/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 diff --git a/src/main/ssh/orcad-migration-catalog-client.test.ts b/src/main/ssh/orcad-migration-catalog-client.test.ts index 9bd8ac10c47..9b9783216b9 100644 --- a/src/main/ssh/orcad-migration-catalog-client.test.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-catalog-client.ts b/src/main/ssh/orcad-migration-catalog-client.ts index 4cd3ff352c9..984a881989c 100644 --- a/src/main/ssh/orcad-migration-catalog-client.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-cutover-coordinator.ts b/src/main/ssh/orcad-migration-cutover-coordinator.ts index 62ee0e5ed2d..a8cbbba2429 100644 --- a/src/main/ssh/orcad-migration-cutover-coordinator.ts +++ b/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 { diff --git a/src/main/ssh/orcad-migration-cutover-fixture.ts b/src/main/ssh/orcad-migration-cutover-fixture.ts index d213391127e..c210ded26c4 100644 --- a/src/main/ssh/orcad-migration-cutover-fixture.ts +++ b/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. */ diff --git a/src/main/ssh/orcad-migration-cutover-journal.test.ts b/src/main/ssh/orcad-migration-cutover-journal.test.ts index 166592061e6..9168daf040c 100644 --- a/src/main/ssh/orcad-migration-cutover-journal.test.ts +++ b/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, diff --git a/src/main/ssh/orcad-migration-cutover-journal.ts b/src/main/ssh/orcad-migration-cutover-journal.ts index 46097ae9194..2e451b403fa 100644 --- a/src/main/ssh/orcad-migration-cutover-journal.ts +++ b/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 diff --git a/src/main/ssh/orcad-migration-delta-move.ts b/src/main/ssh/orcad-migration-delta-move.ts index 9767c1b6413..be3a8f3d71b 100644 --- a/src/main/ssh/orcad-migration-delta-move.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-delta-plan.ts b/src/main/ssh/orcad-migration-delta-plan.ts index 55952da8a5c..56754363345 100644 --- a/src/main/ssh/orcad-migration-delta-plan.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-destination-fake.ts b/src/main/ssh/orcad-migration-destination-fake.ts index a5824edf021..82b5b613915 100644 --- a/src/main/ssh/orcad-migration-destination-fake.ts +++ b/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 diff --git a/src/main/ssh/orcad-migration-manifest-export.ts b/src/main/ssh/orcad-migration-manifest-export.ts index 58a06fcf4a6..389e253b8ba 100644 --- a/src/main/ssh/orcad-migration-manifest-export.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-manifest-golden.test.ts b/src/main/ssh/orcad-migration-manifest-golden.test.ts index 30acdff31fa..f07b784d466 100644 --- a/src/main/ssh/orcad-migration-manifest-golden.test.ts +++ b/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' diff --git a/src/main/ssh/orcad-migration-path-rewrite.test.ts b/src/main/ssh/orcad-migration-path-rewrite.test.ts index 558a225ab6d..d19f4dd812a 100644 --- a/src/main/ssh/orcad-migration-path-rewrite.test.ts +++ b/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, diff --git a/src/main/ssh/orcad-migration-path-rewrite.ts b/src/main/ssh/orcad-migration-path-rewrite.ts index e238b6de65b..eadaa0a41e9 100644 --- a/src/main/ssh/orcad-migration-path-rewrite.ts +++ b/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 { diff --git a/src/main/ssh/orcad-migration-refusal-reason.ts b/src/main/ssh/orcad-migration-refusal-reason.ts index a3e0813da92..20dc11ee344 100644 --- a/src/main/ssh/orcad-migration-refusal-reason.ts +++ b/src/main/ssh/orcad-migration-refusal-reason.ts @@ -1,7 +1,7 @@ import type { OrcadMigrationBlocker, OrcadMigrationDependencyKind -} from '../../shared/orcad-migration-preflight' +} from '../../shared/orcad-migration/orcad-migration-preflight' const DEPENDENCY_WORDS: Record = { 'saved-port-forward': 'saved port forwards', diff --git a/src/main/ssh/orcad-migration-repository-link.test.ts b/src/main/ssh/orcad-migration-repository-link.test.ts index 0db316682ad..885a520c01c 100644 --- a/src/main/ssh/orcad-migration-repository-link.test.ts +++ b/src/main/ssh/orcad-migration-repository-link.test.ts @@ -4,7 +4,7 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { getManagedOrcadFenceEnvironmentId } from '../../shared/managed-orcad-ssh-owner' import { encodePairingOffer, PAIRING_OFFER_VERSION } from '../../shared/pairing' -import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest' +import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest' import { addManagedOrcadEnvironment, removeManagedOrcadEnvironment diff --git a/src/main/ssh/orcad-migration-repository-link.ts b/src/main/ssh/orcad-migration-repository-link.ts index 458ab1a0b49..97d35d27ac1 100644 --- a/src/main/ssh/orcad-migration-repository-link.ts +++ b/src/main/ssh/orcad-migration-repository-link.ts @@ -12,7 +12,7 @@ import type { Automation } from '../../shared/automations-types' import type { FolderWorkspace } from '../../shared/folder-workspace-types' import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path' import { isRepoOnCatalogHost } from '../../shared/execution-host' -import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover' +import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover' import type { Repo } from '../../shared/repo-types' import type { SshManagedServerLinkedProject } from '../../shared/ssh-types' import { parseWorkspaceKey } from '../../shared/workspace-scope' diff --git a/src/main/ssh/orcad-migration-scrollback-retention-wiring.test.ts b/src/main/ssh/orcad-migration-scrollback-retention-wiring.test.ts index 74ca5c06542..cf644d2a9cc 100644 --- a/src/main/ssh/orcad-migration-scrollback-retention-wiring.test.ts +++ b/src/main/ssh/orcad-migration-scrollback-retention-wiring.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { OrcadMigrationManifest } from '../../shared/orcad-migration-manifest' -import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover' +import type { OrcadMigrationManifest } from '../../shared/orcad-migration/orcad-migration-manifest' +import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover' const journal = vi.hoisted(() => { const state: { diff --git a/src/main/ssh/orcad-migration-snapshot-coordinator.test.ts b/src/main/ssh/orcad-migration-snapshot-coordinator.test.ts index b6b9a84646f..2fd151cc114 100644 --- a/src/main/ssh/orcad-migration-snapshot-coordinator.test.ts +++ b/src/main/ssh/orcad-migration-snapshot-coordinator.test.ts @@ -1,11 +1,11 @@ import { createHash } from 'node:crypto' import { describe, expect, it, vi } from 'vitest' -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' -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 { transferOrcadMigrationSnapshots } from './orcad-migration-snapshot-coordinator' const BYTES = Buffer.from('resume these bytes', 'utf8') diff --git a/src/main/ssh/orcad-migration-snapshot-coordinator.ts b/src/main/ssh/orcad-migration-snapshot-coordinator.ts index d15a80f1b73..2e98c8b8e68 100644 --- a/src/main/ssh/orcad-migration-snapshot-coordinator.ts +++ b/src/main/ssh/orcad-migration-snapshot-coordinator.ts @@ -9,12 +9,12 @@ import type { OrcadMigrationCatalogState, OrcadMigrationManifest -} from '../../shared/orcad-migration-manifest' +} from '../../shared/orcad-migration/orcad-migration-manifest' import { decodeOrcadMigrationSnapshotChunk, type OrcadMigrationSnapshotChunkRequest, type OrcadMigrationSnapshotChunkResult -} from '../../shared/orcad-migration-scrollback' +} from '../../shared/orcad-migration/orcad-migration-scrollback' import type { Store } from '../persistence' export type OrcadMigrationSnapshotSource = Pick diff --git a/src/main/ssh/orcad-migration-snapshot-resume.test.ts b/src/main/ssh/orcad-migration-snapshot-resume.test.ts index 0be0d7b701e..f869611ecfc 100644 --- a/src/main/ssh/orcad-migration-snapshot-resume.test.ts +++ b/src/main/ssh/orcad-migration-snapshot-resume.test.ts @@ -7,8 +7,8 @@ import { toSshExecutionHostId } from '../../shared/execution-host' import type { OrcadMigrationCatalogState, OrcadMigrationManifest -} from '../../shared/orcad-migration-manifest' -import type { OrcadMigrationSnapshotChunkRequest } from '../../shared/orcad-migration-scrollback' +} from '../../shared/orcad-migration/orcad-migration-manifest' +import type { OrcadMigrationSnapshotChunkRequest } from '../../shared/orcad-migration/orcad-migration-scrollback' import type { SshTarget } from '../../shared/ssh-types' import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness' import { Store } from '../persistence/loading-store/store' diff --git a/src/main/ssh/orcad-migration-source-assertions.ts b/src/main/ssh/orcad-migration-source-assertions.ts index ff14f9bcc78..d2d3ceb5d3f 100644 --- a/src/main/ssh/orcad-migration-source-assertions.ts +++ b/src/main/ssh/orcad-migration-source-assertions.ts @@ -3,8 +3,8 @@ import { createHash } from 'node:crypto' import { serializeOrcadMigrationValue, type OrcadMigrationManifest -} from '../../shared/orcad-migration-manifest' -import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover' +} from '../../shared/orcad-migration/orcad-migration-manifest' +import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover' import { createOrcadMigrationManifest } from './orcad-migration-manifest-export' import { resolveOrcadMigrationFence } from './orcad-migration-source-fence' import { confirmOrcadMigrationTerminalsUnderFence } from './orcad-migration-terminal-gate' diff --git a/src/main/ssh/orcad-migration-source-fence.ts b/src/main/ssh/orcad-migration-source-fence.ts index 7aeaf3b079a..3c8cf4dc233 100644 --- a/src/main/ssh/orcad-migration-source-fence.ts +++ b/src/main/ssh/orcad-migration-source-fence.ts @@ -8,11 +8,11 @@ */ import { randomUUID } from 'node:crypto' import { getManagedOrcadFenceEnvironmentId } from '../../shared/managed-orcad-ssh-owner' -import type { OrcadMigrationBlocker } from '../../shared/orcad-migration-preflight' +import type { OrcadMigrationBlocker } from '../../shared/orcad-migration/orcad-migration-preflight' import { ORCAD_MIGRATION_SOURCE_CUTOVER_VERSION, type OrcadMigrationSourceCutover -} from '../../shared/orcad-migration-source-cutover' +} from '../../shared/orcad-migration/orcad-migration-source-cutover' import type { SshTarget } from '../../shared/ssh-types' import { createOrcadMigrationManifest } from './orcad-migration-manifest-export' import { diff --git a/src/main/ssh/orcad-migration-source-retention.ts b/src/main/ssh/orcad-migration-source-retention.ts index 51ca26ad49e..b95196a7547 100644 --- a/src/main/ssh/orcad-migration-source-retention.ts +++ b/src/main/ssh/orcad-migration-source-retention.ts @@ -3,7 +3,7 @@ * its projects and can reach them over its own relay. New builds hide those rows and serve the host * from the server. They are never deleted automatically. */ -import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover' +import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover' import { listOrcadMigrationSourceCutovers, writeOrcadMigrationSourceCutover diff --git a/src/main/ssh/orcad-migration-source.ts b/src/main/ssh/orcad-migration-source.ts index 19834328608..fb214235095 100644 --- a/src/main/ssh/orcad-migration-source.ts +++ b/src/main/ssh/orcad-migration-source.ts @@ -5,12 +5,12 @@ * through `OrcadMigrationSourceCutoverPort`; the conversion drives the rest. The relay-era SSH * target (orcad-migration-ssh-relay-source.ts) is the only implementation. */ -import type { OrcadMigrationSourceKind } from '../../shared/orcad-migration-source-kind' +import type { OrcadMigrationSourceKind } from '../../shared/orcad-migration/orcad-migration-source-kind' import type { OrcadMigrationCatalogPayload, OrcadMigrationManifest -} from '../../shared/orcad-migration-manifest' -import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration-source-cutover' +} from '../../shared/orcad-migration/orcad-migration-manifest' +import type { OrcadMigrationSourceCutover } from '../../shared/orcad-migration/orcad-migration-source-cutover' import type { OrcadMigrationManifestExportOptions } from './orcad-migration-manifest-export' import type { OrcadMigrationFenceResult, diff --git a/src/main/ssh/orcad-migration-ssh-relay-source.ts b/src/main/ssh/orcad-migration-ssh-relay-source.ts index 4243ad6ca4c..22051ad8195 100644 --- a/src/main/ssh/orcad-migration-ssh-relay-source.ts +++ b/src/main/ssh/orcad-migration-ssh-relay-source.ts @@ -1,5 +1,5 @@ /** The relay-era SSH target as a migration source: keyed by its target id, paths unchanged. */ -import { ORCAD_MIGRATION_SSH_RELAY_SOURCE_KIND } from '../../shared/orcad-migration-source-kind' +import { ORCAD_MIGRATION_SSH_RELAY_SOURCE_KIND } from '../../shared/orcad-migration/orcad-migration-source-kind' import type { SshTarget } from '../../shared/ssh-types' import { collectOrcadMigrationSourceCatalog } from '../persistence/migrating-orcad-catalog/orcad-source-catalog' import type { Store } from '../persistence' diff --git a/src/main/ssh/orcad-retained-source.ts b/src/main/ssh/orcad-retained-source.ts index 762eda19a00..14dd0834956 100644 --- a/src/main/ssh/orcad-retained-source.ts +++ b/src/main/ssh/orcad-retained-source.ts @@ -12,11 +12,11 @@ import { getAppEnvironment } from '../../shared/app-environment' import { parseExecutionHostId } from '../../shared/execution-host' import type { FolderWorkspace } from '../../shared/folder-workspace-types' import type { ProjectGroup } from '../../shared/project-group-types' -import type { OrcadMigrationCatalogPayload } from '../../shared/orcad-migration-manifest' +import type { OrcadMigrationCatalogPayload } from '../../shared/orcad-migration/orcad-migration-manifest' import { isRetainedOrcadMigrationSourceCutover, type OrcadMigrationSourceCutover -} from '../../shared/orcad-migration-source-cutover' +} from '../../shared/orcad-migration/orcad-migration-source-cutover' import type { Repo } from '../../shared/repo-types' import { listEnvironments } from '../../shared/runtime-environment-store' import { getOrcadSshDeployment } from '../../shared/runtime-environments' diff --git a/src/main/ssh/targets/ssh-target-orcad-claims.ts b/src/main/ssh/targets/ssh-target-orcad-claims.ts index 7560841790d..2577395c90d 100644 --- a/src/main/ssh/targets/ssh-target-orcad-claims.ts +++ b/src/main/ssh/targets/ssh-target-orcad-claims.ts @@ -12,7 +12,7 @@ import { import type { OrcadMigrationBlocker, OrcadMigrationPreflight -} from '../../../shared/orcad-migration-preflight' +} from '../../../shared/orcad-migration/orcad-migration-preflight' import type { SshTarget } from '../../../shared/ssh-types' import { collectDependentStateBlockers, diff --git a/src/main/ssh/targets/ssh-target-orcad-dependents.ts b/src/main/ssh/targets/ssh-target-orcad-dependents.ts index 21bb9cc7559..f56fa9d2458 100644 --- a/src/main/ssh/targets/ssh-target-orcad-dependents.ts +++ b/src/main/ssh/targets/ssh-target-orcad-dependents.ts @@ -11,8 +11,8 @@ import { type OrcadMigrationBlocker, type OrcadMigrationDependency, type OrcadMigrationDependencyKind -} from '../../../shared/orcad-migration-preflight' -import type { OrcadMigrationManifest } from '../../../shared/orcad-migration-manifest' +} from '../../../shared/orcad-migration/orcad-migration-preflight' +import type { OrcadMigrationManifest } from '../../../shared/orcad-migration/orcad-migration-manifest' export type DependentStateStore = Pick< Store, diff --git a/src/main/ssh/targets/ssh-target-orcad-preflight.ts b/src/main/ssh/targets/ssh-target-orcad-preflight.ts index 3b787f4c94a..d027c47b164 100644 --- a/src/main/ssh/targets/ssh-target-orcad-preflight.ts +++ b/src/main/ssh/targets/ssh-target-orcad-preflight.ts @@ -11,7 +11,7 @@ import type { Store } from '../../persistence' import type { OrcadMigrationBlocker, OrcadMigrationPreflight -} from '../../../shared/orcad-migration-preflight' +} from '../../../shared/orcad-migration/orcad-migration-preflight' import { createOrcadMigrationManifest, type OrcadMigrationExportStore diff --git a/src/renderer/src/components/settings/managed-server-copy.test.ts b/src/renderer/src/components/settings/managed-server-copy.test.ts index 6529467664f..0bb3efc701f 100644 --- a/src/renderer/src/components/settings/managed-server-copy.test.ts +++ b/src/renderer/src/components/settings/managed-server-copy.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { ORCAD_MIGRATION_DEPENDENCY_KINDS } from '../../../../shared/orcad-migration-preflight' +import { ORCAD_MIGRATION_DEPENDENCY_KINDS } from '../../../../shared/orcad-migration/orcad-migration-preflight' import { conversionBlockerLabel, managedServerOutcomeLabel } from './managed-server-copy' import { dependencyKindLabel } from './managed-server-dependency-kinds' diff --git a/src/renderer/src/components/settings/managed-server-copy.ts b/src/renderer/src/components/settings/managed-server-copy.ts index 3a924b76722..bb34be675e8 100644 --- a/src/renderer/src/components/settings/managed-server-copy.ts +++ b/src/renderer/src/components/settings/managed-server-copy.ts @@ -3,7 +3,7 @@ import type { OrcadManagedPendingMigrationRow, OrcadManagedRuntimeStatus } from '../../../../shared/orcad-managed-runtime' -import type { OrcadMigrationBlocker } from '../../../../shared/orcad-migration-preflight' +import type { OrcadMigrationBlocker } from '../../../../shared/orcad-migration/orcad-migration-preflight' import { translate } from '@/i18n/i18n' import { dependencyKindLabel } from './managed-server-dependency-kinds' diff --git a/src/renderer/src/components/settings/managed-server-dependency-kinds.ts b/src/renderer/src/components/settings/managed-server-dependency-kinds.ts index 351c357b57b..7a90d2f8d6c 100644 --- a/src/renderer/src/components/settings/managed-server-dependency-kinds.ts +++ b/src/renderer/src/components/settings/managed-server-dependency-kinds.ts @@ -1,5 +1,5 @@ /** Plain names for the kinds of saved state that can keep a host from moving. */ -import type { OrcadMigrationDependencyKind } from '../../../../shared/orcad-migration-preflight' +import type { OrcadMigrationDependencyKind } from '../../../../shared/orcad-migration/orcad-migration-preflight' import { translate } from '@/i18n/i18n' export function dependencyKindLabel(kind: OrcadMigrationDependencyKind): string { diff --git a/src/shared/orcad-managed-runtime.ts b/src/shared/orcad-managed-runtime.ts index af1df2dc565..7a42d2e4698 100644 --- a/src/shared/orcad-managed-runtime.ts +++ b/src/shared/orcad-managed-runtime.ts @@ -1,7 +1,7 @@ import type { PublicKnownRuntimeEnvironment } from './runtime-environments' import type { OrcadTerminalCensus } from './orcad-terminal-census' -import type { OrcadMigrationBlocker } from './orcad-migration-preflight' -import type { OrcadMigrationSourceCutoverPhase } from './orcad-migration-source-cutover' +import type { OrcadMigrationBlocker } from './orcad-migration/orcad-migration-preflight' +import type { OrcadMigrationSourceCutoverPhase } from './orcad-migration/orcad-migration-source-cutover' import type { OrcadDaemonRetirementVerdict } from './orcad-stop-request' import type { SshManagedServerLinkedProject } from './ssh-types' diff --git a/src/shared/orcad-migration-dormant-state-validation.ts b/src/shared/orcad-migration-dormant-state-validation.ts index 87793ef1133..af054457c46 100644 --- a/src/shared/orcad-migration-dormant-state-validation.ts +++ b/src/shared/orcad-migration-dormant-state-validation.ts @@ -1,29 +1,29 @@ -import type { OrcadMigrationDormantStatePayload } from './orcad-migration-manifest' +import type { OrcadMigrationDormantStatePayload } from './orcad-migration/orcad-migration-manifest' import { getRepoIdFromWorktreeId } from './worktree/id' import { parseWorkspaceKey } from './workspace-scope' import { assertOrcadMigrationDormantWorkspaceSessionReferences, parseOrcadMigrationDormantWorkspaceSession -} from './orcad-migration-dormant-session-validation' +} from './orcad-migration/orcad-migration-dormant-session-validation' import { assertOrcadMigrationDormantAutomationReferences, parseOrcadMigrationDormantAutomationRuns, parseOrcadMigrationDormantAutomations -} from './orcad-migration-dormant-automation-validation' +} from './orcad-migration/orcad-migration-dormant-automation-validation' import { assertOrcadMigrationScrollbackReferences, parseOrcadMigrationTerminalScrollbackSnapshots -} from './orcad-migration-scrollback' +} from './orcad-migration/orcad-migration-scrollback' import { assertOrcadMigrationClientStateReferences, parseOrcadMigrationClientState -} from './orcad-migration-client-state' +} from './orcad-migration/orcad-migration-client-state' import { assertUnique, boundedArray, MAX_ORCAD_MIGRATION_DORMANT_NAMESPACES, requiredRecord -} from './orcad-migration-dormant-value-validation' +} from './orcad-migration/orcad-migration-dormant-value-validation' import { parseRetiredNames, parseRetirementNamespace, @@ -31,12 +31,12 @@ import { parseWorkspaceLineageEntry, parseWorktreeLineageEntry, parseWorktreeMetaEntry -} from './orcad-migration-dormant-state-entry-validation' +} from './orcad-migration/orcad-migration-dormant-state-entry-validation' export { MAX_ORCAD_MIGRATION_DORMANT_NAMESPACES, MAX_ORCAD_MIGRATION_DORMANT_ROWS -} from './orcad-migration-dormant-value-validation' +} from './orcad-migration/orcad-migration-dormant-value-validation' export const ORCAD_MIGRATION_DORMANT_STATE_VERSION = 1 as const export function parseOrcadMigrationDormantState(value: unknown): OrcadMigrationDormantStatePayload { diff --git a/src/shared/orcad-migration-manifest-contract.test.ts b/src/shared/orcad-migration-manifest-contract.test.ts index 9281a4fc733..9bd09f893e0 100644 --- a/src/shared/orcad-migration-manifest-contract.test.ts +++ b/src/shared/orcad-migration-manifest-contract.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import { ORCAD_MIGRATION_MANIFEST_VERSION, parseOrcadMigrationManifest -} from './orcad-migration-manifest-validation' +} from './orcad-migration/orcad-migration-manifest-validation' const digest = 'a'.repeat(64) diff --git a/src/shared/orcad-migration-blob-transfer.test.ts b/src/shared/orcad-migration/orcad-migration-blob-transfer.test.ts similarity index 99% rename from src/shared/orcad-migration-blob-transfer.test.ts rename to src/shared/orcad-migration/orcad-migration-blob-transfer.test.ts index 68faaf21354..92f50bb709a 100644 --- a/src/shared/orcad-migration-blob-transfer.test.ts +++ b/src/shared/orcad-migration/orcad-migration-blob-transfer.test.ts @@ -16,7 +16,7 @@ import { import { parseOrcadMigrationCatalogState } from './orcad-migration-catalog-state' import { ORCAD_MIGRATION_MANIFEST_VERSION } from './orcad-migration-manifest-validation' import type { OrcadMigrationManifest } from './orcad-migration-manifest' -import { ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY } from './orcad-runtime-capabilities' +import { ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY } from '../orcad-runtime-capabilities' const HASH = 'a'.repeat(16) const DIGEST = 'b'.repeat(64) diff --git a/src/shared/orcad-migration-blob-transfer.ts b/src/shared/orcad-migration/orcad-migration-blob-transfer.ts similarity index 99% rename from src/shared/orcad-migration-blob-transfer.ts rename to src/shared/orcad-migration/orcad-migration-blob-transfer.ts index ef9d46b1b2d..a098939c081 100644 --- a/src/shared/orcad-migration-blob-transfer.ts +++ b/src/shared/orcad-migration/orcad-migration-blob-transfer.ts @@ -14,7 +14,7 @@ import { } from './orcad-migration-scrollback' import { requiredRecord } from './orcad-migration-dormant-value-validation' import { assertUniqueKeys } from './orcad-migration-manifest-fields' -import { ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY } from './orcad-runtime-capabilities' +import { ORCAD_MIGRATION_BLOB_CHANNEL_RUNTIME_CAPABILITY } from '../orcad-runtime-capabilities' export const ORCAD_MIGRATION_BLOB_KINDS = [ 'terminal-restore-hints', diff --git a/src/shared/orcad-migration-catalog-state.ts b/src/shared/orcad-migration/orcad-migration-catalog-state.ts similarity index 100% rename from src/shared/orcad-migration-catalog-state.ts rename to src/shared/orcad-migration/orcad-migration-catalog-state.ts diff --git a/src/shared/orcad-migration-client-state-parsing.ts b/src/shared/orcad-migration/orcad-migration-client-state-parsing.ts similarity index 97% rename from src/shared/orcad-migration-client-state-parsing.ts rename to src/shared/orcad-migration/orcad-migration-client-state-parsing.ts index 9fc6a774132..fd4c52884f5 100644 --- a/src/shared/orcad-migration-client-state-parsing.ts +++ b/src/shared/orcad-migration/orcad-migration-client-state-parsing.ts @@ -1,15 +1,15 @@ -import { parseHostStableKey } from './automation-owner-key' +import { parseHostStableKey } from '../automation-owner-key' import { MAX_CLIENT_HOSTED_BROWSER_CLOSE_INTENTS, type ClientHostedBrowserCloseIntent -} from './client-hosted-browser-close-intent' +} from '../client-hosted-browser-close-intent' import type { OrcadMigrationClientHostedBrowserCloseIntent, OrcadMigrationUiRoutingState } from './orcad-migration-client-state' -import type { PersistedMobileClientTabSelections } from './persisted-state-types' -import type { ManualRepoOrderEntry, WorkspaceHostOrder } from './ui-chrome-types' -import type { SavedPortForward } from './ssh-types' +import type { PersistedMobileClientTabSelections } from '../persisted-state-types' +import type { ManualRepoOrderEntry, WorkspaceHostOrder } from '../ui-chrome-types' +import type { SavedPortForward } from '../ssh-types' import { isRecord } from './orcad-migration-manifest-fields' import { isWorkspaceHostId, diff --git a/src/shared/orcad-migration-client-state-value-validation.ts b/src/shared/orcad-migration/orcad-migration-client-state-value-validation.ts similarity index 95% rename from src/shared/orcad-migration-client-state-value-validation.ts rename to src/shared/orcad-migration/orcad-migration-client-state-value-validation.ts index 5ee92a446d0..e006c2803c5 100644 --- a/src/shared/orcad-migration-client-state-value-validation.ts +++ b/src/shared/orcad-migration/orcad-migration-client-state-value-validation.ts @@ -1,5 +1,5 @@ -import type { WorkspaceHostScope } from './ui-chrome-types' -import type { SavedPortForward } from './ssh-types' +import type { WorkspaceHostScope } from '../ui-chrome-types' +import type { SavedPortForward } from '../ssh-types' import { requiredRecord } from './orcad-migration-dormant-value-validation' import { boundedStringArray } from './orcad-migration-manifest-fields' diff --git a/src/shared/orcad-migration-client-state.ts b/src/shared/orcad-migration/orcad-migration-client-state.ts similarity index 93% rename from src/shared/orcad-migration-client-state.ts rename to src/shared/orcad-migration/orcad-migration-client-state.ts index e83ad0c225b..283011dc10c 100644 --- a/src/shared/orcad-migration-client-state.ts +++ b/src/shared/orcad-migration/orcad-migration-client-state.ts @@ -1,12 +1,12 @@ -import type { PersistedAutomationHostFilter } from './automation-host-filter' -import type { PersistedMobileClientTabSelections } from './persisted-state-types' +import type { PersistedAutomationHostFilter } from '../automation-host-filter' +import type { PersistedMobileClientTabSelections } from '../persisted-state-types' import type { ManualRepoOrderEntry, VisibleWorkspaceHostIds, WorkspaceHostOrder, WorkspaceHostScope -} from './ui-chrome-types' -import type { SavedPortForward } from './ssh-types' +} from '../ui-chrome-types' +import type { SavedPortForward } from '../ssh-types' import { parseClientHostedBrowserCloseIntents, parseMobileSelections, @@ -15,7 +15,7 @@ import { } from './orcad-migration-client-state-parsing' import { isWorkspaceHostId } from './orcad-migration-client-state-value-validation' import { isRecord } from './orcad-migration-manifest-fields' -import type { ClientHostedBrowserCloseIntent } from './client-hosted-browser-close-intent' +import type { ClientHostedBrowserCloseIntent } from '../client-hosted-browser-close-intent' export type OrcadMigrationUiRoutingState = { lastActiveRepoId?: string | null diff --git a/src/shared/orcad-migration-dormant-automation-fields.ts b/src/shared/orcad-migration/orcad-migration-dormant-automation-fields.ts similarity index 100% rename from src/shared/orcad-migration-dormant-automation-fields.ts rename to src/shared/orcad-migration/orcad-migration-dormant-automation-fields.ts diff --git a/src/shared/orcad-migration-dormant-automation-validation.ts b/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts similarity index 97% rename from src/shared/orcad-migration-dormant-automation-validation.ts rename to src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts index a79e9c46767..9ba53982bb1 100644 --- a/src/shared/orcad-migration-dormant-automation-validation.ts +++ b/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts @@ -1,7 +1,7 @@ -import { assertAutomationExtraAgentArgs } from './automation-extra-agent-args-record' -import { isTuiAgent } from './tui-agent-config' -import type { Automation, AutomationRun } from './automations-types' -import { getAutomationRunRepoId } from './automation-run-identity' +import { assertAutomationExtraAgentArgs } from '../automation-extra-agent-args-record' +import { isTuiAgent } from '../tui-agent-config' +import type { Automation, AutomationRun } from '../automations-types' +import { getAutomationRunRepoId } from '../automation-run-identity' import { assertUnique, boundedArray, diff --git a/src/shared/orcad-migration-dormant-session-validation.test.ts b/src/shared/orcad-migration/orcad-migration-dormant-session-validation.test.ts similarity index 95% rename from src/shared/orcad-migration-dormant-session-validation.test.ts rename to src/shared/orcad-migration/orcad-migration-dormant-session-validation.test.ts index 0c3e31937b4..0215ee38815 100644 --- a/src/shared/orcad-migration-dormant-session-validation.test.ts +++ b/src/shared/orcad-migration/orcad-migration-dormant-session-validation.test.ts @@ -1,13 +1,13 @@ import { describe, expect, it } from 'vitest' -import { getDefaultWorkspaceSession } from './constants' +import { getDefaultWorkspaceSession } from '../constants' import { CLIENT_HOSTED_BROWSER_PAGE_RECORD_VERSION, type PersistedClientHostedBrowserPage -} from './client-hosted-browser-page-record' -import type { BrowserWorkspace } from './browser-workspace-types' +} from '../client-hosted-browser-page-record' +import type { BrowserWorkspace } from '../browser-workspace-types' import { assertOrcadMigrationDormantWorkspaceSessionReferences } from './orcad-migration-dormant-session-validation' import { parseOrcadMigrationClientState } from './orcad-migration-client-state' -import type { WorkspaceSessionState } from './workspace-session-state-types' +import type { WorkspaceSessionState } from '../workspace-session-state-types' const OWNER = 'repo-1::/srv/worktree' const BROWSER_WORKSPACE_ID = 'browser-workspace-1' diff --git a/src/shared/orcad-migration-dormant-session-validation.ts b/src/shared/orcad-migration/orcad-migration-dormant-session-validation.ts similarity index 98% rename from src/shared/orcad-migration-dormant-session-validation.ts rename to src/shared/orcad-migration/orcad-migration-dormant-session-validation.ts index 1746e738a79..fc93aa931cc 100644 --- a/src/shared/orcad-migration-dormant-session-validation.ts +++ b/src/shared/orcad-migration/orcad-migration-dormant-session-validation.ts @@ -1,6 +1,6 @@ -import type { WorkspaceSessionState } from './workspace-session-state-types' -import { parseWorkspaceSession } from './workspace-session-schema' -import { ownedEditorFileId, paneBelongsToTerminalLayout } from './workspace-session-pane-ownership' +import type { WorkspaceSessionState } from '../workspace-session-state-types' +import { parseWorkspaceSession } from '../workspace-session-schema' +import { ownedEditorFileId, paneBelongsToTerminalLayout } from '../workspace-session-pane-ownership' export function parseOrcadMigrationDormantWorkspaceSession(value: unknown): WorkspaceSessionState { const parsed = parseWorkspaceSession(value) diff --git a/src/shared/orcad-migration-dormant-state-entry-validation.ts b/src/shared/orcad-migration/orcad-migration-dormant-state-entry-validation.ts similarity index 96% rename from src/shared/orcad-migration-dormant-state-entry-validation.ts rename to src/shared/orcad-migration/orcad-migration-dormant-state-entry-validation.ts index 5341b91b578..c5b9b60458e 100644 --- a/src/shared/orcad-migration-dormant-state-entry-validation.ts +++ b/src/shared/orcad-migration/orcad-migration-dormant-state-entry-validation.ts @@ -5,11 +5,11 @@ import type { OrcadMigrationDormantWorkspaceLineage, OrcadMigrationDormantWorktreeMeta } from './orcad-migration-manifest' -import type { SparsePreset } from './worktree/create-types' -import type { WorkspaceLineage, WorktreeLineage } from './worktree/lineage-types' -import type { WorktreeMeta } from './worktree/meta-types' -import type { RetiredNameRegistry } from './worktree/retired-name-registry' -import { parseWorkspaceKey } from './workspace-scope' +import type { SparsePreset } from '../worktree/create-types' +import type { WorkspaceLineage, WorktreeLineage } from '../worktree/lineage-types' +import type { WorktreeMeta } from '../worktree/meta-types' +import type { RetiredNameRegistry } from '../worktree/retired-name-registry' +import { parseWorkspaceKey } from '../workspace-scope' import { isString, optionalNullableString, diff --git a/src/shared/orcad-migration-dormant-value-validation.ts b/src/shared/orcad-migration/orcad-migration-dormant-value-validation.ts similarity index 100% rename from src/shared/orcad-migration-dormant-value-validation.ts rename to src/shared/orcad-migration/orcad-migration-dormant-value-validation.ts diff --git a/src/shared/orcad-migration-evicted-receipts.ts b/src/shared/orcad-migration/orcad-migration-evicted-receipts.ts similarity index 100% rename from src/shared/orcad-migration-evicted-receipts.ts rename to src/shared/orcad-migration/orcad-migration-evicted-receipts.ts diff --git a/src/shared/orcad-migration-manifest-fields.ts b/src/shared/orcad-migration/orcad-migration-manifest-fields.ts similarity index 100% rename from src/shared/orcad-migration-manifest-fields.ts rename to src/shared/orcad-migration/orcad-migration-manifest-fields.ts diff --git a/src/shared/orcad-migration-manifest-validation.ts b/src/shared/orcad-migration/orcad-migration-manifest-validation.ts similarity index 97% rename from src/shared/orcad-migration-manifest-validation.ts rename to src/shared/orcad-migration/orcad-migration-manifest-validation.ts index ba20b2934d6..aec9abedaea 100644 --- a/src/shared/orcad-migration-manifest-validation.ts +++ b/src/shared/orcad-migration/orcad-migration-manifest-validation.ts @@ -1,4 +1,4 @@ -import type { FolderWorkspace } from './folder-workspace-types' +import type { FolderWorkspace } from '../folder-workspace-types' import type { OrcadMigrationCatalogPayload, OrcadMigrationImportReceipt, @@ -9,8 +9,8 @@ import { assertLocalWslScopeMatchesPayload, parseLocalWslSource } from './orcad-migration-wsl-source-validation' -import type { ProjectGroup } from './project-group-types' -import type { Repo } from './repo-types' +import type { ProjectGroup } from '../project-group-types' +import type { Repo } from '../repo-types' import { MAX_ORCAD_MIGRATION_FOLDER_WORKSPACES, MAX_ORCAD_MIGRATION_REPOSITORIES, @@ -25,7 +25,7 @@ import { import { assertOrcadMigrationDormantStateReferences, parseOrcadMigrationDormantState -} from './orcad-migration-dormant-state-validation' +} from '../orcad-migration-dormant-state-validation' export { MAX_ORCAD_MIGRATION_FOLDER_WORKSPACES, MAX_ORCAD_MIGRATION_REPOSITORIES } export const ORCAD_MIGRATION_MANIFEST_VERSION = 1 as const diff --git a/src/shared/orcad-migration-manifest.test.ts b/src/shared/orcad-migration/orcad-migration-manifest.test.ts similarity index 99% rename from src/shared/orcad-migration-manifest.test.ts rename to src/shared/orcad-migration/orcad-migration-manifest.test.ts index 61e07a01a5f..265cfae9bb7 100644 --- a/src/shared/orcad-migration-manifest.test.ts +++ b/src/shared/orcad-migration/orcad-migration-manifest.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest' -import { getDefaultWorkspaceSession } from './constants' +import { getDefaultWorkspaceSession } from '../constants' import { MAX_ORCAD_MIGRATION_DORMANT_NAMESPACES, MAX_ORCAD_MIGRATION_DORMANT_ROWS -} from './orcad-migration-dormant-state-validation' +} from '../orcad-migration-dormant-state-validation' import { MAX_ORCAD_MIGRATION_IMPORT_RECEIPTS, MAX_ORCAD_MIGRATION_MANIFEST_BYTES, diff --git a/src/shared/orcad-migration-manifest.ts b/src/shared/orcad-migration/orcad-migration-manifest.ts similarity index 89% rename from src/shared/orcad-migration-manifest.ts rename to src/shared/orcad-migration/orcad-migration-manifest.ts index 3f83048a636..0de03f92e1a 100644 --- a/src/shared/orcad-migration-manifest.ts +++ b/src/shared/orcad-migration/orcad-migration-manifest.ts @@ -1,13 +1,13 @@ -import type { FolderWorkspace } from './folder-workspace-types' -import type { Automation, AutomationRun } from './automations-types' +import type { FolderWorkspace } from '../folder-workspace-types' +import type { Automation, AutomationRun } from '../automations-types' import type { OrcadMigrationManifestVersion } from './orcad-migration-manifest-validation' -import type { ProjectGroup } from './project-group-types' -import type { Repo } from './repo-types' -import type { SparsePreset } from './worktree/create-types' -import type { WorkspaceLineage, WorktreeLineage } from './worktree/lineage-types' -import type { WorktreeMeta } from './worktree/meta-types' -import type { RetiredNameRegistry } from './worktree/retired-name-registry' -import type { WorkspaceSessionState } from './workspace-session-state-types' +import type { ProjectGroup } from '../project-group-types' +import type { Repo } from '../repo-types' +import type { SparsePreset } from '../worktree/create-types' +import type { WorkspaceLineage, WorktreeLineage } from '../worktree/lineage-types' +import type { WorktreeMeta } from '../worktree/meta-types' +import type { RetiredNameRegistry } from '../worktree/retired-name-registry' +import type { WorkspaceSessionState } from '../workspace-session-state-types' import type { OrcadMigrationClientStatePayload } from './orcad-migration-client-state' import type { OrcadMigrationSnapshotUploadState, diff --git a/src/shared/orcad-migration-preflight.ts b/src/shared/orcad-migration/orcad-migration-preflight.ts similarity index 93% rename from src/shared/orcad-migration-preflight.ts rename to src/shared/orcad-migration/orcad-migration-preflight.ts index b883b497f21..308189d4059 100644 --- a/src/shared/orcad-migration-preflight.ts +++ b/src/shared/orcad-migration/orcad-migration-preflight.ts @@ -1,6 +1,6 @@ -import type { FolderWorkspace } from './folder-workspace-types' -import type { Repo } from './repo-types' -import type { SavedPortForward, SshRemotePtyLease } from './ssh-types' +import type { FolderWorkspace } from '../folder-workspace-types' +import type { Repo } from '../repo-types' +import type { SavedPortForward, SshRemotePtyLease } from '../ssh-types' export type OrcadMigrationBlockerCategory = | 'registration' diff --git a/src/shared/orcad-migration-scrollback.test.ts b/src/shared/orcad-migration/orcad-migration-scrollback.test.ts similarity index 97% rename from src/shared/orcad-migration-scrollback.test.ts rename to src/shared/orcad-migration/orcad-migration-scrollback.test.ts index 6b6bbbea0be..35141427a9d 100644 --- a/src/shared/orcad-migration-scrollback.test.ts +++ b/src/shared/orcad-migration/orcad-migration-scrollback.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { getDefaultWorkspaceSession } from './constants' +import { getDefaultWorkspaceSession } from '../constants' import { assertOrcadMigrationScrollbackReferences, MAX_ORCAD_MIGRATION_SCROLLBACK_SNAPSHOTS, @@ -9,7 +9,7 @@ import { type OrcadMigrationSnapshotChunkRequest, type OrcadMigrationTerminalScrollbackSnapshot } from './orcad-migration-scrollback' -import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from './terminal-scrollback-limits' +import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../terminal-scrollback-limits' const DIGEST = 'a'.repeat(64) diff --git a/src/shared/orcad-migration-scrollback.ts b/src/shared/orcad-migration/orcad-migration-scrollback.ts similarity index 97% rename from src/shared/orcad-migration-scrollback.ts rename to src/shared/orcad-migration/orcad-migration-scrollback.ts index 3b799966ae4..9e91cfcf5b9 100644 --- a/src/shared/orcad-migration-scrollback.ts +++ b/src/shared/orcad-migration/orcad-migration-scrollback.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from './terminal-scrollback-limits' -import type { WorkspaceSessionState } from './workspace-session-state-types' +import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../terminal-scrollback-limits' +import type { WorkspaceSessionState } from '../workspace-session-state-types' import { assertUnique, boundedArray, diff --git a/src/shared/orcad-migration-source-cutover.ts b/src/shared/orcad-migration/orcad-migration-source-cutover.ts similarity index 100% rename from src/shared/orcad-migration-source-cutover.ts rename to src/shared/orcad-migration/orcad-migration-source-cutover.ts diff --git a/src/shared/orcad-migration-source-kind.test.ts b/src/shared/orcad-migration/orcad-migration-source-kind.test.ts similarity index 99% rename from src/shared/orcad-migration-source-kind.test.ts rename to src/shared/orcad-migration/orcad-migration-source-kind.test.ts index d6b95be3ad6..28c0aa591bd 100644 --- a/src/shared/orcad-migration-source-kind.test.ts +++ b/src/shared/orcad-migration/orcad-migration-source-kind.test.ts @@ -13,7 +13,7 @@ import { import { ORCAD_MIGRATION_LOCAL_WSL_SOURCE_RUNTIME_CAPABILITY, ORCAD_RUNTIME_CAPABILITIES -} from './orcad-runtime-capabilities' +} from '../orcad-runtime-capabilities' const SSH_SOURCE = { sshTargetId: 'ssh-1', sshTargetGeneration: 2, targetLabel: 'Prod' } const WSL_SOURCE = { diff --git a/src/shared/orcad-migration-source-kind.ts b/src/shared/orcad-migration/orcad-migration-source-kind.ts similarity index 98% rename from src/shared/orcad-migration-source-kind.ts rename to src/shared/orcad-migration/orcad-migration-source-kind.ts index 3a36262dfc4..0546c60f06e 100644 --- a/src/shared/orcad-migration-source-kind.ts +++ b/src/shared/orcad-migration/orcad-migration-source-kind.ts @@ -11,7 +11,7 @@ import type { OrcadMigrationManifestSource, OrcadMigrationSshManifestSource } from './orcad-migration-manifest' -import { ORCAD_MIGRATION_LOCAL_WSL_SOURCE_RUNTIME_CAPABILITY } from './orcad-runtime-capabilities' +import { ORCAD_MIGRATION_LOCAL_WSL_SOURCE_RUNTIME_CAPABILITY } from '../orcad-runtime-capabilities' export const ORCAD_MIGRATION_SSH_RELAY_SOURCE_KIND = 'ssh-relay' as const diff --git a/src/shared/orcad-migration-staged-catalog-validation.test.ts b/src/shared/orcad-migration/orcad-migration-staged-catalog-validation.test.ts similarity index 100% rename from src/shared/orcad-migration-staged-catalog-validation.test.ts rename to src/shared/orcad-migration/orcad-migration-staged-catalog-validation.test.ts diff --git a/src/shared/orcad-migration-staged-catalog-validation.ts b/src/shared/orcad-migration/orcad-migration-staged-catalog-validation.ts similarity index 100% rename from src/shared/orcad-migration-staged-catalog-validation.ts rename to src/shared/orcad-migration/orcad-migration-staged-catalog-validation.ts diff --git a/src/shared/orcad-migration-terminal-restore-hints.test.ts b/src/shared/orcad-migration/orcad-migration-terminal-restore-hints.test.ts similarity index 100% rename from src/shared/orcad-migration-terminal-restore-hints.test.ts rename to src/shared/orcad-migration/orcad-migration-terminal-restore-hints.test.ts diff --git a/src/shared/orcad-migration-terminal-restore-hints.ts b/src/shared/orcad-migration/orcad-migration-terminal-restore-hints.ts similarity index 96% rename from src/shared/orcad-migration-terminal-restore-hints.ts rename to src/shared/orcad-migration/orcad-migration-terminal-restore-hints.ts index 23914296207..b2feb27b842 100644 --- a/src/shared/orcad-migration-terminal-restore-hints.ts +++ b/src/shared/orcad-migration/orcad-migration-terminal-restore-hints.ts @@ -4,9 +4,9 @@ * migration; a later format is a new capability, never a silent reinterpretation of this one. */ import { z } from 'zod' -import { MAX_PANE_KEY_LEN } from './agent-hook-listener/listener-limits' +import { MAX_PANE_KEY_LEN } from '../agent-hook-listener/listener-limits' import { ORCAD_MIGRATION_BLOB_KIND_CONTRACTS } from './orcad-migration-blob-transfer' -import { parsePaneKey } from './stable-pane-id' +import { parsePaneKey } from '../stable-pane-id' export const ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_VERSION = 1 export const ORCAD_MIGRATION_TERMINAL_RESTORE_HINTS_KEY = 'migration' diff --git a/src/shared/orcad-migration-wsl-source-validation.ts b/src/shared/orcad-migration/orcad-migration-wsl-source-validation.ts similarity index 100% rename from src/shared/orcad-migration-wsl-source-validation.ts rename to src/shared/orcad-migration/orcad-migration-wsl-source-validation.ts diff --git a/src/shared/persisted-state-types.ts b/src/shared/persisted-state-types.ts index 936f67c1222..18414cc3965 100644 --- a/src/shared/persisted-state-types.ts +++ b/src/shared/persisted-state-types.ts @@ -25,11 +25,11 @@ import type { RetiredNameRegistry } from './worktree/retired-name-registry' import type { WorkspaceLineage, WorktreeLineage } from './worktree/lineage-types' import type { WorktreeMeta } from './worktree/meta-types' import type { WorkspaceSessionState } from './workspace-session-state-types' -import type { OrcadMigrationEvictedReceipt } from './orcad-migration-evicted-receipts' +import type { OrcadMigrationEvictedReceipt } from './orcad-migration/orcad-migration-evicted-receipts' import type { OrcadMigrationImportReceipt, OrcadMigrationStagedCatalog -} from './orcad-migration-manifest' +} from './orcad-migration/orcad-migration-manifest' export type LegacyPaneKeyAliasEntry = { ptyId: string diff --git a/src/shared/rpc-contract/orcad-migration-params.ts b/src/shared/rpc-contract/orcad-migration-params.ts index 81daa1b184a..f6cbfa05ba6 100644 --- a/src/shared/rpc-contract/orcad-migration-params.ts +++ b/src/shared/rpc-contract/orcad-migration-params.ts @@ -2,7 +2,7 @@ import { z } from 'zod' import { MAX_ORCAD_MIGRATION_BLOBS, OrcadMigrationBlobDescriptorSchema -} from '../orcad-migration-blob-transfer' +} from '../orcad-migration/orcad-migration-blob-transfer' // Why unknown: the handler parses and digest-checks the manifest itself, so a malformed one is // refused with a migration error rather than a generic params failure. diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts index efd7b23a326..d573d4225aa 100644 --- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts +++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts @@ -31,8 +31,8 @@ import { } from '../mobile-relay-credential-contract' import { MobileRelayHostWorktreesParamsSchema } from '../mobile-relay-hosts-contract' import { MobileWebBundleChunkParamsSchema } from '../mobile-web-bundle/bundle-rpc-contract' -import { OrcadMigrationBlobChunkRequestSchema } from '../orcad-migration-blob-transfer' -import { OrcadMigrationSnapshotChunkRequestSchema } from '../orcad-migration-scrollback' +import { OrcadMigrationBlobChunkRequestSchema } from '../orcad-migration/orcad-migration-blob-transfer' +import { OrcadMigrationSnapshotChunkRequestSchema } from '../orcad-migration/orcad-migration-scrollback' import { OrcadTerminalCensusParamsSchema } from '../orcad-terminal-census' import { pluginConsentRequestSchema } from '../plugins/plugin-consent-request' import { diff --git a/src/shared/wsl-move/wsl-move-cutover.ts b/src/shared/wsl-move/wsl-move-cutover.ts index e01f215d122..0b51115fcd1 100644 --- a/src/shared/wsl-move/wsl-move-cutover.ts +++ b/src/shared/wsl-move/wsl-move-cutover.ts @@ -3,12 +3,12 @@ * profile store, in its own directory, so a build that knows only SSH journals never reads one. */ import { z } from 'zod' -import { parseOrcadMigrationManifest } from '../orcad-migration-manifest-validation' +import { parseOrcadMigrationManifest } from '../orcad-migration/orcad-migration-manifest-validation' import type { OrcadMigrationLocalWslManifestSource, OrcadMigrationManifest -} from '../orcad-migration-manifest' -import { isOrcadMigrationLocalWslSource } from '../orcad-migration-source-kind' +} from '../orcad-migration/orcad-migration-manifest' +import { isOrcadMigrationLocalWslSource } from '../orcad-migration/orcad-migration-source-kind' export const WSL_MOVE_CUTOVER_VERSION = 1