refactor(renderer): name target converters by meaning; drop re-export shims (#27992)

Co-authored-by: m4air <m4air@Mac.localdomain>

config/scripts/check-focus-read-ratchet.test.mjs

@@ -95,7 +95,7 @@ describe('countFocusSettingReads', () => {
     expect(readers.namesFor('src/renderer/src/b.ts').has('ownerTarget')).toBe(false)
     expect(
       countFocusSettingReads(
-        'const t = runtimeTargetForOwnerHostId(getSettingsFocusedExecutionHostId(s))',
+        'const t = ipcOrRuntimeTargetForHostId(getSettingsFocusedExecutionHostId(s))',
         readers.namesFor('src/renderer/src/a.ts')
       )
     ).toBe(1)

src/renderer/src/attention/agent-subject-read-actions.ts

@@ -1,5 +1,5 @@
 import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 
 export type StructuredSubjectRead = {
   sessionId: string

src/renderer/src/attention/notification-subject-owner.ts

@@ -16,7 +16,7 @@ import {
   findIndexedProjectGroupOwner,
   getCatalogOwnerHostId
 } from '@/lib/worktree-runtime-owner-index'
-import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner'
+import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner-state'
 
 type SubjectOwnerState = WorktreeRuntimeOwnerState &
   Partial<

src/renderer/src/components/NewWorkspaceComposerCard.tsx

@@ -13,7 +13,7 @@ import {
 } from '@/components/sidebar/AddRemoteHostDialog'
 import { lazyWithRetry } from '@/lib/lazy-with-retry'
 import type * as SetProjectLocationDialogModule from '@/components/new-workspace/SetProjectLocationDialog'
-import { unwrapRuntimeRpcResult } from '@/runtime/runtime-rpc-client'
+import { unwrapRuntimeRpcResult } from '@/runtime/runtime-rpc-result'
 import { withUiConnectTimeout } from '@/ssh/ssh-connect-ui-timeout'
 import { isSshConnectInFlight, trackSshConnect } from '@/ssh/ssh-connect-in-flight'
 import { translate } from '@/i18n/i18n'

src/renderer/src/components/artifacts/ArtifactsPage.test.tsx

@@ -47,9 +47,7 @@ vi.mock('@/components/ui/tooltip', () => ({
   TooltipContent: ({ children }: { children: ReactNode }) => <div>{children}</div>
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({
-  callRuntimeRpc: mocks.rpc
-}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.rpc }))
 
 vi.mock('@/store', () => ({
   useAppStore: Object.assign(

src/renderer/src/components/automations/automation-extra-agent-args-capability.test.ts

@@ -11,9 +11,9 @@ const getRuntimeEnvironmentStatus = vi.fn()
 
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args),
-  hasRuntimeRpcErrorCode: () => false
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args)
 }))
+vi.mock('@/runtime/runtime-rpc-result', () => ({ hasRuntimeRpcErrorCode: () => false }))
 
 const RUNTIME = { kind: 'runtime', environmentId: 'env-1', pairingRevision: 4 } as const
 const OWNER = { authority: RUNTIME, selector: { kind: 'self' } } as const

src/renderer/src/components/automations/automation-host-cache-error.ts

@@ -7,7 +7,7 @@
  * retry budget, while an unreachable or slow host must.
  */
 
-import { hasRuntimeRpcErrorCode } from '@/runtime/runtime-rpc-client'
+import { hasRuntimeRpcErrorCode } from '@/runtime/runtime-rpc-result'
 import {
   AUTOMATION_OWNER_CONFLICT_CODES,
   stripAutomationOwnerConflictCode

src/renderer/src/components/automations/automation-host-client.test.ts

@@ -9,9 +9,7 @@ import {
 } from './automation-host-client'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({
-  callRuntimeRpc: vi.fn()
-}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: vi.fn() }))
 
 const mockApi = {
   automations: {

src/renderer/src/components/automations/automation-host-diagnostics.test.ts

@@ -42,9 +42,9 @@ const getRuntimeEnvironmentStatus = vi.fn()
 // injects a transport, so this mock stands in for a paired host that answers.
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args),
-  hasRuntimeRpcErrorCode: () => false
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args)
 }))
+vi.mock('@/runtime/runtime-rpc-result', () => ({ hasRuntimeRpcErrorCode: () => false }))
 
 const RUNTIME_AUTHORITY: AutomationAuthorityRef = {
   kind: 'runtime',

src/renderer/src/components/automations/automation-host-scale-gates.test.ts

@@ -41,9 +41,9 @@ const getRuntimeEnvironmentStatus = vi.fn()
 
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args),
-  hasRuntimeRpcErrorCode: () => false
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args)
 }))
