refactor(ipc): import ipc helpers from their owning modules, not re-export shims

src/main/agent-hooks/managed-hook-detection-commands.ts

@@ -6,7 +6,7 @@ import {
 import { MANAGED_AGENT_HOOK_TARGETS } from '../../shared/managed-agent-hook-targets'
 import { normalizeDisabledTuiAgents } from '../../shared/tui-agent-selection'
 import type { GlobalSettings } from '../../shared/global-settings-types'
-import type { TuiAgentDetectionCommand } from '../ipc/tui-agent-detection-commands'
+import type { TuiAgentDetectionCommand } from '../../shared/tui-agent-detection-commands'
 import { parseClaudeCliVersion } from '../claude/claude-hook-event-versions'
 
 export type ManagedHookDetectionSettings = Partial<

src/main/ipc/feedback-image-attachments.test.ts

@@ -2,7 +2,9 @@ import { describe, expect, it } from 'vitest'
 import {
   MAX_FEEDBACK_IMAGE_BYTES,
   MAX_FEEDBACK_IMAGE_COUNT,
-  MAX_FEEDBACK_IMAGE_TOTAL_BYTES,
+  MAX_FEEDBACK_IMAGE_TOTAL_BYTES
+} from '../../shared/feedback-image-limits'
+import {
   appendFeedbackImagesToFormData,
   feedbackImageFilename,
   isSupportedFeedbackImageContentType,

src/main/ipc/feedback-image-attachments.ts

@@ -15,13 +15,6 @@ const FEEDBACK_IMAGE_EXTENSIONS: Record<string, string> = {
   'image/gif': 'gif'
 }
 
-export {
-  MAX_FEEDBACK_IMAGE_BYTES,
-  MAX_FEEDBACK_IMAGE_COUNT,
-  MAX_FEEDBACK_IMAGE_TOTAL_BYTES
-} from '../../shared/feedback-image-limits'
-export type { FeedbackImageAttachment } from '../../shared/feedback-submit-contract'
-
 export const MAX_FEEDBACK_IMAGE_RESPONSE_BYTES = 64 * 1024
 export const FEEDBACK_IMAGE_FORM_FIELD = 'feedbackImage'
 

src/main/ipc/feedback-request.ts

@@ -36,8 +36,6 @@ export type FeedbackSubmitBody = {
   images?: FeedbackImageAttachment[]
 }
 
-export type { FeedbackRequestFailure } from '../../shared/feedback-submit-contract'
-
 export async function postFeedback(
   url: string,
   body: FeedbackSubmitBody,

src/main/ipc/feedback.test.ts

@@ -16,10 +16,8 @@ vi.mock('electron', () => ({
   net: { fetch: (...args: unknown[]) => fetchMock(...args) }
 }))
 
-import {
-  MAX_FEEDBACK_IMAGE_RESPONSE_BYTES,
-  MAX_FEEDBACK_IMAGE_TOTAL_BYTES
-} from './feedback-image-attachments'
+import { MAX_FEEDBACK_IMAGE_RESPONSE_BYTES } from './feedback-image-attachments'
+import { MAX_FEEDBACK_IMAGE_TOTAL_BYTES } from '../../shared/feedback-image-limits'
 import { registerFeedbackHandlers, submitFeedback } from './feedback'
 
 function okResponse(): Response {

src/main/ipc/feedback.ts

@@ -1,10 +1,12 @@
 import os from 'node:os'
 import { app, ipcMain } from 'electron'
-import {
-  readFeedbackImagesDelivered,
-  validateFeedbackImages,
-  type FeedbackImageAttachment
-} from './feedback-image-attachments'
+import { readFeedbackImagesDelivered, validateFeedbackImages } from './feedback-image-attachments'
+import type {
+  FeedbackImageAttachment,
+  FeedbackRequestFailure,
+  FeedbackSubmitArgs,
+  FeedbackSubmitResult
+} from '../../shared/feedback-submit-contract'
 import {
   errorFailure,
   FEEDBACK_API_URL,
@@ -15,11 +17,6 @@ import {
   type FeedbackSubmissionType,
   type FeedbackSubmitBody
 } from './feedback-request'
-import type {
-  FeedbackRequestFailure,
-  FeedbackSubmitArgs,
-  FeedbackSubmitResult
-} from '../../shared/feedback-submit-contract'
 
 export type {
   FeedbackDiagnosticBundleAttachment,

src/main/ipc/freebuff-detection.test.ts

@@ -3,7 +3,7 @@ import {
   getTuiAgentDetectionProbeCommands,
   KNOWN_TUI_AGENT_DETECTION_COMMANDS,
   resolveDetectedTuiAgentIds
-} from './tui-agent-detection-commands'
+} from '../../shared/tui-agent-detection-commands'
 
 describe('Freebuff detection', () => {
   it.each(['darwin', 'linux', 'win32', 'wsl'] as const)(

src/main/ipc/parcel-watcher-process.ts

@@ -9,17 +9,6 @@ import type {
 } from './parcel-watcher-process-subscription'
 import { RuntimeWatcherProcessPool } from './runtime-watcher-process-pool'
 
-export type {
-  WatcherProcessCallback,
-  WatcherProcessHooks,
-  WatcherProcessSubscription
-} from './parcel-watcher-process-subscription'
-export type {
-  WatcherProcessDeliveryOptions,
-  WatcherProcessEvent,
-  WatcherProcessSubscribeOptions
-} from './parcel-watcher-process-protocol'
-
 const sharedWatcherProcessSupervisor = new WatcherProcessSupervisor()
 // Why: healthy roots share one child; only fault quarantine scales to four,
 // containing a failed shard without paying that RSS cost during normal use.

src/main/ipc/parcel-watcher-root-path-rewrite.test.ts

@@ -51,9 +51,9 @@ import {
   resetRuntimeWatcherProcessForTest,
   resetWatcherProcessForTest,
   subscribeViaRuntimeWatcherProcess,
-  subscribeViaWatcherProcess,
-  type WatcherProcessEvent
+  subscribeViaWatcherProcess
 } from './parcel-watcher-process'
+import type { WatcherProcessEvent } from './parcel-watcher-process-protocol'
 
 describe('watcher-process root path rewrite', () => {
   let root: AliasedWatcherRoot | null = null

src/main/ipc/plugins.ts

@@ -69,7 +69,6 @@ const logsArgsSchema = z.object({ pluginKey: z.string().min(1) })
 
 // Why re-exported: moved to ../plugins/plugin-client-list so the runtime RPC can reach
 // it without ipcMain. Existing importers of this path keep working.
-export { listPluginsForClients } from '../plugins/plugin-client-list'
 import { listPluginsForClients } from '../plugins/plugin-client-list'
 
 export function canRemoveInstalledPlugin(

src/main/ipc/preflight-agent-detection-no-subprocess.test.ts

@@ -53,7 +53,7 @@ vi.mock('../azure-devops/client', () => ({
 vi.mock('../gitea/client', () => ({ getGiteaAuthStatus: getGiteaAuthStatusMock }))
 
 // Isolate the subprocess-spawn assertion from the fs-based install-dir fallback.
-vi.mock('./local-agent-install-dir-detection', () => ({
+vi.mock('../../shared/local-agent-install-dir-detection', () => ({
   detectCommandsInInstallDirs: detectCommandsInInstallDirsMock
 }))
 
@@ -67,7 +67,7 @@ import { _resetPreflightCache, detectInstalledAgents } from './preflight'
 import {
   getTuiAgentDetectionProbeCommands,
   KNOWN_TUI_AGENT_DETECTION_COMMANDS
-} from './tui-agent-detection-commands'
+} from '../../shared/tui-agent-detection-commands'
 
 describe('#9297: local agent detection spawns zero where/which subprocesses', () => {
   const originalPlatform = process.platform

src/main/ipc/pty-pending-data-drain-queue-differential.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { PtyPendingDataDrainQueue, type PendingPtyData } from './pty-pending-data-drain-queue'
+import { PtyPendingDataDrainQueue } from './pty-pending-data-drain-queue'
+import type { PendingPtyData } from './pty-pending-data-drain-contract'
 
 const CHUNK_CHARS = 4
 const MAX_WRITES = 2

src/main/ipc/pty-pending-data-drain-queue.test.ts

@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import {
-  PtyPendingDataDrainQueue,
-  type PendingPtyData,
-  type PtyPendingDataDrainSelection
-} from './pty-pending-data-drain-queue'
+import { PtyPendingDataDrainQueue } from './pty-pending-data-drain-queue'
+import type {
+  PendingPtyData,
+  PtyPendingDataDrainSelection
+} from './pty-pending-data-drain-contract'
 
 function pending(data: string): PendingPtyData {
   return { data }

src/main/ipc/pty-pending-data-drain-queue.ts

@@ -1,7 +1,5 @@
 import type * as Contract from './pty-pending-data-drain-contract'
 
-export type * from './pty-pending-data-drain-contract'
-
 type LinkedLaneName = Contract.PtyPendingDataDrainDisposition
 type NodeLaneName = LinkedLaneName | 'none' | 'selected'
 

src/main/ipc/pty-pending-data-drain-scheduler-differential.test.ts

@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import {
-  PtyPendingDataDrainQueue,
-  type PendingPtyData,
-  type PtyPendingDataDrainSelection
-} from './pty-pending-data-drain-queue'
+import { PtyPendingDataDrainQueue } from './pty-pending-data-drain-queue'
+import type {
+  PendingPtyData,
+  PtyPendingDataDrainSelection
+} from './pty-pending-data-drain-contract'
 
 const CHUNK_CHARS = 4
 const MAX_WRITES = 2

src/main/ipc/pty/delivery/accounting.ts

@@ -12,7 +12,7 @@ import {
   PTY_RENDERER_TOTAL_IN_FLIGHT_HIGH_WATER_CHARS
 } from './constants'
 import type { PtyIpcSession } from '../session'
-import type { PendingPtyData } from '../../pty-pending-data-drain-queue'
+import type { PendingPtyData } from '../../pty-pending-data-drain-contract'
 
 export function getRendererInFlightCharsForPty(session: PtyIpcSession, id: string): number {
   const accounting = session.rendererDeliveryAccountingByPty.get(id)

src/main/ipc/pty/delivery/flush.ts

@@ -2,7 +2,7 @@ import {
   recordHiddenRendererPtyDataDrop,
   shouldDropHiddenRendererPtyData
 } from '../../pty-hidden-delivery-gate'
-import type { PendingPtyData } from '../../pty-pending-data-drain-queue'
+import type { PendingPtyData } from '../../pty-pending-data-drain-contract'
 import { activeRendererPtys } from './visibility-state'
 import {
   PTY_BATCH_DRAIN_CONTINUE_MS,

src/main/ipc/pty/delivery/pending.ts

@@ -12,7 +12,7 @@ import { redactPtyIdForDiagnostics } from '../../../../shared/pty-delivery-diagn
 import { recordCrashBreadcrumb } from '../../../crash-reporting/crash-breadcrumb-store'
 import { terminalOutputBacklogCapChars } from '../../../../shared/terminal-scrollback-policy'
 import { isHiddenPtyDeliveryGateEnabled } from '../../pty-hidden-delivery-gate'
-import type { PendingPtyData } from '../../pty-pending-data-drain-queue'
+import type { PendingPtyData } from '../../pty-pending-data-drain-contract'
 import { DROPPED_QUERY_SALVAGE_MAX_CHARS } from './constants'
 import type { PtyIpcSession } from '../session'
 

src/main/ipc/pty/host-env/assembly.ts

@@ -4,7 +4,7 @@ import {
   detectExplicitPiAgentKindFromCommand,
   isPiCompatibleAgentType
 } from '../../../../shared/pi-agent-kind'
-import { applyTerminalGitCredentialPromptGuard } from '../../terminal-git-credential-guard'
+import { applyTerminalGitCredentialPromptGuard } from '../../../../shared/terminal-git-credential-guard'
 import { ensureOpenCodeStartupPromptForLaunch } from '../../../opencode/opencode-startup-prompt-installer'
 import { mimoCodeHookService } from '../../../mimo/hook-service'
 import { agentHookServer } from '../../../agent-hooks/server'
@@ -27,9 +27,9 @@ import {
   isMimoLaunchCommand,
   resolveMimocodeSourceHome,
   resolvePiAgentSourceDir,
-  resolveScopedPiAgentSourceDir,
-  restoreOrStripOverlayEnv
+  resolveScopedPiAgentSourceDir
 } from './pi-agent'
+import { restoreOrStripOverlayEnv } from '../../../../shared/agent-overlay-env'
 import { AGENT_HOOK_RUNTIME_ENV_KEYS } from './spawn-env-keys'
 import { applyManagedDataAccountEnvironment } from '../../../managed-data-accounts/launch-environment'
 import { applyOpenCodeStatusPluginEnv, captureOpenCodeSourceConfig } from './opencode-config'

src/main/ipc/pty/host-env/opencode-config.ts

@@ -3,7 +3,8 @@ import {
   isOpenCodeLegacySharedConfigDir
 } from '../../../opencode/legacy-shared-config-dir'
 import { openCode2HookService, openCodeHookService } from '../../../opencode/hook-service'
-import { resolveOpenCodeSourceConfigDir, restoreOrStripOverlayEnv } from './pi-agent'
+import { resolveOpenCodeSourceConfigDir } from './pi-agent'
+import { restoreOrStripOverlayEnv } from '../../../../shared/agent-overlay-env'
 import { selectOpenCodeHookAgent } from '../../../../shared/opencode-launch-command'
 import { isTuiAgentEnabled } from '../../../../shared/tui-agent-selection'
 import { resolveOpenCodeConfigDirectory } from '../../../../shared/opencode-config-directory'

src/main/ipc/pty/host-env/pi-agent.ts

@@ -151,8 +151,6 @@ export function getInheritedAgentSessionStampEnvKeysToDelete(
   ]
 }
 
-export { restoreOrStripOverlayEnv } from '../../../../shared/agent-overlay-env'
-
 export function isMimoLaunchCommand(launchCommand: string | undefined): boolean {
   return getAgentLaunchExecutableName(launchCommand) === 'mimo'
 }

src/main/ipc/pty/session.ts

@@ -10,7 +10,8 @@ import type {
 } from '../../../shared/pty-renderer-delivery-health'
 import type { PtyRendererDeliveryDebugSnapshot } from './delivery/debug'
 import { PtyProducerFlowController } from '../pty-producer-flow-control'
-import { PtyPendingDataDrainQueue, type PendingPtyData } from '../pty-pending-data-drain-queue'
+import { PtyPendingDataDrainQueue } from '../pty-pending-data-drain-queue'
+import type { PendingPtyData } from '../pty-pending-data-drain-contract'
 import { activeRendererPtys } from './delivery/visibility-state'
 import {
   isHiddenPtyDeliveryGateEnabled,

src/main/ipc/qoder-desktop-execution-host.test.ts

@@ -11,7 +11,7 @@ import { buildAgentResumeStartupPlan } from '../../shared/tui-agent-startup'
 import type { PtySpawnIpcArgs } from './pty/ipc/spawn-types'
 
 vi.mock('./preflight-command-exec', () => ({ isCommandOnPath: vi.fn() }))
-vi.mock('./local-agent-install-dir-detection', () => ({
+vi.mock('../../shared/local-agent-install-dir-detection', () => ({
   detectCommandsInInstallDirs: () => new Set()
 }))
 vi.mock('./preflight-wsl-agent-detection', () => ({

src/main/ipc/runtime-watcher-process-pool.ts

@@ -20,8 +20,6 @@ import {
   type RuntimeWatcherProcessPoolOptions
 } from './runtime-watcher-pool-state'
 
-export type { RuntimeWatcherProcessPoolOptions } from './runtime-watcher-pool-state'
-
 // Why: extra ~50 MiB processes are justified only when quarantine isolates a fault.
 const DEFAULT_MAX_SHARED_SUPERVISORS = 1
 const DEFAULT_MAX_QUARANTINE_SUPERVISORS = 4

src/main/ipc/terminal-git-credential-guard.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   applyTerminalGitCredentialPromptGuard,
   TERMINAL_GIT_CREDENTIAL_GUARD_POLICY_ENV
-} from './terminal-git-credential-guard'
+} from '../../shared/terminal-git-credential-guard'
 
 function expectGuarded(env: Record<string, string>): void {
   expect(env.GIT_TERMINAL_PROMPT).toBe('0')

src/main/ipc/tui-agent-detection-commands.test.ts

@@ -3,7 +3,7 @@ import {
   getTuiAgentDetectionProbeCommands,
   KNOWN_TUI_AGENT_DETECTION_COMMANDS,
   resolveDetectedTuiAgentIds
-} from './tui-agent-detection-commands'
+} from '../../shared/tui-agent-detection-commands'
 
 describe('tui agent detection commands', () => {
   it.each(['darwin', 'linux', 'win32', 'wsl'] as const)(

src/main/ipc/worktree-git-common-watch-reconciliation.test.ts

@@ -1,6 +1,7 @@
 import { join, resolve } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { subscribeViaWatcherProcess, type WatcherProcessCallback } from './parcel-watcher-process'
+import { subscribeViaWatcherProcess } from './parcel-watcher-process'
+import type { WatcherProcessCallback } from './parcel-watcher-process-subscription'
 import { startGitCommonPolling } from './worktree-git-common-polling'
 import { startGitCommonNarrowWatch } from './worktree-git-common-narrow-watch'
 import { createGitCommonWatchReconciliation } from './worktree-git-common-watch-reconciliation'

src/main/notifications/notification-delivery-service.ts

@@ -14,7 +14,7 @@ import type {
 import type { OrcaRuntimeService } from '../runtime/orca-runtime'
 import { buildNotificationOptions } from '../ipc/notification-options'
 import { translateMain } from '../i18n/main-i18n'
-import { reserveNotificationCooldown } from '../ipc/notification-burst-cooldown'
+import { reserveNotificationCooldown } from '../../shared/notification-burst-cooldown'
 
 export type NotificationDeliveryDependencies = {
   readNotificationSettings: () => NotificationSettings

src/main/plugins/plugin-dev-watcher-unknown-identity.test.ts

@@ -4,10 +4,8 @@ import { mkdir, rename, rm, stat, symlink } from 'node:fs/promises'
 import type * as FsPromises from 'node:fs/promises'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import {
-  subscribeViaWatcherProcess,
-  type WatcherProcessCallback
-} from '../ipc/parcel-watcher-process'
+import { subscribeViaWatcherProcess } from '../ipc/parcel-watcher-process'
+import type { WatcherProcessCallback } from '../ipc/parcel-watcher-process-subscription'
 import {
   createAliasedWatcherRoot,
   removeAliasedWatcherRoot,

src/main/plugins/plugin-dev-watcher.test.ts

@@ -4,12 +4,12 @@ import type * as Fs from 'node:fs'
 import { mkdir, realpath, rename, rm, stat, symlink, writeFile } from 'node:fs/promises'
 import type * as FsPromises from 'node:fs/promises'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  subscribeViaWatcherProcess,
-  type WatcherProcessCallback,
-  type WatcherProcessHooks,
-  type WatcherProcessSubscribeOptions
-} from '../ipc/parcel-watcher-process'
+import { subscribeViaWatcherProcess } from '../ipc/parcel-watcher-process'
+import type {
+  WatcherProcessCallback,
+  WatcherProcessHooks
+} from '../ipc/parcel-watcher-process-subscription'
+import type { WatcherProcessSubscribeOptions } from '../ipc/parcel-watcher-process-protocol'
 import {
   createAliasedWatcherRoot as createNativeAliasedWatcherRoot,
   removeAliasedWatcherRoot,

src/main/plugins/plugin-dev-watcher.ts

@@ -1,11 +1,9 @@
 import { realpathSync, statSync, type BigIntStats } from 'node:fs'
 import { realpath, stat } from 'node:fs/promises'
 import { basename, dirname, resolve } from 'node:path'
-import {
-  subscribeViaWatcherProcess,
-  type WatcherProcessSubscribeOptions,
-  type WatcherProcessSubscription
-} from '../ipc/parcel-watcher-process'
+import { subscribeViaWatcherProcess } from '../ipc/parcel-watcher-process'
+import type { WatcherProcessSubscribeOptions } from '../ipc/parcel-watcher-process-protocol'
+import type { WatcherProcessSubscription } from '../ipc/parcel-watcher-process-subscription'
 import { resolveWatcherRootPaths } from '../ipc/watcher-event-root-path-rewrite'
 import { watcherDirectoryIdentity } from '../ipc/watcher-directory-identity'
 

src/main/preflight/agent-command-detection.test.ts

@@ -11,7 +11,7 @@ const { detectInstallDirs, guestMounts } = vi.hoisted(() => {
   }
 })
 
-vi.mock('../ipc/local-agent-install-dir-detection', () => ({
+vi.mock('../../shared/local-agent-install-dir-detection', () => ({
   detectCommandsInInstallDirs: detectInstallDirs
 }))
 vi.mock('../ipc/preflight-command-exec', () => ({