From b89cfbd09d6bb99e637a6f4f5bfcad5a4fcf3a12 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Mon, 2 Nov 2026 17:08:59 -0800 Subject: [PATCH] refactor: group desktop integration and lifecycle owners (#37600) * refactor: group desktop integration and lifecycle owners * refactor: preserve runtime literals and mock owner boundaries * refactor: link historical reliability evidence to current test paths * refactor: retain the historical lid-sleep baseline path --- config/flaky-test-pattern-baseline.txt | 4 +- config/main-sync-spawn-baseline.txt | 2 +- config/path-literal-baseline.txt | 1 + .../process-host-direct-import-baseline.txt | 8 +-- config/reliability-gates.jsonc | 11 ++-- config/scripts/ci-shard-timings.json | 54 +++++++++---------- .../repo-icon-source-href-benchmark.mjs | 2 +- .../run-linux-lid-sleep-assertion-docker.mjs | 15 +++++- config/scripts/vitest-node-runtime-files.mjs | 2 +- ...-computer-use-permissions-shutdown.test.ts | 4 +- .../macos-computer-use-permissions.ts | 4 +- .../daemon/daemon-folder-access-reset.test.ts | 2 +- src/main/daemon/daemon-folder-access-reset.ts | 2 +- .../daemon-full-disk-access-status.test.ts | 4 +- .../daemon/daemon-full-disk-access-status.ts | 2 +- src/main/daemon/daemon-health-requests.ts | 2 +- .../editor-launcher-name.ts | 0 ...xternal-editor-launch-process-host.test.ts | 0 .../external-editor-launch.test.ts | 6 +-- .../external-editor-launch.ts | 12 ++--- .../jetbrains-windows-gui-launchers.ts | 0 .../remote-ssh-editor-launch.ts | 10 ++-- .../vscode-cli-install-paths.ts | 0 src/main/ipc/app.test.ts | 4 +- src/main/ipc/app.ts | 2 +- src/main/ipc/developer-permissions.test.ts | 2 +- src/main/ipc/developer-permissions.ts | 2 +- .../filesystem-runtime-upload-staging.ts | 2 +- .../orca-profiles-switch-persistence.test.ts | 2 +- src/main/ipc/orca-profiles.test.ts | 2 +- src/main/ipc/orca-profiles.ts | 2 +- .../register-core-handlers.ts | 4 +- .../ipc/repos-add-linked-worktree.test.ts | 2 +- .../ipc/repos/local-repo-registration.test.ts | 2 +- src/main/ipc/repos/local-repo-registration.ts | 2 +- .../ipc/repos/nested-repo-import-handler.ts | 2 +- src/main/ipc/repos/repo-clone-lifecycle.ts | 2 +- src/main/ipc/repos/repo-creation-handlers.ts | 2 +- .../ipc/settings-delayed-response.test.ts | 2 +- src/main/ipc/settings.test.ts | 2 +- src/main/ipc/settings.ts | 6 +-- src/main/ipc/shell-server-ssh-editor.test.ts | 4 +- src/main/ipc/shell-wsl-owner.test.ts | 6 +-- src/main/ipc/shell.test.ts | 4 +- src/main/ipc/shell.ts | 4 +- src/main/ipc/ssh/ssh-app-shutdown.test.ts | 2 +- .../ipc/ssh/ssh-connect-attempt-registry.ts | 2 +- src/main/ipc/ssh/ssh.ts | 2 +- .../ipc/wsl-drive-unc-conversion-handlers.ts | 2 +- .../link-preview-page-metadata.ts | 2 +- .../macos-full-disk-access-status.test.ts | 0 .../macos-full-disk-access-status.ts | 2 +- .../macos-tcc-log-stream-orphans.test.ts | 2 +- .../macos-tcc-log-stream-orphans.ts | 2 +- .../macos-tcc-prompt-notice.test.ts | 4 +- .../macos-tcc-prompt-notice.ts | 4 +- .../macos-tcc-prompt-watch.test.ts | 0 .../macos-tcc-prompt-watch.ts | 0 .../macos-tcc-reset.ts | 0 .../{ => media}/image-file-signature.test.ts | 0 src/main/{ => media}/image-file-signature.ts | 0 .../page-metadata}/html-head-tags.ts | 0 src/main/orcad/orcad-lifecycle.ts | 2 +- .../profile-state-maintenance.spec.ts | 5 +- .../loading-store/store-runtime-state.ts | 2 +- src/main/persistence/loading-store/store.ts | 2 +- .../active-view-persistence-boundary.test.ts | 10 ++-- ...ve-view-preference-sync-flush-veto.test.ts | 0 .../active-view-preference.test.ts | 0 .../preferences}/active-view-preference.ts | 4 +- ...istence-onboarding-language-cohort.test.ts | 4 +- .../profile-state-writer-diagnostics.ts | 2 +- .../profile-state-writer-sleep.test.ts | 6 +-- src/main/ports/workspace-port-page-probe.ts | 2 +- ...-awake-service-platform-assertions.test.ts | 2 +- .../{ => power}/agent-awake-service.test.ts | 5 +- src/main/{ => power}/agent-awake-service.ts | 7 +-- .../{ => power}/agent-awake-status-lease.ts | 2 +- .../linux-lid-sleep-assertion.test.ts | 0 .../{ => power}/linux-lid-sleep-assertion.ts | 0 .../macos-system-sleep-assertion.test.ts | 0 .../macos-system-sleep-assertion.ts | 0 .../system-power-lifecycle.test.ts | 0 .../{ => power}/system-power-lifecycle.ts | 0 .../system-resume-broadcast.test.ts | 2 +- .../{ => power}/system-resume-broadcast.ts | 2 +- src/main/repo-backfill-wsl-move.test.ts | 4 +- .../repo-icon-autodetect.test.ts | 2 +- .../repo-icon-autodetect.ts | 16 +++--- .../repo-icon-file-detection.test.ts | 2 +- .../repo-icon-file-detection.ts | 10 ++-- .../repo-icon-href-candidates.ts | 0 .../repo-icon-source-href.ts | 0 .../orca-runtime-test-mocks/setup.spec.ts | 6 +++ .../runtime/repo-icon-fork-backfill.test.ts | 9 +++- .../rpc/repo-add-cli.integration.test.ts | 2 +- .../runtime-repository-clone-controller.ts | 2 +- ...ntime-repository-clone-host-dedupe.test.ts | 2 +- .../runtime-repository-fork-backfill.ts | 2 +- ...repository-registration-controller.test.ts | 2 +- ...time-repository-registration-controller.ts | 2 +- ...epository-registration-host-dedupe.test.ts | 2 +- ...rowser-process-user-agent-ordering.test.ts | 2 +- src/main/startup/configure-process.ts | 2 +- src/main/startup/gpu-lifecycle.ts | 2 +- src/main/startup/main-process-observers.ts | 4 +- src/main/startup/main-process-preflight.ts | 2 +- .../main-process-quit-pending-writer.test.ts | 6 +-- .../main-process-quit-update-veto.test.ts | 6 +-- src/main/startup/main-process-quit.ts | 8 +-- .../startup/main-process-ready-foundation.ts | 2 +- .../main-process-ready-identity-write.test.ts | 2 +- src/main/startup/main-process-state.ts | 2 +- .../startup/main-window-core-services.test.ts | 4 +- src/main/startup/main-window-core-services.ts | 2 +- .../{ => startup/quit}/app-relaunch.test.ts | 10 ++-- src/main/{ => startup/quit}/app-relaunch.ts | 8 +-- .../{ => startup/quit}/host-shutdown-state.ts | 0 .../quit-path-durable-write-blocking.test.ts | 14 ++--- .../quit}/quit-teardown-deadline.test.ts | 6 +-- .../quit}/quit-teardown-deadline.ts | 4 +- .../quit}/quit-teardown-start-gate.test.ts | 0 .../quit}/quit-teardown-start-gate.ts | 0 src/main/{ => startup/testing}/e2e-config.ts | 2 +- src/main/tray/system-tray.test.ts | 2 +- src/main/tray/system-tray.ts | 4 +- .../attach-main-window-services.test.ts | 2 +- .../window/attach-main-window-services.ts | 2 +- src/main/window/clipboard-image-temp-file.ts | 2 +- ...reateMainWindow-close-confirmation.test.ts | 4 +- ...MainWindow-low-commit-oom-recovery.test.ts | 4 +- ...teMainWindow-markdown-editor-focus.test.ts | 4 +- ...ainWindow-recovery-reload-watchdog.test.ts | 4 +- ...MainWindow-renderer-crash-recovery.test.ts | 4 +- ...MainWindow-renderer-launch-failure.test.ts | 4 +- .../createMainWindow-startup-reveal.test.ts | 4 +- ...ainWindow-terminal-focus-shortcuts.test.ts | 4 +- ...eateMainWindow-tray-minimize-close.test.ts | 4 +- .../createMainWindow-user-quit-close.test.ts | 4 +- ...ndow-zoom-and-tab-switch-shortcuts.test.ts | 4 +- src/main/window/createMainWindow.test.ts | 4 +- src/main/window/createMainWindow.ts | 2 +- .../desktop-integration}/app-icon.test.ts | 12 ++--- .../desktop-integration}/app-icon.ts | 14 ++--- .../appkit-scene-mutation.ts | 0 ...s-and-hold-default.defaults-domain.test.ts | 0 .../macos-press-and-hold-default.test.ts | 0 .../macos-press-and-hold-default.ts | 2 +- .../desktop-integration}/system-fonts.test.ts | 0 .../desktop-integration}/system-fonts.ts | 0 .../updater-package-recovery-ipc.test.ts | 2 +- src/main/wsl/wsl-orcad-liveness-state.ts | 2 +- .../wsl/wsl-orcad-liveness-supervisor.test.ts | 2 +- src/main/wsl/wsl-orcad-liveness-wiring.ts | 2 +- 154 files changed, 296 insertions(+), 245 deletions(-) rename src/main/{ => external-editors}/editor-launcher-name.ts (100%) rename src/main/{ => external-editors}/external-editor-launch-process-host.test.ts (100%) rename src/main/{ => external-editors}/external-editor-launch.test.ts (99%) rename src/main/{ => external-editors}/external-editor-launch.ts (95%) rename src/main/{ => external-editors}/jetbrains-windows-gui-launchers.ts (100%) rename src/main/{ => external-editors}/remote-ssh-editor-launch.ts (80%) rename src/main/{ => external-editors}/vscode-cli-install-paths.ts (100%) rename src/main/{ => macos-permissions}/macos-full-disk-access-status.test.ts (100%) rename src/main/{ => macos-permissions}/macos-full-disk-access-status.ts (93%) rename src/main/{ => macos-permissions}/macos-tcc-log-stream-orphans.test.ts (96%) rename src/main/{ => macos-permissions}/macos-tcc-log-stream-orphans.ts (98%) rename src/main/{ => macos-permissions}/macos-tcc-prompt-notice.test.ts (99%) rename src/main/{ => macos-permissions}/macos-tcc-prompt-notice.ts (98%) rename src/main/{ => macos-permissions}/macos-tcc-prompt-watch.test.ts (100%) rename src/main/{ => macos-permissions}/macos-tcc-prompt-watch.ts (100%) rename src/main/{ => macos-permissions}/macos-tcc-reset.ts (100%) rename src/main/{ => media}/image-file-signature.test.ts (100%) rename src/main/{ => media}/image-file-signature.ts (100%) rename src/main/{ => network/page-metadata}/html-head-tags.ts (100%) rename src/main/{ => persistence/preferences}/active-view-persistence-boundary.test.ts (86%) rename src/main/{ => persistence/preferences}/active-view-preference-sync-flush-veto.test.ts (100%) rename src/main/{ => persistence/preferences}/active-view-preference.test.ts (100%) rename src/main/{ => persistence/preferences}/active-view-preference.ts (98%) rename src/main/{ => persistence/preferences}/persistence-onboarding-language-cohort.test.ts (96%) rename src/main/{ => power}/agent-awake-service-platform-assertions.test.ts (98%) rename src/main/{ => power}/agent-awake-service.test.ts (98%) rename src/main/{ => power}/agent-awake-service.ts (98%) rename src/main/{ => power}/agent-awake-status-lease.ts (97%) rename src/main/{ => power}/linux-lid-sleep-assertion.test.ts (100%) rename src/main/{ => power}/linux-lid-sleep-assertion.ts (100%) rename src/main/{ => power}/macos-system-sleep-assertion.test.ts (100%) rename src/main/{ => power}/macos-system-sleep-assertion.ts (100%) rename src/main/{ => power}/system-power-lifecycle.test.ts (100%) rename src/main/{ => power}/system-power-lifecycle.ts (100%) rename src/main/{ => power}/system-resume-broadcast.test.ts (98%) rename src/main/{ => power}/system-resume-broadcast.ts (96%) rename src/main/{ => repository-icons}/repo-icon-autodetect.test.ts (99%) rename src/main/{ => repository-icons}/repo-icon-autodetect.ts (89%) rename src/main/{ => repository-icons}/repo-icon-file-detection.test.ts (96%) rename src/main/{ => repository-icons}/repo-icon-file-detection.ts (91%) rename src/main/{ => repository-icons}/repo-icon-href-candidates.ts (100%) rename src/main/{ => repository-icons}/repo-icon-source-href.ts (100%) rename src/main/{ => startup/quit}/app-relaunch.test.ts (88%) rename src/main/{ => startup/quit}/app-relaunch.ts (75%) rename src/main/{ => startup/quit}/host-shutdown-state.ts (100%) rename src/main/{ => startup/quit}/quit-path-durable-write-blocking.test.ts (97%) rename src/main/{ => startup/quit}/quit-teardown-deadline.test.ts (88%) rename src/main/{ => startup/quit}/quit-teardown-deadline.ts (91%) rename src/main/{ => startup/quit}/quit-teardown-start-gate.test.ts (100%) rename src/main/{ => startup/quit}/quit-teardown-start-gate.ts (100%) rename src/main/{ => startup/testing}/e2e-config.ts (71%) rename src/main/{ => window/desktop-integration}/app-icon.test.ts (94%) rename src/main/{ => window/desktop-integration}/app-icon.ts (94%) rename src/main/{ => window/desktop-integration}/appkit-scene-mutation.ts (100%) rename src/main/{ => window/desktop-integration}/macos-press-and-hold-default.defaults-domain.test.ts (100%) rename src/main/{ => window/desktop-integration}/macos-press-and-hold-default.test.ts (100%) rename src/main/{ => window/desktop-integration}/macos-press-and-hold-default.ts (99%) rename src/main/{ => window/desktop-integration}/system-fonts.test.ts (100%) rename src/main/{ => window/desktop-integration}/system-fonts.ts (100%) diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 5907b3c4d20..6fd18c16708 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -829,8 +829,8 @@ 2 test-no-wall-clock:src/main/ipc/worktree-git-status-attribution-real-git.test.ts 5 test-no-wall-clock:src/main/ipc/worktrees-orphan-directory-cleanup.test.ts 2 test-no-wall-clock:src/main/local-worktree-removal-recovery-live.test.ts -1 test-no-wall-clock:src/main/macos-press-and-hold-default.defaults-domain.test.ts -2 test-no-wall-clock:src/main/macos-tcc-log-stream-orphans.test.ts +1 test-no-wall-clock:src/main/window/desktop-integration/macos-press-and-hold-default.defaults-domain.test.ts +2 test-no-wall-clock:src/main/macos-permissions/macos-tcc-log-stream-orphans.test.ts 1 test-no-wall-clock:src/main/managed-server/host-state/orcad-state-mutation-fence-heartbeat.test.ts 3 test-no-wall-clock:src/main/managed-server/host-state/orcad-state-snapshot-shell.test.ts 3 test-no-wall-clock:src/main/managed-server/host-state/orcad-windows-host-fence-ops.test.ts diff --git a/config/main-sync-spawn-baseline.txt b/config/main-sync-spawn-baseline.txt index 2b2c5a4e18c..2ac204c51f6 100644 --- a/config/main-sync-spawn-baseline.txt +++ b/config/main-sync-spawn-baseline.txt @@ -28,7 +28,7 @@ 1 src/main/git/repo-detection-command.ts 1 src/main/git/runner.ts 1 src/main/ipc/worktree-logic.ts -2 src/main/macos-press-and-hold-default.ts +2 src/main/window/desktop-integration/macos-press-and-hold-default.ts 1 src/main/network/macos-tailscale-dns-diagnostic.ts 1 src/main/opencode/legacy-plugin-acl-retry.ts 2 src/main/orcad/node-pty-precondition.ts diff --git a/config/path-literal-baseline.txt b/config/path-literal-baseline.txt index 23eda0f2583..c9057ff29fc 100644 --- a/config/path-literal-baseline.txt +++ b/config/path-literal-baseline.txt @@ -11,6 +11,7 @@ config/scripts/pr-code-change-scope.mjs src/shared/agent-session-resume-marker config/scripts/pr-code-change-scope.mjs src/shared/agent-session-turn-record config/scripts/pr-layout-oracle-route.mjs src/main/runtime/old-session-tabs-stream/ config/scripts/pr-layout-oracle-route.mjs src/renderer/src/runtime/remote-workspace-frozen/ +config/scripts/run-linux-lid-sleep-assertion-docker.mjs src/main/linux-lid-sleep-assertion.ts config/scripts/run-ssh-staged-upload-reliability.mjs src/main/ssh/ssh-relay-install-namespace.test.ts config/tsconfig.node.json src/renderer/src/components/native-chat/native-chat-composer-primary-action.ts config/tsconfig.node.json src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts diff --git a/config/process-host-direct-import-baseline.txt b/config/process-host-direct-import-baseline.txt index b774f9bf748..e3ac61cada5 100644 --- a/config/process-host-direct-import-baseline.txt +++ b/config/process-host-direct-import-baseline.txt @@ -12,7 +12,7 @@ src/main/agent-hooks/wsl-hook-relay-sentinel.ts src/main/ai-vault/session-scanner-service-client-state.ts src/main/ai-vault/session-scanner-service-client.ts src/main/ai-vault/session-scanner-service-spawn.ts -src/main/app-icon.ts +src/main/window/desktop-integration/app-icon.ts src/main/automations/precheck-runner.ts src/main/browser/agent-browser/agent-browser-bridge-execution.ts src/main/browser/agent-browser/agent-browser-bridge-raw-process.ts @@ -38,7 +38,7 @@ src/main/emulator/serve-sim-helper-processes.ts src/main/emulator/serve-sim-runtime-materializer.ts src/main/emulator/simctl-simulator-devices.ts src/main/emulator/simulator-app-visibility.ts -src/main/external-editor-launch.ts +src/main/external-editors/external-editor-launch.ts src/main/git/command-runner/exec-file-capture.ts src/main/git/command-runner/git-exec-file-sync.ts src/main/git/command-runner/git-spawn.ts @@ -73,8 +73,8 @@ src/main/ipc/repos/repo-clone-lifecycle.ts src/main/ipc/worktree-apfs-clone.ts src/main/local-builds/local-build-candidate.ts src/main/macos-keychain/generic-password.ts -src/main/macos-system-sleep-assertion.ts -src/main/macos-tcc-prompt-watch.ts +src/main/power/macos-system-sleep-assertion.ts +src/main/macos-permissions/macos-tcc-prompt-watch.ts src/main/memory/collector.ts src/main/native-chat/wsl-transcript-fs-process-slot.ts src/main/native-chat/wsl-transcript-fs-process-spawn.ts diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 695e84046d3..fc754c43a00 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -4109,19 +4109,19 @@ "invariant": "A non-empty SSH file stream that produces no valid frame for 30 seconds must cancel at its authoritative stream reader and release all local lifecycle state. System suspend is sticky across metadata and subscription races, resume grants every still-live stream one fresh inactivity window, one failing consumer cannot block the others, and the sole Electron bridge survives a vetoed before-quit without retaining a per-stream Electron listener.", "oracle": "Publish suspend before stream metadata resolves, jump wall time by one hour, and require the late-subscribing stream to remain pending until resume grants a fresh 30-second window. Deliver a valid final chunk and end frame, require exact content, then publish another resume and require zero timers, multiplexer listeners, or renewed work; separately require stalled cancellation at 30 seconds, atomic state replay, failure-isolated fanout, and bridge disposal only after the committed will-quit gate.", "commands": [ - "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/system-resume-broadcast.test.ts src/main/system-power-lifecycle.test.ts --reporter=dot --maxWorkers=2" + "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/power/system-resume-broadcast.test.ts src/main/power/system-power-lifecycle.test.ts --reporter=dot --maxWorkers=2" ], "testFiles": [ - "src/main/system-resume-broadcast.test.ts", - "src/main/system-power-lifecycle.test.ts" + "src/main/power/system-resume-broadcast.test.ts", + "src/main/power/system-power-lifecycle.test.ts" ], "assertionRefs": [ { - "file": "src/main/system-resume-broadcast.test.ts", + "file": "src/main/power/system-resume-broadcast.test.ts", "assertions": ["publishes suspend and resume to main-process lifecycle consumers"] }, { - "file": "src/main/system-power-lifecycle.test.ts", + "file": "src/main/power/system-power-lifecycle.test.ts", "assertions": [ "replays suspended state to a late subscriber", "atomically replays a transition to a subscriber added during publication", @@ -4136,6 +4136,7 @@ "platform": "macos", "result": "passed", "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/system-resume-broadcast.test.ts src/main/system-power-lifecycle.test.ts --reporter=dot --maxWorkers=2", + "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/main/power/system-resume-broadcast.test.ts src/main/power/system-power-lifecycle.test.ts --reporter=dot --maxWorkers=2", "durationSeconds": 8.141, "summary": "The retained behavioral cohort passed 25 tests after removing source-only ordering tests. Historical pre-removal receipts are preserved verbatim with their originally executed commands: [{\"date\":\"2026-08-01\",\"runner\":\"local\",\"platform\":\"macos\",\"command\":\"pnpm exec vitest run --config config/vitest.config.ts src/main/system-resume-broadcast.test.ts src/main/system-power-lifecycle.test.ts src/main/startup/desktop-startup-ordering.test.ts --reporter=dot\",\"result\":\"passed\",\"durationSeconds\":1.6,\"summary\":\"Four focused files and 33 tests passed, including stalled cancellation, active progress, late metadata replay, failure isolation, committed-quit bridge lifetime, and post-settlement cleanup.\"}] No new native desktop or hosted run is claimed." } diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json index ad7f94bb398..6d674932176 100644 --- a/config/scripts/ci-shard-timings.json +++ b/config/scripts/ci-shard-timings.json @@ -789,12 +789,12 @@ "src/main/acp/history/acp-history-boundary.test.ts": 1966, "src/main/acp/history/acp-history-catch-up.test.ts": 2140, "src/main/acp/history/acp-history-scaling.test.ts": 24879, - "src/main/active-view-persistence-boundary.test.ts": 2119, - "src/main/active-view-preference-sync-flush-veto.test.ts": 781, - "src/main/active-view-preference.test.ts": 61, + "src/main/persistence/preferences/active-view-persistence-boundary.test.ts": 2119, + "src/main/persistence/preferences/active-view-preference-sync-flush-veto.test.ts": 781, + "src/main/persistence/preferences/active-view-preference.test.ts": 61, "src/main/agent-auth-restart-preservation.test.ts": 55, - "src/main/agent-awake-service-platform-assertions.test.ts": 112, - "src/main/agent-awake-service.test.ts": 128, + "src/main/power/agent-awake-service-platform-assertions.test.ts": 112, + "src/main/power/agent-awake-service.test.ts": 128, "src/main/agent-cli-version-probe.test.ts": 72, "src/main/agent-hooks/agent-home-login-shell.test.ts": 81, "src/main/agent-hooks/agent-tool-call-reader.test.ts": 631, @@ -1218,8 +1218,8 @@ "src/main/antigravity/posix-hook-invocation.test.ts": 5267, "src/main/antigravity/windows-hook-json-post.test.ts": 6873, "src/main/antigravity/windows-hook-payload-delivery.test.ts": 105, - "src/main/app-icon.test.ts": 77, - "src/main/app-relaunch.test.ts": 93, + "src/main/window/desktop-integration/app-icon.test.ts": 77, + "src/main/startup/quit/app-relaunch.test.ts": 93, "src/main/appimage-runtime-identity.test.ts": 104, "src/main/artifacts/artifact-cloud-config.test.ts": 47, "src/main/artifacts/artifact-cloud-recovery.test.ts": 495, @@ -2534,8 +2534,8 @@ "src/main/external-conversations/external-conversation-reopen.test.ts": 1591, "src/main/external-conversations/external-conversation-seam.test.ts": 2913, "src/main/external-conversations/external-conversations-install.test.ts": 1687, - "src/main/external-editor-launch-process-host.test.ts": 215, - "src/main/external-editor-launch.test.ts": 151, + "src/main/external-editors/external-editor-launch-process-host.test.ts": 215, + "src/main/external-editors/external-editor-launch.test.ts": 151, "src/main/file-transaction-lock.test.ts": 1047, "src/main/fish-history-session.test.ts": 82, "src/main/fish-xdg-data-dirs-handoff.test.ts": 76, @@ -2935,7 +2935,7 @@ "src/main/i18n/main-i18n-lazy-locale.test.ts": 518, "src/main/i18n/main-i18n-pre-init.test.ts": 50, "src/main/i18n/system-language.test.ts": 358, - "src/main/image-file-signature.test.ts": 47, + "src/main/media/image-file-signature.test.ts": 47, "src/main/integration-state-file-cache.test.ts": 47, "src/main/integration-token-file-cache.test.ts": 152, "src/main/ipc/account-sign-in-link-opener.test.ts": 128, @@ -3561,7 +3561,7 @@ "src/main/link-preview/link-preview-address-guard.test.ts": 77, "src/main/link-preview/link-preview-page-fetch.test.ts": 95, "src/main/link-preview/link-preview-page-metadata.test.ts": 40, - "src/main/linux-lid-sleep-assertion.test.ts": 98, + "src/main/power/linux-lid-sleep-assertion.test.ts": 98, "src/main/linux-package-install-command.test.ts": 104, "src/main/linux-package-install-diagnostic.test.ts": 47, "src/main/linux-package-update-recovery.test.ts": 261, @@ -3577,13 +3577,13 @@ "src/main/local-worktree-removal-recovery-live.test.ts": 465, "src/main/local-worktree-removal-recovery.test.ts": 351, "src/main/ports/workspace-labels/localhost-worktree-label-proxy.test.ts": 120, - "src/main/macos-full-disk-access-status.test.ts": 42, - "src/main/macos-press-and-hold-default.defaults-domain.test.ts": 76, - "src/main/macos-press-and-hold-default.test.ts": 109, - "src/main/macos-system-sleep-assertion.test.ts": 55, - "src/main/macos-tcc-log-stream-orphans.test.ts": 110, - "src/main/macos-tcc-prompt-notice.test.ts": 82, - "src/main/macos-tcc-prompt-watch.test.ts": 77, + "src/main/macos-permissions/macos-full-disk-access-status.test.ts": 42, + "src/main/window/desktop-integration/macos-press-and-hold-default.defaults-domain.test.ts": 76, + "src/main/window/desktop-integration/macos-press-and-hold-default.test.ts": 109, + "src/main/power/macos-system-sleep-assertion.test.ts": 55, + "src/main/macos-permissions/macos-tcc-log-stream-orphans.test.ts": 110, + "src/main/macos-permissions/macos-tcc-prompt-notice.test.ts": 82, + "src/main/macos-permissions/macos-tcc-prompt-watch.test.ts": 77, "src/main/macos-tree-clone.test.ts": 84, "src/main/macos-update-running-instances.integration.test.ts": 59, "src/main/managed-data-accounts/original-environment.test.ts": 209, @@ -4314,7 +4314,7 @@ "src/main/orcad/serve-profile-ssh-targets.test.ts": 407, "src/main/own-chromium-tree-kill-guard.test.ts": 135, "src/main/persistence-local-only-worktree-meta.test.ts": 1948, - "src/main/persistence-onboarding-language-cohort.test.ts": 1760, + "src/main/persistence/preferences/persistence-onboarding-language-cohort.test.ts": 1760, "src/main/persistence-orcad-migration-wsl-generation-reuse.test.ts": 1658, "src/main/persistence/applying-settings/notification-settings-normalization.test.ts": 65, "src/main/persistence/applying-settings/persistence-automation-extra-agent-args.test.ts": 2268, @@ -4968,9 +4968,9 @@ "src/main/pwsh.test.ts": 69, "src/main/qoder/hook-service.test.ts": 327, "src/main/qoder/real-cli.test.ts": 602, - "src/main/quit-path-durable-write-blocking.test.ts": 3722, - "src/main/quit-teardown-deadline.test.ts": 48, - "src/main/quit-teardown-start-gate.test.ts": 38, + "src/main/startup/quit/quit-path-durable-write-blocking.test.ts": 3722, + "src/main/startup/quit/quit-teardown-deadline.test.ts": 48, + "src/main/startup/quit/quit-teardown-start-gate.test.ts": 38, "src/main/rate-limits/account-runtime-target-sync.test.ts": 262, "src/main/rate-limits/antigravity-usage-error.test.ts": 47, "src/main/rate-limits/antigravity-usage-fetcher.test.ts": 188, @@ -5042,8 +5042,8 @@ "src/main/repo-git-remote-identity.test.ts": 418, "src/main/repo-git-username-enrichment-wsl-act.test.ts": 68, "src/main/repo-git-username-enrichment.test.ts": 111, - "src/main/repo-icon-autodetect.test.ts": 806, - "src/main/repo-icon-file-detection.test.ts": 487, + "src/main/repository-icons/repo-icon-autodetect.test.ts": 806, + "src/main/repository-icons/repo-icon-file-detection.test.ts": 487, "src/main/repo-worktrees.test.ts": 414, "src/main/ripgrep/bundled-ripgrep-path.test.ts": 78, "src/main/ripgrep/bundled-ripgrep-real.test.ts": 242, @@ -6888,9 +6888,9 @@ "src/main/synthetic-title-frame-routing.test.ts": 40, "src/main/synthetic-title-spinner.test.ts": 44, "src/main/synthetic-title-visibility.test.ts": 51, - "src/main/system-fonts.test.ts": 77, - "src/main/system-power-lifecycle.test.ts": 42, - "src/main/system-resume-broadcast.test.ts": 67, + "src/main/window/desktop-integration/system-fonts.test.ts": 77, + "src/main/power/system-power-lifecycle.test.ts": 42, + "src/main/power/system-resume-broadcast.test.ts": 67, "src/main/telemetry/burst-cap.test.ts": 177, "src/main/telemetry/chat-ui-launch-tip-cohort.test.ts": 235, "src/main/telemetry/classify-error.test.ts": 43, diff --git a/config/scripts/repo-icon-source-href-benchmark.mjs b/config/scripts/repo-icon-source-href-benchmark.mjs index 2eae42dc445..2f01a953f6a 100644 --- a/config/scripts/repo-icon-source-href-benchmark.mjs +++ b/config/scripts/repo-icon-source-href-benchmark.mjs @@ -1,6 +1,6 @@ import assert from 'node:assert/strict' import { performance } from 'node:perf_hooks' -import { extractIconHref } from '../../src/main/repo-icon-source-href.ts' +import { extractIconHref } from '../../src/main/repository-icons/repo-icon-source-href.ts' // Regex comparator retained for the before/after measurement. const html = diff --git a/config/scripts/run-linux-lid-sleep-assertion-docker.mjs b/config/scripts/run-linux-lid-sleep-assertion-docker.mjs index 10e378fe7d4..765bdb2ebfc 100644 --- a/config/scripts/run-linux-lid-sleep-assertion-docker.mjs +++ b/config/scripts/run-linux-lid-sleep-assertion-docker.mjs @@ -7,7 +7,7 @@ import { build } from 'esbuild' const repo = resolve(fileURLToPath(new URL('../..', import.meta.url))) const fixture = join(repo, 'config/docker/linux-lid-sleep-assertion') -const sourcePath = join(repo, 'src/main/linux-lid-sleep-assertion.ts') +const sourcePath = join(repo, 'src/main/power/linux-lid-sleep-assertion.ts') const args = process.argv.slice(2) const options = new Map() for (let index = 0; index < args.length; index += 2) { @@ -62,8 +62,19 @@ function runDocker(command, allowFailure = false) { } async function bundle(mode, ref) { + const baselinePaths = [ + 'src/main/power/linux-lid-sleep-assertion.ts', + 'src/main/linux-lid-sleep-assertion.ts' + ] + const availablePaths = ref + ? execFileSync('git', ['ls-tree', '--name-only', ref, '--', ...baselinePaths], { + cwd: repo, + encoding: 'utf8' + }).split('\n') + : [] + const baselinePath = baselinePaths.find((path) => availablePaths.includes(path)) const oldSource = ref - ? execFileSync('git', ['show', `${ref}:src/main/linux-lid-sleep-assertion.ts`], { + ? execFileSync('git', ['show', `${ref}:${baselinePath ?? baselinePaths[0]}`], { cwd: repo, encoding: 'utf8' }) diff --git a/config/scripts/vitest-node-runtime-files.mjs b/config/scripts/vitest-node-runtime-files.mjs index f2c8e56d52d..a93ad8901a9 100644 --- a/config/scripts/vitest-node-runtime-files.mjs +++ b/config/scripts/vitest-node-runtime-files.mjs @@ -100,7 +100,7 @@ const NODE_RUNTIME_INCLUDE = [ 'src/main/sqlite/**/*.test.ts', 'src/main/orca-profiles/**/*.test.ts', 'src/main/managed-data-accounts/**/*.test.ts', - 'src/main/quit-path-durable-write-blocking.test.ts', + 'src/main/startup/quit/quit-path-durable-write-blocking.test.ts', 'src/main/automations/automation-worker-durability.test.ts', 'src/**/*.node-pty.test.ts', 'src/**/node-pty-*.test.ts', diff --git a/src/main/computer/macos-computer-use-permissions-shutdown.test.ts b/src/main/computer/macos-computer-use-permissions-shutdown.test.ts index f788c842821..79bf1dac122 100644 --- a/src/main/computer/macos-computer-use-permissions-shutdown.test.ts +++ b/src/main/computer/macos-computer-use-permissions-shutdown.test.ts @@ -20,7 +20,7 @@ vi.mock('./macos-computer-use-permission-status', () => ({ vi.mock('./macos-computer-use-permission-status-gate', () => ({ computerUsePermissionStatusGate: { peek: mocks.peek, read: mocks.peek, invalidate: () => {} } })) -vi.mock('../macos-tcc-reset', () => ({ +vi.mock('../macos-permissions/macos-tcc-reset', () => ({ readMacosBundleId: mocks.readBundleId, resetMacosTccPermission: async () => ({ ok: true }) })) @@ -58,7 +58,7 @@ async function loadModules(): Promise<{ markHostShuttingDown: () => void }> { const permissions = await import('./macos-computer-use-permissions') - const { markHostShuttingDown } = await import('../host-shutdown-state') + const { markHostShuttingDown } = await import('../startup/quit/host-shutdown-state') return { permissions, markHostShuttingDown } } diff --git a/src/main/computer/macos-computer-use-permissions.ts b/src/main/computer/macos-computer-use-permissions.ts index 0137c88ceed..a1916f33030 100644 --- a/src/main/computer/macos-computer-use-permissions.ts +++ b/src/main/computer/macos-computer-use-permissions.ts @@ -1,7 +1,7 @@ import { spawn, spawnSync } from 'node:child_process' import { RuntimeClientError } from './runtime-client-error' -import { isHostShuttingDown } from '../host-shutdown-state' -import { readMacosBundleId, resetMacosTccPermission } from '../macos-tcc-reset' +import { isHostShuttingDown } from '../startup/quit/host-shutdown-state' +import { readMacosBundleId, resetMacosTccPermission } from '../macos-permissions/macos-tcc-reset' import { resolveMacOSComputerUseAppPath } from './macos-native-provider-paths' import { resolveComputerUseHelperUnavailableReason } from './macos-computer-use-permission-status' import { computerUsePermissionStatusGate } from './macos-computer-use-permission-status-gate' diff --git a/src/main/daemon/daemon-folder-access-reset.test.ts b/src/main/daemon/daemon-folder-access-reset.test.ts index db4085f6f07..de30bd0c6ab 100644 --- a/src/main/daemon/daemon-folder-access-reset.test.ts +++ b/src/main/daemon/daemon-folder-access-reset.test.ts @@ -28,7 +28,7 @@ const { vi.mock('electron', () => ({ app: { getPath: getPathMock } })) vi.mock('node:fs/promises', () => ({ opendir: opendirMock })) vi.mock('../telemetry/client', () => ({ track: trackMock })) -vi.mock('../macos-tcc-reset', () => ({ +vi.mock('../macos-permissions/macos-tcc-reset', () => ({ readMacosBundleId: readMacosBundleIdMock, resetMacosTccPermission: resetMacosTccPermissionMock })) diff --git a/src/main/daemon/daemon-folder-access-reset.ts b/src/main/daemon/daemon-folder-access-reset.ts index bd151880a40..0b0c6e31094 100644 --- a/src/main/daemon/daemon-folder-access-reset.ts +++ b/src/main/daemon/daemon-folder-access-reset.ts @@ -8,7 +8,7 @@ import { type MacTccFolderClass } from '../../shared/daemon-adoption-telemetry' import type { EventProps } from '../../shared/telemetry-events' -import { readMacosBundleId, resetMacosTccPermission } from '../macos-tcc-reset' +import { readMacosBundleId, resetMacosTccPermission } from '../macos-permissions/macos-tcc-reset' import { enumerateDirectoryOnce } from './directory-enumeration-probe' import { track } from '../telemetry/client' import { diff --git a/src/main/daemon/daemon-full-disk-access-status.test.ts b/src/main/daemon/daemon-full-disk-access-status.test.ts index f0a0be72757..a00d8f0b7bd 100644 --- a/src/main/daemon/daemon-full-disk-access-status.test.ts +++ b/src/main/daemon/daemon-full-disk-access-status.test.ts @@ -12,7 +12,9 @@ vi.mock('./daemon-provider-state', () => ({ getDaemonProvider: () => (state.installed ? (state.degraded ? new DegradedProvider() : {}) : null) })) vi.mock('./degraded-daemon-pty-provider', () => ({ DegradedDaemonPtyProvider: DegradedProvider })) -vi.mock('../macos-full-disk-access-status', () => ({ getMacosFullDiskAccessStatus: localStatus })) +vi.mock('../macos-permissions/macos-full-disk-access-status', () => ({ + getMacosFullDiskAccessStatus: localStatus +})) vi.mock('./daemon-provider-routing', () => ({ getCurrentDaemonAdapter: () => current, getLegacyDaemonAdapters: () => [legacy] diff --git a/src/main/daemon/daemon-full-disk-access-status.ts b/src/main/daemon/daemon-full-disk-access-status.ts index 3b80ef1f137..d5c60b99c2c 100644 --- a/src/main/daemon/daemon-full-disk-access-status.ts +++ b/src/main/daemon/daemon-full-disk-access-status.ts @@ -2,7 +2,7 @@ import type { DeveloperPermissionStatus } from '../../shared/developer-permissio import { getCurrentDaemonAdapter, getLegacyDaemonAdapters } from './daemon-provider-routing' import { getDaemonProvider } from './daemon-provider-state' import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider' -import { getMacosFullDiskAccessStatus } from '../macos-full-disk-access-status' +import { getMacosFullDiskAccessStatus } from '../macos-permissions/macos-full-disk-access-status' /** Caller gates macOS; all daemon generations must grant access, and any denial wins. */ export async function getTerminalHostsFullDiskAccessStatus(): Promise { diff --git a/src/main/daemon/daemon-health-requests.ts b/src/main/daemon/daemon-health-requests.ts index 4747d21186f..c98ca59725b 100644 --- a/src/main/daemon/daemon-health-requests.ts +++ b/src/main/daemon/daemon-health-requests.ts @@ -1,5 +1,5 @@ import { readCurrentProcessMacSystemResolverHealth } from '../network/macos-system-resolver-health' -import { getMacosFullDiskAccessStatus } from '../macos-full-disk-access-status' +import { getMacosFullDiskAccessStatus } from '../macos-permissions/macos-full-disk-access-status' import { ptySpawnHealthPlatformCoverage } from './daemon-health-identity' import { checkDaemonAsyncIo } from './daemon-async-io-probe' import type { DaemonFileLog } from './daemon-file-log' diff --git a/src/main/editor-launcher-name.ts b/src/main/external-editors/editor-launcher-name.ts similarity index 100% rename from src/main/editor-launcher-name.ts rename to src/main/external-editors/editor-launcher-name.ts diff --git a/src/main/external-editor-launch-process-host.test.ts b/src/main/external-editors/external-editor-launch-process-host.test.ts similarity index 100% rename from src/main/external-editor-launch-process-host.test.ts rename to src/main/external-editors/external-editor-launch-process-host.test.ts diff --git a/src/main/external-editor-launch.test.ts b/src/main/external-editors/external-editor-launch.test.ts similarity index 99% rename from src/main/external-editor-launch.test.ts rename to src/main/external-editors/external-editor-launch.test.ts index c541ad5bef6..251bf1a5d35 100644 --- a/src/main/external-editor-launch.test.ts +++ b/src/main/external-editors/external-editor-launch.test.ts @@ -4,12 +4,12 @@ const { resolveCliCommandMock } = vi.hoisted(() => ({ resolveCliCommandMock: vi.fn((command: string) => command) })) -vi.mock('./codex-cli/command', () => ({ +vi.mock('../../shared/node-cli-command-resolution', () => ({ resolveCliCommand: resolveCliCommandMock })) -import type { SshTarget } from '../shared/ssh-types' -import { getCmdExePath } from './win32-utils' +import type { SshTarget } from '../../shared/ssh-types' +import { getCmdExePath } from '../../shared/windows-batch-spawn' import { resolveExternalEditorLaunchSpec } from './external-editor-launch' import { resolveRemoteSshEditorLaunchSpec } from './remote-ssh-editor-launch' diff --git a/src/main/external-editor-launch.ts b/src/main/external-editors/external-editor-launch.ts similarity index 95% rename from src/main/external-editor-launch.ts rename to src/main/external-editors/external-editor-launch.ts index e4212f05224..2186d3a3418 100644 --- a/src/main/external-editor-launch.ts +++ b/src/main/external-editors/external-editor-launch.ts @@ -1,12 +1,12 @@ -import { quotePosixShellUnlessPlain } from '../shared/shell-argument-quoting' +import { quotePosixShellUnlessPlain } from '../../shared/shell-argument-quoting' import { spawn, type ChildProcess } from 'node:child_process' import { spawnProcess } from '@orca/process-host' import { existsSync } from 'node:fs' import { posix, win32 } from 'node:path' -import { parseWslUncPath } from '../shared/wsl-paths' -import { isVsCodeLauncherExecutable } from '../shared/remote-ssh-editor-launcher' -import { resolveCliCommand } from './codex-cli/command' -import { envWithoutAppImageRuntime } from './pty/appimage-terminal-env' +import { parseWslUncPath } from '../../shared/wsl-paths' +import { isVsCodeLauncherExecutable } from '../../shared/remote-ssh-editor-launcher' +import { resolveCliCommand } from '../../shared/node-cli-command-resolution' +import { envWithoutAppImageRuntime } from '../pty/appimage-terminal-env' import { getLauncherBaseName, hasMatchingOuterQuotes, @@ -17,7 +17,7 @@ import { resolveColocatedJetBrainsGuiExecutable } from './jetbrains-windows-gui-launchers' import { findInstalledVsCodeCli } from './vscode-cli-install-paths' -import { getCmdExePath, getSpawnArgsForWindows } from './win32-utils' +import { getCmdExePath, getSpawnArgsForWindows } from '../../shared/windows-batch-spawn' export const EXTERNAL_EDITOR_CLI_COMMAND = 'code' const WINDOWS_CONSOLE_EDITORS = new Set(['nvim', 'vim']) diff --git a/src/main/jetbrains-windows-gui-launchers.ts b/src/main/external-editors/jetbrains-windows-gui-launchers.ts similarity index 100% rename from src/main/jetbrains-windows-gui-launchers.ts rename to src/main/external-editors/jetbrains-windows-gui-launchers.ts diff --git a/src/main/remote-ssh-editor-launch.ts b/src/main/external-editors/remote-ssh-editor-launch.ts similarity index 80% rename from src/main/remote-ssh-editor-launch.ts rename to src/main/external-editors/remote-ssh-editor-launch.ts index fd1a3324b0b..3a5fb6f3756 100644 --- a/src/main/remote-ssh-editor-launch.ts +++ b/src/main/external-editors/remote-ssh-editor-launch.ts @@ -1,13 +1,13 @@ -import { getRemoteSshEditorKind } from '../shared/remote-ssh-editor-launcher' -import type { ShellOpenExternalEditorResult } from '../shared/shell-open-types' -import type { SshTarget } from '../shared/ssh-types' +import { getRemoteSshEditorKind } from '../../shared/remote-ssh-editor-launcher' +import type { ShellOpenExternalEditorResult } from '../../shared/shell-open-types' +import type { SshTarget } from '../../shared/ssh-types' import { getLauncherBaseName } from './editor-launcher-name' import { resolveExternalEditorExecutable, type ExternalEditorLaunchSpec } from './external-editor-launch' -import { resolveVsCodeSshAuthority } from './ssh/config/vscode-ssh-authority' -import { resolveZedSshUrl } from './ssh/config/zed-ssh-url' +import { resolveVsCodeSshAuthority } from '../ssh/config/vscode-ssh-authority' +import { resolveZedSshUrl } from '../ssh/config/zed-ssh-url' export function resolveRemoteSshEditorLaunchSpec( command: string | undefined, diff --git a/src/main/vscode-cli-install-paths.ts b/src/main/external-editors/vscode-cli-install-paths.ts similarity index 100% rename from src/main/vscode-cli-install-paths.ts rename to src/main/external-editors/vscode-cli-install-paths.ts diff --git a/src/main/ipc/app.test.ts b/src/main/ipc/app.test.ts index 7904456e2ca..b510caacf77 100644 --- a/src/main/ipc/app.test.ts +++ b/src/main/ipc/app.test.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'node:events' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type * as AppRelaunch from '../app-relaunch' +import type * as AppRelaunch from '../startup/quit/app-relaunch' import { detectUiLanguage } from '../../shared/ui-locale' const { @@ -111,7 +111,7 @@ vi.mock('../i18n/system-language', () => ({ })) vi.mock('../i18n/main-i18n', () => ({ setMainUiLanguage: setMainUiLanguageMock })) -vi.mock('../app-relaunch', async (importOriginal) => ({ +vi.mock('../startup/quit/app-relaunch', async (importOriginal) => ({ ...(await importOriginal()), relaunchApp: relaunchAppMock })) diff --git a/src/main/ipc/app.ts b/src/main/ipc/app.ts index 0f679e481da..88cd3d77e81 100644 --- a/src/main/ipc/app.ts +++ b/src/main/ipc/app.ts @@ -8,7 +8,7 @@ import { app, BrowserWindow, dialog, ipcMain, type IpcMainInvokeEvent } from 'el import type { AppIdentity } from '../../shared/app-identity' import type { MarkdownDocument } from '../../shared/filesystem-entry-types' import type { FloatingTerminalCwdRequest } from '../../shared/ui-chrome-types' -import { relaunchApp, runBeforeRelaunchCleanup } from '../app-relaunch' +import { relaunchApp, runBeforeRelaunchCleanup } from '../startup/quit/app-relaunch' import { setWindowMaterialSuppressed } from '../window/window-material-suppression' import { isTrustedUIRenderer } from './ui' import { prepareWindowsAdministratorRestart } from '../windows/windows-administrator-restart' diff --git a/src/main/ipc/developer-permissions.test.ts b/src/main/ipc/developer-permissions.test.ts index bfea16e6ad8..060f1a3fb5e 100644 --- a/src/main/ipc/developer-permissions.test.ts +++ b/src/main/ipc/developer-permissions.test.ts @@ -64,7 +64,7 @@ vi.mock('node:child_process', () => ({ execFile: execFileMock })) -vi.mock('../macos-full-disk-access-status', () => ({ +vi.mock('../macos-permissions/macos-full-disk-access-status', () => ({ getMacosFullDiskAccessStatus: getMacosFullDiskAccessStatusMock })) vi.mock('../daemon/daemon-full-disk-access-status', () => ({ diff --git a/src/main/ipc/developer-permissions.ts b/src/main/ipc/developer-permissions.ts index 9b5d9e0da71..55ac1360fe3 100644 --- a/src/main/ipc/developer-permissions.ts +++ b/src/main/ipc/developer-permissions.ts @@ -1,7 +1,7 @@ import { execFile } from 'node:child_process' import dgram from 'node:dgram' import { ipcMain, shell, systemPreferences } from 'electron' -import { getMacosFullDiskAccessStatus } from '../macos-full-disk-access-status' +import { getMacosFullDiskAccessStatus } from '../macos-permissions/macos-full-disk-access-status' import { getTerminalHostsFullDiskAccessStatus } from '../daemon/daemon-full-disk-access-status' import { testLocalNetworkConnection } from './local-network-connection-test' import type { diff --git a/src/main/ipc/filesystem/filesystem-runtime-upload-staging.ts b/src/main/ipc/filesystem/filesystem-runtime-upload-staging.ts index 552f2ebf46e..f47106a3a77 100644 --- a/src/main/ipc/filesystem/filesystem-runtime-upload-staging.ts +++ b/src/main/ipc/filesystem/filesystem-runtime-upload-staging.ts @@ -7,7 +7,7 @@ import { constants } from 'node:fs' import { lstat, open, readdir, realpath, type FileHandle } from 'node:fs/promises' import { basename, extname, isAbsolute, join, relative, resolve, sep } from 'node:path' import { classifyImportSource } from './filesystem-import-source-stat' -import { detectImageFileSignature, IMAGE_SIGNATURE_BYTES } from '../../image-file-signature' +import { detectImageFileSignature, IMAGE_SIGNATURE_BYTES } from '../../media/image-file-signature' import type { StagedExternalImportEntry, StagedExternalImportSource diff --git a/src/main/ipc/orca-profiles-switch-persistence.test.ts b/src/main/ipc/orca-profiles-switch-persistence.test.ts index 2ec29383d0b..870bcf49934 100644 --- a/src/main/ipc/orca-profiles-switch-persistence.test.ts +++ b/src/main/ipc/orca-profiles-switch-persistence.test.ts @@ -19,7 +19,7 @@ vi.mock('electron', () => ({ } } })) -vi.mock('../app-relaunch', () => ({ relaunchApp: vi.fn() })) +vi.mock('../startup/quit/app-relaunch', () => ({ relaunchApp: vi.fn() })) vi.mock('../orca-profiles/profile-index-store', () => ({ getOrcaProfileListState: () => ({ activeProfileId: 'source', profiles: [] }), setActiveOrcaProfile: select, diff --git a/src/main/ipc/orca-profiles.test.ts b/src/main/ipc/orca-profiles.test.ts index 185b98877ba..40581ea9a4a 100644 --- a/src/main/ipc/orca-profiles.test.ts +++ b/src/main/ipc/orca-profiles.test.ts @@ -46,7 +46,7 @@ vi.mock('../tray/system-tray', () => ({ destroySystemTray: destroySystemTrayMock })) -vi.mock('../app-relaunch', () => ({ +vi.mock('../startup/quit/app-relaunch', () => ({ relaunchApp: relaunchAppMock })) diff --git a/src/main/ipc/orca-profiles.ts b/src/main/ipc/orca-profiles.ts index da4d87fc28d..cb1b16921fb 100644 --- a/src/main/ipc/orca-profiles.ts +++ b/src/main/ipc/orca-profiles.ts @@ -1,6 +1,6 @@ import { ipcMain, type WebContents } from 'electron' import type { Store } from '../persistence/loading-store/store' -import { relaunchApp, type AppRelaunchReason } from '../app-relaunch' +import { relaunchApp, type AppRelaunchReason } from '../startup/quit/app-relaunch' import { quitProcess } from '../startup/process-quit-request' import type { CreateLocalOrcaProfileArgs, diff --git a/src/main/ipc/register-core-handlers/register-core-handlers.ts b/src/main/ipc/register-core-handlers/register-core-handlers.ts index 09f64060351..e00b97501a6 100644 --- a/src/main/ipc/register-core-handlers/register-core-handlers.ts +++ b/src/main/ipc/register-core-handlers/register-core-handlers.ts @@ -93,7 +93,7 @@ import type { RateLimitService } from '../../rate-limits/service' import type { CodexAccountService } from '../../codex-accounts/service' import type { ClaudeAccountService } from '../../claude-accounts/service' import type { AutomationService } from '../../automations/service' -import type { AgentAwakeService } from '../../agent-awake-service' +import type { AgentAwakeService } from '../../power/agent-awake-service' import type { CrashReportStore } from '../../crash-reporting/crash-report-store' import type { KeybindingService } from '../../keybindings/keybinding-service' import type { @@ -113,7 +113,7 @@ import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/age import { getAgentSessionAttachmentStore } from '../../native-chat/agent-session-attachments/agent-session-attachment-store-registry' import type { PluginService } from '../../plugins/plugin-service' import type { PluginMarketplaceHandlerServices } from '../plugin-marketplaces' -import { settleWithinMs } from '../../quit-teardown-deadline' +import { settleWithinMs } from '../../startup/quit/quit-teardown-deadline' import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/runtime-environment-registry-root' let registered = false diff --git a/src/main/ipc/repos-add-linked-worktree.test.ts b/src/main/ipc/repos-add-linked-worktree.test.ts index ebaff74e605..1556b35a36c 100644 --- a/src/main/ipc/repos-add-linked-worktree.test.ts +++ b/src/main/ipc/repos-add-linked-worktree.test.ts @@ -51,7 +51,7 @@ vi.mock('../git/repo', () => ({ searchBaseRefs: vi.fn().mockResolvedValue([]) })) -vi.mock('../repo-icon-autodetect', () => ({ +vi.mock('../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: detectRepoIconAndUpstreamMock })) diff --git a/src/main/ipc/repos/local-repo-registration.test.ts b/src/main/ipc/repos/local-repo-registration.test.ts index bfed547895b..68059ce80c9 100644 --- a/src/main/ipc/repos/local-repo-registration.test.ts +++ b/src/main/ipc/repos/local-repo-registration.test.ts @@ -6,7 +6,7 @@ import type { Repo } from '../../../shared/repo-types' import type { Store } from '../../persistence/loading-store/store' import { addLocalRepoFromPath } from './local-repo-registration' -vi.mock('../../repo-icon-autodetect', () => ({ +vi.mock('../../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: vi.fn().mockResolvedValue({}) })) vi.mock('../../worktree-root-preparation', () => ({ diff --git a/src/main/ipc/repos/local-repo-registration.ts b/src/main/ipc/repos/local-repo-registration.ts index 4eb10fc8740..0823b17592b 100644 --- a/src/main/ipc/repos/local-repo-registration.ts +++ b/src/main/ipc/repos/local-repo-registration.ts @@ -12,7 +12,7 @@ import { } from '../../git/repo' import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import { findProjectAtSameRealPath } from '../../project-realpath-identity' -import { detectRepoIconAndUpstream } from '../../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect' import { prepareLocalWorktreeRootForRepo } from '../../worktree-root-preparation' import { describeWslUncAccessDenied } from '../../wsl/wsl-unc-access-denied' diff --git a/src/main/ipc/repos/nested-repo-import-handler.ts b/src/main/ipc/repos/nested-repo-import-handler.ts index a52a77a166c..8ea5148aa54 100644 --- a/src/main/ipc/repos/nested-repo-import-handler.ts +++ b/src/main/ipc/repos/nested-repo-import-handler.ts @@ -14,7 +14,7 @@ import { } from '../../project-groups/nested-repo-import' import { createNestedRepoImportTargetResolver } from '../../project-groups/nested-repo-import-target' import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' -import { detectRepoIconAndUpstream } from '../../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect' import { prepareLocalWorktreeRootForRepo } from '../../worktree-root-preparation' import { invalidateAuthorizedRootsCache } from '../registered-worktree-roots-cache' import { emitRepoAdded } from './repo-added-telemetry' diff --git a/src/main/ipc/repos/repo-clone-lifecycle.ts b/src/main/ipc/repos/repo-clone-lifecycle.ts index 4ea936fadae..8f9e25dcafb 100644 --- a/src/main/ipc/repos/repo-clone-lifecycle.ts +++ b/src/main/ipc/repos/repo-clone-lifecycle.ts @@ -19,7 +19,7 @@ import { getClonePathComparisonKey } from '../../git/repo-clone-path' import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' -import { detectRepoIconAndUpstream } from '../../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect' import { prepareLocalWorktreeRootForRepo } from '../../worktree-root-preparation' import { invalidateAuthorizedRootsCache } from '../registered-worktree-roots-cache' import { emitRepoAdded } from './repo-added-telemetry' diff --git a/src/main/ipc/repos/repo-creation-handlers.ts b/src/main/ipc/repos/repo-creation-handlers.ts index c06ab73649e..0f7bcf06b25 100644 --- a/src/main/ipc/repos/repo-creation-handlers.ts +++ b/src/main/ipc/repos/repo-creation-handlers.ts @@ -12,7 +12,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import { getEffectiveHostSetting } from '../../../shared/host-setting-overrides' import { probeGitAvailability } from '../../git/git-availability' import { gitExecFileAsync } from '../../git/runner' -import { detectRepoIconAndUpstream } from '../../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect' import { prepareLocalWorktreeRootForRepo } from '../../worktree-root-preparation' import { invalidateAuthorizedRootsCache } from '../registered-worktree-roots-cache' import { repoCreateFailure, type RepoCreateFailure } from '../../../shared/repo-create-failure-copy' diff --git a/src/main/ipc/settings-delayed-response.test.ts b/src/main/ipc/settings-delayed-response.test.ts index e955d090d0d..c1e98e2d7ed 100644 --- a/src/main/ipc/settings-delayed-response.test.ts +++ b/src/main/ipc/settings-delayed-response.test.ts @@ -43,7 +43,7 @@ vi.mock('../browser/browser-session-proxy', () => ({ vi.mock('../browser/browser-session-registry', () => ({ browserSessionRegistry: { listProfiles: vi.fn(() => []) } })) -vi.mock('../app-icon', () => ({ applyAppIcon: vi.fn() })) +vi.mock('../window/desktop-integration/app-icon', () => ({ applyAppIcon: vi.fn() })) vi.mock('../ai-vault-search/session-search-enablement', () => ({ applySessionSearchSettingsChange: vi.fn() })) diff --git a/src/main/ipc/settings.test.ts b/src/main/ipc/settings.test.ts index f3699943d20..11b141074f9 100644 --- a/src/main/ipc/settings.test.ts +++ b/src/main/ipc/settings.test.ts @@ -63,7 +63,7 @@ vi.mock('../browser/browser-session-registry', () => ({ browserSessionRegistry: { listProfiles: listProfilesMock } })) -vi.mock('../app-icon', () => ({ +vi.mock('../window/desktop-integration/app-icon', () => ({ applyAppIcon: applyAppIconMock })) diff --git a/src/main/ipc/settings.ts b/src/main/ipc/settings.ts index 18bbee0f163..c09eb6df92d 100644 --- a/src/main/ipc/settings.ts +++ b/src/main/ipc/settings.ts @@ -3,14 +3,14 @@ import { app, BrowserWindow, ipcMain, nativeTheme } from 'electron' import type { Store } from '../persistence/loading-store/store' import type { GlobalSettings } from '../../shared/global-settings-types' import type { PersistedState } from '../../shared/persisted-state-types' -import { listSystemFontFamilies } from '../system-fonts' +import { listSystemFontFamilies } from '../window/desktop-integration/system-fonts' import { registerSettingsImportHandlers } from './settings-import-handlers' import { setMainUiLanguage } from '../i18n/main-i18n' import { rebuildAppMenu } from '../menu/register-app-menu' import { rebuildSystemTrayMenu } from '../tray/system-tray' import { track } from '../telemetry/client' import { SETTINGS_CHANGED_WHITELIST, type SettingsChangedKey } from '../../shared/telemetry-events' -import type { AgentAwakeService } from '../agent-awake-service' +import type { AgentAwakeService } from '../power/agent-awake-service' import { sanitizeFloatingWorkspaceDirectorySetting } from './floating-workspace-directory' import { applyAgentStatusHooksEnabled } from '../agent-hooks/managed-agent-hook-controls' import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting' @@ -22,7 +22,7 @@ import { browserSessionRegistry } from '../browser/browser-session-registry' import { sanitizeNetworkSettings } from './network-settings-sanitization' import { normalizeAppIconId } from '../../shared/app-icon' import { normalizeUiLanguage } from '../../shared/ui-language' -import { applyAppIcon } from '../app-icon' +import { applyAppIcon } from '../window/desktop-integration/app-icon' import { normalizeTerminalCustomThemes } from '../../shared/terminal-custom-themes' import { normalizeDesktopTerminalScrollbackRows } from '../../shared/terminal-scrollback-policy' import { normalizeTerminalLineHeight } from '../../shared/terminal-line-height-settings' diff --git a/src/main/ipc/shell-server-ssh-editor.test.ts b/src/main/ipc/shell-server-ssh-editor.test.ts index 6b116cb4a86..fa9be15a0ff 100644 --- a/src/main/ipc/shell-server-ssh-editor.test.ts +++ b/src/main/ipc/shell-server-ssh-editor.test.ts @@ -15,7 +15,9 @@ vi.mock('electron', () => ({ vi.mock('node:child_process', () => ({ spawn: spawnMock })) -vi.mock('../codex-cli/command', () => ({ resolveCliCommand: resolveCliCommandMock })) +vi.mock('../../shared/node-cli-command-resolution', () => ({ + resolveCliCommand: resolveCliCommandMock +})) import { registerShellHandlers } from './shell' import { fingerprintRuntimeSshTarget } from '../ssh/runtime-ssh-target-fingerprint' diff --git a/src/main/ipc/shell-wsl-owner.test.ts b/src/main/ipc/shell-wsl-owner.test.ts index ff5704577f2..e589f155327 100644 --- a/src/main/ipc/shell-wsl-owner.test.ts +++ b/src/main/ipc/shell-wsl-owner.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type * as WindowsPathAccessHost from '../windows-path-access-host' -import type * as ExternalEditorLaunch from '../external-editor-launch' +import type * as ExternalEditorLaunch from '../external-editors/external-editor-launch' const { handleMock, launchMock, showItemInFolderMock, statMock, recordForEnvironmentMock } = vi.hoisted(() => ({ @@ -24,7 +24,7 @@ vi.mock('node:fs/promises', () => ({ stat: statMock })) -vi.mock('../codex-cli/command', () => ({ +vi.mock('../../shared/node-cli-command-resolution', () => ({ resolveCliCommand: (command: string) => command })) @@ -40,7 +40,7 @@ vi.mock('../windows-path-access-host', async (importOriginal) => { } }) -vi.mock('../external-editor-launch', async (importOriginal) => { +vi.mock('../external-editors/external-editor-launch', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/main/ipc/shell.test.ts b/src/main/ipc/shell.test.ts index 93695ed6008..9e197a8b4cc 100644 --- a/src/main/ipc/shell.test.ts +++ b/src/main/ipc/shell.test.ts @@ -46,11 +46,11 @@ vi.mock('node:child_process', () => ({ spawn: spawnMock })) -vi.mock('../codex-cli/command', () => ({ +vi.mock('../../shared/node-cli-command-resolution', () => ({ resolveCliCommand: resolveCliCommandMock })) -vi.mock('../win32-utils', () => ({ +vi.mock('../../shared/windows-batch-spawn', () => ({ getCmdExePath: () => 'C:\\Windows\\System32\\cmd.exe', getSpawnArgsForWindows: getSpawnArgsForWindowsMock })) diff --git a/src/main/ipc/shell.ts b/src/main/ipc/shell.ts index 09252b1a63e..ce55a292711 100644 --- a/src/main/ipc/shell.ts +++ b/src/main/ipc/shell.ts @@ -18,8 +18,8 @@ import { EXTERNAL_EDITOR_CLI_COMMAND, launchExternalEditor, resolveExternalEditorLaunchSpec -} from '../external-editor-launch' -import { resolveRemoteSshEditorLaunchSpec } from '../remote-ssh-editor-launch' +} from '../external-editors/external-editor-launch' +import { resolveRemoteSshEditorLaunchSpec } from '../external-editors/remote-ssh-editor-launch' import { toSshExecutionHostId } from '../../shared/execution-host' import { isEditorSshHostForOwner, diff --git a/src/main/ipc/ssh/ssh-app-shutdown.test.ts b/src/main/ipc/ssh/ssh-app-shutdown.test.ts index ee010c3e45a..cc44ee68de8 100644 --- a/src/main/ipc/ssh/ssh-app-shutdown.test.ts +++ b/src/main/ipc/ssh/ssh-app-shutdown.test.ts @@ -21,7 +21,7 @@ vi.mock('../../managed-server/lifecycle/orcad-managed-tunnel', async (importOrig import { beginSshShutdown } from './ssh-shutdown-drain' import type { SshTarget } from '../../../shared/ssh-types' -import { quitTeardownStartGate } from '../../quit-teardown-start-gate' +import { quitTeardownStartGate } from '../../startup/quit/quit-teardown-start-gate' import { createSshIpcHarness } from './ssh-ipc-test-harness' const { mockSshStore, mockConnectionManager, mockPortForwardManager } = mocks diff --git a/src/main/ipc/ssh/ssh-connect-attempt-registry.ts b/src/main/ipc/ssh/ssh-connect-attempt-registry.ts index 0b2ee3444ac..45dfeb2a98b 100644 --- a/src/main/ipc/ssh/ssh-connect-attempt-registry.ts +++ b/src/main/ipc/ssh/ssh-connect-attempt-registry.ts @@ -1,5 +1,5 @@ import type { DirectSshAuthority, SshConnectionState } from '../../../shared/ssh-types' -import { quitTeardownStartGate } from '../../quit-teardown-start-gate' +import { quitTeardownStartGate } from '../../startup/quit/quit-teardown-start-gate' import { isCurrentSshProviderAuthority, rotateSshProviderAuthority diff --git a/src/main/ipc/ssh/ssh.ts b/src/main/ipc/ssh/ssh.ts index 68a0f1ee60f..f5d23a90a16 100644 --- a/src/main/ipc/ssh/ssh.ts +++ b/src/main/ipc/ssh/ssh.ts @@ -8,7 +8,7 @@ import { } from './ssh-host-user-disconnect' import { SshConnectionManager } from '../../ssh/connection/ssh-connection-manager' import { SshPortForwardManager } from '../../ssh/port-forwarding/ssh-port-forward' -import { quitTeardownStartGate } from '../../quit-teardown-start-gate' +import { quitTeardownStartGate } from '../../startup/quit/quit-teardown-start-gate' import { getSshTargetRegistryStore, setSshConnectionManagerResolver, diff --git a/src/main/ipc/wsl-drive-unc-conversion-handlers.ts b/src/main/ipc/wsl-drive-unc-conversion-handlers.ts index 941f941c567..3ec46c16728 100644 --- a/src/main/ipc/wsl-drive-unc-conversion-handlers.ts +++ b/src/main/ipc/wsl-drive-unc-conversion-handlers.ts @@ -9,7 +9,7 @@ import type { WslDriveUncConversionRequest, WslDriveUncConversionResult } from '../../shared/wsl-drive-unc-conversion-types' -import { relaunchApp } from '../app-relaunch' +import { relaunchApp } from '../startup/quit/app-relaunch' import { gitExecFileAsync } from '../git/command-runner/git-exec-file' import { readProfileProjectTransferState } from '../orca-profiles/profile-project-domain-state' import { getOrcaProfileListState } from '../orca-profiles/profile-index-store' diff --git a/src/main/link-preview/link-preview-page-metadata.ts b/src/main/link-preview/link-preview-page-metadata.ts index f1bc20fe53e..64178b08266 100644 --- a/src/main/link-preview/link-preview-page-metadata.ts +++ b/src/main/link-preview/link-preview-page-metadata.ts @@ -3,7 +3,7 @@ import { findIconHref, htmlTagAttributes, normalizeHtmlText -} from '../html-head-tags' +} from '../network/page-metadata/html-head-tags' const MAX_TITLE_CHARS = 200 const MAX_DESCRIPTION_CHARS = 400 diff --git a/src/main/macos-full-disk-access-status.test.ts b/src/main/macos-permissions/macos-full-disk-access-status.test.ts similarity index 100% rename from src/main/macos-full-disk-access-status.test.ts rename to src/main/macos-permissions/macos-full-disk-access-status.test.ts diff --git a/src/main/macos-full-disk-access-status.ts b/src/main/macos-permissions/macos-full-disk-access-status.ts similarity index 93% rename from src/main/macos-full-disk-access-status.ts rename to src/main/macos-permissions/macos-full-disk-access-status.ts index 44af4fe8d29..d10d01e94ff 100644 --- a/src/main/macos-full-disk-access-status.ts +++ b/src/main/macos-permissions/macos-full-disk-access-status.ts @@ -1,7 +1,7 @@ import { open } from 'node:fs/promises' import { homedir } from 'node:os' import { join } from 'node:path' -import type { DeveloperPermissionStatus } from '../shared/developer-permissions-types' +import type { DeveloperPermissionStatus } from '../../shared/developer-permissions-types' type ReadProbe = (filePath: string) => Promise diff --git a/src/main/macos-tcc-log-stream-orphans.test.ts b/src/main/macos-permissions/macos-tcc-log-stream-orphans.test.ts similarity index 96% rename from src/main/macos-tcc-log-stream-orphans.test.ts rename to src/main/macos-permissions/macos-tcc-log-stream-orphans.test.ts index 71270c1dc13..7128c386ea0 100644 --- a/src/main/macos-tcc-log-stream-orphans.test.ts +++ b/src/main/macos-permissions/macos-tcc-log-stream-orphans.test.ts @@ -3,7 +3,7 @@ import { findOrphanedTccLogStreams, reclaimOrphanedTccLogStreams } from './macos-tcc-log-stream-orphans' -import { parsePsArgsLine, type ProcessIdentityRow } from './opencode/opencode-client-sweep' +import { parsePsArgsLine, type ProcessIdentityRow } from '../opencode/opencode-client-sweep' // Captured from `ps -eo pid=,ppid=,etime=,args=` on a Mac holding leaked watchers. const LEGACY_ARGS = diff --git a/src/main/macos-tcc-log-stream-orphans.ts b/src/main/macos-permissions/macos-tcc-log-stream-orphans.ts similarity index 98% rename from src/main/macos-tcc-log-stream-orphans.ts rename to src/main/macos-permissions/macos-tcc-log-stream-orphans.ts index ee2e38eefba..91d514c989e 100644 --- a/src/main/macos-tcc-log-stream-orphans.ts +++ b/src/main/macos-permissions/macos-tcc-log-stream-orphans.ts @@ -4,7 +4,7 @@ import { splitCommandLineArgv, sweepProcessIdentities, type ProcessIdentityRow -} from './opencode/opencode-client-sweep' +} from '../opencode/opencode-client-sweep' import { LOG_PREDICATE } from './macos-tcc-prompt-watch' // Match legacy builds that spawned log stream without a lifetime wrapper. diff --git a/src/main/macos-tcc-prompt-notice.test.ts b/src/main/macos-permissions/macos-tcc-prompt-notice.test.ts similarity index 99% rename from src/main/macos-tcc-prompt-notice.test.ts rename to src/main/macos-permissions/macos-tcc-prompt-notice.test.ts index 2b02ff71ecf..29a384645d5 100644 --- a/src/main/macos-tcc-prompt-notice.test.ts +++ b/src/main/macos-permissions/macos-tcc-prompt-notice.test.ts @@ -6,10 +6,10 @@ const readTallyFile = vi.fn() const watchStart = vi.fn() const watchStop = vi.fn() const watchOptions: { onPrompt: () => void }[] = [] -vi.mock('./codex-accounts/fs-utils', () => ({ +vi.mock('../codex-accounts/fs-utils', () => ({ writeFileAtomically: (...args: unknown[]) => writeFileAtomically(...args) })) -vi.mock('./persistence/loading-store/user-data-path', () => ({ +vi.mock('../persistence/loading-store/user-data-path', () => ({ getCanonicalUserDataPath: () => '/tmp/orca-tcc-notice-test' })) vi.mock('./macos-tcc-log-stream-orphans', () => ({ diff --git a/src/main/macos-tcc-prompt-notice.ts b/src/main/macos-permissions/macos-tcc-prompt-notice.ts similarity index 98% rename from src/main/macos-tcc-prompt-notice.ts rename to src/main/macos-permissions/macos-tcc-prompt-notice.ts index e2961fd2add..f9d72170086 100644 --- a/src/main/macos-tcc-prompt-notice.ts +++ b/src/main/macos-permissions/macos-tcc-prompt-notice.ts @@ -1,8 +1,8 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import type { BrowserWindow } from 'electron' -import { writeFileAtomically } from './codex-accounts/fs-utils' -import { getCanonicalUserDataPath } from './persistence/loading-store/user-data-path' +import { writeFileAtomically } from '../codex-accounts/fs-utils' +import { getCanonicalUserDataPath } from '../persistence/loading-store/user-data-path' import { MacosTccPromptWatch } from './macos-tcc-prompt-watch' import { reclaimOrphanedTccLogStreams } from './macos-tcc-log-stream-orphans' diff --git a/src/main/macos-tcc-prompt-watch.test.ts b/src/main/macos-permissions/macos-tcc-prompt-watch.test.ts similarity index 100% rename from src/main/macos-tcc-prompt-watch.test.ts rename to src/main/macos-permissions/macos-tcc-prompt-watch.test.ts diff --git a/src/main/macos-tcc-prompt-watch.ts b/src/main/macos-permissions/macos-tcc-prompt-watch.ts similarity index 100% rename from src/main/macos-tcc-prompt-watch.ts rename to src/main/macos-permissions/macos-tcc-prompt-watch.ts diff --git a/src/main/macos-tcc-reset.ts b/src/main/macos-permissions/macos-tcc-reset.ts similarity index 100% rename from src/main/macos-tcc-reset.ts rename to src/main/macos-permissions/macos-tcc-reset.ts diff --git a/src/main/image-file-signature.test.ts b/src/main/media/image-file-signature.test.ts similarity index 100% rename from src/main/image-file-signature.test.ts rename to src/main/media/image-file-signature.test.ts diff --git a/src/main/image-file-signature.ts b/src/main/media/image-file-signature.ts similarity index 100% rename from src/main/image-file-signature.ts rename to src/main/media/image-file-signature.ts diff --git a/src/main/html-head-tags.ts b/src/main/network/page-metadata/html-head-tags.ts similarity index 100% rename from src/main/html-head-tags.ts rename to src/main/network/page-metadata/html-head-tags.ts diff --git a/src/main/orcad/orcad-lifecycle.ts b/src/main/orcad/orcad-lifecycle.ts index e4953351419..4e9f51cdf21 100644 --- a/src/main/orcad/orcad-lifecycle.ts +++ b/src/main/orcad/orcad-lifecycle.ts @@ -1,5 +1,5 @@ import { setRuntimeBrowserCommandsFactory } from '../runtime/runtime-browser-commands-factory' -import { markHostShuttingDown } from '../host-shutdown-state' +import { markHostShuttingDown } from '../startup/quit/host-shutdown-state' import { setDesktopBrowserBridgeHostEnabled } from '../runtime/desktop-browser-bridge/desktop-browser-bridge-registry' import { ORCAD_MANAGED_ACTIVATION_ROOT_ENV } from '../../shared/orcad-managed-launch-env' import { startOrcadBrowserProvider } from './orcad-browser-startup' diff --git a/src/main/persistence/loading-store/profile-state-maintenance.spec.ts b/src/main/persistence/loading-store/profile-state-maintenance.spec.ts index e1efc1d8332..c103c3e6f8d 100644 --- a/src/main/persistence/loading-store/profile-state-maintenance.spec.ts +++ b/src/main/persistence/loading-store/profile-state-maintenance.spec.ts @@ -1,7 +1,10 @@ import { ProfileStateSqliteAuthority } from '../profile-state/profile-state-sqlite-authority' import { existsSync, readFileSync } from 'node:fs' import { describe, expect, it, vi } from 'vitest' -import { ActiveViewPreference, getActiveViewPreferenceFile } from '../../active-view-preference' +import { + ActiveViewPreference, + getActiveViewPreferenceFile +} from '../preferences/active-view-preference' import * as backupWorker from '../profile-state/profile-state-backup-worker' import { profileStateDatabaseBackups } from '../profile-state/profile-state-backup-path' import { profileStateJsonExportPaths } from '../profile-state/legacy-json/profile-state-export-path' diff --git a/src/main/persistence/loading-store/store-runtime-state.ts b/src/main/persistence/loading-store/store-runtime-state.ts index c69a5106483..771ec32455f 100644 --- a/src/main/persistence/loading-store/store-runtime-state.ts +++ b/src/main/persistence/loading-store/store-runtime-state.ts @@ -8,7 +8,7 @@ import type { import type { ExecutionHostId } from '../../../shared/execution-host' import type { StateWriteListener } from './write-scheduling' import type { PartitionEditorViews } from './layout-editor-views' -import type { ActiveViewPreference } from '../../active-view-preference' +import type { ActiveViewPreference } from '../preferences/active-view-preference' import { getProfileTerminalScrollbackSnapshotRoot, type TerminalScrollbackSnapshotStorage diff --git a/src/main/persistence/loading-store/store.ts b/src/main/persistence/loading-store/store.ts index f297cb08604..dc4dbba3f3c 100644 --- a/src/main/persistence/loading-store/store.ts +++ b/src/main/persistence/loading-store/store.ts @@ -4,7 +4,7 @@ import { setMigrationUnsupportedPtyPersistenceListener } from '../../agent-hooks/migration-unsupported-pty-state' import { agentHookServer } from '../../agent-hooks/server' -import { ActiveViewPreference } from '../../active-view-preference' +import { ActiveViewPreference } from '../preferences/active-view-preference' import { registerPersistedPaneKeyAlias } from '../restoring-sessions/pane-alias-normalization' import { normalizePersistedPaneIdentityState } from '../restoring-sessions/workspace-pane-normalization' import { nameEmptyPersistedTerminalLayoutRoots } from '../restoring-sessions/empty-terminal-layout-root-repair' diff --git a/src/main/active-view-persistence-boundary.test.ts b/src/main/persistence/preferences/active-view-persistence-boundary.test.ts similarity index 86% rename from src/main/active-view-persistence-boundary.test.ts rename to src/main/persistence/preferences/active-view-persistence-boundary.test.ts index c633c712ba4..1edf7c65be6 100644 --- a/src/main/active-view-persistence-boundary.test.ts +++ b/src/main/persistence/preferences/active-view-persistence-boundary.test.ts @@ -2,7 +2,7 @@ import { closeTestStores, createSqliteTestStore, readPersistedStateJson -} from './persistence/persistence-test-harness' +} from '../persistence-test-harness' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { mkdtempSync, readFileSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' @@ -20,9 +20,9 @@ vi.mock('electron', () => ({ } })) -vi.mock('./telemetry/client', () => ({ track: vi.fn() })) -vi.mock('./telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn() })) -vi.mock('./ssh/config/ssh-config-parser', () => ({ +vi.mock('../../telemetry/client', () => ({ track: vi.fn() })) +vi.mock('../../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn() })) +vi.mock('../../ssh/config/ssh-config-parser', () => ({ loadUserSshConfig: vi.fn(), sshConfigHostsToTargets: vi.fn() })) @@ -41,7 +41,7 @@ describe('active-view persistence boundary', () => { it('persists a view switch without changing the global durable snapshot', async () => { vi.useFakeTimers() vi.resetModules() - const { Store } = await import('./persistence/loading-store/store') + const { Store } = await import('../loading-store/store') const dataFile = join(testState.dir, 'orca-data.json') const store = createSqliteTestStore(Store, { dataFile }) store.flush() diff --git a/src/main/active-view-preference-sync-flush-veto.test.ts b/src/main/persistence/preferences/active-view-preference-sync-flush-veto.test.ts similarity index 100% rename from src/main/active-view-preference-sync-flush-veto.test.ts rename to src/main/persistence/preferences/active-view-preference-sync-flush-veto.test.ts diff --git a/src/main/active-view-preference.test.ts b/src/main/persistence/preferences/active-view-preference.test.ts similarity index 100% rename from src/main/active-view-preference.test.ts rename to src/main/persistence/preferences/active-view-preference.test.ts diff --git a/src/main/active-view-preference.ts b/src/main/persistence/preferences/active-view-preference.ts similarity index 98% rename from src/main/active-view-preference.ts rename to src/main/persistence/preferences/active-view-preference.ts index 5591ceb0ef4..771ecfa8502 100644 --- a/src/main/active-view-preference.ts +++ b/src/main/persistence/preferences/active-view-preference.ts @@ -1,8 +1,8 @@ import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs' import { mkdir, rename, rm, writeFile } from 'node:fs/promises' import { dirname, join } from 'node:path' -import type { TopLevelView } from '../shared/ui-chrome-types' -import { isTopLevelView } from '../shared/top-level-view' +import type { TopLevelView } from '../../../shared/ui-chrome-types' +import { isTopLevelView } from '../../../shared/top-level-view' const ACTIVE_VIEW_FILE_NAME = 'active-view.json' const SAVE_DEBOUNCE_MS = 100 diff --git a/src/main/persistence-onboarding-language-cohort.test.ts b/src/main/persistence/preferences/persistence-onboarding-language-cohort.test.ts similarity index 96% rename from src/main/persistence-onboarding-language-cohort.test.ts rename to src/main/persistence/preferences/persistence-onboarding-language-cohort.test.ts index 7ef3a57cb7a..46f9bbf6216 100644 --- a/src/main/persistence-onboarding-language-cohort.test.ts +++ b/src/main/persistence/preferences/persistence-onboarding-language-cohort.test.ts @@ -4,7 +4,7 @@ import { readDataFile, testState, writeDataFile -} from './persistence/persistence-test-harness' +} from '../persistence-test-harness' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import * as crypto from 'node:crypto' import { mkdtempSync, rmSync } from 'node:fs' @@ -15,7 +15,7 @@ vi.mock('electron', () => ({ app: { getPath: () => testState.dir }, safeStorage: { isEncryptionAvailable: () => false } })) -vi.mock('./telemetry/client', () => ({ track: vi.fn() })) +vi.mock('../../telemetry/client', () => ({ track: vi.fn() })) vi.mock('node:crypto', async (importOriginal) => ({ ...(await importOriginal()), randomInt: vi.fn() diff --git a/src/main/persistence/profile-state/profile-state-writer-diagnostics.ts b/src/main/persistence/profile-state/profile-state-writer-diagnostics.ts index 039bce5cb57..6e97fc1c68d 100644 --- a/src/main/persistence/profile-state/profile-state-writer-diagnostics.ts +++ b/src/main/persistence/profile-state/profile-state-writer-diagnostics.ts @@ -3,7 +3,7 @@ import { recordCoalescedDurableCrashBreadcrumb, recordDurableCrashBreadcrumb } from '../../crash-reporting/durable-crash-breadcrumb' -import { getSystemPowerState } from '../../system-power-lifecycle' +import { getSystemPowerState } from '../../power/system-power-lifecycle' import { profileStateWriterFailureOutcome } from './profile-state-writer-errors' export type ProfileStateWriterDiagnosticRequest = { diff --git a/src/main/persistence/profile-state/profile-state-writer-sleep.test.ts b/src/main/persistence/profile-state/profile-state-writer-sleep.test.ts index 3f29fd6339f..6144d7dadec 100644 --- a/src/main/persistence/profile-state/profile-state-writer-sleep.test.ts +++ b/src/main/persistence/profile-state/profile-state-writer-sleep.test.ts @@ -3,13 +3,13 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { setImmediate as waitForPoll } from 'node:timers/promises' import { afterEach, expect, it, vi } from 'vitest' -import type * as SystemPowerLifecycle from '../../system-power-lifecycle' -import { publishSystemResume, publishSystemSuspend } from '../../system-power-lifecycle' +import type * as SystemPowerLifecycle from '../../power/system-power-lifecycle' +import { publishSystemResume, publishSystemSuspend } from '../../power/system-power-lifecycle' import type * as WriterDiagnostics from './profile-state-writer-diagnostics' import { ProfileStateWriteWorkerClient } from './profile-state-writer-worker-client' const power = vi.hoisted(() => ({ subscriptions: 0 })) -vi.mock('../../system-power-lifecycle', async (importOriginal) => { +vi.mock('../../power/system-power-lifecycle', async (importOriginal) => { const actual = await importOriginal() return { ...actual, diff --git a/src/main/ports/workspace-port-page-probe.ts b/src/main/ports/workspace-port-page-probe.ts index b2488476a68..170001523ca 100644 --- a/src/main/ports/workspace-port-page-probe.ts +++ b/src/main/ports/workspace-port-page-probe.ts @@ -1,6 +1,6 @@ import http from 'node:http' import https from 'node:https' -import { extractHtmlTitle, findIconHref } from '../html-head-tags' +import { extractHtmlTitle, findIconHref } from '../network/page-metadata/html-head-tags' import { LOOPBACK_LOCALHOST_HOSTS, connectableLoopbackHost, diff --git a/src/main/agent-awake-service-platform-assertions.test.ts b/src/main/power/agent-awake-service-platform-assertions.test.ts similarity index 98% rename from src/main/agent-awake-service-platform-assertions.test.ts rename to src/main/power/agent-awake-service-platform-assertions.test.ts index 1c4e153657e..8046ef95e40 100644 --- a/src/main/agent-awake-service-platform-assertions.test.ts +++ b/src/main/power/agent-awake-service-platform-assertions.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { AgentAwakeService } from './agent-awake-service' -import type { AgentAwakeStatus } from './agent-awake-service' +import type { AgentAwakeStatus } from './agent-awake-status-lease' vi.mock('electron', () => ({ powerMonitor: { diff --git a/src/main/agent-awake-service.test.ts b/src/main/power/agent-awake-service.test.ts similarity index 98% rename from src/main/agent-awake-service.test.ts rename to src/main/power/agent-awake-service.test.ts index f894847ef89..e26403db100 100644 --- a/src/main/agent-awake-service.test.ts +++ b/src/main/power/agent-awake-service.test.ts @@ -1,6 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AgentAwakeService, AGENT_AWAKE_STATUS_STALE_AFTER_MS } from './agent-awake-service' -import type { AgentAwakeStatus } from './agent-awake-service' +import { AgentAwakeService } from './agent-awake-service' +import { AGENT_AWAKE_STATUS_STALE_AFTER_MS } from './agent-awake-status-lease' +import type { AgentAwakeStatus } from './agent-awake-status-lease' vi.mock('electron', () => ({ powerMonitor: { diff --git a/src/main/agent-awake-service.ts b/src/main/power/agent-awake-service.ts similarity index 98% rename from src/main/agent-awake-service.ts rename to src/main/power/agent-awake-service.ts index ab63fb1f795..2c7773f9fe8 100644 --- a/src/main/agent-awake-service.ts +++ b/src/main/power/agent-awake-service.ts @@ -3,16 +3,11 @@ import { normalizeComputerAwakeMode, type ComputerAwakeMode, type ComputerAwakeStatus -} from '../shared/computer-awake-mode' +} from '../../shared/computer-awake-mode' import { LinuxLidSleepAssertion } from './linux-lid-sleep-assertion' import { MacosSystemSleepAssertion } from './macos-system-sleep-assertion' import { AgentAwakeStatusLease, type AgentAwakeStatus } from './agent-awake-status-lease' -export { - AGENT_AWAKE_STATUS_STALE_AFTER_MS, - type AgentAwakeStatus -} from './agent-awake-status-lease' - type PowerSaveBlocker = { start: (type: 'prevent-app-suspension' | 'prevent-display-sleep') => number stop: (id: number) => void diff --git a/src/main/agent-awake-status-lease.ts b/src/main/power/agent-awake-status-lease.ts similarity index 97% rename from src/main/agent-awake-status-lease.ts rename to src/main/power/agent-awake-status-lease.ts index 327bbc201ea..a178ead6000 100644 --- a/src/main/agent-awake-status-lease.ts +++ b/src/main/power/agent-awake-status-lease.ts @@ -1,4 +1,4 @@ -import type { AgentStatusState } from '../shared/agent-status-types' +import type { AgentStatusState } from '../../shared/agent-status-types' export const AGENT_AWAKE_STATUS_STALE_AFTER_MS = 2 * 60 * 60 * 1000 diff --git a/src/main/linux-lid-sleep-assertion.test.ts b/src/main/power/linux-lid-sleep-assertion.test.ts similarity index 100% rename from src/main/linux-lid-sleep-assertion.test.ts rename to src/main/power/linux-lid-sleep-assertion.test.ts diff --git a/src/main/linux-lid-sleep-assertion.ts b/src/main/power/linux-lid-sleep-assertion.ts similarity index 100% rename from src/main/linux-lid-sleep-assertion.ts rename to src/main/power/linux-lid-sleep-assertion.ts diff --git a/src/main/macos-system-sleep-assertion.test.ts b/src/main/power/macos-system-sleep-assertion.test.ts similarity index 100% rename from src/main/macos-system-sleep-assertion.test.ts rename to src/main/power/macos-system-sleep-assertion.test.ts diff --git a/src/main/macos-system-sleep-assertion.ts b/src/main/power/macos-system-sleep-assertion.ts similarity index 100% rename from src/main/macos-system-sleep-assertion.ts rename to src/main/power/macos-system-sleep-assertion.ts diff --git a/src/main/system-power-lifecycle.test.ts b/src/main/power/system-power-lifecycle.test.ts similarity index 100% rename from src/main/system-power-lifecycle.test.ts rename to src/main/power/system-power-lifecycle.test.ts diff --git a/src/main/system-power-lifecycle.ts b/src/main/power/system-power-lifecycle.ts similarity index 100% rename from src/main/system-power-lifecycle.ts rename to src/main/power/system-power-lifecycle.ts diff --git a/src/main/system-resume-broadcast.test.ts b/src/main/power/system-resume-broadcast.test.ts similarity index 98% rename from src/main/system-resume-broadcast.test.ts rename to src/main/power/system-resume-broadcast.test.ts index f063d92438c..704c805488c 100644 --- a/src/main/system-resume-broadcast.test.ts +++ b/src/main/power/system-resume-broadcast.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { clearCrashBreadcrumbsForTest, getCrashBreadcrumbSnapshot -} from './crash-reporting/crash-breadcrumb-store' +} from '../crash-reporting/crash-breadcrumb-store' import { registerSystemResumeBroadcast } from './system-resume-broadcast' vi.mock('electron', () => ({ diff --git a/src/main/system-resume-broadcast.ts b/src/main/power/system-resume-broadcast.ts similarity index 96% rename from src/main/system-resume-broadcast.ts rename to src/main/power/system-resume-broadcast.ts index 3db283f6ed0..2488f3d0f90 100644 --- a/src/main/system-resume-broadcast.ts +++ b/src/main/power/system-resume-broadcast.ts @@ -1,5 +1,5 @@ import { BrowserWindow, powerMonitor } from 'electron' -import { recordCrashBreadcrumb } from './crash-reporting/crash-breadcrumb-store' +import { recordCrashBreadcrumb } from '../crash-reporting/crash-breadcrumb-store' import { publishSystemResume, publishSystemSuspend } from './system-power-lifecycle' export const SYSTEM_RESUMED_CHANNEL = 'system:resumed' diff --git a/src/main/repo-backfill-wsl-move.test.ts b/src/main/repo-backfill-wsl-move.test.ts index f680cb715c5..207ed41313f 100644 --- a/src/main/repo-backfill-wsl-move.test.ts +++ b/src/main/repo-backfill-wsl-move.test.ts @@ -28,7 +28,9 @@ vi.mock('./repo-git-remote-identity', () => ({ probeGitRemoteIdentity: vi.fn() } vi.mock('./github/client', () => ({ getRepoUpstream: vi.fn(async () => ({ owner: 'acme', repo: 'app' })) })) -vi.mock('./repo-icon-autodetect', () => ({ detectGitHubAvatarIcon: vi.fn(async () => null) })) +vi.mock('./repository-icons/repo-icon-autodetect', () => ({ + detectGitHubAvatarIcon: vi.fn(async () => null) +})) const MOVING = 'repo-1' const STAYING = 'repo-2' diff --git a/src/main/repo-icon-autodetect.test.ts b/src/main/repository-icons/repo-icon-autodetect.test.ts similarity index 99% rename from src/main/repo-icon-autodetect.test.ts rename to src/main/repository-icons/repo-icon-autodetect.test.ts index cf73aee6739..7c8d9c6b720 100644 --- a/src/main/repo-icon-autodetect.test.ts +++ b/src/main/repository-icons/repo-icon-autodetect.test.ts @@ -2,7 +2,7 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { join } from 'node:path' import { tmpdir } from 'node:os' import { afterEach, describe, expect, it } from 'vitest' -import { gitExecFileAsync } from './git/runner' +import { gitExecFileAsync } from '../git/command-runner/git-exec-file' import { detectRepoIcon, detectRepoIconAndUpstream } from './repo-icon-autodetect' const PNG_1X1_BASE64 = diff --git a/src/main/repo-icon-autodetect.ts b/src/main/repository-icons/repo-icon-autodetect.ts similarity index 89% rename from src/main/repo-icon-autodetect.ts rename to src/main/repository-icons/repo-icon-autodetect.ts index 30d77e856be..d0e9136c173 100644 --- a/src/main/repo-icon-autodetect.ts +++ b/src/main/repository-icons/repo-icon-autodetect.ts @@ -1,21 +1,21 @@ import { readFile, stat } from 'node:fs/promises' -import type { ExecutionHostId } from '../shared/execution-host' -import type { GitHubRepositoryIdentity } from '../shared/github/pull-request-types' -import type { RepoKind } from '../shared/repo-types' +import type { ExecutionHostId } from '../../shared/execution-host' +import type { GitHubRepositoryIdentity } from '../../shared/github/pull-request-types' +import type { RepoKind } from '../../shared/repo-types' import { faviconUrlFromWebsite, githubAvatarIcon, githubAvatarSlug, type RepoIcon -} from '../shared/repo-icon' -import { getRepoSlug, getRepoUpstream } from './github/client' +} from '../../shared/repo-icon' +import { getRepoSlug, getRepoUpstream } from '../github/client/fetch/repo-slug-upstream' import { resolveFilesystemRouteForHost, resolveGitRouteForHost -} from './providers/execution-host-provider-dispatch' -import { detectGitRemoteIdentity } from './repo-git-remote-identity' +} from '../providers/execution-host-provider-dispatch' +import { detectGitRemoteIdentity } from '../repo-git-remote-identity' import { detectRepoFileIcon } from './repo-icon-file-detection' -import { joinWorktreeRelativePath } from './runtime/runtime-relative-paths' +import { joinWorktreeRelativePath } from '../runtime/runtime-relative-paths' const WEBSITE_HOSTS_TO_SKIP = new Set([ 'github.com', diff --git a/src/main/repo-icon-file-detection.test.ts b/src/main/repository-icons/repo-icon-file-detection.test.ts similarity index 96% rename from src/main/repo-icon-file-detection.test.ts rename to src/main/repository-icons/repo-icon-file-detection.test.ts index 9050375ab2d..de64cc37e92 100644 --- a/src/main/repo-icon-file-detection.test.ts +++ b/src/main/repository-icons/repo-icon-file-detection.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { mkdtemp, mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises' import type * as FsPromisesModule from 'node:fs/promises' import { describe, expect, it, vi } from 'vitest' -import { resolveFilesystemRouteForHost } from './providers/execution-host-provider-dispatch' +import { resolveFilesystemRouteForHost } from '../providers/execution-host-provider-dispatch' import { detectRepoFileIcon } from './repo-icon-file-detection' // Spy on real fs entrypoints so accidental local reads cannot hide behind stubs. diff --git a/src/main/repo-icon-file-detection.ts b/src/main/repository-icons/repo-icon-file-detection.ts similarity index 91% rename from src/main/repo-icon-file-detection.ts rename to src/main/repository-icons/repo-icon-file-detection.ts index d86da92ffb8..289503cdb61 100644 --- a/src/main/repo-icon-file-detection.ts +++ b/src/main/repository-icons/repo-icon-file-detection.ts @@ -1,11 +1,11 @@ import { readFile, stat } from 'node:fs/promises' -import { buildImageDataUri } from '../shared/image-data-uri' -import { MAX_REPO_ICON_UPLOAD_BYTES, type RepoIcon } from '../shared/repo-icon' -import type { ExecutionHostFilesystemRoute } from './providers/execution-host-provider-dispatch' -import { detectImageFileSignature } from './image-file-signature' +import { buildImageDataUri } from '../../shared/image-data-uri' +import { MAX_REPO_ICON_UPLOAD_BYTES, type RepoIcon } from '../../shared/repo-icon' +import type { ExecutionHostFilesystemRoute } from '../providers/execution-host-provider-dispatch' +import { detectImageFileSignature } from '../media/image-file-signature' import { extractIconHref } from './repo-icon-source-href' import { iconHrefCandidates } from './repo-icon-href-candidates' -import { joinWorktreeRelativePath } from './runtime/runtime-relative-paths' +import { joinWorktreeRelativePath } from '../runtime/runtime-relative-paths' // Keep add-repo probes limited to conventional paths. const REPO_ICON_FILE_STEMS = [ diff --git a/src/main/repo-icon-href-candidates.ts b/src/main/repository-icons/repo-icon-href-candidates.ts similarity index 100% rename from src/main/repo-icon-href-candidates.ts rename to src/main/repository-icons/repo-icon-href-candidates.ts diff --git a/src/main/repo-icon-source-href.ts b/src/main/repository-icons/repo-icon-source-href.ts similarity index 100% rename from src/main/repo-icon-source-href.ts rename to src/main/repository-icons/repo-icon-source-href.ts diff --git a/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts b/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts index 4d2bedf8f32..047f39c964e 100644 --- a/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts +++ b/src/main/runtime/orca-runtime-test-mocks/setup.spec.ts @@ -428,6 +428,12 @@ vi.mock('../../source-control/hosted-review', () => ({ })) })) +vi.mock('../../github/client/fetch/repo-slug-upstream', async (importOriginal) => ({ + ...(await importOriginal>()), + getRepoSlug: getRepoSlugMock, + getRepoUpstream: getRepoUpstreamMock +})) + vi.mock('../../github/client', async (importOriginal) => { const actual = (await importOriginal()) as Record return { diff --git a/src/main/runtime/repo-icon-fork-backfill.test.ts b/src/main/runtime/repo-icon-fork-backfill.test.ts index a20d1506063..46bc105d30f 100644 --- a/src/main/runtime/repo-icon-fork-backfill.test.ts +++ b/src/main/runtime/repo-icon-fork-backfill.test.ts @@ -1,17 +1,22 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import type { Repo } from '../../shared/repo-types' import * as client from '../github/client' +import * as repoSlugUpstream from '../github/client/fetch/repo-slug-upstream' import { OrcaRuntimeService } from './orca-runtime' import { repoTarget } from '../persistence/repo-host-target-matcher.test-fixture' vi.mock('../github/client', async (importOriginal) => ({ ...(await importOriginal>()), - getRepoUpstream: vi.fn(), + getRepoUpstream: vi.fn() +})) + +vi.mock('../github/client/fetch/repo-slug-upstream', async (importOriginal) => ({ + ...(await importOriginal>()), getRepoSlug: vi.fn() })) const getRepoUpstream = vi.mocked(client.getRepoUpstream) -const getRepoSlug = vi.mocked(client.getRepoSlug) +const getRepoSlug = vi.mocked(repoSlugUpstream.getRepoSlug) type BackfillInternals = { repositoryForkBackfill: { run(): Promise } } diff --git a/src/main/runtime/rpc/repo-add-cli.integration.test.ts b/src/main/runtime/rpc/repo-add-cli.integration.test.ts index 5cf8bf9b8ad..86aa41bab6e 100644 --- a/src/main/runtime/rpc/repo-add-cli.integration.test.ts +++ b/src/main/runtime/rpc/repo-add-cli.integration.test.ts @@ -15,7 +15,7 @@ import type { RpcRequest } from './core' import { repoDispatcher } from './methods/repo-rpc.test-fixture' import { UnixSocketTransport } from './unix-socket-transport' -vi.mock('../../repo-icon-autodetect', () => ({ +vi.mock('../../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: vi.fn().mockResolvedValue({}) })) vi.mock('../../worktree-root-preparation', () => ({ diff --git a/src/main/runtime/runtime-repository-clone-controller.ts b/src/main/runtime/runtime-repository-clone-controller.ts index 5fcee0414b1..e02ec892cd9 100644 --- a/src/main/runtime/runtime-repository-clone-controller.ts +++ b/src/main/runtime/runtime-repository-clone-controller.ts @@ -16,7 +16,7 @@ import { gitSpawnAfterWindowsEnvironmentReady, promptGuardGitEnv } from '../git/ import { reuseSavedCloneTarget } from '../git/saved-clone-target' import { runWithGitReadCacheInvalidation } from '../git/status' import { invalidateAuthorizedRootsCache } from '../ipc/registered-worktree-roots-cache' -import { detectRepoIconAndUpstream } from '../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../repository-icons/repo-icon-autodetect' import { getRepoName } from '../git/repo' import { prepareLocalWorktreeRootForRepo } from '../worktree-root-preparation' import type { RuntimeStore } from './runtime-store-contract' diff --git a/src/main/runtime/runtime-repository-clone-host-dedupe.test.ts b/src/main/runtime/runtime-repository-clone-host-dedupe.test.ts index d0f48332231..5887186f322 100644 --- a/src/main/runtime/runtime-repository-clone-host-dedupe.test.ts +++ b/src/main/runtime/runtime-repository-clone-host-dedupe.test.ts @@ -8,7 +8,7 @@ import type { Repo } from '../../shared/repo-types' import { RuntimeRepositoryCloneController } from './runtime-repository-clone-controller' import type { RuntimeStore } from './runtime-store-contract' -vi.mock('../repo-icon-autodetect', () => ({ +vi.mock('../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: vi.fn().mockResolvedValue({}) })) vi.mock('../worktree-root-preparation', () => ({ diff --git a/src/main/runtime/runtime-repository-fork-backfill.ts b/src/main/runtime/runtime-repository-fork-backfill.ts index cb5580167eb..ef778121c57 100644 --- a/src/main/runtime/runtime-repository-fork-backfill.ts +++ b/src/main/runtime/runtime-repository-fork-backfill.ts @@ -6,7 +6,7 @@ import { import type { GitHubOwnerRepo } from '../../shared/github/pull-request-types' import type { Repo } from '../../shared/repo-types' import { getRepoUpstream } from '../github/client' -import { detectGitHubAvatarIcon } from '../repo-icon-autodetect' +import { detectGitHubAvatarIcon } from '../repository-icons/repo-icon-autodetect' import type { RuntimeStore } from './runtime-store-contract' import { isWslMoveRepoBlocked } from '../persistence/moving-wsl-projects/wsl-move-background-backoff' import { blockedWslDistroForPath, wslDistroForPath } from '../wsl/wsl-unc-access-gate' diff --git a/src/main/runtime/runtime-repository-registration-controller.test.ts b/src/main/runtime/runtime-repository-registration-controller.test.ts index fc651634bf7..08cf5651bd7 100644 --- a/src/main/runtime/runtime-repository-registration-controller.test.ts +++ b/src/main/runtime/runtime-repository-registration-controller.test.ts @@ -8,7 +8,7 @@ import type { Repo } from '../../shared/repo-types' import { RuntimeRepositoryRegistrationController } from './runtime-repository-registration-controller' import { partialRuntimeStore } from './runtime-store-partial-fixture' -vi.mock('../repo-icon-autodetect', () => ({ +vi.mock('../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: vi.fn().mockResolvedValue({}) })) vi.mock('../worktree-root-preparation', () => ({ diff --git a/src/main/runtime/runtime-repository-registration-controller.ts b/src/main/runtime/runtime-repository-registration-controller.ts index 6dd03685936..0058fce6410 100644 --- a/src/main/runtime/runtime-repository-registration-controller.ts +++ b/src/main/runtime/runtime-repository-registration-controller.ts @@ -13,7 +13,7 @@ import { getRepoName, inspectGitRepoForRegistrationAsync } from '../git/repo' import { invalidateAuthorizedRootsCache } from '../ipc/registered-worktree-roots-cache' import { isENOENT } from '../ipc/filesystem/filesystem-path-containment' import { findProjectAtSameRealPath } from '../project-realpath-identity' -import { detectRepoIconAndUpstream } from '../repo-icon-autodetect' +import { detectRepoIconAndUpstream } from '../repository-icons/repo-icon-autodetect' import { prepareLocalWorktreeRootForRepo } from '../worktree-root-preparation' import type { RuntimeStore } from './runtime-store-contract' import { runtimePathsEqual } from './runtime-worktree-path-identity' diff --git a/src/main/runtime/runtime-repository-registration-host-dedupe.test.ts b/src/main/runtime/runtime-repository-registration-host-dedupe.test.ts index 1a91506f866..1a74f77e3fe 100644 --- a/src/main/runtime/runtime-repository-registration-host-dedupe.test.ts +++ b/src/main/runtime/runtime-repository-registration-host-dedupe.test.ts @@ -6,7 +6,7 @@ import type { Repo } from '../../shared/repo-types' import { RuntimeRepositoryRegistrationController } from './runtime-repository-registration-controller' import type { RuntimeStore } from './runtime-store-contract' -vi.mock('../repo-icon-autodetect', () => ({ +vi.mock('../repository-icons/repo-icon-autodetect', () => ({ detectRepoIconAndUpstream: vi.fn().mockResolvedValue({}) })) vi.mock('../worktree-root-preparation', () => ({ diff --git a/src/main/startup/browser-process-user-agent-ordering.test.ts b/src/main/startup/browser-process-user-agent-ordering.test.ts index ba0495cbfc1..2aa44cfc337 100644 --- a/src/main/startup/browser-process-user-agent-ordering.test.ts +++ b/src/main/startup/browser-process-user-agent-ordering.test.ts @@ -163,7 +163,7 @@ vi.mock('../persistence/profile-state/profile-state-access', () => ({ return mocks.admission() } })) -vi.mock('../macos-press-and-hold-default') +vi.mock('../window/desktop-integration/macos-press-and-hold-default') vi.mock('../ai-vault/session-parse-cache-persistence') vi.mock('../orca-profiles/profile-index-store', () => ({ initOrcaProfilePaths: vi.fn() })) vi.mock('../orca-profiles/profile-storage-paths', () => ({ diff --git a/src/main/startup/configure-process.ts b/src/main/startup/configure-process.ts index b38c992b74e..4185041b493 100644 --- a/src/main/startup/configure-process.ts +++ b/src/main/startup/configure-process.ts @@ -6,7 +6,7 @@ import { homedir } from 'node:os' import { join, resolve } from 'node:path' import { getVersionManagerBinPaths } from '../codex-cli/command' import { isWindowsFnmDefaultAliasDir } from '../../shared/fnm-default-alias-dirs' -import { getMainE2EConfig } from '../e2e-config' +import { getMainE2EConfig } from './testing/e2e-config' import { DISABLED_CHROMIUM_FEATURES } from './disabled-chromium-features' import { readHttp1CompatibilityMarker } from './http1-compatibility-marker' import { checkServeUserDataPath } from './serve-user-data-path-guard' diff --git a/src/main/startup/gpu-lifecycle.ts b/src/main/startup/gpu-lifecycle.ts index 7bc27042d08..2bc119f1401 100644 --- a/src/main/startup/gpu-lifecycle.ts +++ b/src/main/startup/gpu-lifecycle.ts @@ -1,5 +1,5 @@ import { app, type BrowserWindow } from 'electron' -import { relaunchApp } from '../app-relaunch' +import { relaunchApp } from './quit/app-relaunch' import { destroySystemTray } from '../tray/system-tray' import { applyGpuFallbackCommandLineSwitches } from './gpu-fallback-switches' import { diff --git a/src/main/startup/main-process-observers.ts b/src/main/startup/main-process-observers.ts index 8a71d4702f3..6ea465fd459 100644 --- a/src/main/startup/main-process-observers.ts +++ b/src/main/startup/main-process-observers.ts @@ -1,8 +1,8 @@ import { app, powerMonitor } from 'electron' import { join } from 'node:path' -import { AgentAwakeService } from '../agent-awake-service' +import { AgentAwakeService } from '../power/agent-awake-service' import { normalizeComputerAwakeMode } from '../../shared/computer-awake-mode' -import { registerSystemResumeBroadcast } from '../system-resume-broadcast' +import { registerSystemResumeBroadcast } from '../power/system-resume-broadcast' import { readDesktopAwayState } from '../notifications/desktop-away-state' import { listCapableSharedControlSockets, diff --git a/src/main/startup/main-process-preflight.ts b/src/main/startup/main-process-preflight.ts index ef9a0860f4b..44b509964de 100644 --- a/src/main/startup/main-process-preflight.ts +++ b/src/main/startup/main-process-preflight.ts @@ -73,7 +73,7 @@ import { setWorktreeWatcherRemoval } from '../ipc/worktree-watcher-removal' import { desktopWorktreeWatcherRemoval } from '../ipc/filesystem/watchers/filesystem-watcher' import { setDefaultProxySessionResolver } from '../network/proxy-settings' import { initDataPath, getCanonicalUserDataPath } from '../persistence/loading-store/user-data-path' -import { applyMacPressAndHoldDefaultAtStartup } from '../macos-press-and-hold-default' +import { applyMacPressAndHoldDefaultAtStartup } from '../window/desktop-integration/macos-press-and-hold-default' import { configureSessionParseCachePersistence } from '../ai-vault/session-parse-cache-persistence' import { initOrcaProfilePaths } from '../orca-profiles/profile-index-store' import { getProfileUserDataPath } from '../orca-profiles/profile-storage-paths' diff --git a/src/main/startup/main-process-quit-pending-writer.test.ts b/src/main/startup/main-process-quit-pending-writer.test.ts index ccb52aeb202..e4d808a26e6 100644 --- a/src/main/startup/main-process-quit-pending-writer.test.ts +++ b/src/main/startup/main-process-quit-pending-writer.test.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'node:events' import { afterEach, expect, it, vi } from 'vitest' -import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../quit-teardown-deadline' +import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../../shared/quit-teardown-deadline' const settled = () => vi.fn(async () => {}) const idle = () => vi.fn() @@ -53,7 +53,7 @@ const dependencies: Record> = { '../observability': { shutdownObservability: settled() }, '../updater': { isQuittingForUpdate: vi.fn(() => false) }, '../updater-lifecycle-diagnostics': { recordUpdaterLifecycle: idle() }, - '../macos-tcc-prompt-notice': { stopTccPromptNotice: idle() }, + '../macos-permissions/macos-tcc-prompt-notice': { stopTccPromptNotice: idle() }, '../terminal-history-gc': { cancelHistoryGc: idle() }, './window-all-closed-quit-policy': { shouldQuitWhenAllWindowsClosed: vi.fn(() => false) }, './configure-process': { isDevParentShutdownRequested: vi.fn(() => false) }, @@ -108,7 +108,7 @@ async function startQuit( } vi.spyOn(console, 'warn').mockImplementation(() => {}) const { installMainProcessQuitHandlers } = await import('./main-process-quit') - const { quitTeardownStartGate } = await import('../quit-teardown-start-gate') + const { quitTeardownStartGate } = await import('./quit/quit-teardown-start-gate') quitTeardownStartGate.resetForTests() installMainProcessQuitHandlers() app.emit('before-quit', { defaultPrevented: false }) diff --git a/src/main/startup/main-process-quit-update-veto.test.ts b/src/main/startup/main-process-quit-update-veto.test.ts index fa8b8f5903a..85ae14ecc96 100644 --- a/src/main/startup/main-process-quit-update-veto.test.ts +++ b/src/main/startup/main-process-quit-update-veto.test.ts @@ -33,15 +33,15 @@ const dependencyExports: [string, string[]][] = [ ['../codex/codex-account-session-bridge', ['stopCodexAccountSessionBridges']], ['../git/local-repo-ref-maintenance', ['awaitPackedRefsLockRelease']], ['../worktree-background-removal', ['stopBackgroundWorktreeRemovals']], - ['../quit-teardown-deadline', ['settleTeardownWithinDeadline', 'settleWithinMs']], - ['../quit-teardown-start-gate', ['quitTeardownStartGate']], + ['./quit/quit-teardown-deadline', ['settleTeardownWithinDeadline', 'settleWithinMs']], + ['./quit/quit-teardown-start-gate', ['quitTeardownStartGate']], ['../dock/unread-badge', ['setUnreadDockBadgeCount']], ['../tray/system-tray', ['destroySystemTray']], ['../telemetry/client', ['shutdownTelemetry']], ['../observability', ['shutdownObservability']], ['../updater', ['isQuittingForUpdate']], ['../updater-lifecycle-diagnostics', ['recordUpdaterLifecycle']], - ['../macos-tcc-prompt-notice', ['stopTccPromptNotice']], + ['../macos-permissions/macos-tcc-prompt-notice', ['stopTccPromptNotice']], ['../terminal-history-gc', ['cancelHistoryGc']], ['./window-all-closed-quit-policy', ['shouldQuitWhenAllWindowsClosed']], ['./configure-process', ['isDevParentShutdownRequested']], diff --git a/src/main/startup/main-process-quit.ts b/src/main/startup/main-process-quit.ts index 2f175c63f14..1c4394c45d0 100644 --- a/src/main/startup/main-process-quit.ts +++ b/src/main/startup/main-process-quit.ts @@ -1,5 +1,5 @@ import { killWslChannelsInCloseGrace } from '../wsl/wsl-command-channel' -import { markHostShuttingDown } from '../host-shutdown-state' +import { markHostShuttingDown } from './quit/host-shutdown-state' import { app, type Event } from 'electron' import { closeAllWatchers } from '../ipc/filesystem/watchers/filesystem-watcher-shutdown' import { disposeWorktreeBaseDirectoryWatchers } from '../ipc/worktree-base-directory-watcher' @@ -21,15 +21,15 @@ import { stopCodexStateDbBackfillRecoveries } from '../codex/codex-state-db-back import { stopCodexAccountSessionBridges } from '../codex/codex-account-session-bridge' import { awaitPackedRefsLockRelease } from '../git/local-repo-ref-maintenance' import { stopBackgroundWorktreeRemovals } from '../worktree-background-removal' -import { settleTeardownWithinDeadline, settleWithinMs } from '../quit-teardown-deadline' -import { quitTeardownStartGate } from '../quit-teardown-start-gate' +import { settleTeardownWithinDeadline, settleWithinMs } from './quit/quit-teardown-deadline' +import { quitTeardownStartGate } from './quit/quit-teardown-start-gate' import { setUnreadDockBadgeCount } from '../dock/unread-badge' import { destroySystemTray } from '../tray/system-tray' import { shutdownTelemetry } from '../telemetry/client' import { shutdownObservability } from '../observability' import { isQuittingForUpdate } from '../updater' import { recordUpdaterLifecycle } from '../updater-lifecycle-diagnostics' -import { stopTccPromptNotice } from '../macos-tcc-prompt-notice' +import { stopTccPromptNotice } from '../macos-permissions/macos-tcc-prompt-notice' import { cancelHistoryGc } from '../terminal-history-gc' import { shouldQuitWhenAllWindowsClosed } from './window-all-closed-quit-policy' import { desktopConnectorCloud } from './main-process-connector-startup' diff --git a/src/main/startup/main-process-ready-foundation.ts b/src/main/startup/main-process-ready-foundation.ts index 769c9602d63..447d0177170 100644 --- a/src/main/startup/main-process-ready-foundation.ts +++ b/src/main/startup/main-process-ready-foundation.ts @@ -30,7 +30,7 @@ import { setDefaultWslDistroOverride } from '../git/runner' import { wslHookRelayManager } from '../agent-hooks/wsl-hook-relay-manager' -import { applyAppIcon } from '../app-icon' +import { applyAppIcon } from '../window/desktop-integration/app-icon' import { shouldSuppressDevEducation, suppressDevEducationForStore diff --git a/src/main/startup/main-process-ready-identity-write.test.ts b/src/main/startup/main-process-ready-identity-write.test.ts index b3eff19b3b3..bc79f45d03c 100644 --- a/src/main/startup/main-process-ready-identity-write.test.ts +++ b/src/main/startup/main-process-ready-identity-write.test.ts @@ -153,7 +153,7 @@ vi.mock('../git/runner', () => ({ vi.mock('../agent-hooks/wsl-hook-relay-manager', () => ({ wslHookRelayManager: { setManagedHookSettingsResolver: vi.fn() } })) -vi.mock('../app-icon', () => ({ applyAppIcon: vi.fn() })) +vi.mock('../window/desktop-integration/app-icon', () => ({ applyAppIcon: vi.fn() })) vi.mock('./dev-education-suppression', () => ({ shouldSuppressDevEducation: () => false, suppressDevEducationForStore: vi.fn() diff --git a/src/main/startup/main-process-state.ts b/src/main/startup/main-process-state.ts index 28f144b3cc2..fd47190e537 100644 --- a/src/main/startup/main-process-state.ts +++ b/src/main/startup/main-process-state.ts @@ -17,7 +17,7 @@ import type { DesktopRelayService } from '../runtime/mobile-cloud-relay/desktop- import type { DesktopRelayServiceInstaller } from '../runtime/mobile-cloud-relay/desktop-relay-service-installer' import type { DesktopPushService } from '../runtime/push/desktop-push-service' import type { StarNagService } from '../star-nag/service' -import type { AgentAwakeService } from '../agent-awake-service' +import type { AgentAwakeService } from '../power/agent-awake-service' import type { CrashReportStore } from '../crash-reporting/crash-report-store' import type { AutomationService } from '../automations/service' import type { PluginService } from '../plugins/plugin-service' diff --git a/src/main/startup/main-window-core-services.test.ts b/src/main/startup/main-window-core-services.test.ts index 19fe9fe836c..df4385d4e10 100644 --- a/src/main/startup/main-window-core-services.test.ts +++ b/src/main/startup/main-window-core-services.test.ts @@ -59,7 +59,9 @@ vi.mock('../window/attach-main-window-services', () => ({ vi.mock('../ipc/ssh/ssh-host-user-disconnect', () => ({ holdLaunchReconnectOptOuts: holdLaunchReconnectOptOutsMock })) -vi.mock('../macos-tcc-prompt-notice', () => ({ initTccPromptNotice: initTccPromptNoticeMock })) +vi.mock('../macos-permissions/macos-tcc-prompt-notice', () => ({ + initTccPromptNotice: initTccPromptNoticeMock +})) vi.mock('../updater', () => ({ resolveUpdateInstallMode: vi.fn(() => 'interactive') })) vi.mock('./main-process-state', () => ({ mainProcessState: state })) vi.mock('../agent-auth-restart-preservation', () => ({ diff --git a/src/main/startup/main-window-core-services.ts b/src/main/startup/main-window-core-services.ts index dffc53cd2dc..959b8bea4a0 100644 --- a/src/main/startup/main-window-core-services.ts +++ b/src/main/startup/main-window-core-services.ts @@ -1,7 +1,7 @@ import type { BrowserWindow } from 'electron' import { registerCoreHandlers } from '../ipc/register-core-handlers/register-core-handlers' import { attachMainWindowServices } from '../window/attach-main-window-services' -import { initTccPromptNotice } from '../macos-tcc-prompt-notice' +import { initTccPromptNotice } from '../macos-permissions/macos-tcc-prompt-notice' import { resolveUpdateInstallMode } from '../updater' import { desktopConnectorCloud } from './main-process-connector-startup' import { mainProcessState as state } from './main-process-state' diff --git a/src/main/app-relaunch.test.ts b/src/main/startup/quit/app-relaunch.test.ts similarity index 88% rename from src/main/app-relaunch.test.ts rename to src/main/startup/quit/app-relaunch.test.ts index 66b29c10ce1..f1d5d0184b8 100644 --- a/src/main/app-relaunch.test.ts +++ b/src/main/startup/quit/app-relaunch.test.ts @@ -9,17 +9,17 @@ const { appRelaunchMock, hasSwitchMock, recordDurableCrashBreadcrumbMock } = vi. vi.mock('electron', () => ({ app: { relaunch: appRelaunchMock, commandLine: { hasSwitch: hasSwitchMock } } })) -vi.mock('./windows/windows-administrator-status', () => ({ +vi.mock('../../windows/windows-administrator-status', () => ({ getWindowsAdministratorStatus: vi.fn(async () => true) })) -vi.mock('./daemon/daemon-provider-restart', () => ({ restartDaemon: vi.fn(async () => {}) })) -vi.mock('./crash-reporting/durable-crash-breadcrumb', () => ({ +vi.mock('../../daemon/daemon-provider-restart', () => ({ restartDaemon: vi.fn(async () => {}) })) +vi.mock('../../crash-reporting/durable-crash-breadcrumb', () => ({ recordDurableCrashBreadcrumb: recordDurableCrashBreadcrumbMock })) import { relaunchApp } from './app-relaunch' -import { restartLocalTerminalsAfterElevation } from './windows/windows-administrator-restart' -import { _resetHydrateShellPathCache, _setLaunchPathForTests } from './startup/hydrate-shell-path' +import { restartLocalTerminalsAfterElevation } from '../../windows/windows-administrator-restart' +import { _resetHydrateShellPathCache, _setLaunchPathForTests } from '../hydrate-shell-path' beforeEach(() => { appRelaunchMock.mockReset() diff --git a/src/main/app-relaunch.ts b/src/main/startup/quit/app-relaunch.ts similarity index 75% rename from src/main/app-relaunch.ts rename to src/main/startup/quit/app-relaunch.ts index 3489395f22b..35b3ffee9a2 100644 --- a/src/main/app-relaunch.ts +++ b/src/main/startup/quit/app-relaunch.ts @@ -1,8 +1,8 @@ import { app } from 'electron' -import type { CrashReportBreadcrumbData } from '../shared/crash-reporting' -import { recordDurableCrashBreadcrumb } from './crash-reporting/durable-crash-breadcrumb' -import { runWithLaunchPath } from './startup/hydrate-shell-path' -import { getWindowsAdministratorRelaunchOptions } from './windows/windows-administrator-restart' +import type { CrashReportBreadcrumbData } from '../../../shared/crash-reporting' +import { recordDurableCrashBreadcrumb } from '../../crash-reporting/durable-crash-breadcrumb' +import { runWithLaunchPath } from '../hydrate-shell-path' +import { getWindowsAdministratorRelaunchOptions } from '../../windows/windows-administrator-restart' export type AppRelaunchReason = | 'admin-restart' diff --git a/src/main/host-shutdown-state.ts b/src/main/startup/quit/host-shutdown-state.ts similarity index 100% rename from src/main/host-shutdown-state.ts rename to src/main/startup/quit/host-shutdown-state.ts diff --git a/src/main/quit-path-durable-write-blocking.test.ts b/src/main/startup/quit/quit-path-durable-write-blocking.test.ts similarity index 97% rename from src/main/quit-path-durable-write-blocking.test.ts rename to src/main/startup/quit/quit-path-durable-write-blocking.test.ts index 623700cfeb3..30000d0c9b1 100644 --- a/src/main/quit-path-durable-write-blocking.test.ts +++ b/src/main/startup/quit/quit-path-durable-write-blocking.test.ts @@ -1,5 +1,5 @@ -import { createWorkerMaintenanceFixture } from './persistence/loading-store/profile-state-maintenance-fixture' -import type { Store } from './persistence/loading-store/store' +import { createWorkerMaintenanceFixture } from '../../persistence/loading-store/profile-state-maintenance-fixture' +import type { Store } from '../../persistence/loading-store/store' import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest' import { mkdtempSync, readFileSync, existsSync, rmSync, utimesSync, writeFileSync } from 'node:fs' import type * as NodeFs from 'node:fs' @@ -84,14 +84,14 @@ vi.mock('node:fs/promises', async (importOriginal) => { return { ...patched, default: patched } }) -vi.mock('./ssh/config/ssh-config-parser', () => ({ +vi.mock('../../ssh/config/ssh-config-parser', () => ({ loadUserSshConfig: vi.fn(), sshConfigHostsToTargets: vi.fn() })) -vi.mock('./telemetry/client', () => ({ track: vi.fn() })) +vi.mock('../../telemetry/client', () => ({ track: vi.fn() })) -vi.mock('./telemetry/cohort-classifier', () => ({ +vi.mock('../../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn().mockReturnValue({ nth_repo_added: 2 }) })) @@ -161,7 +161,7 @@ function stallCommit(dir: string) { async function createStatsCollector(dir: string): Promise { testState.dir = dir - const { StatsCollector, initStatsPath } = await import('./stats/collector') + const { StatsCollector, initStatsPath } = await import('../../stats/collector') initStatsPath(testState.dir) const stats = new StatsCollector() statsCollectors.push(stats) @@ -307,7 +307,7 @@ describe('quit-path durable writes never park the main thread', () => { const dir = makeDir() const previousGrokHome = process.env.GROK_HOME process.env.GROK_HOME = dir - const { GrokHookService } = await import('./grok/hook-service') + const { GrokHookService } = await import('../../grok/hook-service') const service = new GrokHookService() try { const configPath = join(dir, 'hooks', 'orca-status.json') diff --git a/src/main/quit-teardown-deadline.test.ts b/src/main/startup/quit/quit-teardown-deadline.test.ts similarity index 88% rename from src/main/quit-teardown-deadline.test.ts rename to src/main/startup/quit/quit-teardown-deadline.test.ts index 9bc4768bd92..ef76d1cc0db 100644 --- a/src/main/quit-teardown-deadline.test.ts +++ b/src/main/startup/quit/quit-teardown-deadline.test.ts @@ -1,8 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { - settleTeardownWithinDeadline, - WILL_QUIT_TEARDOWN_DEADLINE_MS -} from './quit-teardown-deadline' +import { settleTeardownWithinDeadline } from './quit-teardown-deadline' +import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../../../shared/quit-teardown-deadline' describe('settleTeardownWithinDeadline', () => { afterEach(() => { diff --git a/src/main/quit-teardown-deadline.ts b/src/main/startup/quit/quit-teardown-deadline.ts similarity index 91% rename from src/main/quit-teardown-deadline.ts rename to src/main/startup/quit/quit-teardown-deadline.ts index 8752ec5f63f..6a93833fb0a 100644 --- a/src/main/quit-teardown-deadline.ts +++ b/src/main/startup/quit/quit-teardown-deadline.ts @@ -1,6 +1,4 @@ -import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../shared/quit-teardown-deadline' - -export { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../shared/quit-teardown-deadline' +import { WILL_QUIT_TEARDOWN_DEADLINE_MS } from '../../../shared/quit-teardown-deadline' export type NamedQuitTeardown = { name: string diff --git a/src/main/quit-teardown-start-gate.test.ts b/src/main/startup/quit/quit-teardown-start-gate.test.ts similarity index 100% rename from src/main/quit-teardown-start-gate.test.ts rename to src/main/startup/quit/quit-teardown-start-gate.test.ts diff --git a/src/main/quit-teardown-start-gate.ts b/src/main/startup/quit/quit-teardown-start-gate.ts similarity index 100% rename from src/main/quit-teardown-start-gate.ts rename to src/main/startup/quit/quit-teardown-start-gate.ts diff --git a/src/main/e2e-config.ts b/src/main/startup/testing/e2e-config.ts similarity index 71% rename from src/main/e2e-config.ts rename to src/main/startup/testing/e2e-config.ts index f4c9c1884be..44e9fa44d76 100644 --- a/src/main/e2e-config.ts +++ b/src/main/startup/testing/e2e-config.ts @@ -1,4 +1,4 @@ -import { createE2EConfig, type E2EConfig } from '../shared/e2e-config' +import { createE2EConfig, type E2EConfig } from '../../../shared/e2e-config' export function getMainE2EConfig(): E2EConfig { return createE2EConfig({ diff --git a/src/main/tray/system-tray.test.ts b/src/main/tray/system-tray.test.ts index 9fc247028ce..f5b4f70bbbb 100644 --- a/src/main/tray/system-tray.test.ts +++ b/src/main/tray/system-tray.test.ts @@ -97,7 +97,7 @@ vi.mock('../../../resources/tray/orca-menu-barTemplate@2x.png?asset&asarUnpack', default: '/assets/orca-menu-barTemplate@2x.png' })) -vi.mock('../app-icon', () => ({ +vi.mock('../window/desktop-integration/app-icon', () => ({ createAppIconImage: createAppIconImageMock })) diff --git a/src/main/tray/system-tray.ts b/src/main/tray/system-tray.ts index 71bbacf0c5e..c996ce1cb37 100644 --- a/src/main/tray/system-tray.ts +++ b/src/main/tray/system-tray.ts @@ -1,8 +1,8 @@ import { Menu, Tray, nativeImage, nativeTheme, type NativeImage } from 'electron' import menuBarIconPath from '../../../resources/tray/orca-menu-barTemplate.png?asset&asarUnpack' import menuBarIconRetinaPath from '../../../resources/tray/orca-menu-barTemplate@2x.png?asset&asarUnpack' -import { deferAppKitSceneMutation } from '../appkit-scene-mutation' -import { createAppIconImage } from '../app-icon' +import { deferAppKitSceneMutation } from '../window/desktop-integration/appkit-scene-mutation' +import { createAppIconImage } from '../window/desktop-integration/app-icon' import { translateMain } from '../i18n/main-i18n' import { quitAndStopAllSessionsMenuText } from '../menu/app-menu-quit-item' import { composeTrayAttentionIcon, tintTrayTemplateForAttention } from './tray-attention-icon' diff --git a/src/main/window/attach-main-window-services.test.ts b/src/main/window/attach-main-window-services.test.ts index 66a98e7d704..a5a389873fa 100644 --- a/src/main/window/attach-main-window-services.test.ts +++ b/src/main/window/attach-main-window-services.test.ts @@ -152,7 +152,7 @@ vi.mock('../updater/electron-updater-proxy-session', () => ({ applyProxyToElectronUpdaterSession: vi.fn() })) -vi.mock('../macos-tcc-prompt-notice', () => ({ +vi.mock('../macos-permissions/macos-tcc-prompt-notice', () => ({ acknowledgePendingTccPromptNotice: acknowledgePendingTccPromptNoticeMock, consumePendingTccPromptNotice: consumePendingTccPromptNoticeMock, dismissTccPromptNotice: dismissTccPromptNoticeMock, diff --git a/src/main/window/attach-main-window-services.ts b/src/main/window/attach-main-window-services.ts index ded1321dfd7..788645c1e91 100644 --- a/src/main/window/attach-main-window-services.ts +++ b/src/main/window/attach-main-window-services.ts @@ -6,7 +6,7 @@ import { consumePendingTccPromptNotice, dismissTccPromptNotice, releasePendingTccPromptNotice -} from '../macos-tcc-prompt-notice' +} from '../macos-permissions/macos-tcc-prompt-notice' import { registerRepoHandlers } from '../ipc/repos' import { setRepoRemoteClientNotifier } from '../ipc/repos/repos-changed-notification' import { setWorktreeCatalogRemoteClientNotifier } from '../ipc/watched-worktree-catalog-notification' diff --git a/src/main/window/clipboard-image-temp-file.ts b/src/main/window/clipboard-image-temp-file.ts index da5297a0d70..20f182648a3 100644 --- a/src/main/window/clipboard-image-temp-file.ts +++ b/src/main/window/clipboard-image-temp-file.ts @@ -10,7 +10,7 @@ import { sanitizeAgentSessionAttachmentName, type AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session/agent-session-attachments' -import { detectImageFileSignature } from '../image-file-signature' +import { detectImageFileSignature } from '../media/image-file-signature' import { nativeChatPasteFolder } from './native-chat-paste-files' export type SaveClipboardImageAsTempFileArgs = { diff --git a/src/main/window/createMainWindow-close-confirmation.test.ts b/src/main/window/createMainWindow-close-confirmation.test.ts index a5cc53ba6e2..1885fd980b4 100644 --- a/src/main/window/createMainWindow-close-confirmation.test.ts +++ b/src/main/window/createMainWindow-close-confirmation.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-low-commit-oom-recovery.test.ts b/src/main/window/createMainWindow-low-commit-oom-recovery.test.ts index aa98a462335..e0121ec9fd4 100644 --- a/src/main/window/createMainWindow-low-commit-oom-recovery.test.ts +++ b/src/main/window/createMainWindow-low-commit-oom-recovery.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-markdown-editor-focus.test.ts b/src/main/window/createMainWindow-markdown-editor-focus.test.ts index 64483f2640e..92ec19a7646 100644 --- a/src/main/window/createMainWindow-markdown-editor-focus.test.ts +++ b/src/main/window/createMainWindow-markdown-editor-focus.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-recovery-reload-watchdog.test.ts b/src/main/window/createMainWindow-recovery-reload-watchdog.test.ts index 043689edde0..aa20a9da85a 100644 --- a/src/main/window/createMainWindow-recovery-reload-watchdog.test.ts +++ b/src/main/window/createMainWindow-recovery-reload-watchdog.test.ts @@ -15,7 +15,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-renderer-crash-recovery.test.ts b/src/main/window/createMainWindow-renderer-crash-recovery.test.ts index e905196da3d..c88917fde9c 100644 --- a/src/main/window/createMainWindow-renderer-crash-recovery.test.ts +++ b/src/main/window/createMainWindow-renderer-crash-recovery.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-renderer-launch-failure.test.ts b/src/main/window/createMainWindow-renderer-launch-failure.test.ts index 81effd0f99e..dec6a66def9 100644 --- a/src/main/window/createMainWindow-renderer-launch-failure.test.ts +++ b/src/main/window/createMainWindow-renderer-launch-failure.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-startup-reveal.test.ts b/src/main/window/createMainWindow-startup-reveal.test.ts index 1b482ef1b7f..7be8661ab85 100644 --- a/src/main/window/createMainWindow-startup-reveal.test.ts +++ b/src/main/window/createMainWindow-startup-reveal.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts b/src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts index 95a5d93701d..dfefd041ecc 100644 --- a/src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts +++ b/src/main/window/createMainWindow-terminal-focus-shortcuts.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-tray-minimize-close.test.ts b/src/main/window/createMainWindow-tray-minimize-close.test.ts index 585830b2af9..43a47b8db10 100644 --- a/src/main/window/createMainWindow-tray-minimize-close.test.ts +++ b/src/main/window/createMainWindow-tray-minimize-close.test.ts @@ -10,7 +10,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-user-quit-close.test.ts b/src/main/window/createMainWindow-user-quit-close.test.ts index ccb6f3debb1..71f7272ee49 100644 --- a/src/main/window/createMainWindow-user-quit-close.test.ts +++ b/src/main/window/createMainWindow-user-quit-close.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts b/src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts index 958358f883a..a3a0a91346e 100644 --- a/src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts +++ b/src/main/window/createMainWindow-zoom-and-tab-switch-shortcuts.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow.test.ts b/src/main/window/createMainWindow.test.ts index bd92a7ec27d..cb23d4e4d6e 100644 --- a/src/main/window/createMainWindow.test.ts +++ b/src/main/window/createMainWindow.test.ts @@ -6,7 +6,9 @@ vi.mock('electron', async () => vi.mock('./macos-tahoe-release', async () => (await import('./createMainWindow-test-harness')).macosTahoeReleaseMock() ) -vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harness')).appIconMock()) +vi.mock('./desktop-integration/app-icon', async () => + (await import('./createMainWindow-test-harness')).appIconMock() +) vi.mock('../browser/browser-manager', async () => (await import('./createMainWindow-test-harness')).browserManagerMock() ) diff --git a/src/main/window/createMainWindow.ts b/src/main/window/createMainWindow.ts index d747e91a336..64928ae14ec 100644 --- a/src/main/window/createMainWindow.ts +++ b/src/main/window/createMainWindow.ts @@ -1,7 +1,7 @@ import { app, BrowserWindow, nativeTheme, powerMonitor, screen } from 'electron' import { release } from 'node:os' import { join } from 'node:path' -import { getAppIconPath } from '../app-icon' +import { getAppIconPath } from './desktop-integration/app-icon' import { browserManager } from '../browser/browser-manager' import { getBrowserClientHostId } from '../browser/browser-client-host-id' import { formatBrowserClientHostIdArgument } from '../../shared/browser-client-host-id-argument' diff --git a/src/main/app-icon.test.ts b/src/main/window/desktop-integration/app-icon.test.ts similarity index 94% rename from src/main/app-icon.test.ts rename to src/main/window/desktop-integration/app-icon.test.ts index 6128bf9eb67..9ca3a30eb73 100644 --- a/src/main/app-icon.test.ts +++ b/src/main/window/desktop-integration/app-icon.test.ts @@ -8,27 +8,27 @@ vi.mock('electron', () => ({ nativeImage: { createEmpty: () => ({ isEmpty: () => true }) } })) -vi.mock('../../resources/icon.png?asset', () => ({ +vi.mock('../../../../resources/icon.png?asset', () => ({ default: 'classic-icon' })) -vi.mock('../../resources/icon-dev.png?asset', () => ({ +vi.mock('../../../../resources/icon-dev.png?asset', () => ({ default: 'classic-dev-icon' })) -vi.mock('../../resources/app-icons/orca-watercolor.png?asset', () => ({ +vi.mock('../../../../resources/app-icons/orca-watercolor.png?asset', () => ({ default: 'watercolor-icon' })) -vi.mock('../../resources/app-icons/orca-watercolor.png?asset&asarUnpack', () => ({ +vi.mock('../../../../resources/app-icons/orca-watercolor.png?asset&asarUnpack', () => ({ default: 'watercolor-icon-unpacked' })) -vi.mock('../../resources/app-icons/orca-blue.png?asset', () => ({ +vi.mock('../../../../resources/app-icons/orca-blue.png?asset', () => ({ default: 'blue-icon' })) -vi.mock('../../resources/app-icons/orca-blue.png?asset&asarUnpack', () => ({ +vi.mock('../../../../resources/app-icons/orca-blue.png?asset&asarUnpack', () => ({ default: 'blue-icon-unpacked' })) diff --git a/src/main/app-icon.ts b/src/main/window/desktop-integration/app-icon.ts similarity index 94% rename from src/main/app-icon.ts rename to src/main/window/desktop-integration/app-icon.ts index 2f07bc0225e..54e79048cc3 100644 --- a/src/main/app-icon.ts +++ b/src/main/window/desktop-integration/app-icon.ts @@ -5,13 +5,13 @@ import { } from 'node:child_process' import { dirname, resolve } from 'node:path' import { app, BrowserWindow, nativeImage } from 'electron' -import classicIcon from '../../resources/icon.png?asset' -import classicDevIcon from '../../resources/icon-dev.png?asset' -import watercolorIcon from '../../resources/app-icons/orca-watercolor.png?asset' -import watercolorMacDockIcon from '../../resources/app-icons/orca-watercolor.png?asset&asarUnpack' -import blueIcon from '../../resources/app-icons/orca-blue.png?asset' -import blueMacDockIcon from '../../resources/app-icons/orca-blue.png?asset&asarUnpack' -import { normalizeAppIconId, type AppIconId } from '../shared/app-icon' +import classicIcon from '../../../../resources/icon.png?asset' +import classicDevIcon from '../../../../resources/icon-dev.png?asset' +import watercolorIcon from '../../../../resources/app-icons/orca-watercolor.png?asset' +import watercolorMacDockIcon from '../../../../resources/app-icons/orca-watercolor.png?asset&asarUnpack' +import blueIcon from '../../../../resources/app-icons/orca-blue.png?asset' +import blueMacDockIcon from '../../../../resources/app-icons/orca-blue.png?asset&asarUnpack' +import { normalizeAppIconId, type AppIconId } from '../../../shared/app-icon' const APP_ICON_PATHS = { classic: !app.isPackaged ? classicDevIcon : classicIcon, diff --git a/src/main/appkit-scene-mutation.ts b/src/main/window/desktop-integration/appkit-scene-mutation.ts similarity index 100% rename from src/main/appkit-scene-mutation.ts rename to src/main/window/desktop-integration/appkit-scene-mutation.ts diff --git a/src/main/macos-press-and-hold-default.defaults-domain.test.ts b/src/main/window/desktop-integration/macos-press-and-hold-default.defaults-domain.test.ts similarity index 100% rename from src/main/macos-press-and-hold-default.defaults-domain.test.ts rename to src/main/window/desktop-integration/macos-press-and-hold-default.defaults-domain.test.ts diff --git a/src/main/macos-press-and-hold-default.test.ts b/src/main/window/desktop-integration/macos-press-and-hold-default.test.ts similarity index 100% rename from src/main/macos-press-and-hold-default.test.ts rename to src/main/window/desktop-integration/macos-press-and-hold-default.test.ts diff --git a/src/main/macos-press-and-hold-default.ts b/src/main/window/desktop-integration/macos-press-and-hold-default.ts similarity index 99% rename from src/main/macos-press-and-hold-default.ts rename to src/main/window/desktop-integration/macos-press-and-hold-default.ts index d597f855615..545c341c803 100644 --- a/src/main/macos-press-and-hold-default.ts +++ b/src/main/window/desktop-integration/macos-press-and-hold-default.ts @@ -2,7 +2,7 @@ import { mkdirSync, readFileSync } from 'node:fs' import { dirname, join } from 'node:path' import { runProcessSync } from '@orca/process-host' import type { ProcessResult } from '@orca/process-host/process-spec' -import { writeFileAtomically } from './codex-accounts/fs-utils' +import { writeFileAtomically } from '../../codex-accounts/fs-utils' // Opt out of the accent picker once so terminal keys repeat (#14746); later user choices win. // The separate defaults process may affect only the next launch. Reverting this also requires deleting the key. diff --git a/src/main/system-fonts.test.ts b/src/main/window/desktop-integration/system-fonts.test.ts similarity index 100% rename from src/main/system-fonts.test.ts rename to src/main/window/desktop-integration/system-fonts.test.ts diff --git a/src/main/system-fonts.ts b/src/main/window/desktop-integration/system-fonts.ts similarity index 100% rename from src/main/system-fonts.ts rename to src/main/window/desktop-integration/system-fonts.ts diff --git a/src/main/window/updater-package-recovery-ipc.test.ts b/src/main/window/updater-package-recovery-ipc.test.ts index 812dcf8ee5d..6d23c947472 100644 --- a/src/main/window/updater-package-recovery-ipc.test.ts +++ b/src/main/window/updater-package-recovery-ipc.test.ts @@ -40,7 +40,7 @@ vi.mock('../memory/hydrate-local-pty-registry', () => ({ hydrateLocalPtyRegistryAtBoot: vi.fn() })) vi.mock('../browser/browser-manager', () => ({ browserManager: { unregisterAll: vi.fn() } })) -vi.mock('../macos-tcc-prompt-notice', () => ({ +vi.mock('../macos-permissions/macos-tcc-prompt-notice', () => ({ acknowledgePendingTccPromptNotice: vi.fn(), consumePendingTccPromptNotice: vi.fn(), dismissTccPromptNotice: vi.fn(), diff --git a/src/main/wsl/wsl-orcad-liveness-state.ts b/src/main/wsl/wsl-orcad-liveness-state.ts index 359bb77604c..59e8423dfcf 100644 --- a/src/main/wsl/wsl-orcad-liveness-state.ts +++ b/src/main/wsl/wsl-orcad-liveness-state.ts @@ -1,6 +1,6 @@ import { EXIT_SETTLE_MS } from './wsl-orcad-liveness-evidence' import type { OrcadTerminalCensus } from '../../shared/orcad-terminal-census' -import type { SystemPowerLifecycleListener } from '../system-power-lifecycle' +import type { SystemPowerLifecycleListener } from '../power/system-power-lifecycle' import type { WslRunningDistrosRead } from '../wsl-background-distro-gate' import type { WslGuestIdentity } from './wsl-guest-process-identity' import type { WslOrcadConnection, WslOrcadConnectionManager } from './wsl-orcad-connection' diff --git a/src/main/wsl/wsl-orcad-liveness-supervisor.test.ts b/src/main/wsl/wsl-orcad-liveness-supervisor.test.ts index 60436004855..60771edfd1f 100644 --- a/src/main/wsl/wsl-orcad-liveness-supervisor.test.ts +++ b/src/main/wsl/wsl-orcad-liveness-supervisor.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' import type { OrcadTerminalCensus } from '../../shared/orcad-terminal-census' -import type { SystemPowerLifecycleListener } from '../system-power-lifecycle' +import type { SystemPowerLifecycleListener } from '../power/system-power-lifecycle' import type { WslRunningDistrosRead } from '../wsl-background-distro-gate' import type { WslGuestIdentity } from './wsl-guest-process-identity' import type { WslOrcadConnection } from './wsl-orcad-connection' diff --git a/src/main/wsl/wsl-orcad-liveness-wiring.ts b/src/main/wsl/wsl-orcad-liveness-wiring.ts index b5d6bcdec74..5b03d2a4757 100644 --- a/src/main/wsl/wsl-orcad-liveness-wiring.ts +++ b/src/main/wsl/wsl-orcad-liveness-wiring.ts @@ -10,7 +10,7 @@ import { UNVERIFIABLE_ORCAD_TERMINAL_CENSUS } from '../../shared/orcad-terminal-census' import { requestOrcadTerminalCensus } from '../ssh/orcad-terminal-census-client' -import { subscribeSystemPowerLifecycle } from '../system-power-lifecycle' +import { subscribeSystemPowerLifecycle } from '../power/system-power-lifecycle' import { deferUntilWslDistroRunning, readSettledConfirmedRunningWslDistros