refactor: group agent session journal and request modules (#36882)

2026-11-14 01:47:24 +00:00 · 2026-10-31 22:33:23 -07:00
parent b59ce5a6b5
commit 7d76028a5c
1191 changed files with 2379 additions and 2522 deletions
@@ -2021,12 +2021,12 @@
      "invariant": "One structured-send operation id causes at most one provider dispatch. Each user Send on phone or desktop is a new action with a fresh id and one request; neither automatically resends an ambiguous action. The host retains the original action's outcome, and a later phone Send remains possible with equal text, after remount, or when phone storage fails. Repeated transmission of the same operation remains protected by host deduplication.",
      "oracle": "Inject adapter/RPC acknowledgement loss, caller replacement, logical-client close after response, auth recovery with a written request, missing host submissions, legacy pending rows, stale fences, expiry, mobile remount, and phone storage refusal. Assert at most one dispatch for repeated transmission of one operation. For a later phone Send, assert a fresh id and second delivery while the original host entry remains unknown; equal images use current uploaded paths and delivery fields follow current host capabilities.",
      "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-evidence.test.ts src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
        "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir mobile test ../mobile/src/session/mobile-structured-send-new-action.test.ts ../mobile/src/session/use-mobile-structured-agent-session-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx ../mobile/src/session/mobile-structured-send-delivery.test.ts ../mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx ../mobile/src/session/use-mobile-structured-agent-session.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx ../mobile/src/session/native-chat/composer/mobile-native-chat-image-attachment.test.ts ../mobile/src/session/native-chat/composer/use-mobile-native-chat-image-attachments.test.ts ../mobile/src/session/use-mobile-structured-native-chat-send-bridge.test.ts ../mobile/src/mobile-web-shell/page-storage-keys.test.ts ../mobile/src/mobile-web-shell/bridge/page-async-storage.test.ts ../mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx ../mobile/src/mobile-web-shell/bridge-host-init.test.ts ../mobile/src/transport/mobile-relay-rpc-session.test.ts ../mobile/src/transport/rpc-client-delivery-ambiguity.test.ts ../mobile/src/transport/stable-logical-rpc-client.test.ts --maxWorkers=2"
      ],
      "testFiles": [
        "src/shared/agent-session-operation-ledger.test.ts",
-        "src/shared/structured-agent-session-send-evidence.test.ts",
+        "src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts",
        "src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts",
        "src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts",
        "src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts",
@@ -2132,7 +2132,8 @@
          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-evidence.test.ts src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
          "result": "passed",
          "durationSeconds": 6.47,
-          "summary": "Eleven focused host, shared, renderer and orchestration files passed 196 tests, including unknown send outcomes, reused message IDs and host replay without duplicate dispatch. The send-idempotency suite pins only that an unknown outcome is never resent; the removed refusal-retry matrix has no replacement here."
+          "summary": "Eleven focused host, shared, renderer and orchestration files passed 196 tests, including unknown send outcomes, reused message IDs and host replay without duplicate dispatch. The send-idempotency suite pins only that an unknown outcome is never resent; the removed refusal-retry matrix has no replacement here.",
+          "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts src/main/runtime/agent-session/ownership/agent-session-operation-admission.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts src/main/runtime/orchestration/structured-pointer-operation-id.test.ts src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts"
        }
      ],
      "runtimeBudget": {
@@ -11328,7 +11328,7 @@
      "src/shared/agent-session-failure.test.ts": 97,
      "src/shared/agent-session/journal/agent-session-journal-body-admission.test.ts": 108,
      "src/shared/agent-session/journal/agent-session-journal-producer.test.ts": 42,
-      "src/shared/agent-session-journal-schemas.test.ts": 113,
+      "src/shared/agent-session/journal/agent-session-journal-schemas.test.ts": 113,
      "src/shared/agent-session-lease-adjudication.test.ts": 51,
      "src/shared/agent-session-legacy-handoff-lease.test.ts": 124,
      "src/shared/agent-session-mutation-envelope.test.ts": 127,
@@ -12156,14 +12156,14 @@
      "src/shared/structured-agent-session-composer.test.ts": 44,
      "src/shared/structured-agent-session-context-usage.test.ts": 101,
      "src/shared/structured-agent-session-create.test.ts": 282,
-      "src/shared/structured-agent-session-dispatch-rejection.test.ts": 115,
+      "src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.test.ts": 115,
      "src/shared/structured-agent-session-item-retention.test.ts": 653,
-      "src/shared/structured-agent-session-latest-request.test.ts": 264,
+      "src/shared/agent-session/requests/structured-agent-session-latest-request.test.ts": 264,
      "src/shared/structured-agent-session-live-turn.test.ts": 118,
      "src/shared/structured-agent-session-message-projection-stopped-before-start.test.ts": 291,
      "src/shared/structured-agent-session-message-projection.test.ts": 171,
      "src/shared/agent-session/options/structured-agent-session-model-catalog-application.test.ts": 86,
-      "src/shared/structured-agent-session-opening-send.test.ts": 97,
+      "src/shared/agent-session/requests/structured-agent-session-opening-send.test.ts": 97,
      "src/shared/agent-session/options/structured-agent-session-option-picks.test.ts": 74,
      "src/shared/agent-session/options/structured-agent-session-option-view.test.ts": 90,
      "src/shared/agent-session/options/structured-agent-session-options.test.ts": 115,
@@ -12172,7 +12172,7 @@
      "src/shared/structured-agent-session-reducer.queued-messages.test.ts": 154,
      "src/shared/structured-agent-session-reducer.test.ts": 166,
      "src/shared/structured-agent-session-rejection-words.test.ts": 111,
-      "src/shared/structured-agent-session-send-evidence.test.ts": 94,
+      "src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts": 94,
      "src/shared/structured-agent-session-status-started-at.test.ts": 138,
      "src/shared/structured-agent-session-status-tool-line.test.ts": 179,
      "src/shared/structured-agent-session-subagent-roster.test.ts": 50,
@@ -6,7 +6,7 @@ describe('cross-version wire routing for the send path', () => {
  it.each([
    'src/shared/agent-session-wire-refusals.ts',
    'src/shared/structured-agent-session-mutation.ts',
-    'src/shared/structured-agent-session-send-mutation.ts',
+    'src/shared/agent-session/requests/structured-agent-session-send-mutation.ts',
    'src/main/runtime/rpc/core.ts',
    'src/main/runtime/rpc/errors.ts',
    'src/main/runtime/rpc/orchestration-contract-fence.ts',
@@ -22,7 +22,7 @@ describe('cross-version wire routing for the send path', () => {
  })

  it.each([
-    'src/shared/structured-agent-session-send-evidence.ts',
+    'src/shared/agent-session/requests/structured-agent-session-send-evidence.ts',
    'src/shared/structured-agent-session-composer.ts',
    'src/shared/structured-agent-session-reducer.ts',
    'src/main/runtime/orchestration/send-agent-turn.ts',
@@ -197,10 +197,11 @@ const CROSS_VERSION_WIRE_PREFIXES = [
  'src/shared/agent-session-mutation-envelope',
  // Cover client sends to release hosts and fingerprints re-derived by host ledger/journal.
  'src/shared/structured-agent-session-mutation.ts',
-  'src/shared/structured-agent-session-send-mutation.ts',
+  'src/shared/agent-session/requests/structured-agent-session-send-mutation.ts',
  'src/shared/agent-session-record',
  'src/shared/agent-session-provider-handle',
  'src/shared/agent-session-journal-',
+  'src/shared/agent-session/journal/',
  'src/main/ai-vault/structured-session-ownership.ts',
  'src/main/native-chat/agent-session-journal/',
  'src/main/native-chat/agent-session-wire/',
@@ -241,6 +242,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [
  'src/shared/agent-session-turn-record',
  'src/shared/structured-agent-session-agent-status',
  'src/shared/structured-agent-session-projection',
+  'src/shared/agent-session/requests/structured-agent-session-projection-sender.spec.ts',
  'src/shared/workspace-session-sleeping-agents',
  // A current desktop's launch route against a released server's capabilities (cross-version-paired-structured-launch).
  'src/shared/structured-native-chat-launch-route.ts',
@@ -377,8 +377,8 @@ describe('per-job path classification', () => {
      'src/shared/agent-session-wire.ts',
      'src/shared/agent-session-provider-handle.ts',
      'src/shared/agent-session-mutation-envelope.ts',
-      'src/shared/agent-session-journal-item-key.ts',
-      'src/shared/agent-session-journal-types.ts',
+      'src/shared/agent-session/journal/agent-session-journal-item-key.ts',
+      'src/shared/agent-session/journal/agent-session-journal-types.ts',
      'src/main/ai-vault/structured-session-ownership.ts',
      'src/main/native-chat/agent-session-journal/journal-cursor.ts',
      'src/main/native-chat/agent-session-journal/journal-reducer.ts',
@@ -3,7 +3,7 @@ import '@testing-library/jest-dom/vitest'
 import { createElement } from 'react'
 import { cleanup, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { agentJournalItemKey } from '../../src/shared/agent-session-journal-item-key.ts'
+import { agentJournalItemKey } from '../../src/shared/agent-session/journal/agent-session-journal-item-key.ts'
 import { projectStructuredItemsToNativeChat } from '../../src/shared/structured-agent-session-projection.ts'
 import { structuredAgentSessionStartFailure } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-failure-text.ts'
 import { structuredAgentSessionStartFailureRow } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts'
@@ -10,7 +10,7 @@ import type {
  NativeChatMessage,
  NativeChatToolResultBlock
 } from '../../../src/shared/native-chat/native-chat-types'
-import type { AgentJournalBoundedPayload } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalBoundedPayload } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { INLINE_TEXT_SELECTION } from '../components/inline-text-selection'
 import { styles } from './native-chat/transcript/mobile-native-chat-message-styles'
 import { toolStyles } from './native-chat/transcript/mobile-native-chat-tool-styles'
@@ -1,7 +1,7 @@
 import { createElement, useMemo, type ReactElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { projectStructuredAgentSessionMessages } from '../../../src/shared/structured-agent-session-message-projection'
 import { agentJournalTurnBody } from '../../../src/shared/agent-session-turn-record'
 import { foldMobileNativeChatMessages } from './mobile-native-chat-render-data'
@@ -2,7 +2,7 @@ import './MobileNativeChatView.harness.test-fixture'
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatMessage } from '../../../src/shared/native-chat/native-chat-types'
 import { MobileNativeChatView } from './MobileNativeChatView'

@@ -1,4 +1,4 @@
-import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity'
 import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import {
  applyJournalRow,
@@ -1,7 +1,7 @@
 import { createContext, type ContextType } from 'react'
 import { z } from 'zod'
-import { isAdmissibleAgentJournalRenderItem } from '../../../src/shared/agent-session-journal-schemas'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import { isAdmissibleAgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-schemas'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc-operation'
 import { rpcResultVariant } from '../transport/rpc-operation-result-reader'
 import type { MobileNativeChatVisualSource } from './native-chat/visual/mobile-native-chat-visual-read'
@@ -1,7 +1,7 @@
 import { formatAgentTypeLabel } from '../../../src/shared/agent-type-label'
 import { describeLoadError } from '../components/load-error-description'
 import type { NativeChatEmptyStateCopy } from '../../../src/shared/native-chat/native-chat-empty-state'
-import { isRootAgentJournalItem } from '../../../src/shared/agent-session-journal-producer'
+import { isRootAgentJournalItem } from '../../../src/shared/agent-session/journal/agent-session-journal-producer'
 import { stripNoiseMessages } from '../../../src/shared/native-chat/native-chat-noise'
 import { nativeChatStreamingMessage } from '../../../src/shared/native-chat/native-chat-streaming'
 import { isWordlessProviderFrameMessage } from '../../../src/shared/native-chat/native-chat-provider-frame-summary'
@@ -3,10 +3,10 @@
 import {
  AGENT_JOURNAL_THREAD_SCOPE,
  AGENT_SESSION_JOURNAL_SCHEMA_VERSION,
-  type AgentJournalItemBody,
-  type AgentJournalTurnScope
-} from '../../../src/shared/agent-session-journal-types'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+  type AgentJournalItemBody
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
+import type { AgentJournalTurnScope } from '../../../src/shared/agent-session-journal-turn-scope'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import type { JournalRow } from '../../../src/main/native-chat/agent-session-journal/journal-row-schema'
 import {
  hostJournalFrames,
@@ -2,18 +2,18 @@ import { createElement } from 'react'
 import { AlertTriangle } from 'lucide-react-native'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem,
-  AgentJournalSubmission,
-  AgentJournalTurnScope
-} from '../../../src/shared/agent-session-journal-types'
+  AgentJournalSubmission
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
+import type { AgentJournalTurnScope } from '../../../src/shared/agent-session-journal-turn-scope'
 import type { NativeChatMessage } from '../../../src/shared/native-chat/native-chat-types'
 import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
 import { AGENT_SESSION_GOAL_CONTROL_COPY } from '../../../src/shared/agent-session-goal-control-copy'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import { projectStructuredAgentSessionMessages } from '../../../src/shared/structured-agent-session-message-projection'
 import { selectStructuredAgentSettledTurns } from '../../../src/shared/structured-agent-session-turn-timing'

@@ -2,15 +2,15 @@ import { describe, expect, it } from 'vitest'
 import {
  agentJournalItemKey,
  agentJournalSubmissionKey
-} from '../../../src/shared/agent-session-journal-item-key'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type { AgentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
 import type {
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { structuredAgentSessionStartFailureRowIdentity } from '../../../src/shared/structured-agent-session-start-failure-row-key'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import { mobileNativeChatUnsentNotices } from './mobile-native-chat-unsent-notices'

 function submission(
@@ -1,8 +1,8 @@
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import { mobileAgentSessionWriteNoticeText } from './agent-session-write-notice-copy'
 import { agentSessionVisibleFailureFacts } from '../../../src/shared/agent-session-visible-failures'
 import type { NativeChatTurnJournal } from '../../../src/shared/native-chat/transcript/native-chat-turn-membership'
-import { dispatchWasWithdrawn } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import { dispatchWasWithdrawn } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import { structuredAgentSessionRecordedRejectionParts } from '../../../src/shared/structured-agent-session-rejection-words'
 import { tuiAgentDisplayName } from '../../../src/shared/tui-agent-display-names'

@@ -14,8 +14,8 @@ import { afterEach, expect, vi } from 'vitest'
 import type {
  AgentSessionQueuedMessage,
  AgentSessionQueuedMessageEditHoldResult
-} from '../../../src/shared/agent-session-wire'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { queuedMessageWithEdit } from '../../../src/shared/queued-message-edit'
 import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse } from '../transport/types'
@@ -7,7 +7,7 @@ import {
 import { act } from 'react-test-renderer'
 import { beforeAll, describe, expect, it, vi } from 'vitest'
 import type { QueuedEditHostFixtureModule } from '../../../src/shared/queued-edit-host.test-fixture'
-import type { AgentSessionQueuedMessageEditHoldResult } from '../../../src/shared/agent-session-wire'
+import type { AgentSessionQueuedMessageEditHoldResult } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
 import { mobileQueuedEditHarness, readOrHoldReply } from './mobile-queued-edit-hook.test-fixture'
 import {
@@ -9,11 +9,11 @@ import type {
  MobileNativeChatDraftInputs,
  MobileNativeChatDraftDestination
 } from './native-chat/composer/mobile-native-chat-draft-inputs'
-import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
-import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
+import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import type { AgentJournalSubmission } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { RpcClient } from '../transport/rpc-client'
 import type { MobileQueuedEditLease } from './mobile-queued-message-edit-lease'
-import { pickedSkillsInText } from '../../../src/shared/structured-agent-session-send-mutation'
+import { pickedSkillsInText } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import {
  queuedEditKeptImages,
  queuedEditTextForKeptImages
@@ -3,7 +3,7 @@ import {
  queuedMessageEditableText,
  queuedEditKeptImages
 } from '../../../src/shared/queued-message-edit'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { createUuidV4 } from '../../../src/shared/uuid-v4'
 import { startMobileQueuedEditLease } from './mobile-queued-message-edit-lease'
 import { mobileQueuedEditValueKey } from './mobile-queued-message-edit-value'
@@ -1,5 +1,5 @@
-import type { AgentSessionQueuedMessageUpdateResult } from '../../../src/shared/agent-session-wire'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+import type { AgentSessionQueuedMessageUpdateResult } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import type { MobileQueuedEditDraft } from './mobile-queued-message-edit-draft'
 import type { StructuredAgentSessionMutationResult } from './mobile-structured-agent-session-rpc'
 import { readMobileNativeChatDraftInputs } from './native-chat/composer/mobile-native-chat-draft-inputs'
@@ -1,5 +1,5 @@
 import type { MobileNativeChatDraftInputs } from './native-chat/composer/mobile-native-chat-draft-inputs'
-import { pickedSkillsInText } from '../../../src/shared/structured-agent-session-send-mutation'
+import { pickedSkillsInText } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'

 type Image = MobileNativeChatDraftInputs['images'][number]
 export function sameMobileQueuedEditImage(left: Image, right: Image): boolean {
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { AgentJournalFreeTextInput } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalFreeTextInput } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { formatQuestionFreeTextAnswer } from './native-chat/input/mobile-native-chat-question'
 import {
  projectStructuredQuestion,
@@ -1,4 +1,4 @@
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  agentSessionPromptQuestions,
  type AgentSessionQuestionAnswer
@@ -15,7 +15,7 @@ import type { NativeChatResolvedPrompt } from '../../../src/shared/native-chat/n
 import type { useMobileStructuredAgentOptions } from './use-mobile-structured-agent-options'
 import type { useMobileStructuredAgentTurnTiming } from './use-mobile-structured-agent-turn-timing'
 import type { StructuredMobileSendAttachment } from './use-mobile-structured-send-with-outcome'
-import type { AgentJournalSkillRef } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalSkillRef } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type {
  MobileNativeChatCommandRefusalCauses,
  MobileNativeChatSendErrorReporter
@@ -3,7 +3,7 @@ import type {
  AgentSessionWireRefusalCode
 } from '../../../src/shared/agent-session-wire'
 import type { AgentSessionRefusalReference } from '../../../src/shared/agent-session-wire-refusals'
-import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity'
 import { structuredAgentSessionPayloadFingerprint } from '../../../src/shared/structured-agent-session-mutation'
 import { agentSessionWriteNoticeParts } from '../../../src/shared/agent-session-refusal-notice'
 import {
@@ -1,12 +1,10 @@
 import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'
-import type {
-  AgentJournalCursor,
-  AgentJournalSkillRef
-} from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity'
+import type { AgentJournalSkillRef } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  structuredAgentSessionSendBody,
  type StructuredAgentSessionAttachment
-} from '../../../src/shared/structured-agent-session-send-mutation'
+} from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { structuredAgentSessionBlocksTooLarge } from '../../../src/shared/rpc-contract/structured-agent-session-message-params'
 import { AGENT_SESSION_MESSAGE_TOO_LARGE_PARTS } from '../../../src/shared/agent-session-refusal-notice'
 import { mobileAgentSessionWriteNoticeText } from './agent-session-write-notice-copy'
@@ -1,8 +1,10 @@
 import { describe, expect, it } from 'vitest'
 import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../src/shared/agent-session-wire'
-import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
+import {
+  QUEUED_MESSAGE_PAUSED_SEND_FAILED,
+  type AgentSessionQueuedMessage
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import { mobileQueuedMessageCards } from './mobile-structured-queued-message-cards'

 function returnedAs(fact: Parameters<typeof agentSessionFailureWords>[0]) {
@@ -3,11 +3,11 @@ import { stripSentImagePromptMarkers } from '../../../src/shared/native-chat/tra

 import type { AgentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { mobileAgentSessionWriteNoticeText } from './agent-session-write-notice-copy'
-import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalSubmission } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  QUEUED_MESSAGE_PAUSED_SEND_FAILED,
  type AgentSessionQueuedMessage
-} from '../../../src/shared/agent-session-wire'
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import {
  projectQueuedMessageCards,
  queuedMessageCardLine,
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
-import type { AgentJournalDispatchState } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalDispatchState } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import { mobileStructuredSendDelivery } from './mobile-structured-send-delivery'
 import type { StructuredAgentSessionMutationCallResult } from './mobile-structured-agent-session-rpc'
 import { structuredSendResultFixture } from './structured-agent-send-result.test-fixture'
@@ -1,7 +1,7 @@
 import { useCallback, useSyncExternalStore } from 'react'
 import { createUuidV4 } from '../../../../../src/shared/uuid-v4'
-import { pickedSkillsInText } from '../../../../../src/shared/structured-agent-session-send-mutation'
-import type { AgentJournalSkillRef } from '../../../../../src/shared/agent-session-journal-types'
+import { pickedSkillsInText } from '../../../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
+import type { AgentJournalSkillRef } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import type { PendingNativeChatFile } from './mobile-native-chat-file-attachment'
 import type {
@@ -1,5 +1,5 @@
 import { useSyncExternalStore, type SetStateAction } from 'react'
-import type { AgentJournalSkillRef } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalSkillRef } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  resetMobileNativeChatDraftInputsForTests,
  closeMobileNativeChatEditInputs,
@@ -3,7 +3,7 @@ import { Pressable, ScrollView, StyleSheet, Text, View } from 'react-native'
 import { Check } from 'lucide-react-native'
 import type { AskAnswerSelection } from '../../../../../src/shared/native-chat-ask-answer'
 import type { AskPrompt } from '../../../../../src/shared/native-chat/input/native-chat-ask-types'
-import type { AgentJournalFreeTextInput } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalFreeTextInput } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  askAcceptsEmptyAnswer,
  askConfirmAction,
@@ -18,7 +18,7 @@ import type { MobileStructuredAgentMutate } from '../../use-mobile-structured-ag
 import type {
  AgentSessionQueuedMessage,
  AgentSessionQueuedMessageMoveResult
-} from '../../../../../src/shared/agent-session-wire'
+} from '../../../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import type { StructuredAgentSessionMutationResult } from '../../mobile-structured-agent-session-rpc'

 let fontScale = 1
@@ -9,7 +9,7 @@ import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 import { useLargeSystemText } from '../../../theme/use-large-system-text'
 import type { MobileQueuedMessageCard } from '../../mobile-structured-queued-message-cards'
-import type { AgentSessionQueuePause } from '../../../../../src/shared/agent-session-wire'
+import type { AgentSessionQueuePause } from '../../../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import type { MobileQueuedMessageEdit } from '../../use-mobile-structured-queued-message-controls'
 import type { MobileQueuedMessageInlineEditor } from '../../use-mobile-structured-queued-edit'
 import { MobileQueuedMessageCardRow } from '../../MobileQueuedMessageCardRow'
@@ -1,4 +1,4 @@
-import type { AgentJournalQuestion } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalQuestion } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { encodeAgentSessionQuestionAnswers } from '../../../../../src/shared/agent-session-question-answer'
 import {
  structuredQuestionAnswers,
@@ -1,7 +1,7 @@
 // A structured Claude chat on the desktop, read back with `agentSession.history` after its owner
 // approved a Bash call and answered an AskUserQuestion (Claude Code 2.1.300, 2026-10-15).

-import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'

 export const ANSWERED_PROMPT_ITEMS: AgentJournalRenderItem[] = [
  {
@@ -1,7 +1,7 @@
 import type {
  AgentJournalFreeTextInput,
  AgentJournalQuestion
-} from '../../../../../src/shared/agent-session-journal-types'
+} from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'

 export type MobileChatQuestion = {
  question: string
@@ -1,8 +1,8 @@
 import { createElement, type ReactNode } from 'react'
 import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalStatusItem } from '../../../../../src/shared/agent-session-journal-types'
-import { isAdmissibleAgentJournalItemBody } from '../../../../../src/shared/agent-session-journal-schemas'
+import type { AgentJournalStatusItem } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
+import { isAdmissibleAgentJournalItemBody } from '../../../../../src/shared/agent-session/journal/agent-session-journal-schemas'
 import { projectStructuredItemToNativeChat } from '../../../../../src/shared/structured-agent-session-projection'
 import {
  NATIVE_CHAT_INTERRUPTED_STATUS_TEXT,
@@ -5,7 +5,7 @@ import type { NativeChatMessage } from '../../../../../src/shared/native-chat/na
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem
-} from '../../../../../src/shared/agent-session-journal-types'
+} from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import * as toolFold from '../../../../../src/shared/native-chat/tools/native-chat-tool-pairs'
 import { projectStructuredItemsToNativeChat } from '../../../../../src/shared/structured-agent-session-projection'
 import { foldMobileNativeChatMessages } from '../../mobile-native-chat-render-data'
@@ -2,7 +2,7 @@ import { createElement, type ReactNode } from 'react'
 import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
-import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { RpcClient } from '../../../transport/rpc-client'
 import { MobileNativeChatItemSourceContext } from '../../mobile-native-chat-item-read'
 import { useMobileNativeChatMessageDetail } from './use-mobile-native-chat-message-detail'
@@ -1,7 +1,7 @@
 import { createElement, type ReactNode } from 'react'
 import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalToolCallItem } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalToolCallItem } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { MAX_TOOL_DETAIL_LENGTH } from '../../../../../src/shared/native-chat/tools/native-chat-tool-summary'
 import { projectStructuredItemToNativeChat } from '../../../../../src/shared/structured-agent-session-projection'
 import type {
@@ -4,7 +4,7 @@ import { nativeChatTurnMembership } from '../../../../../src/shared/native-chat/
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem
-} from '../../../../../src/shared/agent-session-journal-types'
+} from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'

 it.each([10, 100])(
  'reads turn ownership linearly for %i queued openers and earlier-turn rows',
@@ -2,7 +2,7 @@ import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
-import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { foldMobileNativeChatMessages } from '../../mobile-native-chat-render-data'
 import { useMobileNativeChatMessageDetail } from './use-mobile-native-chat-message-detail'
 import { stubRpcClient } from '../../../transport/rpc-client-test-stub'
@@ -1,7 +1,7 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalItemBody } from '../../../../../src/shared/agent-session-journal-types'
+import type { AgentJournalItemBody } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
 import type { NativeChatTurnJournal } from '../../../../../src/shared/native-chat/transcript/native-chat-turn-membership'

@@ -5,12 +5,12 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it } from 'vitest'
 import { agentSessionFailureFact } from '../../../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../../../src/shared/agent-session-failure-words'
-import { agentJournalSubmissionKey } from '../../../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../../../src/shared/agent-session-journal-types'
+} from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
 import { nativeChatTurnMembership } from '../../../../../src/shared/native-chat/transcript/native-chat-turn-membership'
 import {
@@ -4,9 +4,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem
-} from '../../../../../src/shared/agent-session-journal-types'
+} from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { AgentJournalTurnScope } from '../../../../../src/shared/agent-session-journal-turn-scope'
-import { agentJournalSubmissionKey } from '../../../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
 import type { NativeChatTurnJournal } from '../../../../../src/shared/native-chat/transcript/native-chat-turn-membership'
 import { useMobileNativeChatTurnDisclosure } from './use-mobile-native-chat-turn-disclosure'
@@ -1,6 +1,6 @@
 // Include the durable submission and dispatchState: ok alone proves no message delivery.

-import type { AgentJournalDispatchState } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalDispatchState } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'

 export function structuredSendResultFixture(
@@ -1,7 +1,7 @@
 import { createElement } from 'react'
 import { act } from 'react-test-renderer'
 import { describe, expect, it, vi } from 'vitest'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { queuedMessageWithEdit } from '../../../src/shared/queued-message-edit'
 import { queuedMessageUpdateDecision } from '../../../src/main/native-chat/agent-session-journal/queued-message-update'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
@@ -2,7 +2,7 @@ import { useCallback, useLayoutEffect, useRef, useState } from 'react'
 import type {
  AgentSessionQueuedMessage,
  AgentSessionQueuedMessageMoveResult
-} from '../../../src/shared/agent-session-wire'
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import type { DragReorderMove } from '../components/drag-reorder-positions'
 import type { MobileStructuredAgentMutate } from './use-mobile-structured-agent-mutation'

@@ -3,7 +3,7 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { RpcClient } from '../transport/rpc-client'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 import {
@@ -1,7 +1,7 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { StructuredAgentSessionState } from '../../../src/shared/structured-agent-session-reducer'
 import type { RpcClient } from '../transport/rpc-client'

@@ -1,12 +1,12 @@
 import type {
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type {
  AgentSessionQueuedMessage,
-  AgentSessionQueuePause,
-  AgentSessionSubscribeEvent
-} from '../../../src/shared/agent-session-wire'
+  AgentSessionQueuePause
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import type { RpcResponse } from '../transport/types'
 import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'

@@ -1,7 +1,7 @@
 // Test capability-gated queue writes with authoritative cards; Stop preserves host-held drafts and legacy Edit copies before deleting.

 import { createElement } from 'react'
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { structuredAgentSessionPayloadFingerprint } from '../../../src/shared/structured-agent-session-mutation'
@@ -3,7 +3,7 @@ import { snapshotEvent } from './use-mobile-structured-agent-session-queued.test
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import type { RpcClient } from '../transport/rpc-client'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
@@ -5,8 +5,8 @@ import {
 import { createElement, useState } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalDispatchState } from '../../../src/shared/agent-session-journal-types'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import type { AgentJournalDispatchState } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import type { RpcClient } from '../transport/rpc-client'
 import {
  fieldsOf,
@@ -29,7 +29,7 @@ import {
 } from './mobile-structured-agent-session-host-support'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
 import { mobileNativeChatUnsentNotices } from './mobile-native-chat-unsent-notices'
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import {
  useMobileNativeChatSendError,
  type MobileNativeChatSendErrorDetails
@@ -2,7 +2,7 @@ import { createElement } from 'react'
 import { snapshotEvent } from './use-mobile-structured-agent-session-queued.test-fixture'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse } from '../transport/types'
@@ -10,7 +10,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
  AgentJournalRenderItem,
  AgentJournalResolution
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { SessionOptionDescriptor } from '../../../src/shared/native-chat/input/native-chat-session-options'
 import type { RpcClient } from '../transport/rpc-client'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
@@ -1,11 +1,11 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity'
 import type {
-  AgentJournalCursor,
  AgentJournalRenderItem,
  AgentJournalResetReason
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { STRUCTURED_AGENT_SESSION_CLIENT_COALESCE_MS } from '../../../src/shared/agent-session/structured-agent-session-coalescer'
 import type {
  AgentSessionSubscribeEvent,
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
-import { isRootAgentJournalItem } from '../../../src/shared/agent-session-journal-producer'
+import { isRootAgentJournalItem } from '../../../src/shared/agent-session/journal/agent-session-journal-producer'
+import type { AgentSessionHistoryResult } from '../../../src/shared/agent-session-wire'
 import type {
-  AgentSessionHistoryResult,
  AgentSessionQueuedMessage,
  AgentSessionQueuePause
-} from '../../../src/shared/agent-session-wire'
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import { AGENT_SESSION_HISTORY_MAX_LIMIT } from '../../../src/shared/agent-session-wire'
 import { structuredAgentSessionHolderId } from '../../../src/shared/structured-agent-session-holder'
 import { startStructuredAgentSessionLiveRead } from '../../../src/shared/agent-session/structured-agent-session-live-read'
@@ -5,7 +5,7 @@ import type {
  AgentJournalRenderItem,
  AgentJournalSubmission,
  AgentJournalTurnLifecycle
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { agentJournalTurnBody } from '../../../src/shared/agent-session-turn-record'
 import { useMobileStructuredAgentTurnTiming } from './use-mobile-structured-agent-turn-timing'

@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react'
 import type {
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatSettledTurns } from '../../../src/shared/native-chat/transcript/native-chat-turn-status'
 import type { AgentSessionLatestTurn } from '../../../src/shared/agent-session-wire'
 import type { NativeChatTurnJournal } from '../../../src/shared/native-chat/transcript/native-chat-turn-membership'
@@ -8,7 +8,7 @@ import type {
 } from './native-chat/mobile-native-chat-send'
 import type { MobileNativeChatSendOrigin } from './native-chat/mobile-native-chat-pending-echo'
 import type { StructuredMobileSendAttachment } from './use-mobile-structured-send-with-outcome'
-import type { AgentJournalSkillRef } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalSkillRef } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  readMobileNativeChatPickedSkills,
  restoreMobileNativeChatPickedSkills
@@ -1,7 +1,7 @@
 import { createElement, useRef } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  encodeAgentSessionQuestionAnswers,
  type AgentSessionQuestionAnswer
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import type { AgentSessionPromptResult } from '../../../src/shared/agent-session-wire'
-import type { AgentJournalQuestionItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalQuestionItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import {
  AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH,
  decodeAgentSessionQuestionAnswers,
@@ -2,7 +2,7 @@ import type { RpcClient } from '../transport/rpc-client'
 import { createElement } from 'react'
 import { act } from 'react-test-renderer'
 import { describe, expect, it, vi } from 'vitest'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { queuedMessageWithEdit } from '../../../src/shared/queued-message-edit'
 import type { RpcResponse } from '../transport/types'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
@@ -9,8 +9,8 @@ import {
  useRef,
  useState
 } from 'react'
-import type { AgentSessionQueuedMessageUpdateResult } from '../../../src/shared/agent-session-wire'
-import { agentSessionSendBodyFingerprint } from '../../../src/shared/structured-agent-session-send-mutation'
+import type { AgentSessionQueuedMessageUpdateResult } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import { agentSessionSendBodyFingerprint } from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import { queuedMessageWithEdit } from '../../../src/shared/queued-message-edit'
 import {
  mobileQueuedEditValueKey,
@@ -7,16 +7,16 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type {
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { agentSessionVisibleFailureFacts } from '../../../src/shared/agent-session-visible-failures'
 import { mapSettledWithConcurrency } from '../../../src/shared/map-with-concurrency'
 import type {
  AgentSessionQueuedMessage,
  AgentSessionQueuedMessageDeleteResult,
  AgentSessionQueuedMessagesResumeResult,
-  AgentSessionQueuePause,
-  AgentSessionSendResult
-} from '../../../src/shared/agent-session-wire'
+  AgentSessionQueuePause
+} from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'
 import { queuedMessagesQueuePause } from '../../../src/shared/structured-agent-session-queued-cards'
 import {
  mobileQueuedMessageCards,
@@ -1,4 +1,4 @@
-import { selectAgentSessionCurrentRequests } from '../../../src/shared/agent-session-current-requests'
+import { selectAgentSessionCurrentRequests } from '../../../src/shared/agent-session/requests/agent-session-current-requests'

 import { useCallback } from 'react'
 import { runningStructuredAgentSessionTurnId } from '../../../src/shared/structured-agent-session-live-turn'
@@ -12,8 +12,8 @@ import {
  structuredAgentSessionSendBody,
  type StructuredAgentSessionAttachment,
  type StructuredAgentSessionSendControl
-} from '../../../src/shared/structured-agent-session-send-mutation'
-import type { AgentJournalSkillRef } from '../../../src/shared/agent-session-journal-types'
+} from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
+import type { AgentJournalSkillRef } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import { MAX_SKILL_REFS } from '../../../src/shared/rpc-contract/structured-agent-session-message-params'
 import type { StructuredAgentSessionComposerOptions } from '../../../src/shared/structured-agent-session-composer'
 import type { AgentSessionSlashCommand } from '../../../src/shared/agent-session-wire'
@@ -3,14 +3,14 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type {
  AgentJournalDispatchState,
  AgentJournalRenderItem,
  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
-import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+} from '../../../src/shared/agent-session/journal/agent-session-journal-types'
+import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
+import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/agent-session/requests/structured-agent-session-dispatch-rejection'
 import type { RpcClient } from '../transport/rpc-client'
 import {
  acceptedSubmission,
@@ -1,18 +1,16 @@
 // Project each local send until the host records its id; lost replies stay hidden unless their deadline expires first.

 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import type {
-  AgentJournalCursor,
-  AgentJournalSubmission
-} from '../../../src/shared/agent-session-journal-types'
-import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key'
+import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity'
+import type { AgentJournalSubmission } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
+import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key'
 import type { StructuredAgentSessionOptimisticMessage } from '../../../src/shared/structured-agent-session-message-projection'
 import {
  structuredAgentSessionReadCoversSend,
  structuredAgentSessionSettledSends
-} from '../../../src/shared/structured-agent-session-send-settlement'
+} from '../../../src/shared/agent-session/requests/structured-agent-session-send-settlement'
 import { mergeSentImagePreviews } from './native-chat/composer/mobile-native-chat-draft-reconcile'
-import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
+import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire'
 import type { MobileNativeChatSendErrorReporter } from './native-chat/use-mobile-native-chat-send-error'
 import {
  UNCONFIRMED_SEND_DEADLINE_MS,
@@ -2,7 +2,7 @@ import { createElement } from 'react'
 import { snapshotEvent } from './use-mobile-structured-agent-session-queued.test-fixture'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types'
 import type {
  AgentSessionSubscribeEvent,
  AgentSessionTurnActivity
@@ -3,7 +3,7 @@ import {
  AGENT_SESSION_COHERENT_MODEL_CATALOG_CAPABILITY
 } from '../../../src/shared/structured-agent-session-surface-capabilities'
 import { AGENT_SESSION_QUEUED_IMAGE_CARDS_CLIENT_CAPABILITY } from '../../../src/shared/agent-session-runtime-capabilities'
-import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../src/shared/agent-session-current-requests-capability'
+import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../src/shared/agent-session/requests/agent-session-current-requests-capability'
 import {
  AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
  AGENT_STATUS_RESTORED_UNCONFIRMED_RUNTIME_CAPABILITY,
@@ -1,6 +1,6 @@
 import { normalizeAgentProviderSession } from '../../shared/agent-session-resume'
 import { OpenCodeCopyServerRouteError } from '../../shared/opencode-launch-command'
-import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity'
 import {
  agentSessionAccountHomesEqual,
  type AgentSessionAccountHome
@@ -1,6 +1,6 @@
 import type { AgentSessionContextUsage } from '../../../shared/agent-session-context-usage'
 import type { AgentSessionUsageLimit } from '../../../shared/agent-session-usage-limit'
-import type { AgentJournalToolCallItem } from '../../../shared/agent-session-journal-types'
+import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
 import type { AgentSessionPromptResponse } from '../../../shared/agent-session-question-answer'
 import type {
  NativeChatBackgroundTaskBlock,
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import type { AgentJournalToolCallItem } from '../../../shared/agent-session-journal-types'
+import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
 import {
  isSettledBackgroundTaskState,
  normalizeBackgroundTaskKind
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { AgentJournalToolCallItem } from '../../../shared/agent-session-journal-types'
+import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
 import type { ToolCallUpdate } from '../generated/acp-protocol.generated'
 import { grokToolBackgroundTasks } from './grok-background-tasks'
 import { GROK_ACP_DIALECT } from './grok-dialect'
@@ -1,7 +1,7 @@
 // Grok's subagent IDs also name their child sessions (1.0.46 recordings).

 import { z } from 'zod'
-import type { AgentJournalToolCallItem } from '../../../shared/agent-session-journal-types'
+import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatSubagentState } from '../../../shared/native-chat/native-chat-types'
 import type { ToolCallUpdate } from '../generated/acp-protocol.generated'
 import type { AcpSubagentUpdate } from './acp-dialect'
@@ -3,7 +3,7 @@ import { agentSessionFailureFact } from '../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
 import * as historyBatch from '../native-chat/agent-session-wire/structured-agent-session-history-catch-up'
 import { journalLifecycleMutationItemId } from '../native-chat/agent-session-journal/journal-lifecycle-mutation'
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { AcpAgentError } from './acp-errors'
 import { z } from 'zod'
 import { continuedOutsideNotice } from '../native-chat/agent-session-wire/structured-agent-session-history-catch-up'
@@ -1,4 +1,4 @@
-import type { AgentJournalPlainStatusItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalPlainStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types'

 export function acpHistoryBoundary(): AgentJournalPlainStatusItem | null {
  return null
@@ -2,8 +2,8 @@ import { vi } from 'vitest'
 import {
  agentJournalSubmissionKey,
  parseAgentJournalItemKey
-} from '../../shared/agent-session-journal-item-key'
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+} from '../../shared/agent-session/journal/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
 import type { AcpDialect } from './acp-dialects/acp-dialect'
 import type { AcpHistoryTurnIdentity, AcpLoadHistoryFrame } from './acp-history-replay'
@@ -11,8 +11,8 @@ import {
  answerReplay
 } from './acp-history-catch-up.test-support'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key'
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { agentSessionFailureFact } from '../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
 import {
@@ -2,11 +2,11 @@ import {
  agentJournalItemKey,
  agentJournalSubmissionKey,
  parseAgentJournalItemKey
-} from '../../shared/agent-session-journal-item-key'
+} from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import {
  AGENT_JOURNAL_THREAD_SCOPE,
  type AgentJournalRenderItem
-} from '../../shared/agent-session-journal-types'
+} from '../../shared/agent-session/journal/agent-session-journal-types'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import { nativeChatRowRendersContent } from '../../shared/native-chat/transcript/native-chat-row-content'
 import { projectNativeChatTranscriptMessages } from '../../shared/native-chat/transcript/native-chat-transcript-projection'
@@ -1,5 +1,5 @@
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
-import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types'
+import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import {
  journalLifecycleItemMutation,
  journalLifecycleMutationItemId,
@@ -1,9 +1,9 @@
 import { afterEach, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import {
  agentJournalItemKey,
  agentJournalSubmissionKey
-} from '../../shared/agent-session-journal-item-key'
+} from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import { agentSessionFailureFact } from '../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
@@ -1,7 +1,7 @@
 // A replayed turn written as the chat's lane writes a live one: the same translator and assembler,
 // so its rows carry exactly the keys and bodies a live turn would have, into a staging overlay.

-import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import type { AgentType } from '../../shared/agent-status-types'
 import { createProviderTimelineAssembler } from '../native-chat/agent-session-timeline/provider-timeline-assembler'
 import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
@@ -2,11 +2,11 @@ import { OrderedAvailability } from './acp-history-ordered-availability'
 import {
  agentJournalItemKey,
  parseAgentJournalItemKey
-} from '../../shared/agent-session-journal-item-key'
+} from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import type {
  AgentJournalItemBody,
  AgentJournalRenderItem
-} from '../../shared/agent-session-journal-types'
+} from '../../shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatBlock } from '../../shared/native-chat/native-chat-types'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import { isProviderTimelineTurnInNamespace } from '../native-chat/agent-session-timeline/provider-timeline-identity'
@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { afterAll, describe, expect, it } from 'vitest'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatBlock } from '../../shared/native-chat/native-chat-types'
 import {
  ACP_PROMPT_IMAGE_MAX_BYTES,
@@ -10,7 +10,7 @@ import {
  type AgentJournalDispatchRejection
 } from '../../shared/agent-session-failure-words'
 import { formatNativeChatFileReference } from '../../shared/agent-image-paste'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { IMAGE_FILE_MIME_TYPES } from '../../shared/image-file-extensions'
 import type { NativeChatImageRefBlock } from '../../shared/native-chat/native-chat-types'
 import {
@@ -5,7 +5,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { vi } from 'vitest'
 import { z } from 'zod'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import type { AgentChatPermissionChoice } from '../../shared/agent-chat-permission-mode'
 import type { StructuredAgentSessionLifecycleEvent } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import type { StructuredAgentSessionProviderOpenResult } from '../native-chat/agent-session-wire/structured-agent-session-provider-open-contract'
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import { agentJournalTurnBody, readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import {
  closeProviderTimelineRigs,
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types'
 import {
@@ -1,6 +1,6 @@
 import { expect } from 'vitest'
 import { z } from 'zod'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { agentSessionProviderHandleKey } from '../../shared/agent-session-provider-handle'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import { openTestJournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database-test-support'
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import {
  closeProviderTimelineRigs,
  SESSION
@@ -1,7 +1,7 @@
 // Preserve event order across journal backpressure; hold later events until the sink accepts.

 import type { StructuredAgentSessionChildWorkProducer } from '../native-chat/agent-session-wire/structured-agent-session-subagent-rows'
-import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import {
  createProviderTimelineAssembler,
  type ProviderTimelineAssembler
@@ -23,7 +23,7 @@ import { publishJournalOutcomeEpoch } from '../native-chat/agent-session-journal
 import { JOURNAL_OUTCOME_FORMAT } from '../native-chat/agent-session-journal/journal-outcome-format'
 import type { JournalRow } from '../native-chat/agent-session-journal/journal-row-schema'
 import { createJournalReducerState } from '../native-chat/agent-session-journal/journal-reducer'
-import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import {
  createLegacyProviderTimelineIdentityScheme,
  spellProviderTimelineKey
@@ -10,7 +10,7 @@ import {

 import { delimiter } from 'node:path'
 import { homedir } from 'node:os'
-import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key'
 import {
  agentSessionProviderHandleChainHead,
  agentSessionProviderHandleKey,
@@ -7,7 +7,7 @@ import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire
 import { commandReceiptScope } from '../native-chat/agent-session-journal/command-receipt-schema'
 import { createStructuredMailboxPointerHost } from '../runtime/orchestration/structured-mailbox-pointer-host'
 import { mintAgentSessionOperationId } from '../runtime/orchestration/structured-pointer-operation-id'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'

 afterEach(async () => {
  setStructuredAgentSessionHost(null)
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import {
  closeProviderTimelineRigs,
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import {
  closeProviderTimelineRigs,
--- a/Show More
+++ b/Show More