+vi.mock('@/runtime/runtime-rpc-result', () => ({ hasRuntimeRpcErrorCode: () => false }))
 
 // 10 authorities x 5 entries = 50 hosts; 50 hosts x 20 = 1,000 automations.
 // Half the authorities are old servers, because the legacy fan-out is where the

src/renderer/src/components/automations/automation-scoped-list-client.test.ts

@@ -11,11 +11,7 @@ const getRuntimeEnvironmentStatus = vi.fn()
 
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args),
-  // Why: the real matcher is exercised in runtime-rpc-result's own tests; here it only needs to be honest about the tail token.
-  hasRuntimeRpcErrorCode: (error: unknown, code: string) =>
-    typeof (error as { message?: unknown })?.message === 'string' &&
-    (error as { message: string }).message.trimEnd().endsWith(`: ${code}`)
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => getRuntimeEnvironmentStatus(...args)
 }))
 
 const DESKTOP = { kind: 'desktop' } as const

src/renderer/src/components/automations/automation-scoped-list-client.ts

@@ -9,7 +9,8 @@
  * that would attribute other hosts' automations to the selected one.
  */
 
-import { callRuntimeRpc, type RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   Automation,
   AutomationCreateInput,

src/renderer/src/components/automations/automations-page-test-harness.tsx

@@ -164,10 +164,7 @@ vi.mock('@/store/selectors', () => ({
 
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => mocks.callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => mocks.getRuntimeEnvironmentStatus(...args),
-  // Matches the real matcher's contract: the code is a `: <token>` message tail.
-  hasRuntimeRpcErrorCode: (error: unknown, code: string) =>
-    error instanceof Error && error.message.trimEnd().endsWith(`: ${code}`)
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => mocks.getRuntimeEnvironmentStatus(...args)
 }))
 
 vi.mock('sonner', () => ({

src/renderer/src/components/automations/use-automation-host-catalog-readoption.test.tsx

@@ -35,9 +35,9 @@ vi.mock('@/store', () => {
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (_target: unknown, _method: string, params: unknown) =>
     listScoped(params as { selector: AutomationListScopeSelector }),
-  getRuntimeEnvironmentStatus: vi.fn(),
-  hasRuntimeRpcErrorCode: () => false
+  getRuntimeEnvironmentStatus: vi.fn()
 }))
+vi.mock('@/runtime/runtime-rpc-result', () => ({ hasRuntimeRpcErrorCode: () => false }))
 
 import { useAutomationHostCatalog } from './use-automation-host-catalog'
 

src/renderer/src/components/automations/use-automation-host-catalog.test.tsx

@@ -33,9 +33,9 @@ vi.mock('@/store', () => {
 
 vi.mock('@/runtime/runtime-rpc-client', () => ({
   callRuntimeRpc: (...args: unknown[]) => mocks.callRuntimeRpc(...args),
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => mocks.getRuntimeEnvironmentStatus(...args),
-  hasRuntimeRpcErrorCode: () => false
+  getRuntimeEnvironmentStatus: (...args: unknown[]) => mocks.getRuntimeEnvironmentStatus(...args)
 }))
+vi.mock('@/runtime/runtime-rpc-result', () => ({ hasRuntimeRpcErrorCode: () => false }))
 
 import { useAutomationHostCatalog } from './use-automation-host-catalog'
 

src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx

@@ -32,9 +32,7 @@ vi.mock('@/store', () => ({
   }
 }))
 
-vi.mock('@/lib/worktree-runtime-owner', () => ({
-  getRuntimeEnvironmentIdForWorktree: () => null
-}))
+vi.mock('@/lib/worktree-runtime-owner', () => ({ getRuntimeEnvironmentIdForWorktree: () => null }))
 
 vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({
   useContextualTour: () => {}

src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-input-model.ts

@@ -1,6 +1,6 @@
 import type { BrowserScreencastFrameMetadata } from '../../../../../shared/browser-screencast-protocol'
 import type { BrowserTabInfo } from '../../../../../shared/runtime-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import type {
   RemoteBrowserOperationToken,
   RemoteBrowserStreamToken,

src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/constants'
 import type { BrowserTabInfo } from '../../../../../shared/runtime-types'
 import { isRemoteBrowserPageMissingError } from './remote-browser-stream-errors'

src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.ts

@@ -1,4 +1,4 @@
-import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { BROWSER_UNAVAILABLE_ERROR_CODE } from '../../../../../shared/runtime-session-contracts'
 import {
   remoteBrowserStreamLostNotice,

src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import type { RuntimeStatus } from '../../../../../shared/runtime-types'
 import { RemoteBrowserPageSession } from './remote-browser-page-session'
 import { openRemoteBrowserScreencastStream } from './remote-browser-screencast-subscription'

src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts

@@ -6,7 +6,8 @@ import type {
   RemoteBrowserOperationToken,
   RemoteBrowserViewportSize
 } from './remote-browser-stream-tokens'
-import { callRuntimeRpc, type RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { toRuntimeWorktreeSelector } from '@/runtime/runtime-worktree-selector'
 import type { BrowserScreencastFrameMetadata } from '../../../../../shared/browser-screencast-protocol'
 import type { BrowserPage as BrowserPageState } from '../../../../../shared/browser-workspace-types'

src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx

@@ -22,9 +22,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/store', () => ({
   useAppStore: (selector: (state: unknown) => unknown) => selector(mocks.storeState)
 }))
-vi.mock('@/lib/worktree-runtime-owner', () => ({
-  getRuntimeEnvironmentIdForWorktree: () => null
-}))
+vi.mock('@/lib/worktree-runtime-owner', () => ({ getRuntimeEnvironmentIdForWorktree: () => null }))
 vi.mock('./HtmlDocPreview', () => ({
   HtmlDocPreview: ({ holdsGuestFocus }: { holdsGuestFocus?: boolean }) => {
     mocks.handedFocus.push(holdsGuestFocus)

src/renderer/src/components/connect-dialog-outside-dismiss.test.tsx

@@ -28,8 +28,6 @@ vi.mock('@/store', () => ({
   }
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
-
 let root: Root | null = null
 
 beforeEach(() => {

src/renderer/src/components/editor/ExternalFileChangeBanner.test.tsx

@@ -15,7 +15,7 @@ vi.mock('@/store', () => ({
 vi.mock('@/runtime/runtime-file-read-client', () => ({
   readRuntimeFileContent: readRuntimeFileContentMock
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('@/lib/connection-context', () => ({
   // Why: the floating workspace is always client-local; other owners are still loading.
   getConnectionIdForFile: (worktreeId: string) =>

src/renderer/src/components/editor/ExternalFileChangeCompareDialog.test.tsx

@@ -13,7 +13,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/runtime/runtime-file-read-client', () => ({
   readRuntimeFileContent: mocks.readRuntimeFileContent
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('@/lib/connection-context', () => ({
   getConnectionIdForFile: mocks.getConnectionIdForFile
 }))

src/renderer/src/components/editor/editor-dropped-file-open.ts

@@ -4,13 +4,11 @@ import { isPathInsideWorktree, toWorktreeRelativePath } from '@/lib/terminal-lin
 import { useAppStore } from '@/store'
 import { getConnectionId } from '@/lib/connection-context'
 import { joinPath } from '@/lib/path'
-import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner'
+import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner-state'
 import { importExternalPathsToRuntime } from '@/runtime/runtime-file-import-client'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client-types'
-import {
-  runtimeTargetEnvironmentId,
-  type RuntimeClientTarget
-} from '@/runtime/runtime-client-target'
+import { runtimeTargetEnvironmentId } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { translate } from '@/i18n/i18n'
 import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
 import { statUserOpenedPath } from '@/lib/user-opened-local-path'

src/renderer/src/components/editor/editor-restored-tab-conflict-scan.test.ts

@@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/runtime/runtime-file-read-client', () => ({
   readRuntimeFileContent: mocks.readRuntimeFileContent
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('@/lib/connection-context', () => ({
   getConnectionIdForFile: mocks.getConnectionIdForFile
 }))

src/renderer/src/components/editor/rich-markdown-async-image-paste.test.ts

@@ -25,7 +25,7 @@ vi.mock('@/store', () => ({
     }))
   }
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), info: vi.fn() } }))
 
 type ImportResult = Awaited<ReturnType<typeof importExternalPathsToRuntime>>

src/renderer/src/components/editor/rich-markdown-async-image-table.test.ts

@@ -19,7 +19,7 @@ vi.mock('@/store', () => ({
     }))
   }
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), info: vi.fn() } }))
 
 type ImportResult = Awaited<ReturnType<typeof importExternalPathsToRuntime>>

src/renderer/src/components/editor/rich-markdown-editor-config.ts

@@ -27,7 +27,7 @@ import {
   createRichMarkdownImageResolverContext,
   setRichMarkdownImageResolverContext
 } from './rich-markdown-image-context'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { getRichMarkdownSpellcheckAttribute } from './rich-markdown-spellcheck'
 import type { MutableRefObject, Dispatch, SetStateAction } from 'react'
 import type { DiffComment } from '../../../../shared/diff-comment-types'

src/renderer/src/components/editor/rich-markdown-image-context.ts

@@ -1,6 +1,6 @@
 import type { Editor } from '@tiptap/core'
 import { getConnectionId } from '@/lib/connection-context'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client-types'
 
 export type RichMarkdownImageRuntimeContext = Omit<RuntimeFileOperationArgs, 'connectionId'> & {

src/renderer/src/components/editor/rich-markdown-image-insert-code-block.test.ts

@@ -30,8 +30,6 @@ vi.mock('@/store', () => ({
   }
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
-
 vi.mock('sonner', () => ({
   toast: { error: vi.fn(), info: vi.fn() }
 }))

src/renderer/src/components/editor/rich-markdown-image-insert.test.ts

@@ -22,8 +22,6 @@ vi.mock('@/store', () => ({
   }
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
-
 vi.mock('sonner', () => ({
   toast: { error: vi.fn(), info: vi.fn() }
 }))

src/renderer/src/components/editor/rich-markdown-paste-image.test.ts

@@ -22,8 +22,6 @@ vi.mock('@/store', () => ({
   }
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
-
 vi.mock('sonner', () => ({
   toast: { error: vi.fn(), info: vi.fn() }
 }))

src/renderer/src/components/editor/useEditorPanelFileContentLoader.ts

@@ -5,8 +5,8 @@ import { useAppStore } from '@/store'
 import { getDiskBaselineSignature } from './diff-content-signature'
 import { getRuntimeFileReadScope } from '@/runtime/runtime-file-routing'
 import { readEditorCsvFileContent } from './csv/csv-file-content'
-import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { requireRuntimeTargetForFileOwner } from '@/lib/file-owner-runtime-target'
 import { findWorkspaceFileRoute } from '@/lib/runtime-workspace-file-route'
 import { selectWorktreeHostConnectionPhase } from '@/lib/worktree-host-connection-phase'

src/renderer/src/components/editor/useLocalImagePick.test.tsx

@@ -21,7 +21,7 @@ vi.mock('@/store', () => ({
     }))
   }
 }))
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
+
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), info: vi.fn() } }))
 
 type ImportResult = Awaited<ReturnType<typeof importExternalPathsToRuntime>>

src/renderer/src/components/editor/useRichMarkdownProgrammaticSync.ts

@@ -10,7 +10,7 @@ import {
   createRichMarkdownImageResolverContext,
   setRichMarkdownImageResolverContext
 } from './rich-markdown-image-context'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
 
 type RichMarkdownProgrammaticSyncOptions = {

src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts

@@ -13,7 +13,7 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import type { FloatingWorkspaceChromeModel } from './use-floating-workspace-chrome-model'
 import type { FloatingTerminalPanelLocalState } from './use-floating-terminal-panel-local-state'
 import type { FloatingTerminalPanelStoreState } from './use-floating-terminal-panel-store-state'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 const LOCAL_TARGET: RuntimeClientTarget = { kind: 'local' }
 

src/renderer/src/components/github-item-dialog/land-pull-request/pr-reviewers-request-actions.ts

@@ -14,7 +14,7 @@ import type {
 } from '../../../../../shared/github/pull-request-types'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types'
 import type { TaskSourceContext } from '../../../../../shared/task-source-context'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { translate } from '@/i18n/i18n'
 
 type ReviewerRequestArgs = {

src/renderer/src/components/github-project/ProjectCell.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React from 'react'
 import { TYPE_FIELD_DATA_TYPE } from './columns'
 import type {

src/renderer/src/components/github-project/ProjectCellIdentity.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React from 'react'
 import { FileText, GitPullRequest, Lock } from 'lucide-react'
 import { translate } from '@/i18n/i18n'

src/renderer/src/components/github-project/ProjectCellIssueType.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React, { useEffect, useMemo, useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { CircleDot } from 'lucide-react'

src/renderer/src/components/github-project/ProjectCellRepositoryEditors.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React, { useMemo, useState } from 'react'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { useRepoAssigneesBySlug, useRepoLabelsBySlug } from '@/hooks/useGitHubSlugMetadata'

src/renderer/src/components/github-project/ProjectItemSlugDialog.tsx

@@ -7,7 +7,7 @@
 // Files, Checks, and review-thread tabs hidden. This component is that
 // simplified surface; it also routes every write through slug-addressed
 // mutation helpers and patches the Project table cache on success.
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React from 'react'
 import * as VisuallyHidden from 'radix-ui/visually-hidden'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'

src/renderer/src/components/github-project/ProjectPicker.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { ChevronDown } from 'lucide-react'
 import { toast } from 'sonner'

src/renderer/src/components/github-project/ProjectRow.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import React from 'react'
 import { ExternalLink, Play } from 'lucide-react'
 import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card'

src/renderer/src/components/github-project/ProjectViewList.tsx

@@ -23,7 +23,7 @@ import type {
   GitHubProjectSortDirection,
   GitHubProjectTable
 } from '../../../../shared/github/project-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { translate } from '@/i18n/i18n'
 
 type SortOverride = { fieldId: string; direction: GitHubProjectSortDirection }

src/renderer/src/components/github-project/project-picker-runtime.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import { githubProjectHost } from '../../../../shared/github/project-identity'
 import type { GitHubProjectOwnerType } from '../../../../shared/github/project-types'

src/renderer/src/components/github-project/slug-dialog/AssigneesEditor.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import React, { useMemo, useState } from 'react'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { cn } from '@/lib/utils'

src/renderer/src/components/github-project/slug-dialog/Comments.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import React, { useState } from 'react'
 import { Send } from 'lucide-react'
 import { toast } from 'sonner'

src/renderer/src/components/github-project/slug-dialog/LabelsEditor.tsx

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import React, { useState } from 'react'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { cn } from '@/lib/utils'

src/renderer/src/components/github-project/slug-dialog/SlugDialogBody.tsx

@@ -1,5 +1,5 @@
 /* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: slug dialog details are loaded through GitHub IPC and must clear stale request state before each lookup. */
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { CircleDot, ExternalLink, GitPullRequest, LoaderCircle, X } from 'lucide-react'
 import { toast } from 'sonner'

src/renderer/src/components/github-project/useProjectPickerBrowse.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useCallback, useLayoutEffect, useRef, useState } from 'react'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import type { GitHubProjectSummary } from '../../../../shared/github/project-types'

src/renderer/src/components/github-project/useProjectViewTable.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
 import { useMountedRef } from '@/hooks/useMountedRef'

src/renderer/src/components/github/PRFilterDropdowns.tsx

@@ -19,7 +19,7 @@ import type {
   GitHubAssignableUser,
   GitHubOwnerRepo
 } from '../../../../shared/github/pull-request-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { ParsedTaskQuery } from '../../../../shared/task-query'
 import { translate } from '@/i18n/i18n'
 

src/renderer/src/components/github/github-rate-limit-display.tsx

@@ -3,7 +3,7 @@ import { Gauge, RefreshCw } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { installWindowVisibilityInterval } from '@/lib/window-visibility-interval'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   GetRateLimitResult,
   GitHubRateLimitSnapshot

src/renderer/src/components/github/github-work-item-edit-mutations.ts

@@ -1,6 +1,6 @@
 import { useAppStore } from '@/store'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   getGitHubRepoRoutingTarget,
   getGitHubRuntimeRepoId,

src/renderer/src/components/gitlab/gitlab-rate-limit-display.tsx

@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import { installWindowVisibilityInterval } from '@/lib/window-visibility-interval'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   GetGitLabRateLimitResult,
   GitLabRateLimitSnapshot

src/renderer/src/components/native-chat/NativeChatAgentMessageSenders.tsx

@@ -2,7 +2,7 @@ import { Fragment } from 'react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { openAgentMessageSender } from '@/lib/open-agent-message-sender'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useNativeChatVisualOwner } from './native-chat-visual-owner'
 import {
   agentMessageSendersShown,

src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx

@@ -40,7 +40,7 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   NativeChatInterruptedContinueButton,
   useNativeChatInterruptedContinuation

src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx

@@ -5,7 +5,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { translate } from '@/i18n/i18n'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { useStructuredAgentSessionHostCapabilityState } from '@/runtime/structured-agent-session-host-capability'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   AgentJournalRenderItem,
   AgentJournalSubmission

src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.tsx

@@ -9,7 +9,7 @@ import {
 import { findStructuredAgentSessionReadOwner } from './structured-agent-session-read-owner'
 import { structuredAttentionReadObservation } from './structured-attention-read-observation'
 import { useAppStore } from '@/store'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   structuredAgentSessionOwnerForTab,
   structuredAgentSessionTargetForHost

src/renderer/src/components/native-chat/StructuredAgentSessionPaneOverlayLayer.test.tsx

@@ -39,8 +39,6 @@ vi.mock('@/lib/worktree-runtime-owner', () => ({
     state.runtimeEnvironmentId ? `runtime:${state.runtimeEnvironmentId}` : 'local'
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({}))
-
 vi.mock('./NativeChatView', async () => {
   const { useEffect } = await import('react')
   return {

src/renderer/src/components/native-chat/StructuredAgentSessionStatusBridge.tsx

@@ -32,7 +32,7 @@ import { agentMainAgentVerdict } from '../../../../shared/agent-main-agent-verdi
 import { useStructuredAgentSessionLaunchLifecycle } from '@/lib/structured-agent-session-launch-registry'
 import { useStructuredAgentSessionLaunchFailedAt } from '@/lib/structured-agent-session-launch-failed-at'
 import { useAppStore } from '@/store'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   structuredAgentSessionOwnerForTab,
   structuredAgentSessionTargetForHost

src/renderer/src/components/native-chat/native-chat-agent-message-sender-host.test.tsx

@@ -9,7 +9,7 @@ import type { AgentSessionStatusEvent } from '../../../../shared/agent-session-w
 import type { AgentMessageSource } from '../../../../shared/agent-session-message-source'
 import { testOrcaSessionId } from '../../../../shared/orca-session-address-test-fixture'
 import type { Tab } from '../../../../shared/tab-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   AGENT_SESSION_STATUS_FEED_RUNTIME_CAPABILITY,
   MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,

src/renderer/src/components/native-chat/native-chat-agent-message-sender-label.ts

@@ -8,7 +8,7 @@ import {
   resolveStructuredAgentSessionOwner,
   executionHostIdForStructuredTarget
 } from '@/runtime/structured-agent-session-owner'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { AgentMessageSender } from '../../../../shared/agent-session-message-source'
 import type { Tab } from '../../../../shared/tab-types'
 import { getKnownExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'

src/renderer/src/components/native-chat/native-chat-claude-sign-in.ts

@@ -2,7 +2,7 @@ import { createContext, useCallback, useContext, useMemo, useRef, useState } fro
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
 import { signInToClaudeAccount } from '@/lib/claude-account-sign-in'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 /** The chat failures a sign-in to the selected Claude account fixes. */
 const SIGN_IN_FAILURE_KINDS: ReadonlySet<string> = new Set([

src/renderer/src/components/native-chat/native-chat-image-runtime-context.ts

@@ -1,10 +1,8 @@
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client-types'
-import {
-  runtimeTargetForOwnerEnvironment,
-  type RuntimeClientTarget
-} from '@/runtime/runtime-client-target'
+import { runtimeTargetForOwnerEnvironment } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   resolveWorktreeOperationRouteResult,
   type WorktreeOperationRouteResolution

src/renderer/src/components/native-chat/native-chat-retire-persisted-model.test.ts

@@ -20,9 +20,7 @@ vi.mock('../../store', () => ({
     selector({ agentStatusByPaneKey: {} })
 }))
 
-vi.mock('@/runtime/runtime-rpc-client', () => ({
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.callRuntimeRpc }))
 
 vi.mock('./native-chat-pty-session-options', () => ({
   createNativeChatPtySessionOptions: mocks.createNativeChatPtySessionOptions

src/renderer/src/components/native-chat/native-chat-runtime-owner.ts

@@ -1,7 +1,5 @@
-import {
-  getRuntimeEnvironmentIdForWorktree,
-  type WorktreeRuntimeOwnerState
-} from '@/lib/worktree-runtime-owner'
+import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner-state'
 import type { AppState } from '@/store/types'
 import {
   createNativeChatTabOwnerSelector,

src/renderer/src/components/native-chat/native-chat-session-option-settings-write.ts

@@ -1,5 +1,6 @@
 import type { NativeChatSessionOptionSettingsMutation } from '../../../../shared/native-chat-session-options'
-import { callRuntimeRpc, type RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 /**
  * The executing runtime applies deltas to its latest record. This keeps paired-runtime

src/renderer/src/components/native-chat/native-chat-session-transport.test.ts

@@ -2,9 +2,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import {
   clearRuntimeCompatibilityCacheForTests,
-  markRuntimeEnvironmentCompatible,
-  RuntimeRpcCallError
+  markRuntimeEnvironmentCompatible
 } from '@/runtime/runtime-rpc-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { RUNTIME_COMPAT_BLOCK_CODE } from '@/runtime/runtime-protocol-compat'
 import {
   getNativeChatSessionTransport,

src/renderer/src/components/native-chat/native-chat-session-transport.ts

@@ -1,10 +1,8 @@
 import type { NativeChatApi, NativeChatAppendedMessages } from '../../../../preload/api-types'
 import { isWebClientLocation } from '@/lib/web-client-location'
-import {
-  callRuntimeRpc,
-  RuntimeRpcCallError,
-  type RuntimeClientTarget
-} from '@/runtime/runtime-rpc-client'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import {
   parseRuntimeNativeChatReadSessionResult,

src/renderer/src/components/native-chat/native-chat-skill-discovery-context.ts

@@ -1,7 +1,7 @@
 import type { AppState } from '../../store/types'
 import type { SkillDiscoveryTarget } from '../../../../shared/skills'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   getExplicitRuntimeEnvironmentIdForWorktree,
   getExecutionHostIdForWorktree

src/renderer/src/components/native-chat/native-chat-view-types.ts

@@ -1,6 +1,6 @@
 import type { AgentType } from '../../../../shared/agent-status-types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { NativeChatSession } from '../../../../shared/native-chat-types'
 import type { NativeChatContextMenuActions } from './use-native-chat-context-menu'
 

src/renderer/src/components/native-chat/native-chat-visual-owner.tsx

@@ -1,5 +1,5 @@
 import { createContext, useContext, useMemo, type ReactNode } from 'react'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
 
 /** The structured chat a transcript belongs to: where its visuals are read and what owns them. */

src/renderer/src/components/native-chat/native-chat-visual-read-client.ts

@@ -5,7 +5,7 @@
 // cached; the next mount or retry asks again.
 
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   AGENT_SESSION_VISUAL_READ_ERRORS,
   type AgentSessionReadVisualResult,

src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts

@@ -11,7 +11,7 @@ import type {
 } from '../../../../shared/agent-session-journal-types'
 import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy'
 import { agentSessionWriteNotDoneParts } from '../../../../shared/agent-session-refusal-notice'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { readStructuredAgentSessionConversationOutline } from '@/runtime/structured-agent-session-client'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
 import { handBackStructuredAgentSessionMessage } from './structured-agent-session-message-hand-back'

src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts

@@ -15,7 +15,7 @@ import {
   agentSessionWriteNotDoneParts
 } from '../../../../shared/agent-session-refusal-notice'
 import type { AgentSessionWriteFailure } from '../../../../shared/agent-session-write-failure'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   attemptStructuredAgentSessionSend,
   forgetStructuredAgentSessionFence,

src/renderer/src/components/native-chat/structured-agent-session-older-page-read.ts

@@ -7,7 +7,7 @@ import {
   type StructuredAgentSessionAction,
   type StructuredAgentSessionState
 } from '../../../../shared/structured-agent-session-reducer'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import type { NativeChatOlderPageResult } from './native-chat-pagination'
 

src/renderer/src/components/native-chat/structured-agent-session-prompt-response.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { supportsStructuredAgentSessionQuestionAnswers } from '@/runtime/structured-agent-session-client'
 import {
   legacyAgentSessionSelectedOptionId,

src/renderer/src/components/native-chat/structured-agent-session-queued-edit-lease.ts

@@ -3,7 +3,7 @@
 // that fails is only logged; nothing here ever blocks typing, Save or Cancel.
 
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   AgentSessionQueuedMessageEditHoldParams,
   AgentSessionQueuedMessageEditHoldResult

src/renderer/src/components/native-chat/structured-agent-session-read-owner-registry.ts

@@ -1,4 +1,4 @@
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { StructuredAgentSessionReadOwner } from './structured-agent-session-read-owner'
 
 const owners = new Map<string, StructuredAgentSessionReadOwner>()

src/renderer/src/components/native-chat/structured-agent-session-read-owner.ts

@@ -13,7 +13,7 @@ import {
   type StructuredAgentSessionAction,
   type StructuredAgentSessionState
 } from '../../../../shared/structured-agent-session-reducer'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { NATIVE_CHAT_INITIAL_LIMIT, type NativeChatOlderPageResult } from './native-chat-pagination'
 import {

src/renderer/src/components/native-chat/structured-agent-session-read-transport.ts

@@ -9,7 +9,7 @@ import {
 import type { AgentSessionRefusalReference } from '../../../../shared/agent-session-wire-refusals'
 import { readAgentSessionErrorRefusal } from '../../../../shared/agent-session-write-failure'
 import { subscribeRuntimeHostContactRegained } from '@/runtime/runtime-host-contact-regained'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { subscribeStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 
 // A stream hands its failure over as the raw `{ code, message }` payload; `String()` of that is `[object Object]`.

src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts

@@ -18,10 +18,8 @@ import {
   type StructuredAgentSessionSendAnswer,
   type StructuredAgentSessionSendEvidence
 } from '../../../../shared/structured-agent-session-send-evidence'
-import {
-  ensureRuntimeEnvironmentCompatible,
-  type RuntimeClientTarget
-} from '@/runtime/runtime-rpc-client'
+import { ensureRuntimeEnvironmentCompatible } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
 import {

src/renderer/src/components/native-chat/structured-agent-session-send-runtime.ts

@@ -6,7 +6,7 @@ import {
 import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy'
 import type { AgentSessionWriteFailure } from '../../../../shared/agent-session-write-failure'
 import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
 import { nativeChatRewindReasonCopy } from './native-chat-rewind-copy'
 import { handBackStructuredAgentSessionMessage } from './structured-agent-session-message-hand-back'

src/renderer/src/components/native-chat/structured-attention-dispatch.ts

@@ -26,7 +26,7 @@
  * later. Unread and delivery otherwise share the existing `resolveAgentAttention` decision.
  */
 import { notificationSourceForOwner } from '../../../../shared/notification-source'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { resolveNotificationTabOwner } from '@/attention/notification-subject-owner'
 import type {
   AgentSessionPromptAttention,

src/renderer/src/components/native-chat/use-host-model-catalog-upgrade.ts

@@ -11,7 +11,7 @@ import {
   settleStructuredAgentSessionBuiltinCatalog,
   type StructuredAgentSessionOptionState
 } from '../../../../shared/structured-agent-session-options'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { recordHostModelCatalogSnapshot } from '@/runtime/host-model-catalog-snapshots'
 import { structuredAgentSessionHostKey } from '@/runtime/structured-agent-session-host-capability'

src/renderer/src/components/native-chat/use-native-chat-host-outage.test.tsx

@@ -9,7 +9,7 @@ import type {
   RuntimeHostStatusSnapshot
 } from '../../../../shared/runtime-host-status'
 import type { RuntimeStatus } from '../../../../shared/runtime-types'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   NATIVE_CHAT_HOST_RECONNECTING_GRACE_MS,
   useNativeChatHostOutage

src/renderer/src/components/native-chat/use-native-chat-host-outage.ts

@@ -7,7 +7,7 @@ import {
   runtimeHostConnectionStateForEntry,
   type RuntimeHostConnectionState
 } from '@/runtime/runtime-host-connection-state'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 export type NativeChatHostOutageKind = 'reconnecting' | 'offline'
 

src/renderer/src/components/native-chat/use-native-chat-rewind-host.ts

@@ -1,5 +1,5 @@
 import { useCallback, type RefObject } from 'react'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useStructuredAgentSessionRewindBlockedReason } from './StructuredAgentSessionStatusBridge'
 import type { NativeChatComposerHandle } from './NativeChatComposer'
 import type { NativeChatRewindHost } from './use-native-chat-rewind'

src/renderer/src/components/native-chat/use-structured-agent-session-hold.ts

@@ -14,7 +14,7 @@
 
 import { useEffect, useRef } from 'react'
 import { structuredAgentSessionHolderId } from '../../../../shared/structured-agent-session-holder'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 
 export function useStructuredAgentSessionHold(args: {

src/renderer/src/components/native-chat/use-structured-agent-session-host-label.ts

@@ -1,6 +1,6 @@
 import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label'
 import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
-import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { useAppStore } from '../../store'
 
 /** What Orca calls the chat's host; null for a paired server this client has no name for, whose

src/renderer/src/components/native-chat/use-structured-agent-session-mutate.ts

@@ -19,7 +19,7 @@ import {
 } from '../../../../shared/agent-session-write-failure'
 import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
 import { structuredSessionOperationId } from './structured-agent-session-operation-id'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import {
   callStructuredAgentSession,

src/renderer/src/components/native-chat/use-structured-agent-session-option-state.ts

@@ -11,7 +11,7 @@ import {
   createStructuredAgentSessionOptionState,
   type StructuredAgentSessionOptionState
 } from '../../../../shared/structured-agent-session-options'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { readHostModelCatalogSnapshot } from '@/runtime/host-model-catalog-snapshots'
 import {

src/renderer/src/components/native-chat/use-structured-agent-session-options.first-frame.test.tsx

@@ -20,7 +20,7 @@ vi.mock('@/lib/structured-agent-session-launch-options', () => ({
 import type { AgentType } from '../../../../shared/agent-status-types'
 import type { AgentSessionModelCatalogResult } from '../../../../shared/agent-session-wire'
 import type { SessionOptionDescriptor } from '../../../../shared/native-chat-session-options'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import {
   preloadHostModelCatalogSnapshots,
   resetHostModelCatalogSnapshotsForTests

src/renderer/src/components/native-chat/use-structured-agent-session-options.ts

@@ -17,7 +17,7 @@ import {
   type StructuredAgentSessionOptionState
 } from '../../../../shared/structured-agent-session-options'
 import { structuredAgentSessionOptionView } from '../../../../shared/structured-agent-session-option-view'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
 import { enqueueSessionOptionSettingsWrite } from './native-chat-session-option-settings-write'
 import { encodeStructuredAgentSessionOptionValue } from '../../../../shared/structured-agent-session-option-codec'

src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx

@@ -38,7 +38,7 @@ import {
   RUNTIME_CAPABILITIES
 } from '../../../../shared/protocol-version'
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner'
 import {
   useStructuredAgentSession,

src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.ts

@@ -4,7 +4,7 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { structuredAgentSessionHostKey } from '@/runtime/structured-agent-session-host-capability'
 import type {
   AgentSessionQueuedMessage,