From 7d76028a5c69262b6bcf3aa9940443dd39bb1309 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Sat, 31 Oct 2026 22:33:23 -0700 Subject: [PATCH] refactor: group agent session journal and request modules (#36882) --- config/reliability-gates.jsonc | 7 +- config/scripts/ci-shard-timings.json | 10 +- ...nge-scope-cross-version-send-path.test.mjs | 4 +- config/scripts/pr-code-change-scope.mjs | 4 +- config/scripts/pr-code-change-scope.test.mjs | 4 +- ...-session-start-failure-row-render.test.mjs | 2 +- .../session/MobileNativeChatFullContent.tsx | 2 +- ...obileNativeChatView.streaming-rows.test.ts | 2 +- .../MobileNativeChatView.waiting-rows.test.ts | 2 +- ...e-chat-host-journal-frames.test-fixture.ts | 2 +- .../session/mobile-native-chat-item-read.ts | 4 +- .../session/mobile-native-chat-render-data.ts | 2 +- ...e-native-chat-stop-journal.test-fixture.ts | 8 +- ...-native-chat-stopped-before-start.test.tsx | 10 +- .../mobile-native-chat-unsent-notices.test.ts | 6 +- .../mobile-native-chat-unsent-notices.ts | 4 +- .../mobile-queued-edit-hook.test-fixture.tsx | 4 +- .../mobile-queued-edit-lease-outcome.test.tsx | 2 +- .../mobile-queued-message-edit-draft.ts | 6 +- .../mobile-queued-message-edit-open.ts | 2 +- .../mobile-queued-message-edit-outcome.ts | 4 +- .../mobile-queued-message-edit-value.ts | 2 +- ...structured-agent-prompts-free-text.test.ts | 2 +- .../mobile-structured-agent-prompts.ts | 2 +- ...obile-structured-agent-session-contract.ts | 2 +- .../mobile-structured-agent-session-rpc.ts | 2 +- .../mobile-structured-agent-session-send.ts | 8 +- ...le-structured-queued-message-cards.test.ts | 6 +- .../mobile-structured-queued-message-cards.ts | 4 +- .../mobile-structured-send-delivery.test.ts | 4 +- .../mobile-native-chat-draft-inputs.ts | 4 +- .../mobile-native-chat-draft-store.ts | 2 +- .../native-chat/input/MobileNativeChatAsk.tsx | 2 +- .../MobileNativeChatQueuedMessages.test.tsx | 2 +- .../input/MobileNativeChatQueuedMessages.tsx | 2 +- .../input/MobileNativeChatStructuredAsk.tsx | 2 +- ...tive-chat-answered-prompts.test-fixture.ts | 2 +- .../input/mobile-native-chat-question.ts | 2 +- ...leNativeChatMessage.status-notices.test.ts | 4 +- ...tMessage.tool-result-availability.test.tsx | 2 +- .../MobileNativeChatMessage.work-run.test.tsx | 2 +- .../MobileNativeChatToolRun.test.tsx | 2 +- ...ative-chat-turn-draw-order-scaling.test.ts | 2 +- ...mobile-native-chat-message-detail.test.tsx | 2 +- ...tive-chat-turn-disclosure-journal.test.tsx | 2 +- ...chat-turn-disclosure-opening-send.test.tsx | 4 +- ...obile-native-chat-turn-disclosure.test.tsx | 4 +- ...ructured-agent-send-result.test-fixture.ts | 2 +- ...se-mobile-queued-edit-replacement.test.tsx | 2 +- ...-mobile-queued-message-composer-actions.ts | 2 +- ...agent-session-newer-approval-send.test.tsx | 2 +- ...tured-agent-session-prompt-cancel.test.tsx | 2 +- ...tured-agent-session-queued.test-fixture.ts | 8 +- ...e-structured-agent-session-queued.test.tsx | 2 +- ...ructured-agent-session-retry-rows.test.tsx | 2 +- ...ile-structured-agent-session-send.test.tsx | 6 +- ...red-agent-session.cut-turn-notice.test.tsx | 2 +- ...e-mobile-structured-agent-session.test.tsx | 2 +- ...use-mobile-structured-agent-state.test.tsx | 4 +- .../use-mobile-structured-agent-state.ts | 6 +- ...bile-structured-agent-turn-timing.test.tsx | 2 +- ...use-mobile-structured-agent-turn-timing.ts | 2 +- ...bile-structured-native-chat-send-bridge.ts | 2 +- ...obile-structured-prompt-responses.test.tsx | 2 +- .../use-mobile-structured-prompt-responses.ts | 2 +- ...use-mobile-structured-queued-edit.test.tsx | 2 +- .../use-mobile-structured-queued-edit.ts | 4 +- ...bile-structured-queued-message-controls.ts | 8 +- ...use-mobile-structured-send-with-outcome.ts | 6 +- .../use-mobile-structured-sends.test.tsx | 8 +- .../session/use-mobile-structured-sends.ts | 12 +-- ...-mobile-structured-turn-indicator.test.tsx | 2 +- .../mobile-runtime-client-capabilities.ts | 2 +- src/main/acp/acp-conversation-copy.ts | 2 +- src/main/acp/acp-dialects/acp-dialect.ts | 2 +- .../acp/acp-dialects/grok-background-tasks.ts | 2 +- .../acp/acp-dialects/grok-subagents.test.ts | 2 +- src/main/acp/acp-dialects/grok-subagents.ts | 2 +- src/main/acp/acp-history-boundary.test.ts | 2 +- src/main/acp/acp-history-boundary.ts | 2 +- .../acp/acp-history-catch-up.test-support.ts | 4 +- src/main/acp/acp-history-catch-up.test.ts | 4 +- src/main/acp/acp-history-catch-up.ts | 4 +- src/main/acp/acp-history-journal-overlay.ts | 4 +- src/main/acp/acp-history-scaling.test.ts | 4 +- src/main/acp/acp-history-translation.ts | 2 +- src/main/acp/acp-history-turn-matching.ts | 4 +- src/main/acp/acp-prompt-content.test.ts | 2 +- src/main/acp/acp-prompt-content.ts | 2 +- .../acp-structured-adapter.test-support.ts | 2 +- .../acp/acp-structured-compaction.test.ts | 2 +- ...tructured-grok-subagent-recordings.test.ts | 2 +- .../acp/acp-structured-host.test-support.ts | 2 +- .../acp/acp-structured-image-prompts.test.ts | 2 +- src/main/acp/acp-structured-lane.ts | 2 +- .../acp-structured-launch-resolution.test.ts | 2 +- .../acp/acp-structured-launch-resolution.ts | 2 +- .../acp/acp-structured-mail-admission.test.ts | 2 +- .../acp/acp-structured-omp-recordings.test.ts | 2 +- ...acp-structured-opencode-recordings.test.ts | 2 +- .../acp-structured-session-adapter-deps.ts | 2 +- ...uctured-session-adapter-recordings.test.ts | 2 +- ...-structured-session-adapter-resume.test.ts | 2 +- .../acp-structured-session-adapter.test.ts | 2 +- src/main/acp/acp-structured-steer.test.ts | 2 +- src/main/acp/acp-structured-turns.ts | 2 +- .../acp/acp-timeline-fixture.test-support.ts | 2 +- .../acp/acp-timeline-grok-subagents.test.ts | 2 +- .../acp/acp-timeline-turn-failures.test.ts | 2 +- src/main/acp/acp-tool-timeline.ts | 2 +- .../first-work-branch-rename.test.ts | 2 +- .../agent-launch-prompt-delivery.ts | 2 +- .../ai-vault/structured-chat-cli-fork.test.ts | 4 +- src/main/ai-vault/structured-chat-cli-fork.ts | 4 +- ...ation-chat-run-measurement-test-harness.ts | 2 +- .../automation-chat-run-observation.ts | 4 +- .../automation-chat-session-reuse.ts | 2 +- .../runtime-chat-run-observer.test.ts | 6 +- .../automations/runtime-chat-run-observer.ts | 2 +- .../claude-adapter-capture-replay.test.ts | 4 +- src/main/claude/claude-api-retry-row.test.ts | 6 +- src/main/claude/claude-api-retry-row.ts | 2 +- ...claude-background-task-row-journal.test.ts | 2 +- .../claude-background-task-row-journal.ts | 8 +- ...claude-background-task-row-test-support.ts | 8 +- .../claude-background-task-row-writer.ts | 2 +- .../claude/claude-background-task-rows.ts | 2 +- ...de-background-task-turn-resumption.test.ts | 12 +-- .../claude-background-wake-retention.test.ts | 2 +- src/main/claude/claude-child-tool-queries.ts | 2 +- ...aude-child-work-evidence-retention.test.ts | 6 +- ...hild-work-producer-harness.test-fixture.ts | 4 +- src/main/claude/claude-close-turn-end.test.ts | 2 +- .../claude-command-lifecycle-frames.test.ts | 6 +- .../claude/claude-command-lifecycle.test.ts | 4 +- src/main/claude/claude-command-turn.test.ts | 10 +- src/main/claude/claude-command-turn.ts | 8 +- src/main/claude/claude-context-facts.ts | 2 +- .../claude-context-usage-test-support.ts | 6 +- .../claude/claude-fold-steer-receipt.test.ts | 4 +- .../claude/claude-informational-row.test.ts | 2 +- src/main/claude/claude-informational-row.ts | 2 +- .../claude-journal-translator-contract.ts | 2 +- .../claude/claude-journal-turn-scope.test.ts | 6 +- src/main/claude/claude-message-journaling.ts | 2 +- src/main/claude/claude-open-turn.ts | 10 +- .../claude/claude-permission-presentation.ts | 2 +- src/main/claude/claude-prompt-registry.ts | 2 +- ...claude-provisional-row-corrections.test.ts | 8 +- .../claude-provisional-row-corrections.ts | 12 +-- src/main/claude/claude-result-outcome.ts | 2 +- .../claude/claude-streamed-block-identity.ts | 2 +- .../claude-streamed-text-checkpoints.test.ts | 6 +- .../claude-streamed-text-checkpoints.ts | 6 +- src/main/claude/claude-streamed-thinking.ts | 10 +- .../claude-structured-content-parts.test.ts | 6 +- ...claude-structured-dispatch-content.test.ts | 2 +- .../claude-structured-dispatch-content.ts | 2 +- ...claude-structured-dispatch-test-support.ts | 2 +- src/main/claude/claude-structured-dispatch.ts | 6 +- .../claude-structured-in-turn-stop.test.ts | 4 +- .../claude-structured-item-translation.ts | 4 +- ...de-structured-journal-prompt-cards.test.ts | 2 +- ...de-structured-journal-prompt-retry.test.ts | 8 +- .../claude-structured-journal-prompts.ts | 10 +- ...urnal-translation-background-tasks.test.ts | 10 +- ...-journal-translation-context-usage.test.ts | 6 +- ...ured-journal-translation-subagents.test.ts | 6 +- ...ed-journal-translation-turn-timing.test.ts | 6 +- ...ude-structured-journal-translation.test.ts | 8 +- .../claude-structured-launch-visuals.test.ts | 2 +- .../claude-structured-prompt-items.test.ts | 2 +- .../claude/claude-structured-prompt-items.ts | 4 +- ...claude-structured-prompt-ownership.test.ts | 6 +- ...laude-structured-provider-fallback.test.ts | 6 +- .../claude-structured-provider-fallback.ts | 6 +- .../claude-structured-queued-stop.test.ts | 6 +- ...claude-structured-rate-limit-retry.test.ts | 6 +- .../claude-structured-real-cli-fold.test.ts | 6 +- ...claude-structured-real-cli-options.test.ts | 2 +- .../claude-structured-real-cli-rewind.test.ts | 2 +- ...aude-structured-real-cli-stop-task.test.ts | 2 +- ...claude-structured-real-cli-visuals.test.ts | 2 +- .../claude/claude-structured-real-cli.test.ts | 2 +- ...ude-structured-reasoning-lifecycle.test.ts | 4 +- .../claude-structured-reasoning.test.ts | 4 +- .../claude-structured-requested-stop.test.ts | 6 +- ...structured-session-reading-control.test.ts | 10 +- .../claude-structured-session-test-support.ts | 6 +- .../claude/claude-structured-sign-in.test.ts | 2 +- .../claude-subagent-journaled-identities.ts | 2 +- src/main/claude/claude-subagent-linkage.ts | 2 +- ...claude-subagent-permission-request.test.ts | 4 +- ...aude-subagent-resume-after-restart.test.ts | 2 +- src/main/claude/claude-terminal-failure.ts | 10 +- .../claude-thread-goal-journaling.test.ts | 4 +- src/main/claude/claude-thread-goal.ts | 4 +- ...claude-transcript-catch-up-test-support.ts | 2 +- .../claude/claude-transcript-catch-up.test.ts | 6 +- src/main/claude/claude-transcript-catch-up.ts | 2 +- .../claude/claude-transcript-duration.test.ts | 2 +- .../claude/claude-transcript-import-plan.ts | 10 +- .../claude/claude-transcript-item-reader.ts | 8 +- src/main/claude/claude-turn-lifecycle-item.ts | 10 +- src/main/claude/claude-turn-opening.ts | 2 +- src/main/claude/claude-turn-outcome.test.ts | 6 +- src/main/claude/claude-turn-ownership.test.ts | 4 +- .../claude/claude-turn-resumption.test.ts | 8 +- src/main/claude/claude-usage-limits.test.ts | 2 +- .../claude-structured-owner-identity.ts | 2 +- ...ed-session-acquisition-processless.test.ts | 2 +- .../claude-structured-session-state.ts | 2 +- .../codex-background-command-tracker.test.ts | 4 +- ...x-child-work-translation-retention.test.ts | 2 +- src/main/codex/codex-close-turn-end.test.ts | 2 +- .../codex-collab-agent-item-translation.ts | 2 +- .../codex/codex-collab-call-frames-fixture.ts | 2 +- ...ab-call-rows-on-positional-clients.test.ts | 2 +- .../codex/codex-command-turn-claim.test.ts | 10 +- src/main/codex/codex-command-turn-claim.ts | 4 +- src/main/codex/codex-context-usage.ts | 2 +- .../codex-default-mode-subagents.test.ts | 2 +- ...codex-deferred-sink-target-test-support.ts | 6 +- src/main/codex/codex-goal-journal-identity.ts | 4 +- src/main/codex/codex-goal-journal-rows.ts | 2 +- src/main/codex/codex-history-import-plan.ts | 10 +- src/main/codex/codex-history-journal-view.ts | 8 +- .../codex/codex-image-item-translation.ts | 2 +- src/main/codex/codex-journal-command-turn.ts | 8 +- src/main/codex/codex-journal-turn-scopes.ts | 8 +- .../codex-notice-item-translation.test.ts | 2 +- ...codex-persistent-command-retention.test.ts | 6 +- .../codex/codex-provider-retry-row.test.ts | 8 +- src/main/codex/codex-provider-retry-row.ts | 2 +- ...-structured-acquisition-exit-proof.test.ts | 2 +- .../codex-structured-async-question.test.ts | 2 +- ...codex-structured-child-environment.test.ts | 2 +- ...dex-structured-child-work-producer.test.ts | 4 +- ...odex-structured-dispatch-admission.test.ts | 4 +- .../codex-structured-dispatch-echo.test.ts | 2 +- .../codex/codex-structured-dispatch-echo.ts | 6 +- .../codex-structured-dispatch-test-support.ts | 6 +- .../codex-structured-item-stream-bounds.ts | 2 +- .../codex-structured-item-stream-contracts.ts | 2 +- .../codex/codex-structured-item-streams.ts | 2 +- .../codex-structured-item-translation.test.ts | 2 +- .../codex-structured-item-translation.ts | 2 +- ...dex-structured-journal-compactions.test.ts | 6 +- ...x-structured-journal-context-usage.test.ts | 6 +- .../codex-structured-journal-contracts.ts | 2 +- ...tructured-journal-exit-convergence.test.ts | 2 +- ...codex-structured-journal-generic-frames.ts | 4 +- ...-structured-journal-goal-admission.test.ts | 10 +- ...dex-structured-journal-goal-resume.test.ts | 8 +- ...x-structured-journal-goal-revision.test.ts | 4 +- ...codex-structured-journal-goal-rows.test.ts | 4 +- .../codex/codex-structured-journal-goals.ts | 6 +- .../codex/codex-structured-journal-items.ts | 6 +- .../codex/codex-structured-journal-prompts.ts | 2 +- ...ured-journal-restore-turn-grouping.test.ts | 4 +- .../codex-structured-journal-settlement.ts | 4 +- .../codex/codex-structured-journal-sink.ts | 4 +- ...tructured-journal-subagent-readers.test.ts | 4 +- ...-structured-journal-translation-restore.ts | 2 +- ...red-journal-translation-settlement.test.ts | 8 +- ...ctured-journal-translation-streams.test.ts | 8 +- ...urnal-translation-subagent-linkage.test.ts | 6 +- ...red-journal-translation-turn-boundaries.ts | 8 +- ...rnal-translation-turn-settles-once.test.ts | 8 +- ...ructured-journal-translation-turn-state.ts | 2 +- ...ex-structured-journal-translation-turns.ts | 10 +- ...dex-structured-journal-translation.test.ts | 8 +- ...ctured-journal-turn-endings-replay.test.ts | 8 +- .../codex/codex-structured-message-options.ts | 4 +- .../codex/codex-structured-owner-identity.ts | 2 +- .../codex/codex-structured-prompt-items.ts | 4 +- .../codex-structured-prompt-ownership.test.ts | 8 +- ...dex-structured-reasoning-lifecycle.test.ts | 4 +- ...odex-structured-session-adapter-fixture.ts | 6 +- ...ructured-session-adapter-lifecycle.test.ts | 6 +- ...tructured-session-background-tasks.test.ts | 2 +- .../codex-structured-session-cancel.test.ts | 6 +- .../codex-structured-session-shutdown.test.ts | 2 +- .../codex/codex-structured-session-state.ts | 6 +- .../codex/codex-structured-sign-in.test.ts | 2 +- .../codex-structured-skill-report.test.ts | 2 +- ...ex-structured-thread-catch-up-echo.spec.ts | 8 +- ...dex-structured-turn-end-settlement.test.ts | 10 +- .../codex-structured-turn-end-settlement.ts | 2 +- .../codex/codex-structured-turn-permission.ts | 2 +- src/main/codex/codex-structured-turn-start.ts | 2 +- ...odex-subagent-execution-projection.test.ts | 2 +- src/main/codex/codex-subagent-linkage.ts | 2 +- ...x-thread-catch-up-contract-test-fixture.ts | 2 +- .../codex-thread-catch-up-rewind.test.ts | 2 +- src/main/codex/codex-thread-item-identity.ts | 2 +- ...ex-turn-lifecycle-contract-test-fixture.ts | 8 +- src/main/codex/codex-unfinished-item-body.ts | 2 +- src/main/codex/codex-usage-limits.test.ts | 2 +- .../jsonl-rpc/timeline-final-tail.test.ts | 2 +- src/main/jsonl-rpc/timeline-lane.ts | 2 +- .../agent-session-attachment-claims.test.ts | 8 +- .../agent-session-attachment-claims.ts | 2 +- .../agent-session-attachment-references.ts | 2 +- .../agent-session-attachment-sweep.test.ts | 2 +- .../command-receipt-transaction.spec.ts | 2 +- ...urnal-approval-revision-validation.spec.ts | 4 +- ...atomic-settlement-contract-test-fixture.ts | 2 +- ...ournal-atomic-settlement-oversized.spec.ts | 2 +- ...journal-atomic-settlement-rollback.spec.ts | 2 +- .../agent-session-journal/journal-commit.ts | 2 +- .../journal-completed-content.test.ts | 2 +- .../journal-context-controller.ts | 2 +- .../journal-context-rewind.ts | 6 +- .../journal-crash-boundary.spec.ts | 8 +- .../agent-session-journal/journal-cursor.ts | 6 +- .../journal-damage.test.ts | 10 +- .../journal-database.spec.ts | 2 +- .../journal-derived-turn-scope.ts | 6 +- .../journal-dispatch-doubt-reasons.ts | 2 +- .../journal-dispatch-observation.ts | 2 +- .../journal-dispatch-reason-bound.spec.ts | 4 +- .../journal-dispatch-reducer.ts | 4 +- .../journal-dispatch-settlement.test.ts | 2 +- .../journal-dispatch-settlement.ts | 6 +- .../journal-epoch-controller.ts | 2 +- ...epoch-replacement-contract-test-fixture.ts | 6 +- ...journal-epoch-replacement-receipts.spec.ts | 2 +- .../journal-epoch-replacement.ts | 14 +-- .../journal-epoch-rollover.ts | 4 +- .../journal-host-database-test-support.ts | 4 +- .../journal-host-database.spec.ts | 4 +- .../journal-input-card-index.ts | 4 +- .../journal-input-conversion.ts | 2 +- .../journal-input-domain-index.ts | 2 +- .../journal-input-legacy-baseline.test.ts | 2 +- .../journal-input-lineage.ts | 2 +- .../journal-input-order-state.ts | 6 +- .../journal-input-order.test.ts | 4 +- .../journal-input-order.ts | 10 +- .../journal-input-place-index.ts | 2 +- .../journal-input-provenance.ts | 6 +- .../journal-item-appender.ts | 6 +- .../journal-item-fold.ts | 10 +- .../journal-item-identity.test.ts | 4 +- .../journal-item-provenance.spec.ts | 12 ++- .../journal-legacy-identity.ts | 2 +- ...journal-legacy-import-tool-pairing.test.ts | 4 +- .../journal-legacy-import.test.ts | 6 +- .../journal-legacy-import.ts | 4 +- .../journal-lifecycle-batch-appender.spec.ts | 2 +- .../journal-lifecycle-batch-appender.ts | 4 +- .../journal-lifecycle-batch-partition.test.ts | 2 +- .../journal-lifecycle-batch-partition.ts | 2 +- .../journal-lifecycle-boundaries.spec.ts | 4 +- .../journal-lifecycle-mutation.ts | 12 +-- .../journal-mixed-epoch-replacement.test.ts | 12 ++- .../journal-outcome-format-1-decode.ts | 2 +- .../journal-outcome-format-1.ts | 4 +- .../journal-outcome-scaling.test.ts | 6 +- .../journal-outcome-wire.test.ts | 2 +- .../journal-payload-bounds-retention.test.ts | 2 +- .../journal-payload-bounds.ts | 2 +- .../journal-pending-submission-recovery.ts | 4 +- .../journal-pi-active-branch.ts | 2 +- .../journal-producer-inheritance.spec.ts | 8 +- .../journal-projection-bootstrap.test.ts | 2 +- .../journal-projection-failure.test.ts | 4 +- .../journal-projection-streams.test.ts | 6 +- .../journal-prompt-body-bounds.ts | 2 +- .../journal-provider-activity.ts | 4 +- .../journal-public-read.ts | 4 +- .../journal-queue-adoption-plan.ts | 2 +- .../journal-queue-events.ts | 8 +- .../journal-queue-fold.ts | 10 +- .../journal-queue-import.ts | 2 +- .../journal-queue-retention.ts | 4 +- .../journal-queued-messages.ts | 4 +- .../journal-queued-rejection-batch.spec.ts | 8 +- .../journal-reasoning-row.ts | 2 +- .../journal-received-content.test.ts | 2 +- .../journal-reducer-producer-linkage.test.ts | 4 +- .../journal-reducer-rejection-fact.test.ts | 2 +- .../journal-reducer.test.ts | 12 +-- .../agent-session-journal/journal-reducer.ts | 10 +- ...journal-rejected-message-placement.test.ts | 10 +- .../journal-render-item.ts | 8 +- .../journal-rewind-submission-retirement.ts | 2 +- .../journal-row-builders.ts | 16 ++-- .../journal-row-context-usage.spec.ts | 6 +- .../journal-row-schema-version.spec.ts | 2 +- .../journal-row-schema.test.ts | 2 +- .../journal-row-schema.ts | 12 +-- .../journal-row-writer.spec.ts | 2 +- .../journal-row-writer.ts | 2 +- .../journal-saved-state.test.ts | 10 +- .../journal-sequence-replay.spec.ts | 8 +- .../journal-stop-acceptance.ts | 2 +- .../journal-stop-and-resume-rows.spec.ts | 6 +- .../journal-stop-and-resume-rows.ts | 2 +- .../journal-stop-note-projection.ts | 2 +- .../journal-stop-turn-end.test.ts | 2 +- .../journal-stop-turn-end.ts | 4 +- .../journal-storage-admission.test.ts | 12 +-- .../journal-storage-row-schema.ts | 2 +- .../journal-storage-schema.ts | 6 +- .../journal-storage-strict.ts | 4 +- .../journal-store-collaborators.ts | 2 +- .../journal-store-contract-test-fixture.ts | 4 +- .../journal-store-contracts.ts | 12 ++- .../journal-store-open.ts | 6 +- .../journal-store-restore.ts | 2 +- .../journal-store-schema.spec.ts | 6 +- .../agent-session-journal/journal-store.ts | 14 +-- ...streamed-revision-contract-test-fixture.ts | 2 +- ...reamed-revision-resolved-lifecycle.test.ts | 2 +- .../journal-streamed-text-revision.test.ts | 2 +- .../journal-streamed-text-revision.ts | 2 +- .../journal-streaming-replay.test.ts | 2 +- .../journal-subagent-item.spec.ts | 10 +- .../journal-subagent-item.ts | 6 +- .../journal-subagent-liveness.spec.ts | 10 +- .../journal-subagent-liveness.ts | 6 +- .../journal-submission-fold.ts | 6 +- .../journal-submission-hook.ts | 2 +- .../journal-submission-links.ts | 2 +- .../journal-submission-positions.spec.ts | 8 +- .../journal-submission-queued-link.spec.ts | 10 +- .../journal-submission-writer.ts | 2 +- .../journal-terminal-settlement.ts | 6 +- .../journal-terminal-time-validation.spec.ts | 6 +- ...ournal-terminal-validation-test-fixture.ts | 2 +- .../journal-thread-goal-source.ts | 6 +- .../journal-turn-scope.test.ts | 10 +- .../journal-unknown-content.spec.ts | 10 +- .../journal-unknown-row-kind.spec.ts | 10 +- ...-unsent-send-hold-contract-test-fixture.ts | 6 +- .../journal-unsent-send-hold-queue.spec.ts | 2 +- .../journal-unsent-send-hold-recovery.spec.ts | 2 +- .../journal-unsent-send-hold.ts | 6 +- .../journal-write-queue.spec.ts | 6 +- .../queued-edit-host.test-fixture.ts | 2 +- .../queued-message-edit-leases.ts | 2 +- .../queued-message-move.ts | 2 +- ...ued-message-pause-contract-test-fixture.ts | 8 +- .../queued-message-pause.ts | 6 +- .../queued-message-stored-row.ts | 4 +- .../queued-message-table.ts | 8 +- .../queued-message-update.spec.ts | 4 +- .../queued-message-update.ts | 6 +- .../agent-session-saved-prompt-text.ts | 6 +- .../agent-journal-turn-row-revision.ts | 6 +- ...der-timeline-assembler-attribution.test.ts | 2 +- ...vider-timeline-assembler-held-rows.test.ts | 2 +- .../provider-timeline-assembler-items.test.ts | 2 +- .../provider-timeline-assembler-rows.test.ts | 2 +- ...rovider-timeline-assembler-session.test.ts | 4 +- .../provider-timeline-assembler-stop.test.ts | 2 +- ...rovider-timeline-assembler-streams.test.ts | 2 +- ...rovider-timeline-assembler-test-support.ts | 4 +- ...vider-timeline-assembler-tool-ends.test.ts | 4 +- .../provider-timeline-assembler-turns.test.ts | 2 +- .../provider-timeline-assembler.ts | 4 +- .../provider-timeline-background-tasks.ts | 2 +- .../provider-timeline-context.ts | 8 +- .../provider-timeline-decision.ts | 6 +- .../provider-timeline-event.ts | 6 +- .../provider-timeline-history.ts | 4 +- .../provider-timeline-identity.test.ts | 2 +- .../provider-timeline-identity.ts | 6 +- .../provider-timeline-item-decisions.ts | 2 +- .../provider-timeline-rows.ts | 8 +- .../provider-timeline-settlement.ts | 6 +- .../provider-timeline-state.ts | 6 +- .../provider-timeline-text-events.ts | 2 +- .../provider-timeline-text-streams.ts | 6 +- .../provider-timeline-turn-decisions.ts | 4 +- .../agent-session-bounded-frame-item.ts | 4 +- .../agent-session-bounded-frames.test.ts | 6 +- .../agent-session-bounded-frames.ts | 2 +- ...agent-session-conversation-outline.test.ts | 2 +- .../agent-session-conversation-outline.ts | 2 +- .../agent-session-current-requests.test.ts | 8 +- .../agent-session-current-requests.ts | 6 +- .../agent-session-empty-batch.ts | 2 +- ...gent-session-empty-delta-retention.test.ts | 2 +- .../agent-session-history-batches.test.ts | 10 +- ...nt-session-history-byte-accounting.test.ts | 6 +- .../agent-session-history-byte-limits.test.ts | 2 +- ...t-session-history-contract-test-fixture.ts | 6 +- ...ession-history-conversation-window.test.ts | 8 +- ...ession-history-forward-read-budget.test.ts | 6 +- ...t-session-history-large-identities.test.ts | 6 +- .../agent-session-history-latest-turn.ts | 2 +- .../agent-session-history-page-bounds.ts | 4 +- ...ssion-history-page-grouping-parity.test.ts | 2 +- ...agent-session-history-page-scaling.test.ts | 2 +- .../agent-session-history-page.test.ts | 4 +- .../agent-session-history-page.ts | 8 +- .../agent-session-history-subagent-roster.ts | 4 +- .../agent-session-item-wire-form.test.ts | 2 +- .../agent-session-item-wire-form.ts | 2 +- .../agent-session-journal-batch.ts | 6 +- ...session-stop-note-contract-test-fixture.ts | 4 +- .../agent-session-stop-note-paging.test.ts | 2 +- ...agent-session-stop-note-projection.test.ts | 4 +- .../agent-session-stop-note-refresh.test.ts | 4 +- .../agent-session-stop-note-refresh.ts | 2 +- .../agent-session-subscribe-input.ts | 2 +- .../agent-session-work-refresh.ts | 2 +- .../hook-outcome-rows.test.ts | 4 +- .../json-string-shortening.ts | 2 +- .../provider-turn-activity-routing.test.ts | 6 +- ...-agent-session-accept-then-deliver.test.ts | 8 +- ...ructured-agent-session-account-recovery.ts | 6 +- ...ctured-agent-session-actionable-prompts.ts | 2 +- ...structured-agent-session-adapter-router.ts | 2 +- .../structured-agent-session-adapter-stop.ts | 2 +- .../structured-agent-session-adapter.ts | 8 +- ...tured-agent-session-adopted-import.test.ts | 2 +- ...ured-agent-session-append-delivery.test.ts | 4 +- .../structured-agent-session-attach.ts | 2 +- ...agent-session-attachment-admission.test.ts | 2 +- ...d-agent-session-background-task-channel.ts | 2 +- ...ructured-agent-session-chat-stop-target.ts | 4 +- .../structured-agent-session-child-exit.ts | 2 +- ...agent-session-child-work-selection.test.ts | 2 +- ...-agent-session-claude-echo-working.test.ts | 2 +- ...ent-session-claude-hung-start-stop.test.ts | 2 +- ...t-session-claude-opening-send-hold.test.ts | 4 +- ...d-agent-session-claude-queued-stop.test.ts | 4 +- ...t-session-claude-stop-ends-session.test.ts | 2 +- ...agent-session-claude-stop-note-end.test.ts | 2 +- ...uctured-agent-session-clear-rewind.test.ts | 2 +- ...ctured-agent-session-close-verdict.test.ts | 2 +- ...ured-agent-session-codex-held-goal.test.ts | 4 +- ...gent-session-codex-input-admission.spec.ts | 2 +- ...t-session-codex-input-finalization.spec.ts | 4 +- ...red-agent-session-codex-input-host.test.ts | 6 +- ...ured-agent-session-command-readers.test.ts | 6 +- .../structured-agent-session-command-turn.ts | 6 +- ...ured-agent-session-continuation-context.ts | 2 +- ...ctured-agent-session-conversations.test.ts | 4 +- .../structured-agent-session-conversations.ts | 2 +- ...tured-agent-session-crash-turn-end.test.ts | 4 +- .../structured-agent-session-create.ts | 2 +- ...red-agent-session-current-requests.test.ts | 6 +- ...uctured-agent-session-current-work.test.ts | 2 +- .../structured-agent-session-current-work.ts | 12 +-- ...session-dead-generation-settlement.test.ts | 2 +- ...gent-session-dead-generation-settlement.ts | 4 +- ...ctured-agent-session-delivery-loop-deps.ts | 2 +- ...ctured-agent-session-delivery-loop.test.ts | 2 +- ...-agent-session-ended-prompt-cancel.test.ts | 6 +- ...tured-agent-session-event-sink-estimate.ts | 6 +- ...tructured-agent-session-event-sink.test.ts | 10 +- .../structured-agent-session-event-sink.ts | 10 +- ...tructured-agent-session-exit-turn-scope.ts | 8 +- ...ctured-agent-session-forget-status.test.ts | 4 +- ...ructured-agent-session-fork-rewind.test.ts | 4 +- ...ctured-agent-session-goal-steering.test.ts | 2 +- .../structured-agent-session-handover.ts | 6 +- ...red-agent-session-history-catch-up.test.ts | 2 +- ...ructured-agent-session-history-catch-up.ts | 4 +- .../structured-agent-session-host-delivery.ts | 2 +- .../structured-agent-session-host-lifetime.ts | 4 +- ...structured-agent-session-host-mutations.ts | 2 +- ...structured-agent-session-host-test-data.ts | 4 +- ...uctured-agent-session-host-test-harness.ts | 4 +- .../structured-agent-session-host-types.ts | 2 +- ...tructured-agent-session-idle-sweep.test.ts | 2 +- .../structured-agent-session-idle-sweep.ts | 2 +- ...tructured-agent-session-input-admission.ts | 2 +- ...structured-agent-session-input-handover.ts | 2 +- ...ent-session-input-order-projection.test.ts | 4 +- ...d-agent-session-input-order-reopen.test.ts | 2 +- ...d-agent-session-input-order-rewind.test.ts | 2 +- ...ructured-agent-session-input-order.test.ts | 2 +- ...tructured-agent-session-input-selection.ts | 2 +- ...ed-agent-session-journal-append-options.ts | 2 +- ...d-agent-session-journal-corruption.test.ts | 2 +- ...ent-session-journal-double-test-support.ts | 6 +- .../structured-agent-session-journal-views.ts | 6 +- .../structured-agent-session-late-dispatch.ts | 6 +- ...agent-session-late-proof-tool-ends.test.ts | 8 +- ...-session-late-settlement-cancelled.test.ts | 2 +- ...ured-agent-session-late-settlement.test.ts | 2 +- ...ession-leftover-settlement.test-fixture.ts | 8 +- ...agent-session-listed-stop-lifetime.test.ts | 2 +- ...red-agent-session-live-turn-window.test.ts | 6 +- ...ured-agent-session-message-choices.test.ts | 4 +- ...tructured-agent-session-message-options.ts | 4 +- ...structured-agent-session-mutation-plans.ts | 4 +- ...ructured-agent-session-native-responses.ts | 10 +- ...d-agent-session-newer-content-host.test.ts | 4 +- .../structured-agent-session-opening-send.ts | 2 +- ...uctured-agent-session-options-read.test.ts | 2 +- .../structured-agent-session-orca-stop-row.ts | 6 +- ...tured-agent-session-outgrown-child.test.ts | 2 +- ...structured-agent-session-outgrown-child.ts | 6 +- ...ent-session-prompt-answer-receipts.test.ts | 4 +- ...agent-session-prompt-cancel-repeat.test.ts | 2 +- ...ctured-agent-session-prompt-cancel.test.ts | 8 +- .../structured-agent-session-prompt-cancel.ts | 2 +- .../structured-agent-session-prompt-state.ts | 2 +- ...structured-agent-session-provider-child.ts | 2 +- ...sion-queue-import-contract-test-fixture.ts | 4 +- ...sion-queue-import-retained-history.test.ts | 4 +- ...d-agent-session-queue-import-reuse.test.ts | 2 +- ...agent-session-queue-import-scaling.test.ts | 2 +- ...ent-session-queued-action-receipts.test.ts | 2 +- ...ed-agent-session-queued-command-refusal.ts | 4 +- ...tured-agent-session-queued-command.test.ts | 4 +- ...tured-agent-session-queued-compact.test.ts | 2 +- ...ructured-agent-session-queued-edit.test.ts | 4 +- .../structured-agent-session-queued-edit.ts | 6 +- ...ructured-agent-session-queued-gate.test.ts | 2 +- ...agent-session-queued-legacy-import.test.ts | 4 +- ...ueued-message-rig-provider.test-fixture.ts | 2 +- ...session-queued-message-rig.test-fixture.ts | 6 +- ...ured-agent-session-queued-messages.test.ts | 8 +- ...tructured-agent-session-queued-messages.ts | 10 +- ...ructured-agent-session-queued-move.test.ts | 2 +- .../structured-agent-session-queued-move.ts | 6 +- ...ructured-agent-session-queued-mutations.ts | 8 +- ...ed-agent-session-queued-pause-lift.test.ts | 2 +- ...ctured-agent-session-queued-publication.ts | 2 +- ...ed-agent-session-queued-published-bytes.ts | 2 +- ...-agent-session-queued-refused-card.test.ts | 2 +- ...nt-session-queued-rig-turn.test-fixture.ts | 4 +- .../structured-agent-session-queued-send.ts | 2 +- ...ured-agent-session-queued-stop-row.test.ts | 4 +- ...gent-session-ready-operation-order.test.ts | 4 +- ...ured-agent-session-reasoning-sweep.test.ts | 2 +- ...ent-session-receiving-account-perf.test.ts | 2 +- ...nt-session-receiving-account-queue.test.ts | 4 +- ...-session-receiving-account.test-support.ts | 4 +- ...ed-agent-session-receiving-account.test.ts | 4 +- ...uctured-agent-session-receiving-account.ts | 4 +- ...-session-receiving-callers.test-support.ts | 4 +- ...red-agent-session-receiving-nested.test.ts | 2 +- ...agent-session-recovered-queue-idle.test.ts | 2 +- ...agent-session-recovered-turn-clock.test.ts | 2 +- ...ctured-agent-session-recovery-read.test.ts | 2 +- ...ctured-agent-session-repeated-stop.test.ts | 6 +- ...agent-session-replaced-server-turn.test.ts | 4 +- ...ructured-agent-session-request-failures.ts | 8 +- ...ured-agent-session-resolved-append.test.ts | 10 +- ...tructured-agent-session-resolved-append.ts | 6 +- .../structured-agent-session-rest-test-rig.ts | 2 +- ...ctured-agent-session-restart-candidates.ts | 2 +- ...gent-session-restart-context-clear.test.ts | 2 +- ...t-session-restart-continuation-envelope.ts | 2 +- ...-session-restart-continuation-wait.test.ts | 2 +- ...ured-agent-session-restart-continuation.ts | 2 +- ...ssion-restart-interruption-test-harness.ts | 2 +- ...-agent-session-restart-offer-withdrawal.ts | 2 +- ...ed-agent-session-restart-ownership.test.ts | 2 +- ...nt-session-restart-provider-output.test.ts | 4 +- ...ent-session-restart-resume-test-harness.ts | 2 +- ...red-agent-session-restart-resume-wiring.ts | 2 +- ...nt-session-restart-stream-duration.test.ts | 4 +- ...red-agent-session-restart-teardown.test.ts | 2 +- ...-agent-session-resumed-child-owner.test.ts | 4 +- ...tured-agent-session-rewind-at-rest.test.ts | 4 +- ...red-agent-session-rewind-live-send.test.ts | 4 +- ...ed-agent-session-rewind-provenance.test.ts | 12 ++- ...gent-session-rewind-replay.test-fixture.ts | 4 +- ...t-session-rewind-stop-note.test-fixture.ts | 4 +- .../structured-agent-session-rewind.test.ts | 4 +- ...uctured-agent-session-saved-status.test.ts | 2 +- ...red-agent-session-send-idempotency.test.ts | 4 +- ...agent-session-send-open-stale-turn.test.ts | 2 +- ...uctured-agent-session-send-options.test.ts | 4 +- ...session-send-restarts-failed-start.test.ts | 2 +- ...tructured-agent-session-send-settlement.ts | 8 +- ...-session-settlement-double.test-fixture.ts | 4 +- .../structured-agent-session-shown-work.ts | 2 +- ...red-agent-session-shutdown-cut-row.test.ts | 2 +- ...ed-agent-session-stale-state-settlement.ts | 2 +- ...structured-agent-session-stale-stop-row.ts | 2 +- ...ured-agent-session-stale-turn-open.test.ts | 2 +- ...d-agent-session-stale-turn-verdict.test.ts | 6 +- ...ctured-agent-session-stale-turn-verdict.ts | 2 +- ...ion-stale-verdict-contract-test-fixture.ts | 10 +- ...gent-session-stale-verdict-prompts.test.ts | 2 +- ...ured-agent-session-start-admission.test.ts | 6 +- ...structured-agent-session-start-attempts.ts | 2 +- ...uctured-agent-session-start-failure-row.ts | 12 +-- ...agent-session-start-failure-writer.test.ts | 2 +- ...gent-session-start-settlement-host.test.ts | 2 +- ...-agent-session-startup-attempt-contract.ts | 2 +- ...ssion-startup-attempt-host-test-support.ts | 2 +- ...agent-session-startup-attempt-host.test.ts | 4 +- ...tructured-agent-session-startup-attempt.ts | 2 +- ...agent-session-startup-failure-exit.test.ts | 2 +- ...uctured-agent-session-status-child-work.ts | 2 +- ...agent-session-status-feed-children.test.ts | 2 +- ...ed-agent-session-status-feed-clock.test.ts | 8 +- ...agent-session-status-feed-stopping.test.ts | 2 +- ...ructured-agent-session-status-feed.test.ts | 2 +- ...ession-status-first-input-identity.test.ts | 2 +- ...agent-session-status-journal-projection.ts | 4 +- ...tured-agent-session-status-reentry.test.ts | 2 +- ...ed-agent-session-stop-aborts-start.test.ts | 2 +- ...tructured-agent-session-stop-event.test.ts | 4 +- ...gent-session-stop-note-opened-turn.test.ts | 8 +- ...t-session-stop-note-withdrawn-send.test.ts | 6 +- ...ctured-agent-session-stop-receipts.test.ts | 4 +- ...red-agent-session-stop-unconfirmed-note.ts | 6 +- ...structured-agent-session-stop-wind-down.ts | 10 +- ...agent-session-stopped-history-selection.ts | 8 +- ...ured-agent-session-stopped-history.test.ts | 4 +- ...red-agent-session-stopping-journal.test.ts | 4 +- .../structured-agent-session-stopping.ts | 2 +- ...red-agent-session-subagent-recency.test.ts | 2 +- ...ctured-agent-session-subagent-rows.test.ts | 2 +- .../structured-agent-session-subagent-rows.ts | 6 +- ...ession-subscriber-background-tasks.test.ts | 2 +- ...ssion-subscriber-journal-retention.test.ts | 2 +- ...ssion-subscriber-oversized-removal.test.ts | 2 +- ...ent-session-subscriber-publication.test.ts | 2 +- ...ructured-agent-session-subscribers.test.ts | 2 +- .../structured-agent-session-subscribers.ts | 2 +- ...tructured-agent-session-targeted-cancel.ts | 2 +- ...ructured-agent-session-thread-goal.test.ts | 8 +- .../structured-agent-session-thread-goal.ts | 6 +- ...ession-transition-contract-test-fixture.ts | 4 +- ...-agent-session-transition-rollback.test.ts | 4 +- ...tructured-agent-session-transition.test.ts | 4 +- .../structured-agent-session-transition.ts | 6 +- ...agent-session-turn-completion-feed.test.ts | 6 +- ...ured-agent-session-turn-completion-feed.ts | 2 +- ...tructured-agent-session-turn-stop-notes.ts | 6 +- .../structured-agent-session-turns-cancel.ts | 6 +- .../structured-agent-session-turns-prompt.ts | 4 +- .../structured-agent-session-turns.ts | 2 +- ...ured-agent-session-unexpected-exit.test.ts | 4 +- ...tructured-agent-session-unfinished-work.ts | 4 +- .../structured-agent-session-unheld-turns.ts | 4 +- ...t-session-unopened-send-withdrawal.test.ts | 8 +- ...-agent-session-unopened-send-withdrawal.ts | 6 +- ...uctured-agent-session-unopened-tab.test.ts | 2 +- ...red-agent-session-unsent-send-hold.test.ts | 2 +- ...t-session-wedged-profile-migration.test.ts | 2 +- ...tured-agent-session-wire-admission.test.ts | 8 +- ...tured-agent-session-working-at-teardown.ts | 8 +- .../structured-agent-start-journal.ts | 6 +- ...red-conversation-command-admission.test.ts | 4 +- ...ructured-conversation-command-admission.ts | 2 +- ...ed-conversation-command-child-work.test.ts | 2 +- .../structured-conversation-compaction.ts | 4 +- .../structured-rewind-cut.test.ts | 12 ++- .../structured-rewind-cut.ts | 6 +- .../structured-rewind-recovery.ts | 4 +- .../unhandled-provider-frame.ts | 8 +- .../native-chat-visuals-delivery.test.ts | 2 +- .../structured-chat-naming.test.ts | 2 +- .../native-chat/structured-chat-naming.ts | 2 +- .../orcad/orcad-chat-restart-offer.test.ts | 2 +- ...ad-managed-idle-exit-chat-provider.test.ts | 2 +- ...ckaged-structured-chat.integration.test.ts | 2 +- src/main/pi/rpc-history-catch-up.test.ts | 4 +- src/main/pi/rpc-history-import.ts | 8 +- src/main/pi/rpc-history-journal-view.ts | 4 +- src/main/pi/rpc-launch-resolution.test.ts | 2 +- src/main/pi/rpc-messages.ts | 2 +- src/main/pi/rpc-prompt.test.ts | 2 +- src/main/pi/rpc-prompt.ts | 2 +- src/main/pi/rpc-session-adapter.test.ts | 4 +- .../provider-spawned-process-identity.ts | 2 +- .../agent-session-publication-scale.test.ts | 2 +- .../agent-session-rewind-completion.ts | 2 +- .../agent-session-saved-status-scale.test.ts | 4 +- .../agent-session-status-cut-scale.test.ts | 4 +- ...nt-session-status-cut-work.test-support.ts | 2 +- .../agent-session-store-load-scale.test.ts | 2 +- ...e-structured-idle-releases-unknown.test.ts | 2 +- ...ude-structured-session-integration.test.ts | 2 +- ...ker-error-operation-counts.test-support.ts | 2 +- .../orchestration/chat-worker-error-words.ts | 6 +- .../chat-worker-legacy-failure-read.test.ts | 6 +- ...worker-request-failure-rig.test-fixture.ts | 2 +- .../chat-worker-request-failures.test.ts | 4 +- .../send-agent-turn-host.test.ts | 2 +- .../orchestration/send-agent-turn.test.ts | 2 +- .../runtime/orchestration/send-agent-turn.ts | 4 +- .../orchestration/structured-mail-source.ts | 2 +- ...tructured-mailbox-pointer-host-contract.ts | 2 +- .../structured-mailbox-pointer-host.test.ts | 2 +- .../structured-mailbox-pointer-host.ts | 2 +- .../structured-pointer-operation-id.ts | 2 +- ...tructured-session-pointer-delivery.test.ts | 2 +- .../structured-session-pointer-delivery.ts | 2 +- ...structured-worker-group-addressing.test.ts | 2 +- .../structured-worker-journal-archive.test.ts | 2 +- .../structured-worker-journal-archive.ts | 2 +- .../structured-worker-journal-page.test.ts | 6 +- .../structured-worker-journal-page.ts | 2 +- .../methods/native-chat-rpc-page-bounds.ts | 2 +- ...ration-structured-worker-lifecycle.test.ts | 2 +- ...stration-structured-worker-redrive.test.ts | 2 +- ...stration-structured-worker-session.test.ts | 4 +- ...orchestration-structured-worker-session.ts | 2 +- .../agent-message-command-contract.test.ts | 4 +- .../orchestration/chat-task-delivery.ts | 2 +- .../worker-start-card-operations.test.ts | 2 +- ...rker-start-card-population.test-fixture.ts | 2 +- ...worker-start-card-scenario.test-fixture.ts | 4 +- .../orchestration/worker-start-card.test.ts | 2 +- .../helper-follow-up-cli.integration.test.ts | 2 +- ...ured-agent-session-at-rest-context.test.ts | 4 +- ...ured-agent-session-at-rest-options.test.ts | 2 +- .../structured-agent-session-at-rest.test.ts | 2 +- ...agent-session-continuation-context.test.ts | 4 +- ...ructured-agent-session-current-requests.ts | 2 +- .../methods/structured-agent-session-item.ts | 2 +- ...-agent-session-legacy-command-wait.test.ts | 2 +- ...nt-session-queued-image-capability.test.ts | 6 +- ...d-agent-session-queued-image-capability.ts | 4 +- ...agent-session-turn-item-capability.test.ts | 2 +- ...ured-agent-session-turn-item-capability.ts | 2 +- ...tured-agent-session-wire-contracts.test.ts | 2 +- .../structured-worker-read-cursor.test.ts | 2 +- ...untime-worktree-agent-rows-verdict.test.ts | 2 +- ...ree-structured-agent-rows-liveness.test.ts | 2 +- ...d-agent-launch-composition.test-support.ts | 2 +- .../structured-agent-launch-composition.ts | 2 +- ...red-agent-session-codex-held-sends.test.ts | 4 +- ...gent-session-codex-interrupt-order.test.ts | 2 +- ...nt-session-codex-opening-send-hold.test.ts | 6 +- ...ent-session-codex-settlement-order.test.ts | 2 +- ...t-session-codex-stopped-send-order.test.ts | 6 +- ...-session-codex-turn-end-settlement.test.ts | 4 +- ...d-agent-session-integration-replay.test.ts | 2 +- ...ructured-agent-session-integration.test.ts | 2 +- ...session-legacy-send-behind-command.test.ts | 2 +- ...ed-agent-session-mobile-retirement.test.ts | 2 +- ...provider-operations-while-starting.test.ts | 2 +- ...-agent-session-startup-tab-restore.test.ts | 2 +- ...-chat-coordinator-mail-rig.test-fixture.ts | 2 +- .../structured-chat-coordinator-mail.test.ts | 2 +- .../structured-chat-naming-runtime.test.ts | 2 +- .../runtime/structured-chat-naming-runtime.ts | 2 +- ...ructured-claude-naming-occurrences.test.ts | 2 +- .../structured-claude-pending-rewind.test.ts | 2 +- .../structured-worker-cleared-session.test.ts | 2 +- .../structured-worker-terminal-read.test.ts | 2 +- src/main/wsl/wsl-orcad-chat-assistant-text.ts | 2 +- src/main/wsl/wsl-orcad-midturn-stop-lane.ts | 2 +- .../wsl/wsl-orcad-scripted-provider-chat.ts | 2 +- .../wsl/wsl-orcad-structured-chat-contract.ts | 2 +- .../attention/agent-subject-read-actions.ts | 2 +- .../NativeChatAgentMessageCard.test.tsx | 4 +- .../NativeChatInterruptedContinue.test.tsx | 4 +- .../NativeChatInterruptedContinue.tsx | 2 +- ...iveChatMessageList.live-reasoning.test.tsx | 2 +- ...ativeChatMessageList.opening-send.test.tsx | 10 +- ...ChatMessageList.queued-turn-order.test.tsx | 6 +- ...ChatMessageList.rail-history-jump.test.tsx | 2 +- ...NativeChatMessageList.render-cost.test.tsx | 2 +- ...NativeChatMessageList.rewind-rows.test.tsx | 8 +- ...ChatMessageList.subagent-sections.test.tsx | 2 +- .../NativeChatMessageList.test.tsx | 6 +- ...eChatMessageList.tool-stream-cost.test.tsx | 2 +- .../native-chat/NativeChatMessageList.tsx | 2 +- ...iveChatMessageList.turn-indicator.test.tsx | 6 +- ...veChatMessageList.turn-membership.test.tsx | 8 +- ...NativeChatMessageList.turn-status.test.tsx | 2 +- ...iveChatMessageList.unsent-message.test.tsx | 10 +- .../NativeChatMessageList.windowing.test.tsx | 2 +- .../native-chat/NativeChatNoticeRow.test.tsx | 4 +- .../native-chat/NativeChatQuestionCard.tsx | 2 +- .../NativeChatQueuedMessageCard.tsx | 2 +- ...hatQueuedMessageComposer.raw-task.test.tsx | 4 +- ...veChatQueuedMessageList.in-flight.test.tsx | 2 +- .../NativeChatQueuedMessageList.test.tsx | 6 +- .../NativeChatResolutionReceipt.test.tsx | 2 +- .../NativeChatRewindAction.target.test.tsx | 2 +- .../NativeChatStructuredQuestionCard.test.tsx | 2 +- .../NativeChatStructuredQuestionCard.tsx | 2 +- ...ession.approval-and-start-failure.test.tsx | 4 +- ...cturedSession.availability-notice.test.tsx | 4 +- ...veChatStructuredSession.goal-dock.test.tsx | 2 +- ...ucturedSession.history-read-state.test.tsx | 2 +- ...ChatStructuredSession.host-outage.test.tsx | 2 +- ...ChatStructuredSession.notice-card.test.tsx | 2 +- ...ucturedSession.orca-stop-continue.test.tsx | 4 +- ...tiveChatStructuredSession.test-harness.tsx | 2 +- .../NativeChatStructuredSession.test.tsx | 2 +- .../NativeChatStructuredSession.tsx | 2 +- .../NativeChatThreadGoalBanner.test.tsx | 2 +- .../NativeChatThreadGoalBanner.tsx | 2 +- .../native-chat/NativeChatToolOutput.test.tsx | 2 +- .../native-chat/NativeChatToolOutput.tsx | 2 +- .../native-chat/NativeChatToolRun.test.tsx | 2 +- .../NativeChatToolRunCallCounts.test.tsx | 2 +- ...tSessionAttentionBridge.lifecycle.test.tsx | 2 +- ...cturedAgentSessionAttentionBridge.test.tsx | 2 +- .../StructuredAgentSessionAttentionBridge.tsx | 2 +- .../inline-deferred-input.test.tsx | 2 +- .../inline-queued-edit-lease.test.tsx | 2 +- .../inline-rich-draft-consumers.test.tsx | 4 +- .../native-chat-claude-sign-in.test.tsx | 2 +- .../native-chat-compaction-visibility.test.ts | 6 +- .../native-chat-new-rows-marker.ts | 4 +- .../native-chat-prompt-document.ts | 2 +- .../native-chat-queued-edit-draft.test.ts | 4 +- .../native-chat-queued-edit-draft.ts | 4 +- .../native-chat-queued-edit-outcome.ts | 4 +- .../native-chat-queued-edit-session.ts | 4 +- .../native-chat-rail-outline-parity.test.ts | 6 +- ...ve-chat-structured-alternate-send.test.tsx | 6 +- ...ative-chat-structured-composer-dispatch.ts | 4 +- ...-chat-structured-question-test-fixtures.ts | 2 +- .../native-chat-subagent-live-frontier.ts | 4 +- ...e-chat-subagent-sections-retention.test.ts | 2 +- .../native-chat-subagent-sections.test.ts | 2 +- .../native-chat-subagent-sections.ts | 2 +- .../native-chat-thread-goal-presentation.ts | 2 +- .../native-chat-transcript-slots.test.ts | 6 +- .../native-chat-transcript-slots.ts | 2 +- .../native-chat-transcript-work-runs.ts | 2 +- ...tive-chat-waiting-partition-budget.test.ts | 2 +- .../native-chat-work-run-pairing.test.ts | 2 +- ...red-agent-session-delivery-notices.test.ts | 4 +- ...ructured-agent-session-delivery-notices.ts | 6 +- ...ctured-agent-session-legacy-outbox.test.ts | 4 +- .../structured-agent-session-legacy-outbox.ts | 4 +- ...ed-agent-session-message-hand-back.test.ts | 2 +- ...uctured-agent-session-message-hand-back.ts | 2 +- ...ssage-projection.rejected-in-place.test.ts | 8 +- ...d-agent-session-message-projection.test.ts | 6 +- ...ctured-agent-session-message-projection.ts | 2 +- ...tured-agent-session-message-sender.test.ts | 4 +- ...structured-agent-session-message-sender.ts | 8 +- .../structured-agent-session-pending-sends.ts | 4 +- ...ctured-agent-session-queue-request.test.ts | 6 +- .../structured-agent-session-read-activity.ts | 4 +- ...uctured-agent-session-read-owner-create.ts | 2 +- ...tured-agent-session-read-transport.test.ts | 6 +- .../structured-agent-session-send-attempt.ts | 10 +- .../structured-agent-session-send-runtime.ts | 8 +- .../structured-agent-session-send-slot.ts | 4 +- ...ured-agent-session-sending-queued-cards.ts | 2 +- ...red-agent-session-transcript-order.test.ts | 6 +- .../structured-attention-dispatch.test.ts | 2 +- .../structured-conversation-command-send.ts | 2 +- .../structured-model-refusal.test-fixture.ts | 2 +- .../structured-queued-edit.test-fixture.tsx | 6 +- ...e-native-chat-availability-notice.test.tsx | 4 +- .../use-native-chat-availability-notice.ts | 4 +- ...e-native-chat-context-clear-floor.test.tsx | 2 +- .../use-native-chat-context-clear-floor.ts | 2 +- .../use-native-chat-draft.test.tsx | 2 +- .../use-native-chat-pasted-text-file.test.tsx | 2 +- .../use-native-chat-pasted-text-file.ts | 2 +- .../use-native-chat-rewind.test.tsx | 2 +- .../native-chat/use-native-chat-rewind.ts | 2 +- ...ive-chat-structured-composer-send.test.tsx | 2 +- ...se-native-chat-structured-composer-send.ts | 2 +- .../use-native-chat-transcript-projection.ts | 2 +- .../use-native-chat-turn-membership.ts | 2 +- ...d-agent-session-command-send-gate.test.tsx | 2 +- ...ent-session-command-start-failure.test.tsx | 4 +- ...tured-agent-session-context-usage.test.tsx | 2 +- ...-structured-agent-session-context-usage.ts | 2 +- ...ed-agent-session-delivery-notices.test.tsx | 4 +- ...ructured-agent-session-delivery-notices.ts | 4 +- ...red-agent-session-legacy-recovery.test.tsx | 4 +- ...structured-agent-session-messages.test.tsx | 4 +- .../use-structured-agent-session-messages.ts | 2 +- ...ured-agent-session-paired-runtime.test.tsx | 2 +- ...tured-agent-session-prompt-cancel.test.tsx | 2 +- ...ed-agent-session-question-answers.test.tsx | 2 +- ...uctured-agent-session-queued-edit.test.tsx | 4 +- ...se-structured-agent-session-queued-edit.ts | 4 +- ...nt-session-queued-messages.resume.test.tsx | 2 +- ...red-agent-session-queued-messages.test.tsx | 2 +- ...tructured-agent-session-queued-messages.ts | 8 +- ...structured-agent-session-queued-reorder.ts | 2 +- ...ctured-agent-session-rail-outline.test.tsx | 2 +- ...e-structured-agent-session-rail-outline.ts | 2 +- ...use-structured-agent-session-read.test.tsx | 6 +- ...e-structured-agent-session-send-options.ts | 2 +- .../use-structured-agent-session-sends.ts | 8 +- ...tured-agent-session-start-failure-facts.ts | 2 +- ...use-structured-agent-session-stop.test.tsx | 2 +- ...uctured-agent-session-thread-goal.test.tsx | 2 +- ...se-structured-agent-session-thread-goal.ts | 2 +- ...t-session-transport-state.working.test.tsx | 2 +- ...ructured-agent-session.clear-send.test.tsx | 2 +- ...gent-session.queue-while-stopping.test.tsx | 2 +- ...tured-agent-session.queued-gating.test.tsx | 6 +- ...tured-agent-session.rejected-card.test.tsx | 8 +- ...e-structured-agent-session.rewind.test.tsx | 4 +- .../use-structured-agent-session.test.tsx | 2 +- .../use-structured-agent-turn-timing.test.tsx | 2 +- .../use-structured-agent-turn-timing.ts | 2 +- ...tructured-agent-session-launch-recovery.ts | 6 +- ...sion-launch-create-message.test-fixture.ts | 2 +- .../structured-agent-session-launch-prompt.ts | 2 +- .../structured-agent-session-client.ts | 6 +- .../agent-journal-tool-call-lifecycle.ts | 2 +- .../agent-session-approval-blocked-path.ts | 2 +- .../agent-session-approval-subject.test.ts | 4 +- src/shared/agent-session-approval-subject.ts | 2 +- src/shared/agent-session-attention.ts | 2 +- .../agent-session-context-clear.test.ts | 2 +- src/shared/agent-session-context-clear.ts | 4 +- .../agent-session-failure-words.test.ts | 2 +- src/shared/agent-session-failure-words.ts | 2 +- src/shared/agent-session-frame-fields.ts | 4 +- src/shared/agent-session-hook-outcome.ts | 2 +- src/shared/agent-session-host-status-rows.ts | 2 +- src/shared/agent-session-native-content.ts | 2 +- .../agent-session-provider-handle-encoding.ts | 2 +- src/shared/agent-session-question-answer.ts | 5 +- src/shared/agent-session-refusal-details.ts | 4 +- .../agent-session-refusal-notice.test.ts | 2 +- src/shared/agent-session-resume-marker.ts | 2 +- src/shared/agent-session-rewind.ts | 11 ++- .../agent-session-runtime-capabilities.ts | 2 +- .../agent-session-stopped-history.test.ts | 2 +- src/shared/agent-session-stopped-history.ts | 4 +- .../agent-session-turn-completion-wire.ts | 3 +- src/shared/agent-session-turn-record.test.ts | 2 +- src/shared/agent-session-turn-record.ts | 15 ++- src/shared/agent-session-visible-failures.ts | 2 +- .../agent-session-wire-refusals.test.ts | 2 +- src/shared/agent-session-wire.ts | 9 +- .../agent-session/agent-session-compaction.ts | 2 +- .../agent-session-conversation-outline.ts | 8 +- .../agent-session-thread-goal.test.ts | 2 +- .../agent-session-thread-goal.ts | 4 +- ...ent-session-journal-body-admission.test.ts | 2 +- .../agent-session-journal-body-admission.ts | 0 .../agent-session-journal-item-key.ts | 2 +- .../agent-session-journal-open-union.ts | 0 .../agent-session-journal-position.ts | 2 +- .../agent-session-journal-producer.test.ts | 5 +- .../agent-session-journal-producer.ts | 0 .../agent-session-journal-schemas.test.ts | 0 .../journal}/agent-session-journal-schemas.ts | 4 +- ...-session-journal-submission-schema.spec.ts | 0 ...agent-session-journal-submission-schema.ts | 6 +- ...gent-session-journal-thread-goal-schema.ts | 0 .../journal}/agent-session-journal-types.ts | 42 +++------ .../options/agent-session-options-result.ts | 2 +- ...ent-session-current-requests-capability.ts | 0 .../agent-session-current-requests-reader.ts | 10 +- .../agent-session-current-requests-wire.ts | 0 .../agent-session-current-requests.ts | 6 +- .../agent-session-current-work-wire.ts | 0 .../agent-session-queued-message-wire.ts | 4 +- .../agent-session-queued-submission.ts | 4 +- ...d-agent-session-dispatch-rejection.test.ts | 4 +- ...ctured-agent-session-dispatch-rejection.ts | 4 +- ...uctured-agent-session-first-prompt.spec.ts | 2 +- .../structured-agent-session-first-prompt.ts | 10 +- ...tured-agent-session-latest-request.test.ts | 12 +-- ...structured-agent-session-latest-request.ts | 18 ++-- ...uctured-agent-session-opening-send.test.ts | 2 +- .../structured-agent-session-opening-send.ts | 12 +-- ...ed-agent-session-projection-sender.spec.ts | 9 +- ...d-agent-session-queue-publication-field.ts | 0 ...ctured-agent-session-send-evidence.test.ts | 4 +- .../structured-agent-session-send-evidence.ts | 4 +- ...ctured-agent-session-send-mutation.spec.ts | 10 +- .../structured-agent-session-send-mutation.ts | 8 +- ...tructured-agent-session-send-settlement.ts | 5 +- ...tured-agent-session-unanswered-dispatch.ts | 2 +- ...structured-agent-session-coalescer.test.ts | 2 +- .../structured-agent-session-command-entry.ts | 2 +- .../structured-agent-session-live-read.ts | 4 +- ...tructured-agent-session-tool-call-block.ts | 2 +- src/shared/agent-turn-lifecycle-text.ts | 2 +- src/shared/agent-turn-outcome.ts | 2 +- ...-queued-edit-host.test-fixture-contract.ts | 4 +- src/shared/native-chat-ask-card-rules.ts | 2 +- .../native-chat-composer-autocomplete.test.ts | 2 +- src/shared/native-chat-interactive-prompt.ts | 2 +- .../native-chat-live-turn-membership.ts | 2 +- .../input/native-chat-background-task-row.ts | 2 +- .../native-chat-orca-stop-cut.test.ts | 4 +- .../native-chat/native-chat-orca-stop-cut.ts | 9 +- .../native-chat-provider-retry-runs.test.ts | 4 +- .../native-chat-provider-retry-runs.ts | 2 +- .../native-chat-resolution-receipt.ts | 2 +- .../native-chat/native-chat-send-order.ts | 2 +- .../native-chat-stopped-before-start.ts | 6 +- src/shared/native-chat/native-chat-types.ts | 2 +- .../native-chat-usage-limit-cut.ts | 7 +- .../tools/native-chat-tool-output.ts | 2 +- ...t-turn-membership-derived-tool-row.test.ts | 2 +- .../native-chat-cut-turn-notice.test.ts | 4 +- .../transcript/native-chat-cut-turn-notice.ts | 9 +- ...-chat-messages-waiting-behind-live-turn.ts | 4 +- .../transcript/native-chat-reasoning-row.ts | 2 +- .../native-chat-stopped-send-turn.test.ts | 6 +- .../native-chat-transcript-projection.test.ts | 2 +- .../native-chat-transcript-projection.ts | 4 +- .../native-chat-turn-activity.test.ts | 2 +- .../transcript/native-chat-turn-activity.ts | 4 +- .../transcript/native-chat-turn-grouping.ts | 2 +- .../native-chat-turn-membership.test.ts | 4 +- .../transcript/native-chat-turn-membership.ts | 10 +- .../native-chat-turn-row-attribution.ts | 4 +- ...tive-chat-unverifiable-turn-status.test.ts | 2 +- src/shared/queued-edit-host.test-fixture.ts | 4 +- src/shared/queued-message-edit-lease.test.ts | 2 +- src/shared/queued-message-edit-lease.ts | 2 +- src/shared/queued-message-edit-publication.ts | 6 +- src/shared/queued-message-edit.ts | 6 +- src/shared/structured-agent-question-card.ts | 5 +- ...ructured-agent-question-projection.test.ts | 2 +- .../structured-agent-question-projection.ts | 6 +- ...red-agent-session-command-turn-identity.ts | 4 +- ...ctured-agent-session-context-usage.test.ts | 5 +- .../structured-agent-session-context-usage.ts | 2 +- ...structured-agent-session-draft-hand-off.ts | 2 +- .../structured-agent-session-history-state.ts | 4 +- ...tured-agent-session-item-retention.test.ts | 2 +- ...structured-agent-session-item-retention.ts | 9 +- ...structured-agent-session-live-turn.test.ts | 2 +- .../structured-agent-session-live-turn.ts | 8 +- ...ctured-agent-session-main-agent-working.ts | 4 +- ...ge-projection-stopped-before-start.test.ts | 10 +- ...d-agent-session-message-projection.test.ts | 8 +- ...ctured-agent-session-message-projection.ts | 12 +-- .../structured-agent-session-owed-work.ts | 5 +- ...nt-session-projection-turn-verdict.test.ts | 91 +++++++++++++++++++ ...tructured-agent-session-projection.test.ts | 88 ++---------------- .../structured-agent-session-projection.ts | 10 +- ...uctured-agent-session-queued-cards.test.ts | 4 +- .../structured-agent-session-queued-cards.ts | 9 +- ...agent-session-reasoning-projection.spec.ts | 2 +- ...nt-session-reducer.queued-messages.test.ts | 7 +- .../structured-agent-session-reducer.test.ts | 5 +- .../structured-agent-session-reducer.ts | 16 ++-- ...ured-agent-session-rejection-words.test.ts | 4 +- ...tructured-agent-session-rejection-words.ts | 4 +- ...nt-session-renderer-client-capabilities.ts | 2 +- ...red-agent-session-start-failure-row-key.ts | 4 +- .../structured-agent-session-status-block.ts | 3 +- ...ed-agent-session-status-started-at.test.ts | 2 +- ...uctured-agent-session-status-started-at.ts | 11 ++- ...red-agent-session-status-tool-line.test.ts | 2 +- ...ured-agent-session-subagent-roster.test.ts | 2 +- ...tructured-agent-session-subagent-roster.ts | 9 +- ...structured-agent-session-turn-bars.test.ts | 2 +- ...gent-session-turn-timing-retention.test.ts | 5 +- ...ructured-agent-session-turn-timing.test.ts | 2 +- .../structured-agent-session-turn-timing.ts | 4 +- ...uctured-agent-session-unknown-item.spec.ts | 4 +- .../structured-agent-start-projection.ts | 6 +- ...structured-agent-turn-clock-anchor.test.ts | 2 +- ...structured-chat-naming-eligibility.test.ts | 7 +- .../structured-chat-naming-eligibility.ts | 8 +- ...ctured-session-foreground-commands.spec.ts | 2 +- .../structured-session-foreground-commands.ts | 4 +- ...ructured-session-message-contracts.test.ts | 8 +- .../ai-vault-manual-name-clear.unit.test.ts | 2 +- ...x-child-approval-activity-row.unit.test.ts | 4 +- ...gent-session-clear-old-client.unit.test.ts | 2 +- ...on-interrupted-tool-downgrade.unit.test.ts | 2 +- ...nt-session-newer-chat-refusal.unit.test.ts | 10 +- ...ession-outcome-chat-downgrade.unit.test.ts | 10 +- ...-session-stop-event-downgrade.unit.test.ts | 14 +-- ...ersion-host-observed-turn-end.unit.test.ts | 2 +- .../cross-version-stop-note-scenarios.ts | 4 +- .../cross-version-stop-note-test-rig.ts | 8 +- ...n-structured-attention-frames.unit.test.ts | 2 +- .../kept-card-downgrade.unit.test.ts | 4 +- .../released-chat-continuation.ts | 6 +- .../cross-version-wire/released-chat-queue.ts | 4 +- .../released-chat-upgrade.unit.test.ts | 2 +- .../released-chat-writers.ts | 6 +- .../structured-agent-session-surface-calls.ts | 2 +- ...ructured-agent-session-surface-manifest.ts | 2 +- ...ubmission-positions-downgrade.unit.test.ts | 6 +- .../versioned-agent-session-wire.ts | 4 +- .../automation-chat-reuse-test-harness.ts | 4 +- .../journal-restored-consumers.unit.test.ts | 6 +- .../native-chat-rewind-boundary.unit.test.ts | 4 +- ...ured-agent-session-read-owner.unit.test.ts | 12 +-- ...ttention-host-read-retirement.unit.test.ts | 2 +- ...ctured-attention-prompt-relay.unit.test.ts | 2 +- ...attention-read-retirement.test-fixture.tsx | 2 +- ...red-attention-read-retirement.unit.test.ts | 2 +- ...d-session-workspace-authority.unit.test.ts | 2 +- 1191 files changed, 2379 insertions(+), 2522 deletions(-) rename src/shared/{ => agent-session/journal}/agent-session-journal-body-admission.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-item-key.ts (98%) rename src/shared/{ => agent-session/journal}/agent-session-journal-open-union.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-position.ts (94%) rename src/shared/{ => agent-session/journal}/agent-session-journal-producer.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-schemas.test.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-schemas.ts (98%) rename src/shared/{ => agent-session/journal}/agent-session-journal-submission-schema.spec.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-submission-schema.ts (85%) rename src/shared/{ => agent-session/journal}/agent-session-journal-thread-goal-schema.ts (100%) rename src/shared/{ => agent-session/journal}/agent-session-journal-types.ts (93%) rename src/shared/{ => agent-session/requests}/agent-session-current-requests-capability.ts (100%) rename src/shared/{ => agent-session/requests}/agent-session-current-requests-reader.ts (91%) rename src/shared/{ => agent-session/requests}/agent-session-current-requests-wire.ts (100%) rename src/shared/{ => agent-session/requests}/agent-session-current-requests.ts (92%) rename src/shared/{ => agent-session/requests}/agent-session-current-work-wire.ts (100%) rename src/shared/{ => agent-session/requests}/agent-session-queued-message-wire.ts (95%) rename src/shared/{ => agent-session/requests}/agent-session-queued-submission.ts (86%) rename src/shared/{ => agent-session/requests}/structured-agent-session-dispatch-rejection.test.ts (96%) rename src/shared/{ => agent-session/requests}/structured-agent-session-dispatch-rejection.ts (98%) rename src/shared/{ => agent-session/requests}/structured-agent-session-first-prompt.spec.ts (97%) rename src/shared/{ => agent-session/requests}/structured-agent-session-first-prompt.ts (73%) rename src/shared/{ => agent-session/requests}/structured-agent-session-latest-request.test.ts (96%) rename src/shared/{ => agent-session/requests}/structured-agent-session-latest-request.ts (92%) rename src/shared/{ => agent-session/requests}/structured-agent-session-opening-send.test.ts (94%) rename src/shared/{ => agent-session/requests}/structured-agent-session-opening-send.ts (87%) rename src/shared/{ => agent-session/requests}/structured-agent-session-projection-sender.spec.ts (82%) rename src/shared/{ => agent-session/requests}/structured-agent-session-queue-publication-field.ts (100%) rename src/shared/{ => agent-session/requests}/structured-agent-session-send-evidence.test.ts (96%) rename src/shared/{ => agent-session/requests}/structured-agent-session-send-evidence.ts (97%) rename src/shared/{ => agent-session/requests}/structured-agent-session-send-mutation.spec.ts (93%) rename src/shared/{ => agent-session/requests}/structured-agent-session-send-mutation.ts (94%) rename src/shared/{ => agent-session/requests}/structured-agent-session-send-settlement.ts (79%) rename src/shared/{ => agent-session/requests}/structured-agent-session-unanswered-dispatch.ts (93%) create mode 100644 src/shared/structured-agent-session-projection-turn-verdict.test.ts diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index f05f57f1265..785ffd269fe 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -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": { diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json index 5a7a8c96791..f4d9c6b4d02 100644 --- a/config/scripts/ci-shard-timings.json +++ b/config/scripts/ci-shard-timings.json @@ -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, diff --git a/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs b/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs index aa7704f66e6..2f886172e2e 100644 --- a/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs +++ b/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs @@ -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', diff --git a/config/scripts/pr-code-change-scope.mjs b/config/scripts/pr-code-change-scope.mjs index d07b67d990c..a86cbde2f24 100644 --- a/config/scripts/pr-code-change-scope.mjs +++ b/config/scripts/pr-code-change-scope.mjs @@ -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', diff --git a/config/scripts/pr-code-change-scope.test.mjs b/config/scripts/pr-code-change-scope.test.mjs index 93ae01b9a8f..4c1deebe0ca 100644 --- a/config/scripts/pr-code-change-scope.test.mjs +++ b/config/scripts/pr-code-change-scope.test.mjs @@ -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', diff --git a/config/scripts/structured-agent-session-start-failure-row-render.test.mjs b/config/scripts/structured-agent-session-start-failure-row-render.test.mjs index 4f28a6cb747..c7063ea4e7f 100644 --- a/config/scripts/structured-agent-session-start-failure-row-render.test.mjs +++ b/config/scripts/structured-agent-session-start-failure-row-render.test.mjs @@ -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' diff --git a/mobile/src/session/MobileNativeChatFullContent.tsx b/mobile/src/session/MobileNativeChatFullContent.tsx index 515e2e58331..47520466f63 100644 --- a/mobile/src/session/MobileNativeChatFullContent.tsx +++ b/mobile/src/session/MobileNativeChatFullContent.tsx @@ -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' diff --git a/mobile/src/session/MobileNativeChatView.streaming-rows.test.ts b/mobile/src/session/MobileNativeChatView.streaming-rows.test.ts index 7007fe2f13a..95210c562b5 100644 --- a/mobile/src/session/MobileNativeChatView.streaming-rows.test.ts +++ b/mobile/src/session/MobileNativeChatView.streaming-rows.test.ts @@ -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' diff --git a/mobile/src/session/MobileNativeChatView.waiting-rows.test.ts b/mobile/src/session/MobileNativeChatView.waiting-rows.test.ts index c025a5a5894..3b7052a63d5 100644 --- a/mobile/src/session/MobileNativeChatView.waiting-rows.test.ts +++ b/mobile/src/session/MobileNativeChatView.waiting-rows.test.ts @@ -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' diff --git a/mobile/src/session/mobile-native-chat-host-journal-frames.test-fixture.ts b/mobile/src/session/mobile-native-chat-host-journal-frames.test-fixture.ts index 08a4ca6f439..7a68ef0c4a8 100644 --- a/mobile/src/session/mobile-native-chat-host-journal-frames.test-fixture.ts +++ b/mobile/src/session/mobile-native-chat-host-journal-frames.test-fixture.ts @@ -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, diff --git a/mobile/src/session/mobile-native-chat-item-read.ts b/mobile/src/session/mobile-native-chat-item-read.ts index ec5bc2d5fff..2e60cc5221c 100644 --- a/mobile/src/session/mobile-native-chat-item-read.ts +++ b/mobile/src/session/mobile-native-chat-item-read.ts @@ -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' diff --git a/mobile/src/session/mobile-native-chat-render-data.ts b/mobile/src/session/mobile-native-chat-render-data.ts index 2b42bb0dd4a..a4788e857a5 100644 --- a/mobile/src/session/mobile-native-chat-render-data.ts +++ b/mobile/src/session/mobile-native-chat-render-data.ts @@ -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' diff --git a/mobile/src/session/mobile-native-chat-stop-journal.test-fixture.ts b/mobile/src/session/mobile-native-chat-stop-journal.test-fixture.ts index c5da3118c29..3d3834ebe5f 100644 --- a/mobile/src/session/mobile-native-chat-stop-journal.test-fixture.ts +++ b/mobile/src/session/mobile-native-chat-stop-journal.test-fixture.ts @@ -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, diff --git a/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx b/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx index f94122495bc..4cf4e392822 100644 --- a/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx +++ b/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx @@ -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' diff --git a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts index cd3481dc86a..c22d470491d 100644 --- a/mobile/src/session/mobile-native-chat-unsent-notices.test.ts +++ b/mobile/src/session/mobile-native-chat-unsent-notices.test.ts @@ -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( diff --git a/mobile/src/session/mobile-native-chat-unsent-notices.ts b/mobile/src/session/mobile-native-chat-unsent-notices.ts index e63e965e6b2..496b7105484 100644 --- a/mobile/src/session/mobile-native-chat-unsent-notices.ts +++ b/mobile/src/session/mobile-native-chat-unsent-notices.ts @@ -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' diff --git a/mobile/src/session/mobile-queued-edit-hook.test-fixture.tsx b/mobile/src/session/mobile-queued-edit-hook.test-fixture.tsx index d5688eb9ac3..08949dcf373 100644 --- a/mobile/src/session/mobile-queued-edit-hook.test-fixture.tsx +++ b/mobile/src/session/mobile-queued-edit-hook.test-fixture.tsx @@ -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' diff --git a/mobile/src/session/mobile-queued-edit-lease-outcome.test.tsx b/mobile/src/session/mobile-queued-edit-lease-outcome.test.tsx index b607618a33d..c279033553c 100644 --- a/mobile/src/session/mobile-queued-edit-lease-outcome.test.tsx +++ b/mobile/src/session/mobile-queued-edit-lease-outcome.test.tsx @@ -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 { diff --git a/mobile/src/session/mobile-queued-message-edit-draft.ts b/mobile/src/session/mobile-queued-message-edit-draft.ts index e2321909a48..68f3b3196be 100644 --- a/mobile/src/session/mobile-queued-message-edit-draft.ts +++ b/mobile/src/session/mobile-queued-message-edit-draft.ts @@ -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 diff --git a/mobile/src/session/mobile-queued-message-edit-open.ts b/mobile/src/session/mobile-queued-message-edit-open.ts index 8e928d50f7f..7e1451073c4 100644 --- a/mobile/src/session/mobile-queued-message-edit-open.ts +++ b/mobile/src/session/mobile-queued-message-edit-open.ts @@ -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' diff --git a/mobile/src/session/mobile-queued-message-edit-outcome.ts b/mobile/src/session/mobile-queued-message-edit-outcome.ts index 93dc2909e65..ef37efd9d30 100644 --- a/mobile/src/session/mobile-queued-message-edit-outcome.ts +++ b/mobile/src/session/mobile-queued-message-edit-outcome.ts @@ -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' diff --git a/mobile/src/session/mobile-queued-message-edit-value.ts b/mobile/src/session/mobile-queued-message-edit-value.ts index be2abe1a6eb..173aacd67b2 100644 --- a/mobile/src/session/mobile-queued-message-edit-value.ts +++ b/mobile/src/session/mobile-queued-message-edit-value.ts @@ -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 { diff --git a/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts b/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts index 9c61af61a71..5d50efe23dc 100644 --- a/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts +++ b/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts @@ -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, diff --git a/mobile/src/session/mobile-structured-agent-prompts.ts b/mobile/src/session/mobile-structured-agent-prompts.ts index eaa44b49b73..a9c704afb9a 100644 --- a/mobile/src/session/mobile-structured-agent-prompts.ts +++ b/mobile/src/session/mobile-structured-agent-prompts.ts @@ -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 diff --git a/mobile/src/session/mobile-structured-agent-session-contract.ts b/mobile/src/session/mobile-structured-agent-session-contract.ts index af60007d293..af029ccd970 100644 --- a/mobile/src/session/mobile-structured-agent-session-contract.ts +++ b/mobile/src/session/mobile-structured-agent-session-contract.ts @@ -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 diff --git a/mobile/src/session/mobile-structured-agent-session-rpc.ts b/mobile/src/session/mobile-structured-agent-session-rpc.ts index 5c8d9fe6870..8d8b72d145f 100644 --- a/mobile/src/session/mobile-structured-agent-session-rpc.ts +++ b/mobile/src/session/mobile-structured-agent-session-rpc.ts @@ -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 { diff --git a/mobile/src/session/mobile-structured-agent-session-send.ts b/mobile/src/session/mobile-structured-agent-session-send.ts index 11d886b7c93..342f3597164 100644 --- a/mobile/src/session/mobile-structured-agent-session-send.ts +++ b/mobile/src/session/mobile-structured-agent-session-send.ts @@ -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' diff --git a/mobile/src/session/mobile-structured-queued-message-cards.test.ts b/mobile/src/session/mobile-structured-queued-message-cards.test.ts index 260b329ca6a..4d6b71a088c 100644 --- a/mobile/src/session/mobile-structured-queued-message-cards.test.ts +++ b/mobile/src/session/mobile-structured-queued-message-cards.test.ts @@ -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[0]) { diff --git a/mobile/src/session/mobile-structured-queued-message-cards.ts b/mobile/src/session/mobile-structured-queued-message-cards.ts index 52cbebda724..cbfb509202d 100644 --- a/mobile/src/session/mobile-structured-queued-message-cards.ts +++ b/mobile/src/session/mobile-structured-queued-message-cards.ts @@ -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, diff --git a/mobile/src/session/mobile-structured-send-delivery.test.ts b/mobile/src/session/mobile-structured-send-delivery.test.ts index ca3e90dcbb6..602e9ca210d 100644 --- a/mobile/src/session/mobile-structured-send-delivery.test.ts +++ b/mobile/src/session/mobile-structured-send-delivery.test.ts @@ -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' diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-draft-inputs.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-draft-inputs.ts index 488bec0fce3..fe626a54b71 100644 --- a/mobile/src/session/native-chat/composer/mobile-native-chat-draft-inputs.ts +++ b/mobile/src/session/native-chat/composer/mobile-native-chat-draft-inputs.ts @@ -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 { diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-draft-store.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-draft-store.ts index 88331a606af..206924a35a3 100644 --- a/mobile/src/session/native-chat/composer/mobile-native-chat-draft-store.ts +++ b/mobile/src/session/native-chat/composer/mobile-native-chat-draft-store.ts @@ -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, diff --git a/mobile/src/session/native-chat/input/MobileNativeChatAsk.tsx b/mobile/src/session/native-chat/input/MobileNativeChatAsk.tsx index 95261b8636f..98711e750cb 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatAsk.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatAsk.tsx @@ -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, diff --git a/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.test.tsx b/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.test.tsx index f9bd6f9ee10..73f3491c7cd 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.test.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.test.tsx @@ -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 diff --git a/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.tsx b/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.tsx index 9c75a2d397c..dfedb235019 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatQueuedMessages.tsx @@ -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' diff --git a/mobile/src/session/native-chat/input/MobileNativeChatStructuredAsk.tsx b/mobile/src/session/native-chat/input/MobileNativeChatStructuredAsk.tsx index 00b7c565a23..6055e342496 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatStructuredAsk.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatStructuredAsk.tsx @@ -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, diff --git a/mobile/src/session/native-chat/input/mobile-native-chat-answered-prompts.test-fixture.ts b/mobile/src/session/native-chat/input/mobile-native-chat-answered-prompts.test-fixture.ts index 4666d28bcf6..829ffd49bda 100644 --- a/mobile/src/session/native-chat/input/mobile-native-chat-answered-prompts.test-fixture.ts +++ b/mobile/src/session/native-chat/input/mobile-native-chat-answered-prompts.test-fixture.ts @@ -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[] = [ { diff --git a/mobile/src/session/native-chat/input/mobile-native-chat-question.ts b/mobile/src/session/native-chat/input/mobile-native-chat-question.ts index e935188748e..87b0644a465 100644 --- a/mobile/src/session/native-chat/input/mobile-native-chat-question.ts +++ b/mobile/src/session/native-chat/input/mobile-native-chat-question.ts @@ -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 diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.status-notices.test.ts b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.status-notices.test.ts index df8906cde22..17ebedc872e 100644 --- a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.status-notices.test.ts +++ b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.status-notices.test.ts @@ -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, diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.tool-result-availability.test.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.tool-result-availability.test.tsx index 7fa6f104e98..405b01104d7 100644 --- a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.tool-result-availability.test.tsx +++ b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.tool-result-availability.test.tsx @@ -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' diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.work-run.test.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.work-run.test.tsx index 79a08ce6c04..18c87e632f1 100644 --- a/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.work-run.test.tsx +++ b/mobile/src/session/native-chat/transcript/MobileNativeChatMessage.work-run.test.tsx @@ -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' diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx index 7ed2e8b7ae3..78afd061dbe 100644 --- a/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx +++ b/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx @@ -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 { diff --git a/mobile/src/session/native-chat/transcript/native-chat-turn-draw-order-scaling.test.ts b/mobile/src/session/native-chat/transcript/native-chat-turn-draw-order-scaling.test.ts index 385b3d4f214..33e322c37ea 100644 --- a/mobile/src/session/native-chat/transcript/native-chat-turn-draw-order-scaling.test.ts +++ b/mobile/src/session/native-chat/transcript/native-chat-turn-draw-order-scaling.test.ts @@ -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', diff --git a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-message-detail.test.tsx b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-message-detail.test.tsx index 2d1a4cdcdbd..04664d565ed 100644 --- a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-message-detail.test.tsx +++ b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-message-detail.test.tsx @@ -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' diff --git a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-journal.test.tsx b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-journal.test.tsx index 32f663b6cc2..35acb20bc8d 100644 --- a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-journal.test.tsx +++ b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-journal.test.tsx @@ -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' diff --git a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-opening-send.test.tsx b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-opening-send.test.tsx index 981dd203615..79391c5e6a2 100644 --- a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-opening-send.test.tsx +++ b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure-opening-send.test.tsx @@ -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 { diff --git a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure.test.tsx b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure.test.tsx index 7a5949bf28c..2b29dd65746 100644 --- a/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure.test.tsx +++ b/mobile/src/session/native-chat/transcript/use-mobile-native-chat-turn-disclosure.test.tsx @@ -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' diff --git a/mobile/src/session/structured-agent-send-result.test-fixture.ts b/mobile/src/session/structured-agent-send-result.test-fixture.ts index 3204161d77b..c56373ce518 100644 --- a/mobile/src/session/structured-agent-send-result.test-fixture.ts +++ b/mobile/src/session/structured-agent-send-result.test-fixture.ts @@ -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( diff --git a/mobile/src/session/use-mobile-queued-edit-replacement.test.tsx b/mobile/src/session/use-mobile-queued-edit-replacement.test.tsx index 96e0048324a..ac8d8552af9 100644 --- a/mobile/src/session/use-mobile-queued-edit-replacement.test.tsx +++ b/mobile/src/session/use-mobile-queued-edit-replacement.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-queued-message-composer-actions.ts b/mobile/src/session/use-mobile-queued-message-composer-actions.ts index 1ea421afe52..ac28c9ed593 100644 --- a/mobile/src/session/use-mobile-queued-message-composer-actions.ts +++ b/mobile/src/session/use-mobile-queued-message-composer-actions.ts @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx index 0d7bf102318..c1177bc92c9 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx @@ -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 { diff --git a/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx index ff41c8941dd..c67edaf0194 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session-queued.test-fixture.ts b/mobile/src/session/use-mobile-structured-agent-session-queued.test-fixture.ts index 09ee7c97f11..79dced97382 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-queued.test-fixture.ts +++ b/mobile/src/session/use-mobile-structured-agent-session-queued.test-fixture.ts @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx index 38d890594e5..ef1679f6294 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session-retry-rows.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-retry-rows.test.tsx index fcae4a54547..c5e1344cbe3 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-retry-rows.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session-retry-rows.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx index a2001f9113b..f490b3e7379 100644 --- a/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx @@ -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 diff --git a/mobile/src/session/use-mobile-structured-agent-session.cut-turn-notice.test.tsx b/mobile/src/session/use-mobile-structured-agent-session.cut-turn-notice.test.tsx index 380295ac1ae..4fda89f1d54 100644 --- a/mobile/src/session/use-mobile-structured-agent-session.cut-turn-notice.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session.cut-turn-notice.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-session.test.tsx b/mobile/src/session/use-mobile-structured-agent-session.test.tsx index d66ea9f1910..e6cf033b3a2 100644 --- a/mobile/src/session/use-mobile-structured-agent-session.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-session.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-state.test.tsx b/mobile/src/session/use-mobile-structured-agent-state.test.tsx index a4425e8e8ef..fbcd84cc061 100644 --- a/mobile/src/session/use-mobile-structured-agent-state.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-state.test.tsx @@ -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, diff --git a/mobile/src/session/use-mobile-structured-agent-state.ts b/mobile/src/session/use-mobile-structured-agent-state.ts index 122ef9607fe..2016353e5bd 100644 --- a/mobile/src/session/use-mobile-structured-agent-state.ts +++ b/mobile/src/session/use-mobile-structured-agent-state.ts @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-turn-timing.test.tsx b/mobile/src/session/use-mobile-structured-agent-turn-timing.test.tsx index cacbe93423f..02a38c71bbe 100644 --- a/mobile/src/session/use-mobile-structured-agent-turn-timing.test.tsx +++ b/mobile/src/session/use-mobile-structured-agent-turn-timing.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-agent-turn-timing.ts b/mobile/src/session/use-mobile-structured-agent-turn-timing.ts index 2c1108d25ef..26e9157aeee 100644 --- a/mobile/src/session/use-mobile-structured-agent-turn-timing.ts +++ b/mobile/src/session/use-mobile-structured-agent-turn-timing.ts @@ -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' diff --git a/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts b/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts index b9764d89035..408026226dc 100644 --- a/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts +++ b/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts @@ -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 diff --git a/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx b/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx index b17a48c575c..46084ec14e6 100644 --- a/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx +++ b/mobile/src/session/use-mobile-structured-prompt-responses.test.tsx @@ -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 diff --git a/mobile/src/session/use-mobile-structured-prompt-responses.ts b/mobile/src/session/use-mobile-structured-prompt-responses.ts index bd9041791e8..ab57c3f72f2 100644 --- a/mobile/src/session/use-mobile-structured-prompt-responses.ts +++ b/mobile/src/session/use-mobile-structured-prompt-responses.ts @@ -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, diff --git a/mobile/src/session/use-mobile-structured-queued-edit.test.tsx b/mobile/src/session/use-mobile-structured-queued-edit.test.tsx index f7922561c30..955bb7fe9c6 100644 --- a/mobile/src/session/use-mobile-structured-queued-edit.test.tsx +++ b/mobile/src/session/use-mobile-structured-queued-edit.test.tsx @@ -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' diff --git a/mobile/src/session/use-mobile-structured-queued-edit.ts b/mobile/src/session/use-mobile-structured-queued-edit.ts index 58296f8f427..200a5608cb8 100644 --- a/mobile/src/session/use-mobile-structured-queued-edit.ts +++ b/mobile/src/session/use-mobile-structured-queued-edit.ts @@ -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, diff --git a/mobile/src/session/use-mobile-structured-queued-message-controls.ts b/mobile/src/session/use-mobile-structured-queued-message-controls.ts index 4c020eebc54..78b1e7ca466 100644 --- a/mobile/src/session/use-mobile-structured-queued-message-controls.ts +++ b/mobile/src/session/use-mobile-structured-queued-message-controls.ts @@ -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, diff --git a/mobile/src/session/use-mobile-structured-send-with-outcome.ts b/mobile/src/session/use-mobile-structured-send-with-outcome.ts index 6f4ce056d0a..36b690f76a7 100644 --- a/mobile/src/session/use-mobile-structured-send-with-outcome.ts +++ b/mobile/src/session/use-mobile-structured-send-with-outcome.ts @@ -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' diff --git a/mobile/src/session/use-mobile-structured-sends.test.tsx b/mobile/src/session/use-mobile-structured-sends.test.tsx index dde7e107eaa..0075ddec9dc 100644 --- a/mobile/src/session/use-mobile-structured-sends.test.tsx +++ b/mobile/src/session/use-mobile-structured-sends.test.tsx @@ -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, diff --git a/mobile/src/session/use-mobile-structured-sends.ts b/mobile/src/session/use-mobile-structured-sends.ts index c30c804b898..d67a137dff5 100644 --- a/mobile/src/session/use-mobile-structured-sends.ts +++ b/mobile/src/session/use-mobile-structured-sends.ts @@ -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, diff --git a/mobile/src/session/use-mobile-structured-turn-indicator.test.tsx b/mobile/src/session/use-mobile-structured-turn-indicator.test.tsx index c17a6c40595..f463f42ac94 100644 --- a/mobile/src/session/use-mobile-structured-turn-indicator.test.tsx +++ b/mobile/src/session/use-mobile-structured-turn-indicator.test.tsx @@ -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 diff --git a/mobile/src/transport/mobile-runtime-client-capabilities.ts b/mobile/src/transport/mobile-runtime-client-capabilities.ts index a588d7c843f..176a5a682a5 100644 --- a/mobile/src/transport/mobile-runtime-client-capabilities.ts +++ b/mobile/src/transport/mobile-runtime-client-capabilities.ts @@ -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, diff --git a/src/main/acp/acp-conversation-copy.ts b/src/main/acp/acp-conversation-copy.ts index 3e806f216fd..7e82fce8ce2 100644 --- a/src/main/acp/acp-conversation-copy.ts +++ b/src/main/acp/acp-conversation-copy.ts @@ -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 diff --git a/src/main/acp/acp-dialects/acp-dialect.ts b/src/main/acp/acp-dialects/acp-dialect.ts index 553195909d2..ad96787ce68 100644 --- a/src/main/acp/acp-dialects/acp-dialect.ts +++ b/src/main/acp/acp-dialects/acp-dialect.ts @@ -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, diff --git a/src/main/acp/acp-dialects/grok-background-tasks.ts b/src/main/acp/acp-dialects/grok-background-tasks.ts index 5146707421a..9d628c9038c 100644 --- a/src/main/acp/acp-dialects/grok-background-tasks.ts +++ b/src/main/acp/acp-dialects/grok-background-tasks.ts @@ -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 diff --git a/src/main/acp/acp-dialects/grok-subagents.test.ts b/src/main/acp/acp-dialects/grok-subagents.test.ts index 0e0cab0f0ec..9c66db0ab75 100644 --- a/src/main/acp/acp-dialects/grok-subagents.test.ts +++ b/src/main/acp/acp-dialects/grok-subagents.test.ts @@ -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' diff --git a/src/main/acp/acp-dialects/grok-subagents.ts b/src/main/acp/acp-dialects/grok-subagents.ts index 9e5c8df0725..f87fa4540a5 100644 --- a/src/main/acp/acp-dialects/grok-subagents.ts +++ b/src/main/acp/acp-dialects/grok-subagents.ts @@ -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' diff --git a/src/main/acp/acp-history-boundary.test.ts b/src/main/acp/acp-history-boundary.test.ts index 9f3236e6484..0f9f04e0b13 100644 --- a/src/main/acp/acp-history-boundary.test.ts +++ b/src/main/acp/acp-history-boundary.test.ts @@ -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' diff --git a/src/main/acp/acp-history-boundary.ts b/src/main/acp/acp-history-boundary.ts index a3bdabaa367..9d15d63409e 100644 --- a/src/main/acp/acp-history-boundary.ts +++ b/src/main/acp/acp-history-boundary.ts @@ -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 diff --git a/src/main/acp/acp-history-catch-up.test-support.ts b/src/main/acp/acp-history-catch-up.test-support.ts index 3241f117858..8b8b56ee1f2 100644 --- a/src/main/acp/acp-history-catch-up.test-support.ts +++ b/src/main/acp/acp-history-catch-up.test-support.ts @@ -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' diff --git a/src/main/acp/acp-history-catch-up.test.ts b/src/main/acp/acp-history-catch-up.test.ts index e6b6ab0e364..902e36a74ed 100644 --- a/src/main/acp/acp-history-catch-up.test.ts +++ b/src/main/acp/acp-history-catch-up.test.ts @@ -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 { diff --git a/src/main/acp/acp-history-catch-up.ts b/src/main/acp/acp-history-catch-up.ts index 6945cc0ba3c..19ed8eff0ee 100644 --- a/src/main/acp/acp-history-catch-up.ts +++ b/src/main/acp/acp-history-catch-up.ts @@ -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' diff --git a/src/main/acp/acp-history-journal-overlay.ts b/src/main/acp/acp-history-journal-overlay.ts index 51d644f6733..d5497268120 100644 --- a/src/main/acp/acp-history-journal-overlay.ts +++ b/src/main/acp/acp-history-journal-overlay.ts @@ -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, diff --git a/src/main/acp/acp-history-scaling.test.ts b/src/main/acp/acp-history-scaling.test.ts index c8a673120f4..bcac3da3c0d 100644 --- a/src/main/acp/acp-history-scaling.test.ts +++ b/src/main/acp/acp-history-scaling.test.ts @@ -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' diff --git a/src/main/acp/acp-history-translation.ts b/src/main/acp/acp-history-translation.ts index c8698fa43e5..aaad68aba48 100644 --- a/src/main/acp/acp-history-translation.ts +++ b/src/main/acp/acp-history-translation.ts @@ -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' diff --git a/src/main/acp/acp-history-turn-matching.ts b/src/main/acp/acp-history-turn-matching.ts index c7a59068834..c73ecfb6f2f 100644 --- a/src/main/acp/acp-history-turn-matching.ts +++ b/src/main/acp/acp-history-turn-matching.ts @@ -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' diff --git a/src/main/acp/acp-prompt-content.test.ts b/src/main/acp/acp-prompt-content.test.ts index 2410df760fa..8cfd7e8273e 100644 --- a/src/main/acp/acp-prompt-content.test.ts +++ b/src/main/acp/acp-prompt-content.test.ts @@ -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, diff --git a/src/main/acp/acp-prompt-content.ts b/src/main/acp/acp-prompt-content.ts index de590457ca1..0cfecd03185 100644 --- a/src/main/acp/acp-prompt-content.ts +++ b/src/main/acp/acp-prompt-content.ts @@ -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 { diff --git a/src/main/acp/acp-structured-adapter.test-support.ts b/src/main/acp/acp-structured-adapter.test-support.ts index e79111e348e..2f469158598 100644 --- a/src/main/acp/acp-structured-adapter.test-support.ts +++ b/src/main/acp/acp-structured-adapter.test-support.ts @@ -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' diff --git a/src/main/acp/acp-structured-compaction.test.ts b/src/main/acp/acp-structured-compaction.test.ts index 10329ff5db1..7e99d4776ad 100644 --- a/src/main/acp/acp-structured-compaction.test.ts +++ b/src/main/acp/acp-structured-compaction.test.ts @@ -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, diff --git a/src/main/acp/acp-structured-grok-subagent-recordings.test.ts b/src/main/acp/acp-structured-grok-subagent-recordings.test.ts index 91ea8262482..c17c49b3165 100644 --- a/src/main/acp/acp-structured-grok-subagent-recordings.test.ts +++ b/src/main/acp/acp-structured-grok-subagent-recordings.test.ts @@ -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 { diff --git a/src/main/acp/acp-structured-host.test-support.ts b/src/main/acp/acp-structured-host.test-support.ts index 3a445b4fbf0..d78ec16f336 100644 --- a/src/main/acp/acp-structured-host.test-support.ts +++ b/src/main/acp/acp-structured-host.test-support.ts @@ -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' diff --git a/src/main/acp/acp-structured-image-prompts.test.ts b/src/main/acp/acp-structured-image-prompts.test.ts index da033067e6f..b85d972bcde 100644 --- a/src/main/acp/acp-structured-image-prompts.test.ts +++ b/src/main/acp/acp-structured-image-prompts.test.ts @@ -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 diff --git a/src/main/acp/acp-structured-lane.ts b/src/main/acp/acp-structured-lane.ts index 21efb442ec0..90ccfdc0396 100644 --- a/src/main/acp/acp-structured-lane.ts +++ b/src/main/acp/acp-structured-lane.ts @@ -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 diff --git a/src/main/acp/acp-structured-launch-resolution.test.ts b/src/main/acp/acp-structured-launch-resolution.test.ts index d8d8086ee47..0d5e41833bd 100644 --- a/src/main/acp/acp-structured-launch-resolution.test.ts +++ b/src/main/acp/acp-structured-launch-resolution.test.ts @@ -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 diff --git a/src/main/acp/acp-structured-launch-resolution.ts b/src/main/acp/acp-structured-launch-resolution.ts index 35a97814d5a..070e13886c2 100644 --- a/src/main/acp/acp-structured-launch-resolution.ts +++ b/src/main/acp/acp-structured-launch-resolution.ts @@ -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, diff --git a/src/main/acp/acp-structured-mail-admission.test.ts b/src/main/acp/acp-structured-mail-admission.test.ts index 777d11b02ea..ca7bb5f8cbf 100644 --- a/src/main/acp/acp-structured-mail-admission.test.ts +++ b/src/main/acp/acp-structured-mail-admission.test.ts @@ -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) diff --git a/src/main/acp/acp-structured-omp-recordings.test.ts b/src/main/acp/acp-structured-omp-recordings.test.ts index 918808b5970..960ce8dc91f 100644 --- a/src/main/acp/acp-structured-omp-recordings.test.ts +++ b/src/main/acp/acp-structured-omp-recordings.test.ts @@ -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, diff --git a/src/main/acp/acp-structured-opencode-recordings.test.ts b/src/main/acp/acp-structured-opencode-recordings.test.ts index fb7b5fcb04c..644d7bf2409 100644 --- a/src/main/acp/acp-structured-opencode-recordings.test.ts +++ b/src/main/acp/acp-structured-opencode-recordings.test.ts @@ -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, diff --git a/src/main/acp/acp-structured-session-adapter-deps.ts b/src/main/acp/acp-structured-session-adapter-deps.ts index 52eee130b2b..5fd9820e91e 100644 --- a/src/main/acp/acp-structured-session-adapter-deps.ts +++ b/src/main/acp/acp-structured-session-adapter-deps.ts @@ -9,7 +9,7 @@ import type { StructuredAgentSessionLogger } from '../native-chat/agent-session- import type { AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session-journal-identity' import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words' import type { AcpLaunchSpec } from './acp-launch-specs' import type { ConnectAcpAgent } from './acp-structured-connection' diff --git a/src/main/acp/acp-structured-session-adapter-recordings.test.ts b/src/main/acp/acp-structured-session-adapter-recordings.test.ts index c337acc8d1e..8cb7836aab0 100644 --- a/src/main/acp/acp-structured-session-adapter-recordings.test.ts +++ b/src/main/acp/acp-structured-session-adapter-recordings.test.ts @@ -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, diff --git a/src/main/acp/acp-structured-session-adapter-resume.test.ts b/src/main/acp/acp-structured-session-adapter-resume.test.ts index cb7dd89c0ca..111b47fba9d 100644 --- a/src/main/acp/acp-structured-session-adapter-resume.test.ts +++ b/src/main/acp/acp-structured-session-adapter-resume.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentSessionFailureFact } from '../../shared/agent-session-failure' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { diff --git a/src/main/acp/acp-structured-session-adapter.test.ts b/src/main/acp/acp-structured-session-adapter.test.ts index 5d6c18b406d..73d6c48c1ed 100644 --- a/src/main/acp/acp-structured-session-adapter.test.ts +++ b/src/main/acp/acp-structured-session-adapter.test.ts @@ -23,7 +23,7 @@ import { waitFor, type AcpAdapterRig } from './acp-structured-adapter.test-support' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { createAcpStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support' import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' diff --git a/src/main/acp/acp-structured-steer.test.ts b/src/main/acp/acp-structured-steer.test.ts index 46d875bb001..0395f81661b 100644 --- a/src/main/acp/acp-structured-steer.test.ts +++ b/src/main/acp/acp-structured-steer.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { DISPATCH_REJECTED_CANCELLED } from '../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { closeProviderTimelineRigs, SESSION as ADAPTER_SESSION diff --git a/src/main/acp/acp-structured-turns.ts b/src/main/acp/acp-structured-turns.ts index cd8c7b0c510..4854f8f5a78 100644 --- a/src/main/acp/acp-structured-turns.ts +++ b/src/main/acp/acp-structured-turns.ts @@ -9,7 +9,7 @@ import { agentSessionFailureWords, type AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionCommandAdmission, StructuredAgentSessionCommandRun diff --git a/src/main/acp/acp-timeline-fixture.test-support.ts b/src/main/acp/acp-timeline-fixture.test-support.ts index 9596781e247..063057fb0d1 100644 --- a/src/main/acp/acp-timeline-fixture.test-support.ts +++ b/src/main/acp/acp-timeline-fixture.test-support.ts @@ -1,7 +1,7 @@ import { readFile } from 'node:fs/promises' import { z } from 'zod' import { expect } from 'vitest' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { legacyAgentSessionSelectedOptionId, type AgentSessionPromptResponse diff --git a/src/main/acp/acp-timeline-grok-subagents.test.ts b/src/main/acp/acp-timeline-grok-subagents.test.ts index e474338f159..e0efa624ce9 100644 --- a/src/main/acp/acp-timeline-grok-subagents.test.ts +++ b/src/main/acp/acp-timeline-grok-subagents.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' import { closeProviderTimelineRigs } from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support' import { openAcpFixtureRig, readAcpFixture } from './acp-timeline-fixture.test-support' diff --git a/src/main/acp/acp-timeline-turn-failures.test.ts b/src/main/acp/acp-timeline-turn-failures.test.ts index 77a275799a9..5bfc77b58cc 100644 --- a/src/main/acp/acp-timeline-turn-failures.test.ts +++ b/src/main/acp/acp-timeline-turn-failures.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { closeProviderTimelineRigs, messageText, diff --git a/src/main/acp/acp-tool-timeline.ts b/src/main/acp/acp-tool-timeline.ts index 1b52b5b820b..852724acd3d 100644 --- a/src/main/acp/acp-tool-timeline.ts +++ b/src/main/acp/acp-tool-timeline.ts @@ -1,6 +1,6 @@ import { createPatch } from 'diff' 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 { BoundedMap } from '../../shared/bounded-map' import { MAX_PROVIDER_TIMELINE_OPEN_BYTES, diff --git a/src/main/agent-hooks/first-work-branch-rename.test.ts b/src/main/agent-hooks/first-work-branch-rename.test.ts index 82de0f5da1d..b0d5c4a167d 100644 --- a/src/main/agent-hooks/first-work-branch-rename.test.ts +++ b/src/main/agent-hooks/first-work-branch-rename.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { GlobalSettings } from '../../shared/global-settings-types' import type { Repo } from '../../shared/repo-types' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' import { StructuredAgentSessionStatusFeed } from '../native-chat/agent-session-wire/structured-agent-session-status-feed' import { maybeAutoRenameWorkspaceOnFirstStructuredTurn } from './first-work-structured-session-rename' diff --git a/src/main/agent-launch/agent-launch-prompt-delivery.ts b/src/main/agent-launch/agent-launch-prompt-delivery.ts index 91bb7fcd53f..7c9d4b43485 100644 --- a/src/main/agent-launch/agent-launch-prompt-delivery.ts +++ b/src/main/agent-launch/agent-launch-prompt-delivery.ts @@ -1,7 +1,7 @@ import type { RuntimeTerminalCreate } from '../../shared/runtime-terminal-create-contract' import { randomUUID } from 'node:crypto' import { createStructuredAgentSessionOperationId } from '../../shared/structured-agent-session-mutation' -import { structuredAgentSessionSendBody } from '../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { StructuredAgentSessionFirstMessage } from '../../shared/structured-agent-session-create' import type { AgentLaunchIntent, diff --git a/src/main/ai-vault/structured-chat-cli-fork.test.ts b/src/main/ai-vault/structured-chat-cli-fork.test.ts index bd8e51ca0aa..72049a9619a 100644 --- a/src/main/ai-vault/structured-chat-cli-fork.test.ts +++ b/src/main/ai-vault/structured-chat-cli-fork.test.ts @@ -5,8 +5,8 @@ import { tmpdir } from 'node:os' import { afterEach, expect, it, vi } from 'vitest' import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture' import type { AgentSessionRecord } from '../../shared/agent-session-record' -import type { AgentJournalSnapshot } from '../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry' import { prepareStructuredChatCliFork } from './structured-chat-cli-fork' import { structuredAgentRuntimeRegistration } from '../runtime/structured-agent-runtime-registrations' diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-chat-cli-fork.ts index 0caa3a3038c..1272d098f7d 100644 --- a/src/main/ai-vault/structured-chat-cli-fork.ts +++ b/src/main/ai-vault/structured-chat-cli-fork.ts @@ -18,11 +18,11 @@ import { structuredAgentRuntimeMetadata } from '../runtime/structured-agent-runt import { readPiSessionHeader } from '../pi/rpc-launch-resolution' import { copyStructuredChatRecordConversation } from './structured-chat-conversation-copy' import { isAiVaultAgent } from './session-list-result-validation' -import type { AgentJournalSnapshot } from '../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' function assertNativeConversationContent(snapshot: AgentJournalSnapshot): void { const submissions = new Map( diff --git a/src/main/automations/automation-chat-run-measurement-test-harness.ts b/src/main/automations/automation-chat-run-measurement-test-harness.ts index 32c27c51886..daba75cab83 100644 --- a/src/main/automations/automation-chat-run-measurement-test-harness.ts +++ b/src/main/automations/automation-chat-run-measurement-test-harness.ts @@ -1,5 +1,5 @@ import { vi, type Mock, type MockInstance } from 'vitest' -import type { AgentJournalSnapshot } from '../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host' diff --git a/src/main/automations/automation-chat-run-observation.ts b/src/main/automations/automation-chat-run-observation.ts index 09e0f70c722..6b2af24cfb2 100644 --- a/src/main/automations/automation-chat-run-observation.ts +++ b/src/main/automations/automation-chat-run-observation.ts @@ -1,6 +1,6 @@ -import type { AgentJournalSnapshot } from '../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSendResult } from '../../shared/agent-session-wire' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn, readAgentJournalTurnOutcome diff --git a/src/main/automations/automation-chat-session-reuse.ts b/src/main/automations/automation-chat-session-reuse.ts index 6f13d853430..c615d855f38 100644 --- a/src/main/automations/automation-chat-session-reuse.ts +++ b/src/main/automations/automation-chat-session-reuse.ts @@ -10,7 +10,7 @@ import { rpcCallerOperationKey } from '../runtime/rpc/rpc-caller-identity' import { structuredAgentSessionMessageSendMutation, structuredAgentSessionSendBody -} from '../../shared/structured-agent-session-send-mutation' +} from '../../shared/agent-session/requests/structured-agent-session-send-mutation' import { automationRunAcceptedTarget } from './automation-agent-run-result' export async function reuseAutomationChat( diff --git a/src/main/automations/runtime-chat-run-observer.test.ts b/src/main/automations/runtime-chat-run-observer.test.ts index 26b9cec30f0..fd6dbe8d820 100644 --- a/src/main/automations/runtime-chat-run-observer.test.ts +++ b/src/main/automations/runtime-chat-run-observer.test.ts @@ -4,11 +4,11 @@ import type { AgentJournalSnapshot, AgentJournalRenderItem, AgentJournalSubmission -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalSubmissionKey, agentJournalItemKey -} from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { OrcaRuntimeService } from '../runtime/orca-runtime' import { buildProfileStateCutoverFixture } from '../persistence/profile-state-cutover-fixture' import { chatAutomationRunObservation, observeAutomationChatRun } from './runtime-chat-run-observer' @@ -23,7 +23,7 @@ import { HOST_TEST_THREAD, hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { automationRunOperationId } from './automation-run-operation' const mocks = vi.hoisted(() => { diff --git a/src/main/automations/runtime-chat-run-observer.ts b/src/main/automations/runtime-chat-run-observer.ts index 72f9c87490e..74a6aec4a6d 100644 --- a/src/main/automations/runtime-chat-run-observer.ts +++ b/src/main/automations/runtime-chat-run-observer.ts @@ -2,7 +2,7 @@ import { resolveChatAutomationRun } from './automation-chat-run-observation' export { chatAutomationRunObservation } from './automation-chat-run-observation' import type { JournalPublication } from '../native-chat/agent-session-wire/structured-agent-session-conversations' import type { AutomationRun } from '../../shared/automations-types' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn, readAgentJournalTurnOutcome diff --git a/src/main/claude/claude-adapter-capture-replay.test.ts b/src/main/claude/claude-adapter-capture-replay.test.ts index c0e980bc18c..2ed2153166b 100644 --- a/src/main/claude/claude-adapter-capture-replay.test.ts +++ b/src/main/claude/claude-adapter-capture-replay.test.ts @@ -6,10 +6,10 @@ import { describe, expect, it, vi, type Mock } from 'vitest' import type { AgentJournalItemBody, AgentJournalMessageItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' import type { ClaudeLateDispatchOutcome, diff --git a/src/main/claude/claude-api-retry-row.test.ts b/src/main/claude/claude-api-retry-row.test.ts index 2ffb3c74b24..229e4fd4060 100644 --- a/src/main/claude/claude-api-retry-row.test.ts +++ b/src/main/claude/claude-api-retry-row.test.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { MAX_PROVIDER_DIAGNOSTIC_CHARS } from '../../shared/agent-session-failure' import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' diff --git a/src/main/claude/claude-api-retry-row.ts b/src/main/claude/claude-api-retry-row.ts index 9ca23f73750..bef6f136002 100644 --- a/src/main/claude/claude-api-retry-row.ts +++ b/src/main/claude/claude-api-retry-row.ts @@ -4,7 +4,7 @@ import { readProviderRetry } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' -import type { AgentJournalStatusItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names' export const CLAUDE_API_RETRY_FRAME_KIND = 'message:system:api_retry' diff --git a/src/main/claude/claude-background-task-row-journal.test.ts b/src/main/claude/claude-background-task-row-journal.test.ts index 287d3aeff9c..9bd836b6202 100644 --- a/src/main/claude/claude-background-task-row-journal.test.ts +++ b/src/main/claude/claude-background-task-row-journal.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' import type { StructuredAgentSessionEventSink, diff --git a/src/main/claude/claude-background-task-row-journal.ts b/src/main/claude/claude-background-task-row-journal.ts index 88cdc075950..ca0e75b4790 100644 --- a/src/main/claude/claude-background-task-row-journal.ts +++ b/src/main/claude/claude-background-task-row-journal.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemIdentity, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { backgroundTaskJournalBody } from '../../shared/native-chat/input/native-chat-background-task-row' import { isBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' import type { @@ -10,7 +8,7 @@ import type { StructuredAgentSessionSinkAdmission } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { ClaudeBackgroundTaskRow } from './claude-background-task-row-lifecycle' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' const MAX_RESOLVED_TASK_IDENTITIES = 512 const ADMITTED: StructuredAgentSessionSinkAdmission = { accepted: true } diff --git a/src/main/claude/claude-background-task-row-test-support.ts b/src/main/claude/claude-background-task-row-test-support.ts index c8f6ce79466..f16a3618c70 100644 --- a/src/main/claude/claude-background-task-row-test-support.ts +++ b/src/main/claude/claude-background-task-row-test-support.ts @@ -1,10 +1,8 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { NativeChatBackgroundTaskBlock } from '../../shared/native-chat/native-chat-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { ClaudeBackgroundTaskRows } from './claude-background-task-rows' diff --git a/src/main/claude/claude-background-task-row-writer.ts b/src/main/claude/claude-background-task-row-writer.ts index 0415503b9c2..02833db9a16 100644 --- a/src/main/claude/claude-background-task-row-writer.ts +++ b/src/main/claude/claude-background-task-row-writer.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission diff --git a/src/main/claude/claude-background-task-rows.ts b/src/main/claude/claude-background-task-rows.ts index 53803e3850f..9ee358e6159 100644 --- a/src/main/claude/claude-background-task-rows.ts +++ b/src/main/claude/claude-background-task-rows.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { isSettledBackgroundTaskState } from '../../shared/native-chat/input/native-chat-background-task-row' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { record, taskAliasId } from './claude-background-task-frames' diff --git a/src/main/claude/claude-background-task-turn-resumption.test.ts b/src/main/claude/claude-background-task-turn-resumption.test.ts index 6ad3877c013..0412523b3d6 100644 --- a/src/main/claude/claude-background-task-turn-resumption.test.ts +++ b/src/main/claude/claude-background-task-turn-resumption.test.ts @@ -1,15 +1,13 @@ import { describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { - hasUnansweredStructuredAgentSessionDispatch, - projectStructuredAgentSessionStatus -} from '../../shared/structured-agent-session-projection' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' +import { projectStructuredAgentSessionStatus } from '../../shared/structured-agent-session-projection' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-background-wake-retention.test.ts b/src/main/claude/claude-background-wake-retention.test.ts index 534c1fd6283..663cff8f688 100644 --- a/src/main/claude/claude-background-wake-retention.test.ts +++ b/src/main/claude/claude-background-wake-retention.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' import { structuredRunningChildWork } from '../../shared/agent-child-work-listing' import type { AgentHookServer } from '../agent-hooks/server' import type { StructuredAgentSessionJournalProjections } from '../native-chat/agent-session-wire/structured-agent-session-status-journal-projection' diff --git a/src/main/claude/claude-child-tool-queries.ts b/src/main/claude/claude-child-tool-queries.ts index 367e845c3bc..ad618083646 100644 --- a/src/main/claude/claude-child-tool-queries.ts +++ b/src/main/claude/claude-child-tool-queries.ts @@ -1,4 +1,4 @@ -import type { AgentJournalProducerLinkage } from '../../shared/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' import type { ClaudePendingPrompt } from './claude-prompt-registry' import type { ClaudeToolUse } from './claude-structured-item-translation' import type { diff --git a/src/main/claude/claude-child-work-evidence-retention.test.ts b/src/main/claude/claude-child-work-evidence-retention.test.ts index efe8cc1d8a4..f011846225d 100644 --- a/src/main/claude/claude-child-work-evidence-retention.test.ts +++ b/src/main/claude/claude-child-work-evidence-retention.test.ts @@ -1,9 +1,7 @@ import { createHash } from 'node:crypto' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { ClaudeChildWorkDecoder } from './claude-child-work-decoder' import { claudeChildOperation, drainClaudeChildWork } from './claude-child-work-evidence' diff --git a/src/main/claude/claude-child-work-producer-harness.test-fixture.ts b/src/main/claude/claude-child-work-producer-harness.test-fixture.ts index ebb8d8a3c8f..0648ff0a33f 100644 --- a/src/main/claude/claude-child-work-producer-harness.test-fixture.ts +++ b/src/main/claude/claude-child-work-producer-harness.test-fixture.ts @@ -1,6 +1,6 @@ import { expect } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { createAgentChildWorkAdmission } from '../../shared/agent-status-child-work-admission' import type { AgentChildWorkRecord } from '../../shared/agent-status-child-work' import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence' diff --git a/src/main/claude/claude-close-turn-end.test.ts b/src/main/claude/claude-close-turn-end.test.ts index 06b415ee03c..b45eded065b 100644 --- a/src/main/claude/claude-close-turn-end.test.ts +++ b/src/main/claude/claude-close-turn-end.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalTurnLifecycle -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' diff --git a/src/main/claude/claude-command-lifecycle-frames.test.ts b/src/main/claude/claude-command-lifecycle-frames.test.ts index 1072889e23c..8332b913bd6 100644 --- a/src/main/claude/claude-command-lifecycle-frames.test.ts +++ b/src/main/claude/claude-command-lifecycle-frames.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-command-lifecycle.test.ts b/src/main/claude/claude-command-lifecycle.test.ts index 3cb764ca2ea..3558997406d 100644 --- a/src/main/claude/claude-command-lifecycle.test.ts +++ b/src/main/claude/claude-command-lifecycle.test.ts @@ -3,9 +3,9 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { DISPATCH_REJECTED_CANCELLED } from '../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED, DISPATCH_DOUBT_PROVIDER_IDLE diff --git a/src/main/claude/claude-command-turn.test.ts b/src/main/claude/claude-command-turn.test.ts index c5075cbe861..ec3c3cdbba1 100644 --- a/src/main/claude/claude-command-turn.test.ts +++ b/src/main/claude/claude-command-turn.test.ts @@ -1,10 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink, diff --git a/src/main/claude/claude-command-turn.ts b/src/main/claude/claude-command-turn.ts index 0b7c6d5c603..96435fea61b 100644 --- a/src/main/claude/claude-command-turn.ts +++ b/src/main/claude/claude-command-turn.ts @@ -1,10 +1,8 @@ // Command output stays off the reply timeline; only the command's result ends its turn. -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { providerDiagnostic, type ProviderDiagnostic } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names' diff --git a/src/main/claude/claude-context-facts.ts b/src/main/claude/claude-context-facts.ts index 46f35987781..79f090c40ad 100644 --- a/src/main/claude/claude-context-facts.ts +++ b/src/main/claude/claude-context-facts.ts @@ -5,7 +5,7 @@ import { type AgentSessionContextUsage, type AgentSessionContextWindow } from '../../shared/agent-session-context-usage' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { claudeContextResetKind, diff --git a/src/main/claude/claude-context-usage-test-support.ts b/src/main/claude/claude-context-usage-test-support.ts index 409967d3f44..d5311022356 100644 --- a/src/main/claude/claude-context-usage-test-support.ts +++ b/src/main/claude/claude-context-usage-test-support.ts @@ -1,10 +1,10 @@ import { vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink, StructuredAgentSessionRevisionJournal diff --git a/src/main/claude/claude-fold-steer-receipt.test.ts b/src/main/claude/claude-fold-steer-receipt.test.ts index 30722d79372..5ccf1912f3d 100644 --- a/src/main/claude/claude-fold-steer-receipt.test.ts +++ b/src/main/claude/claude-fold-steer-receipt.test.ts @@ -3,9 +3,9 @@ import { describe, expect, it, vi, type Mock } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalMessageItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' diff --git a/src/main/claude/claude-informational-row.test.ts b/src/main/claude/claude-informational-row.test.ts index cc92ee3c9b7..4bb357c1908 100644 --- a/src/main/claude/claude-informational-row.test.ts +++ b/src/main/claude/claude-informational-row.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-informational-row.ts b/src/main/claude/claude-informational-row.ts index 0e8042992ad..4b5acf80c46 100644 --- a/src/main/claude/claude-informational-row.ts +++ b/src/main/claude/claude-informational-row.ts @@ -5,7 +5,7 @@ import { type AgentSessionHookOutcome } from '../../shared/agent-session-hook-outcome' import { AGENT_SESSION_TURN_NOTICE_PRESENTATION } from '../../shared/agent-session-turn-notice' -import type { AgentJournalStatusItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { claudeRecord, claudeText } from './claude-structured-item-translation' export const CLAUDE_INFORMATIONAL_FRAME_KIND = 'message:system:informational' diff --git a/src/main/claude/claude-journal-translator-contract.ts b/src/main/claude/claude-journal-translator-contract.ts index d27c88fb1d5..a0aac728f5c 100644 --- a/src/main/claude/claude-journal-translator-contract.ts +++ b/src/main/claude/claude-journal-translator-contract.ts @@ -1,5 +1,5 @@ import type { AgentSessionContextReport } from '../../shared/agent-session-context-usage' -import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission diff --git a/src/main/claude/claude-journal-turn-scope.test.ts b/src/main/claude/claude-journal-turn-scope.test.ts index ba83ef59a52..6fa2087d2f6 100644 --- a/src/main/claude/claude-journal-turn-scope.test.ts +++ b/src/main/claude/claude-journal-turn-scope.test.ts @@ -1,8 +1,6 @@ import { expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink, StructuredAgentSessionItemAppendOptions diff --git a/src/main/claude/claude-message-journaling.ts b/src/main/claude/claude-message-journaling.ts index 8d2f1b97b8c..d016241d099 100644 --- a/src/main/claude/claude-message-journaling.ts +++ b/src/main/claude/claude-message-journaling.ts @@ -1,6 +1,6 @@ import { writeClaudeTerminalFailure } from './claude-terminal-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { ClaudeBackgroundTaskRows } from './claude-background-task-rows' import type { ClaudeToolOriginRegistry } from './claude-tool-origin-registry' diff --git a/src/main/claude/claude-open-turn.ts b/src/main/claude/claude-open-turn.ts index 95bb61c145b..d8fa54ee1e9 100644 --- a/src/main/claude/claude-open-turn.ts +++ b/src/main/claude/claude-open-turn.ts @@ -1,10 +1,8 @@ import type { AgentSessionContextUsage } from '../../shared/agent-session-context-usage' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, - type AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { claudeCurrentTurnIdentity, diff --git a/src/main/claude/claude-permission-presentation.ts b/src/main/claude/claude-permission-presentation.ts index 0815596ad34..ec41d010791 100644 --- a/src/main/claude/claude-permission-presentation.ts +++ b/src/main/claude/claude-permission-presentation.ts @@ -1,5 +1,5 @@ import type { CanUseTool } from '@anthropic-ai/claude-agent-sdk' -import type { AgentJournalApprovalSubject } from '../../shared/agent-session-journal-types' +import type { AgentJournalApprovalSubject } from '../../shared/agent-session/journal/agent-session-journal-types' import { stripAnsiEscapeSequences, TERMINAL_CONTROL_CHARACTER_PATTERN diff --git a/src/main/claude/claude-prompt-registry.ts b/src/main/claude/claude-prompt-registry.ts index a1985a9cc0f..b87542e530a 100644 --- a/src/main/claude/claude-prompt-registry.ts +++ b/src/main/claude/claude-prompt-registry.ts @@ -2,7 +2,7 @@ import type { PermissionResult, PermissionUpdate } from '@anthropic-ai/claude-ag import type { AgentJournalApprovalMatchedAskRule, AgentJournalApprovalSubject -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' /** Settles the SDK's `canUseTool` promise; `null` writes no provider response. */ export type ClaudePromptSettle = (response: PermissionResult | null) => void diff --git a/src/main/claude/claude-provisional-row-corrections.test.ts b/src/main/claude/claude-provisional-row-corrections.test.ts index 68dcb742967..3f94aaa0aa7 100644 --- a/src/main/claude/claude-provisional-row-corrections.test.ts +++ b/src/main/claude/claude-provisional-row-corrections.test.ts @@ -1,9 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { ClaudeProvisionalRowCorrections } from './claude-provisional-row-corrections' import type { ClaudeSubagentLinkageVerdict } from './claude-subagent-linkage' diff --git a/src/main/claude/claude-provisional-row-corrections.ts b/src/main/claude/claude-provisional-row-corrections.ts index 999dae620de..e3be16703e4 100644 --- a/src/main/claude/claude-provisional-row-corrections.ts +++ b/src/main/claude/claude-provisional-row-corrections.ts @@ -1,13 +1,13 @@ // Publish before task_started using the spawn ID; correct attribution later without replacing content. -import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, - AgentJournalItemIdentity, - AgentJournalProducerLinkage, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' + AgentJournalProducerLinkage +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import type { StructuredAgentSessionItemAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { ClaudeSubagentLinkageSource } from './claude-subagent-linkage' diff --git a/src/main/claude/claude-result-outcome.ts b/src/main/claude/claude-result-outcome.ts index d7c30ac0e35..0b3e5cdc28a 100644 --- a/src/main/claude/claude-result-outcome.ts +++ b/src/main/claude/claude-result-outcome.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnOutcome } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../shared/agent-turn-outcome' import { claudeText } from './claude-structured-item-translation' /** User stops are error results too; abort reasons distinguish cancellation from failure. */ diff --git a/src/main/claude/claude-streamed-block-identity.ts b/src/main/claude/claude-streamed-block-identity.ts index 2c1d334e5b7..0c442ea3c18 100644 --- a/src/main/claude/claude-streamed-block-identity.ts +++ b/src/main/claude/claude-streamed-block-identity.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { claudeRecord, claudeText } from './claude-structured-item-translation' // Stream and final frames have different UUIDs; reconcile by message.id and block order to avoid duplicate rows. diff --git a/src/main/claude/claude-streamed-text-checkpoints.test.ts b/src/main/claude/claude-streamed-text-checkpoints.test.ts index e3a65547e74..554c50a7713 100644 --- a/src/main/claude/claude-streamed-text-checkpoints.test.ts +++ b/src/main/claude/claude-streamed-text-checkpoints.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemIdentity, - AgentJournalProducerLinkage -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeStreamedTextCheckpoints } from './claude-streamed-text-checkpoints' import type { diff --git a/src/main/claude/claude-streamed-text-checkpoints.ts b/src/main/claude/claude-streamed-text-checkpoints.ts index c035616b6dd..7292fdaae04 100644 --- a/src/main/claude/claude-streamed-text-checkpoints.ts +++ b/src/main/claude/claude-streamed-text-checkpoints.ts @@ -1,6 +1,6 @@ -import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createAgentSessionDeltaCoalescer, diff --git a/src/main/claude/claude-streamed-thinking.ts b/src/main/claude/claude-streamed-thinking.ts index 67d98fbe205..5f50c052fbd 100644 --- a/src/main/claude/claude-streamed-thinking.ts +++ b/src/main/claude/claude-streamed-thinking.ts @@ -1,9 +1,7 @@ -import type { - AgentJournalItemIdentity, - AgentJournalMessageItem, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { endedJournalReasoning, journalReasoningBody diff --git a/src/main/claude/claude-structured-content-parts.test.ts b/src/main/claude/claude-structured-content-parts.test.ts index 6ee6ac39edb..930c03d9906 100644 --- a/src/main/claude/claude-structured-content-parts.test.ts +++ b/src/main/claude/claude-structured-content-parts.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-structured-dispatch-content.test.ts b/src/main/claude/claude-structured-dispatch-content.test.ts index 57751647379..a52833381c0 100644 --- a/src/main/claude/claude-structured-dispatch-content.test.ts +++ b/src/main/claude/claude-structured-dispatch-content.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { 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 { claudeDispatchInvokesSlashCommand, claudeDispatchMessageContent diff --git a/src/main/claude/claude-structured-dispatch-content.ts b/src/main/claude/claude-structured-dispatch-content.ts index 865a53bbcd9..41b721bab84 100644 --- a/src/main/claude/claude-structured-dispatch-content.ts +++ b/src/main/claude/claude-structured-dispatch-content.ts @@ -1,7 +1,7 @@ import { createHash } from 'node:crypto' import { open } from 'node:fs/promises' import { extname } from 'node:path' -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 { agentSessionFailureFact, diff --git a/src/main/claude/claude-structured-dispatch-test-support.ts b/src/main/claude/claude-structured-dispatch-test-support.ts index dea918d60e3..1d02aceca4d 100644 --- a/src/main/claude/claude-structured-dispatch-test-support.ts +++ b/src/main/claude/claude-structured-dispatch-test-support.ts @@ -1,5 +1,5 @@ import { vi, type Mock } from 'vitest' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { retireClaudeDispatchWaiters } from './claude-structured-dispatch' import type { ClaudeSession } from './structured/claude-structured-session-state' import { ClaudeBackgroundTaskTracker } from './claude-background-task-tracker' diff --git a/src/main/claude/claude-structured-dispatch.ts b/src/main/claude/claude-structured-dispatch.ts index d1aa870dec6..32631da165e 100644 --- a/src/main/claude/claude-structured-dispatch.ts +++ b/src/main/claude/claude-structured-dispatch.ts @@ -1,5 +1,5 @@ import { randomUUID } from 'node:crypto' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { claudePromptUuidForSubmission } from './structured/claude-structured-session-id' import { isAbortSignalReason } from '../../shared/abort-signal-reason' import { @@ -8,7 +8,7 @@ import { retireWaiter, waitForReplay } from './claude-structured-dispatch-waiters' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter' import type { ClaudeDispatchWaiter, @@ -23,7 +23,7 @@ import { claudeDispatchRejection } from './claude-structured-dispatch-content' import { dispatchWriteOutcomeUnknownReason } from '../native-chat/agent-session-journal/journal-dispatch-doubt-reasons' -import { DISPATCH_REJECTED_QUEUE_FULL } from '../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_QUEUE_FULL } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { agentSessionFailureFact, providerDiagnostic, diff --git a/src/main/claude/claude-structured-in-turn-stop.test.ts b/src/main/claude/claude-structured-in-turn-stop.test.ts index c35f001709c..7023e100d78 100644 --- a/src/main/claude/claude-structured-in-turn-stop.test.ts +++ b/src/main/claude/claude-structured-in-turn-stop.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { personStopDecidesTurn } from '../native-chat/agent-session-journal/journal-stop-turn-end' import { createJournalReducerState } from '../native-chat/agent-session-journal/journal-reducer' diff --git a/src/main/claude/claude-structured-item-translation.ts b/src/main/claude/claude-structured-item-translation.ts index 4099aef4215..e918a0cb979 100644 --- a/src/main/claude/claude-structured-item-translation.ts +++ b/src/main/claude/claude-structured-item-translation.ts @@ -1,8 +1,8 @@ import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalMessageItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { NativeChatBlock } from '../../shared/native-chat/native-chat-types' import { journalPayload } from '../native-chat/agent-session-journal/journal-payload-bounds' diff --git a/src/main/claude/claude-structured-journal-prompt-cards.test.ts b/src/main/claude/claude-structured-journal-prompt-cards.test.ts index be4056c2324..05cafd2991d 100644 --- a/src/main/claude/claude-structured-journal-prompt-cards.test.ts +++ b/src/main/claude/claude-structured-journal-prompt-cards.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionSinkBarrier } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { ClaudeJournalPrompts } from './claude-structured-journal-prompts' import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' diff --git a/src/main/claude/claude-structured-journal-prompt-retry.test.ts b/src/main/claude/claude-structured-journal-prompt-retry.test.ts index b3511ed1753..2d24aad107a 100644 --- a/src/main/claude/claude-structured-journal-prompt-retry.test.ts +++ b/src/main/claude/claude-structured-journal-prompt-retry.test.ts @@ -1,9 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink, StructuredAgentSessionReadingControl diff --git a/src/main/claude/claude-structured-journal-prompts.ts b/src/main/claude/claude-structured-journal-prompts.ts index ecf4c9f6b47..c4608d65902 100644 --- a/src/main/claude/claude-structured-journal-prompts.ts +++ b/src/main/claude/claude-structured-journal-prompts.ts @@ -1,11 +1,11 @@ import type { AgentJournalApprovalItem, - AgentJournalItemIdentity, AgentJournalProducerLinkage, - AgentJournalQuestionItem, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' + AgentJournalQuestionItem +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { cancelledJournalPromptBody } from '../native-chat/agent-session-journal/journal-prompt-body-bounds' import type { StructuredAgentSessionEventSink, diff --git a/src/main/claude/claude-structured-journal-translation-background-tasks.test.ts b/src/main/claude/claude-structured-journal-translation-background-tasks.test.ts index 9e4150ceca6..4d1bfc43e58 100644 --- a/src/main/claude/claude-structured-journal-translation-background-tasks.test.ts +++ b/src/main/claude/claude-structured-journal-translation-background-tasks.test.ts @@ -1,10 +1,8 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { createDeferredStructuredAgentSessionEventSink, type StructuredAgentSessionEventSink, diff --git a/src/main/claude/claude-structured-journal-translation-context-usage.test.ts b/src/main/claude/claude-structured-journal-translation-context-usage.test.ts index 747ba050a1c..31915b8bf26 100644 --- a/src/main/claude/claude-structured-journal-translation-context-usage.test.ts +++ b/src/main/claude/claude-structured-journal-translation-context-usage.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { isAdmissibleAgentJournalItemBody } from '../../shared/agent-session-journal-schemas' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { isAdmissibleAgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-schemas' import { selectStructuredAgentContextUsage } from '../../shared/structured-agent-session-context-usage' import { claudeContextReportFromControl } from './claude-context-usage' import { diff --git a/src/main/claude/claude-structured-journal-translation-subagents.test.ts b/src/main/claude/claude-structured-journal-translation-subagents.test.ts index e862342e6f7..893a2895b72 100644 --- a/src/main/claude/claude-structured-journal-translation-subagents.test.ts +++ b/src/main/claude/claude-structured-journal-translation-subagents.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionAppendOptions, StructuredAgentSessionEventSink diff --git a/src/main/claude/claude-structured-journal-translation-turn-timing.test.ts b/src/main/claude/claude-structured-journal-translation-turn-timing.test.ts index fc99d59494f..2230f092586 100644 --- a/src/main/claude/claude-structured-journal-translation-turn-timing.test.ts +++ b/src/main/claude/claude-structured-journal-translation-turn-timing.test.ts @@ -1,8 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionAppendOptions, StructuredAgentSessionEventSink diff --git a/src/main/claude/claude-structured-journal-translation.test.ts b/src/main/claude/claude-structured-journal-translation.test.ts index f43553c8964..86db497af40 100644 --- a/src/main/claude/claude-structured-journal-translation.test.ts +++ b/src/main/claude/claude-structured-journal-translation.test.ts @@ -4,11 +4,13 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, + AgentJournalRenderItem +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity, - AgentJournalRenderItem, AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { activeStructuredAgentSessionTurnId } from '../../shared/structured-agent-session-projection' import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory' import { diff --git a/src/main/claude/claude-structured-launch-visuals.test.ts b/src/main/claude/claude-structured-launch-visuals.test.ts index b5e9d857605..3831487299a 100644 --- a/src/main/claude/claude-structured-launch-visuals.test.ts +++ b/src/main/claude/claude-structured-launch-visuals.test.ts @@ -1,6 +1,6 @@ import { createClaudeStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support' import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' import { diff --git a/src/main/claude/claude-structured-prompt-items.test.ts b/src/main/claude/claude-structured-prompt-items.test.ts index 6228691e69a..22d70647238 100644 --- a/src/main/claude/claude-structured-prompt-items.test.ts +++ b/src/main/claude/claude-structured-prompt-items.test.ts @@ -1,5 +1,5 @@ import { 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 { cancelledJournalPromptBody } from '../native-chat/agent-session-journal/journal-prompt-body-bounds' import { MAX_JOURNAL_LIFECYCLE_BATCH_BYTES } from '../native-chat/agent-session-journal/journal-row-schema' import { MAX_TOOL_DETAIL_LENGTH } from '../../shared/native-chat/tools/native-chat-tool-summary' diff --git a/src/main/claude/claude-structured-prompt-items.ts b/src/main/claude/claude-structured-prompt-items.ts index 251b22ee3cd..002abf710dc 100644 --- a/src/main/claude/claude-structured-prompt-items.ts +++ b/src/main/claude/claude-structured-prompt-items.ts @@ -1,10 +1,10 @@ import type { AgentJournalApprovalItem, - AgentJournalItemIdentity, AgentJournalPromptOption, AgentJournalQuestion, AgentJournalQuestionItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { formatToolInput, truncateToolDetail diff --git a/src/main/claude/claude-structured-prompt-ownership.test.ts b/src/main/claude/claude-structured-prompt-ownership.test.ts index 3511fa88e11..9209cd32713 100644 --- a/src/main/claude/claude-structured-prompt-ownership.test.ts +++ b/src/main/claude/claude-structured-prompt-ownership.test.ts @@ -1,7 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionAppendOptions, StructuredAgentSessionEventSink diff --git a/src/main/claude/claude-structured-provider-fallback.test.ts b/src/main/claude/claude-structured-provider-fallback.test.ts index 2aaaa3068aa..08d590d0edf 100644 --- a/src/main/claude/claude-structured-provider-fallback.test.ts +++ b/src/main/claude/claude-structured-provider-fallback.test.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { openAgentSessionJournal } from '../native-chat/agent-session-journal/journal-store-factory' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-structured-provider-fallback.ts b/src/main/claude/claude-structured-provider-fallback.ts index 8b40cc09609..fb7e8710669 100644 --- a/src/main/claude/claude-structured-provider-fallback.ts +++ b/src/main/claude/claude-structured-provider-fallback.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalStatusItem, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import type { AgentSessionFailureRowWords } from '../../shared/agent-session-failure-words' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { PROVIDER_FRAME_PAYLOAD_LIMITS } from '../native-chat/agent-session-journal/journal-payload-bounds' diff --git a/src/main/claude/claude-structured-queued-stop.test.ts b/src/main/claude/claude-structured-queued-stop.test.ts index ae1d661b280..4887fd46902 100644 --- a/src/main/claude/claude-structured-queued-stop.test.ts +++ b/src/main/claude/claude-structured-queued-stop.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { DISPATCH_REJECTED_CANCELLED } from '../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { ClaudeStructuredSessionAdapterDeps } from './structured/claude-structured-session-state' import { PROVIDER_SESSION_ID, diff --git a/src/main/claude/claude-structured-rate-limit-retry.test.ts b/src/main/claude/claude-structured-rate-limit-retry.test.ts index 2ee8ef86a3b..b6b257ea1a7 100644 --- a/src/main/claude/claude-structured-rate-limit-retry.test.ts +++ b/src/main/claude/claude-structured-rate-limit-retry.test.ts @@ -1,10 +1,8 @@ // Claude Code 2.1.280 HTTP 429 capture: api_retry precedes the replay, so retries open no turn. import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-structured-real-cli-fold.test.ts b/src/main/claude/claude-structured-real-cli-fold.test.ts index 9e5690c177b..d1b4ac50f29 100644 --- a/src/main/claude/claude-structured-real-cli-fold.test.ts +++ b/src/main/claude/claude-structured-real-cli-fold.test.ts @@ -3,10 +3,8 @@ import { mkdtemp } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './claude-structured-launch-resolution' diff --git a/src/main/claude/claude-structured-real-cli-options.test.ts b/src/main/claude/claude-structured-real-cli-options.test.ts index d0bbca8739b..7de8223a8e3 100644 --- a/src/main/claude/claude-structured-real-cli-options.test.ts +++ b/src/main/claude/claude-structured-real-cli-options.test.ts @@ -3,7 +3,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionExecutionOptions } from '../../shared/agent-session/options/agent-session-execution-options' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { diff --git a/src/main/claude/claude-structured-real-cli-rewind.test.ts b/src/main/claude/claude-structured-real-cli-rewind.test.ts index df7a9cba44e..2004b4b0a96 100644 --- a/src/main/claude/claude-structured-real-cli-rewind.test.ts +++ b/src/main/claude/claude-structured-real-cli-rewind.test.ts @@ -3,7 +3,7 @@ import { mkdtemp, readFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { resolveSessionFilePath } from '../native-chat/session-file-resolver' import { diff --git a/src/main/claude/claude-structured-real-cli-stop-task.test.ts b/src/main/claude/claude-structured-real-cli-stop-task.test.ts index 92d629b227b..75b9e8031ba 100644 --- a/src/main/claude/claude-structured-real-cli-stop-task.test.ts +++ b/src/main/claude/claude-structured-real-cli-stop-task.test.ts @@ -3,7 +3,7 @@ import { mkdtemp } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CLAUDE_STRUCTURED_BASE_OPTIONS } from './claude-structured-launch-resolution' import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter' diff --git a/src/main/claude/claude-structured-real-cli-visuals.test.ts b/src/main/claude/claude-structured-real-cli-visuals.test.ts index 6a640b5c06d..b2b7664c019 100644 --- a/src/main/claude/claude-structured-real-cli-visuals.test.ts +++ b/src/main/claude/claude-structured-real-cli-visuals.test.ts @@ -3,7 +3,7 @@ import { mkdir, mkdtemp, rm } from 'node:fs/promises' import { homedir, tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { createNativeChatVisualsDelivery } from '../native-chat/native-chat-visuals-delivery' diff --git a/src/main/claude/claude-structured-real-cli.test.ts b/src/main/claude/claude-structured-real-cli.test.ts index a89da022c75..9f280cd92d4 100644 --- a/src/main/claude/claude-structured-real-cli.test.ts +++ b/src/main/claude/claude-structured-real-cli.test.ts @@ -5,7 +5,7 @@ import { basename, join, relative } from 'node:path' import { describe, expect, it, vi } from 'vitest' import { buildClaudeChildProcessEnv } from './claude-child-process-environment' import * as claudeConnection from './claude-stream-json-connection' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { resolveSessionFilePath } from '../native-chat/session-file-resolver' import { CLAUDE_STRUCTURED_BASE_OPTIONS, diff --git a/src/main/claude/claude-structured-reasoning-lifecycle.test.ts b/src/main/claude/claude-structured-reasoning-lifecycle.test.ts index 0a8e3889966..ebb1cfa6bc3 100644 --- a/src/main/claude/claude-structured-reasoning-lifecycle.test.ts +++ b/src/main/claude/claude-structured-reasoning-lifecycle.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' diff --git a/src/main/claude/claude-structured-reasoning.test.ts b/src/main/claude/claude-structured-reasoning.test.ts index d23935b8376..913fe056bd4 100644 --- a/src/main/claude/claude-structured-reasoning.test.ts +++ b/src/main/claude/claude-structured-reasoning.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' function setup() { diff --git a/src/main/claude/claude-structured-requested-stop.test.ts b/src/main/claude/claude-structured-requested-stop.test.ts index f57db0e1eec..9b122d50b52 100644 --- a/src/main/claude/claude-structured-requested-stop.test.ts +++ b/src/main/claude/claude-structured-requested-stop.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { ClaudeStructuredSessionEvent } from './structured/claude-structured-session-state' diff --git a/src/main/claude/claude-structured-session-reading-control.test.ts b/src/main/claude/claude-structured-session-reading-control.test.ts index 9a2c858c4aa..8f1da29b47d 100644 --- a/src/main/claude/claude-structured-session-reading-control.test.ts +++ b/src/main/claude/claude-structured-session-reading-control.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' import { createDeferredStructuredAgentSessionEventSink, @@ -7,11 +7,9 @@ import { type StructuredAgentSessionLinkageJournal, type StructuredAgentSessionReadingControl } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' import { blockOf } from './claude-background-task-row-test-support' import { diff --git a/src/main/claude/claude-structured-session-test-support.ts b/src/main/claude/claude-structured-session-test-support.ts index dc609872b11..2aea5e8fcb5 100644 --- a/src/main/claude/claude-structured-session-test-support.ts +++ b/src/main/claude/claude-structured-session-test-support.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session-caller-env' import type { ClaudeStreamJsonConnection, diff --git a/src/main/claude/claude-structured-sign-in.test.ts b/src/main/claude/claude-structured-sign-in.test.ts index c1c433258d7..7a06c79b4cf 100644 --- a/src/main/claude/claude-structured-sign-in.test.ts +++ b/src/main/claude/claude-structured-sign-in.test.ts @@ -1,7 +1,7 @@ import { readFile } from 'node:fs/promises' import { describe, expect, it } from 'vitest' import { z } from 'zod' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { ClaudeAssistantFailures } from './claude-assistant-failures' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' diff --git a/src/main/claude/claude-subagent-journaled-identities.ts b/src/main/claude/claude-subagent-journaled-identities.ts index d765aab58ce..f7f341ebe4f 100644 --- a/src/main/claude/claude-subagent-journaled-identities.ts +++ b/src/main/claude/claude-subagent-journaled-identities.ts @@ -1,4 +1,4 @@ -import type { AgentJournalProducerLinkage } from '../../shared/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' import { namedSubagents } from '../../shared/native-chat/transcript/native-chat-subagent-items' import type { StructuredAgentSessionLinkageJournal } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { isBoundedClaudeTaskId } from './claude-background-task-tracker' diff --git a/src/main/claude/claude-subagent-linkage.ts b/src/main/claude/claude-subagent-linkage.ts index a367e1a2c36..8d6b221959d 100644 --- a/src/main/claude/claude-subagent-linkage.ts +++ b/src/main/claude/claude-subagent-linkage.ts @@ -1,6 +1,6 @@ // Prefer canonical task IDs across resumes; write provisional child rows immediately and correct them in place. -import type { AgentJournalProducerLinkage } from '../../shared/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../shared/agent-session/journal/agent-session-journal-types' import type { ClaudeSubagentIds } from './claude-subagent-id-aliases' export type ClaudeSubagentLinkageVerdict = diff --git a/src/main/claude/claude-subagent-permission-request.test.ts b/src/main/claude/claude-subagent-permission-request.test.ts index 157d48e3b3d..615510629e6 100644 --- a/src/main/claude/claude-subagent-permission-request.test.ts +++ b/src/main/claude/claude-subagent-permission-request.test.ts @@ -6,12 +6,12 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { isDeepStrictEqual } from 'node:util' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalProducerLinkage, AgentJournalRenderItem, AgentJournalResolution -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence' import type { AgentStatusStructuredSessionSubject } from '../../shared/agent-status-subject' import { AgentHookServer } from '../agent-hooks/server' diff --git a/src/main/claude/claude-subagent-resume-after-restart.test.ts b/src/main/claude/claude-subagent-resume-after-restart.test.ts index 55f988c0726..c96df5bfa91 100644 --- a/src/main/claude/claude-subagent-resume-after-restart.test.ts +++ b/src/main/claude/claude-subagent-resume-after-restart.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, 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 type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-host-database-test-support' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' diff --git a/src/main/claude/claude-terminal-failure.ts b/src/main/claude/claude-terminal-failure.ts index af34ab1d188..2c65fd9f04c 100644 --- a/src/main/claude/claude-terminal-failure.ts +++ b/src/main/claude/claude-terminal-failure.ts @@ -1,9 +1,7 @@ -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { isRootAgentJournalItem } from '../../shared/agent-session-journal-producer' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { isRootAgentJournalItem } from '../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentSessionFailureFact, providerDiagnostic } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' import type { diff --git a/src/main/claude/claude-thread-goal-journaling.test.ts b/src/main/claude/claude-thread-goal-journaling.test.ts index b03fb1c5f15..63e2addd155 100644 --- a/src/main/claude/claude-thread-goal-journaling.test.ts +++ b/src/main/claude/claude-thread-goal-journaling.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalThreadGoal -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createClaudeJournalTranslator } from './claude-structured-journal-translation' import { journal } from './claude-context-usage-test-support' diff --git a/src/main/claude/claude-thread-goal.ts b/src/main/claude/claude-thread-goal.ts index 2e9d23b6ea6..f9116b94a34 100644 --- a/src/main/claude/claude-thread-goal.ts +++ b/src/main/claude/claude-thread-goal.ts @@ -2,9 +2,9 @@ import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalThreadGoal -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { claudeRecord, claudeText } from './claude-structured-item-translation' import { isRootClaudeFrame } from './claude-turn-opening' import type { ClaudeGoalBackgroundWork } from './claude-background-task-tracker' diff --git a/src/main/claude/claude-transcript-catch-up-test-support.ts b/src/main/claude/claude-transcript-catch-up-test-support.ts index 2752c3c9aee..793231e9b32 100644 --- a/src/main/claude/claude-transcript-catch-up-test-support.ts +++ b/src/main/claude/claude-transcript-catch-up-test-support.ts @@ -3,7 +3,7 @@ import { appendFile, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, type Mock, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-host-database-test-support' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' diff --git a/src/main/claude/claude-transcript-catch-up.test.ts b/src/main/claude/claude-transcript-catch-up.test.ts index ecfbd806a9f..ea242e31aa8 100644 --- a/src/main/claude/claude-transcript-catch-up.test.ts +++ b/src/main/claude/claude-transcript-catch-up.test.ts @@ -7,13 +7,13 @@ import { isStructuredRewindTarget, structuredRewindCut } from '../native-chat/agent-session-wire/structured-rewind-cut' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentSessionHistory } from '../native-chat/agent-session-wire/agent-session-history-page' import { projectJournalBatch } from '../native-chat/agent-session-wire/agent-session-journal-batch' import { replacePage, mergeItems } from '../../shared/structured-agent-session-history-state' -import { AgentJournalRenderItemSchema } from '../../shared/agent-session-journal-schemas' +import { AgentJournalRenderItemSchema } from '../../shared/agent-session/journal/agent-session-journal-schemas' import { projectStructuredItemToNativeChat } from '../../shared/structured-agent-session-projection' -import { agentSessionSendBodyFingerprint } from '../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../shared/agent-session/requests/structured-agent-session-send-mutation' import { dispatchClaudeTurn } from './claude-structured-dispatch' import { claudePromptUuidForSubmission } from './structured/claude-structured-session-id' import { childExited, sessionFor, userMessage } from './claude-structured-dispatch-test-support' diff --git a/src/main/claude/claude-transcript-catch-up.ts b/src/main/claude/claude-transcript-catch-up.ts index 7412daed68b..6d58c2362ad 100644 --- a/src/main/claude/claude-transcript-catch-up.ts +++ b/src/main/claude/claude-transcript-catch-up.ts @@ -1,5 +1,5 @@ import { join } from 'node:path' -import { isRootAgentJournalItem } from '../../shared/agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../shared/agent-session/journal/agent-session-journal-producer' import { encodeClaudeProjectPaths } from '../ai-vault/claude-project-dir-encoding' import { wslGatedStat } from '../native-chat/wsl-transcript-fs-access' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' diff --git a/src/main/claude/claude-transcript-duration.test.ts b/src/main/claude/claude-transcript-duration.test.ts index 44f02c96fd4..4c31c409d3f 100644 --- a/src/main/claude/claude-transcript-duration.test.ts +++ b/src/main/claude/claude-transcript-duration.test.ts @@ -1,5 +1,5 @@ import { 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 { selectStructuredAgentSettledTurns } from '../../shared/structured-agent-session-turn-timing' import { isStructuredRewindTarget } from '../native-chat/agent-session-wire/structured-rewind-cut' import { diff --git a/src/main/claude/claude-transcript-import-plan.ts b/src/main/claude/claude-transcript-import-plan.ts index 3f6f8915d7a..3e5c337e777 100644 --- a/src/main/claude/claude-transcript-import-plan.ts +++ b/src/main/claude/claude-transcript-import-plan.ts @@ -2,13 +2,13 @@ import { isDeepStrictEqual } from 'node:util' import { agentJournalItemKey, parseAgentJournalItemKey -} from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { journalLifecycleItemMutation } from '../native-chat/agent-session-journal/journal-row-builders' import { continuedOutsideNotice, diff --git a/src/main/claude/claude-transcript-item-reader.ts b/src/main/claude/claude-transcript-item-reader.ts index 3fbdcf55a35..ecd36c08b44 100644 --- a/src/main/claude/claude-transcript-item-reader.ts +++ b/src/main/claude/claude-transcript-item-reader.ts @@ -1,11 +1,11 @@ import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalRenderItem, - type AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' + type AgentJournalRenderItem +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { HISTORY_CATCH_UP_MAX_OPERATIONS } from '../native-chat/agent-session-wire/structured-agent-session-history-catch-up' import type { StructuredAgentSessionTransitionJournal } from '../native-chat/agent-session-wire/structured-agent-session-transition' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { claudePromptUuidForSubmission } from './structured/claude-structured-session-id' /** Every saved item used by the projection is a conditional commit dependency, even if equal. */ diff --git a/src/main/claude/claude-turn-lifecycle-item.ts b/src/main/claude/claude-turn-lifecycle-item.ts index e930a8a1026..a33058eded5 100644 --- a/src/main/claude/claude-turn-lifecycle-item.ts +++ b/src/main/claude/claude-turn-lifecycle-item.ts @@ -1,9 +1,7 @@ -import type { - AgentJournalItemIdentity, - AgentJournalTurnItem, - AgentJournalTurnOutcome -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../shared/agent-turn-outcome' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionAppendOptions } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { claudeResultOutcome } from './claude-result-outcome' diff --git a/src/main/claude/claude-turn-opening.ts b/src/main/claude/claude-turn-opening.ts index e09f282e003..63b9b216d67 100644 --- a/src/main/claude/claude-turn-opening.ts +++ b/src/main/claude/claude-turn-opening.ts @@ -4,7 +4,7 @@ import { claudeText, type ClaudeMessageEnvelope } from './claude-structured-item-translation' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { ClaudeStartedSend } from './structured/claude-structured-session-state' import { claudeProviderResumedTurnTimingAnchor, diff --git a/src/main/claude/claude-turn-outcome.test.ts b/src/main/claude/claude-turn-outcome.test.ts index 967f9aa6761..1d5753850c9 100644 --- a/src/main/claude/claude-turn-outcome.test.ts +++ b/src/main/claude/claude-turn-outcome.test.ts @@ -1,10 +1,10 @@ import { describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn, readAgentJournalTurnOutcome diff --git a/src/main/claude/claude-turn-ownership.test.ts b/src/main/claude/claude-turn-ownership.test.ts index 47df1796846..e4e62689fdd 100644 --- a/src/main/claude/claude-turn-ownership.test.ts +++ b/src/main/claude/claude-turn-ownership.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { cancelClaudeStructuredTurn } from './claude-structured-prompt-ownership' import { sessionFor } from './claude-structured-dispatch-test-support' import { diff --git a/src/main/claude/claude-turn-resumption.test.ts b/src/main/claude/claude-turn-resumption.test.ts index 2106015f2a3..c980cfab9ba 100644 --- a/src/main/claude/claude-turn-resumption.test.ts +++ b/src/main/claude/claude-turn-resumption.test.ts @@ -3,17 +3,17 @@ import { describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { legacyAgentJournalTurnStatusBody, readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { selectStructuredAgentSettledTurns } from '../../shared/structured-agent-session-turn-timing' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import { - hasUnansweredStructuredAgentSessionDispatch, projectStructuredAgentSessionStatus, projectStructuredAgentSessionStatusSummary } from '../../shared/structured-agent-session-projection' diff --git a/src/main/claude/claude-usage-limits.test.ts b/src/main/claude/claude-usage-limits.test.ts index 9d3140227cf..15919ebd10b 100644 --- a/src/main/claude/claude-usage-limits.test.ts +++ b/src/main/claude/claude-usage-limits.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' import { latestNativeChatUsageLimitCut } from '../../shared/native-chat/native-chat-usage-limit-cut' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { adapterFor, fakeClaude, diff --git a/src/main/claude/structured/claude-structured-owner-identity.ts b/src/main/claude/structured/claude-structured-owner-identity.ts index c9974fc6341..b98043bd726 100644 --- a/src/main/claude/structured/claude-structured-owner-identity.ts +++ b/src/main/claude/structured/claude-structured-owner-identity.ts @@ -1,4 +1,4 @@ -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session-provider-handle' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { AgentSessionProcessIdentity } from '../../../shared/agent-session-record' diff --git a/src/main/claude/structured/claude-structured-session-acquisition-processless.test.ts b/src/main/claude/structured/claude-structured-session-acquisition-processless.test.ts index 2c938b73ec9..297682a12e1 100644 --- a/src/main/claude/structured/claude-structured-session-acquisition-processless.test.ts +++ b/src/main/claude/structured/claude-structured-session-acquisition-processless.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { AgentSessionPreSpawnError } from '../../native-chat/agent-session-wire/structured-agent-session-adapter-errors' import type { ClaudeStreamJsonConnection, diff --git a/src/main/claude/structured/claude-structured-session-state.ts b/src/main/claude/structured/claude-structured-session-state.ts index c0a6a367183..9a03234c5bd 100644 --- a/src/main/claude/structured/claude-structured-session-state.ts +++ b/src/main/claude/structured/claude-structured-session-state.ts @@ -3,7 +3,7 @@ import type { ClaudeCliFlagCheck, ClaudeCliFlagFact } from '../claude-cli-flag-s import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/structured-agent-session-logger' import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words' import type { SubmissionRejectionFact } from '../../../shared/agent-session-failure' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../../native-chat/agent-session-wire/structured-agent-session-event-sink' import type * as SessionAdapter from '../../native-chat/agent-session-wire/structured-agent-session-adapter' import type { diff --git a/src/main/codex/codex-background-command-tracker.test.ts b/src/main/codex/codex-background-command-tracker.test.ts index ade16f23705..b4453e58250 100644 --- a/src/main/codex/codex-background-command-tracker.test.ts +++ b/src/main/codex/codex-background-command-tracker.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { CodexBackgroundCommandTracker } from './codex-background-command-tracker' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import type { CodexStructuredSessionEvent } from './codex-structured-session-state' diff --git a/src/main/codex/codex-child-work-translation-retention.test.ts b/src/main/codex/codex-child-work-translation-retention.test.ts index b895cd5bde0..747ad0d8215 100644 --- a/src/main/codex/codex-child-work-translation-retention.test.ts +++ b/src/main/codex/codex-child-work-translation-retention.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence' import { CodexBackgroundTaskTracker } from './codex-background-task-tracker' import { diff --git a/src/main/codex/codex-close-turn-end.test.ts b/src/main/codex/codex-close-turn-end.test.ts index 18381e7a1aa..4edb4b4922b 100644 --- a/src/main/codex/codex-close-turn-end.test.ts +++ b/src/main/codex/codex-close-turn-end.test.ts @@ -1,6 +1,6 @@ import { createCodexTurnOpenWaits } from './codex-structured-turn-open-wait' import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexBackgroundTaskTracker } from './codex-background-task-tracker' import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo' diff --git a/src/main/codex/codex-collab-agent-item-translation.ts b/src/main/codex/codex-collab-agent-item-translation.ts index e360d19c6e4..8ea11881d4f 100644 --- a/src/main/codex/codex-collab-agent-item-translation.ts +++ b/src/main/codex/codex-collab-agent-item-translation.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { CODEX_COLLAB_ROW_AGENTS_KEY } from '../../shared/codex-collab-agent-tools' import { journalPayload } from '../native-chat/agent-session-journal/journal-payload-bounds' import { diff --git a/src/main/codex/codex-collab-call-frames-fixture.ts b/src/main/codex/codex-collab-call-frames-fixture.ts index dba195e639d..b4f5569272b 100644 --- a/src/main/codex/codex-collab-call-frames-fixture.ts +++ b/src/main/codex/codex-collab-call-frames-fixture.ts @@ -5,7 +5,7 @@ import { THREAD_ID } from './codex-structured-session-adapter-fixture' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter' diff --git a/src/main/codex/codex-collab-call-rows-on-positional-clients.test.ts b/src/main/codex/codex-collab-call-rows-on-positional-clients.test.ts index 43877e4ce13..c6c782b24b1 100644 --- a/src/main/codex/codex-collab-call-rows-on-positional-clients.test.ts +++ b/src/main/codex/codex-collab-call-rows-on-positional-clients.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { pairToolBlocks } from '../../shared/native-chat/tools/native-chat-tool-pairs' import { pairNativeChatToolResults } from '../../shared/native-chat/tools/native-chat-tool-pairing' import { projectNativeChatTranscript } from '../../shared/native-chat/transcript/native-chat-transcript-projection' diff --git a/src/main/codex/codex-command-turn-claim.test.ts b/src/main/codex/codex-command-turn-claim.test.ts index 83f61a78b1f..4b2b5ac51c4 100644 --- a/src/main/codex/codex-command-turn-claim.test.ts +++ b/src/main/codex/codex-command-turn-claim.test.ts @@ -1,12 +1,10 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity, - AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink, diff --git a/src/main/codex/codex-command-turn-claim.ts b/src/main/codex/codex-command-turn-claim.ts index 9c7fded7fa4..5bf7a687b33 100644 --- a/src/main/codex/codex-command-turn-claim.ts +++ b/src/main/codex/codex-command-turn-claim.ts @@ -1,5 +1,5 @@ -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink, StructuredAgentSessionSinkAdmission diff --git a/src/main/codex/codex-context-usage.ts b/src/main/codex/codex-context-usage.ts index 8b40df583da..cc2476e831e 100644 --- a/src/main/codex/codex-context-usage.ts +++ b/src/main/codex/codex-context-usage.ts @@ -1,5 +1,5 @@ import type { AgentSessionContextUsage } from '../../shared/agent-session-context-usage' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { writeAgentJournalTurnRow } from '../native-chat/agent-session-timeline/agent-journal-turn-row-revision' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { readRecord } from './codex-item-field-readers' diff --git a/src/main/codex/codex-default-mode-subagents.test.ts b/src/main/codex/codex-default-mode-subagents.test.ts index 81e15b90bb2..647b0ebb0af 100644 --- a/src/main/codex/codex-default-mode-subagents.test.ts +++ b/src/main/codex/codex-default-mode-subagents.test.ts @@ -6,7 +6,7 @@ import { } from './codex-structured-session-adapter-fixture' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { createAgentChildWorkAdmission } from '../../shared/agent-status-child-work-admission' import type { AgentChildWorkRecord } from '../../shared/agent-status-child-work' import { reconcileAgentChildWorkEvidence } from '../../shared/agent-status-child-work-reconciliation' diff --git a/src/main/codex/codex-deferred-sink-target-test-support.ts b/src/main/codex/codex-deferred-sink-target-test-support.ts index caaca1c991a..a25b864416c 100644 --- a/src/main/codex/codex-deferred-sink-target-test-support.ts +++ b/src/main/codex/codex-deferred-sink-target-test-support.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { JournalLifecycleMutationInput } from '../native-chat/agent-session-journal/journal-row-builders' import type { StructuredAgentSessionEventTarget } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { withJournalQueueMembers } from '../native-chat/agent-session-wire/structured-agent-session-journal-double-test-support' diff --git a/src/main/codex/codex-goal-journal-identity.ts b/src/main/codex/codex-goal-journal-identity.ts index abb81c3c052..9915bd289b5 100644 --- a/src/main/codex/codex-goal-journal-identity.ts +++ b/src/main/codex/codex-goal-journal-identity.ts @@ -1,6 +1,6 @@ import { createHash } from 'node:crypto' -import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' export type CodexGoalJournalState = { thread: string diff --git a/src/main/codex/codex-goal-journal-rows.ts b/src/main/codex/codex-goal-journal-rows.ts index 068dcf79b76..c6430bac9d0 100644 --- a/src/main/codex/codex-goal-journal-rows.ts +++ b/src/main/codex/codex-goal-journal-rows.ts @@ -3,7 +3,7 @@ import type { AgentJournalThreadGoal, AgentJournalThreadGoalState -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { isAgentJournalThreadGoalStatus } from '../../shared/agent-session/agent-session-thread-goal' const GOAL_UPDATED_METHOD = 'thread/goal/updated' diff --git a/src/main/codex/codex-history-import-plan.ts b/src/main/codex/codex-history-import-plan.ts index 85ab4adcc1a..233ce668ca2 100644 --- a/src/main/codex/codex-history-import-plan.ts +++ b/src/main/codex/codex-history-import-plan.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { codexItemIdentity, CodexTurnOrdinals, @@ -7,11 +7,9 @@ import { import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { journalLifecycleItemMutation } from '../native-chat/agent-session-journal/journal-row-builders' import type { StructuredAgentSessionEventSink, diff --git a/src/main/codex/codex-history-journal-view.ts b/src/main/codex/codex-history-journal-view.ts index 88e902d87c9..c51d1439de4 100644 --- a/src/main/codex/codex-history-journal-view.ts +++ b/src/main/codex/codex-history-journal-view.ts @@ -2,14 +2,14 @@ import { usableJournalHistoryOrigin } from '../native-chat/agent-session-journal import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../shared/agent-session-journal-item-key' -import type { AgentJournalPosition } from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalPosition } from '../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalItemPosition, compareAgentJournalPositions -} from '../../shared/agent-session-journal-position' +} from '../../shared/agent-session/journal/agent-session-journal-position' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import { isRootAgentJournalItem } from '../../shared/agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../shared/agent-session/journal/agent-session-journal-producer' import type { StructuredAgentSessionHistoryJournal } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' const TURN_LIFECYCLE_RECORD_PREFIX = 'turn-lifecycle:' diff --git a/src/main/codex/codex-image-item-translation.ts b/src/main/codex/codex-image-item-translation.ts index 9cdd999b61d..946b0c30ad8 100644 --- a/src/main/codex/codex-image-item-translation.ts +++ b/src/main/codex/codex-image-item-translation.ts @@ -1,4 +1,4 @@ -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 { buildImageDataUri } from '../../shared/image-data-uri' import { readString } from './codex-item-field-readers' diff --git a/src/main/codex/codex-journal-command-turn.ts b/src/main/codex/codex-journal-command-turn.ts index 88253c625bb..3be92da63a5 100644 --- a/src/main/codex/codex-journal-command-turn.ts +++ b/src/main/codex/codex-journal-command-turn.ts @@ -1,10 +1,8 @@ // Command-carrying provider turns share the command's journal turn instead of creating a second one. -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../shared/agent-session-turn-record' import { providerDiagnostic } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' diff --git a/src/main/codex/codex-journal-turn-scopes.ts b/src/main/codex/codex-journal-turn-scopes.ts index 2bbdaf9bbac..0fb32bdc460 100644 --- a/src/main/codex/codex-journal-turn-scopes.ts +++ b/src/main/codex/codex-journal-turn-scopes.ts @@ -1,10 +1,8 @@ // Child rows follow the active primary turn; their own turns are not drawn in the timeline. -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalTurnScope -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../shared/agent-session-journal-turn-scope' import { codexTurnLifecycleIdentity } from './codex-structured-journal-translation-turns' export class CodexJournalTurnScopes { diff --git a/src/main/codex/codex-notice-item-translation.test.ts b/src/main/codex/codex-notice-item-translation.test.ts index 14a87cb8cc5..66bbd8a7831 100644 --- a/src/main/codex/codex-notice-item-translation.test.ts +++ b/src/main/codex/codex-notice-item-translation.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import { codexItemBody, codexStreamingJournalItem } from './codex-structured-item-translation' -import { AgentJournalItemBodySchema } from '../../shared/agent-session-journal-schemas' +import { AgentJournalItemBodySchema } from '../../shared/agent-session/journal/agent-session-journal-schemas' import { projectStructuredItemsToNativeChat } from '../../shared/structured-agent-session-projection' describe('plan document translation', () => { diff --git a/src/main/codex/codex-persistent-command-retention.test.ts b/src/main/codex/codex-persistent-command-retention.test.ts index 22396998943..5da18b49f6e 100644 --- a/src/main/codex/codex-persistent-command-retention.test.ts +++ b/src/main/codex/codex-persistent-command-retention.test.ts @@ -1,7 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { CodexBackgroundCommandTracker } from './codex-background-command-tracker' import { CodexJournalItems } from './codex-structured-journal-items' import { settleCodexJournalTurn } from './codex-structured-journal-settlement' diff --git a/src/main/codex/codex-provider-retry-row.test.ts b/src/main/codex/codex-provider-retry-row.test.ts index 8974b15867d..fa83aea65d2 100644 --- a/src/main/codex/codex-provider-retry-row.test.ts +++ b/src/main/codex/codex-provider-retry-row.test.ts @@ -7,11 +7,9 @@ import { import { readFileSync } from 'node:fs' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import type { CodexStructuredSessionEvent } from './codex-structured-session-state' diff --git a/src/main/codex/codex-provider-retry-row.ts b/src/main/codex/codex-provider-retry-row.ts index 07733585d05..7645de2a486 100644 --- a/src/main/codex/codex-provider-retry-row.ts +++ b/src/main/codex/codex-provider-retry-row.ts @@ -6,7 +6,7 @@ import { readProviderRetry } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' -import type { AgentJournalStatusItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { TUI_AGENT_DISPLAY_NAMES } from '../../shared/tui-agent-display-names' import { boundPayload, diff --git a/src/main/codex/codex-structured-acquisition-exit-proof.test.ts b/src/main/codex/codex-structured-acquisition-exit-proof.test.ts index 29517f46856..e8f58c844b2 100644 --- a/src/main/codex/codex-structured-acquisition-exit-proof.test.ts +++ b/src/main/codex/codex-structured-acquisition-exit-proof.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { CodexAppServerConnection } from './app-server/codex-app-server-connection-types' import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter' import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding' diff --git a/src/main/codex/codex-structured-async-question.test.ts b/src/main/codex/codex-structured-async-question.test.ts index 535adeefa9f..3c380b71e5d 100644 --- a/src/main/codex/codex-structured-async-question.test.ts +++ b/src/main/codex/codex-structured-async-question.test.ts @@ -4,7 +4,7 @@ import { scanPendingAsks, asyncQuestionOccurrenceId } from '../../shared/native-chat/input/native-chat-ask' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { NativeChatMessage } from '../../shared/native-chat/native-chat-types' import { codexItemBody, diff --git a/src/main/codex/codex-structured-child-environment.test.ts b/src/main/codex/codex-structured-child-environment.test.ts index 26c8b31f7a0..c13e26b1aee 100644 --- a/src/main/codex/codex-structured-child-environment.test.ts +++ b/src/main/codex/codex-structured-child-environment.test.ts @@ -7,7 +7,7 @@ import { ORCA_AGENT_SESSION_SPAWN_TOKEN_ENV } from '../../shared/agent-session-c import { sealStructuredSessionChild } from '../runtime/structured-session-child-env' import { createCodexStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support' import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { mintStructuredWorkerHandle, mintStructuredWorkerPaneKey, diff --git a/src/main/codex/codex-structured-child-work-producer.test.ts b/src/main/codex/codex-structured-child-work-producer.test.ts index c410a8b38c5..c2f13821db0 100644 --- a/src/main/codex/codex-structured-child-work-producer.test.ts +++ b/src/main/codex/codex-structured-child-work-producer.test.ts @@ -21,11 +21,11 @@ import { } from '../../shared/agent-status-child-work-display' import { projectAgentChildWorkViews } from '../../shared/agent-status-child-work-view' import { createAgentStatusStore } from '../../shared/agent-status-store' -import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer' +import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' import type { AgentJournalItemBody, AgentJournalProducerLinkage -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { makeStructuredAgentStatusSubject } from '../../shared/agent-status-subject' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter' diff --git a/src/main/codex/codex-structured-dispatch-admission.test.ts b/src/main/codex/codex-structured-dispatch-admission.test.ts index dd13ef0c290..83660528d7c 100644 --- a/src/main/codex/codex-structured-dispatch-admission.test.ts +++ b/src/main/codex/codex-structured-dispatch-admission.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { MAX_CODEX_PENDING_DISPATCH_ECHOES } from './codex-structured-dispatch-echo' import { diff --git a/src/main/codex/codex-structured-dispatch-echo.test.ts b/src/main/codex/codex-structured-dispatch-echo.test.ts index 9295612b5ae..975372d4576 100644 --- a/src/main/codex/codex-structured-dispatch-echo.test.ts +++ b/src/main/codex/codex-structured-dispatch-echo.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { createCodexDispatchEchoes, readCodexDispatchEcho } from './codex-structured-dispatch-echo' const CODEX_IDENTITY: AgentJournalItemIdentity = { diff --git a/src/main/codex/codex-structured-dispatch-echo.ts b/src/main/codex/codex-structured-dispatch-echo.ts index 3a084eb575a..83306ae972e 100644 --- a/src/main/codex/codex-structured-dispatch-echo.ts +++ b/src/main/codex/codex-structured-dispatch-echo.ts @@ -1,8 +1,6 @@ import type { ProviderDiagnostic } from '../../shared/agent-session-failure' -import type { - AgentJournalItemIdentity, - AgentJournalTurnJoin -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnJoin } from '../../shared/agent-session/journal/agent-session-journal-types' export const MAX_CODEX_PENDING_DISPATCH_ECHOES = 256 // Retain turn outcomes for late answers and turns left unopened by a wait. diff --git a/src/main/codex/codex-structured-dispatch-test-support.ts b/src/main/codex/codex-structured-dispatch-test-support.ts index 49c506458c4..e667e0b153f 100644 --- a/src/main/codex/codex-structured-dispatch-test-support.ts +++ b/src/main/codex/codex-structured-dispatch-test-support.ts @@ -1,10 +1,8 @@ import { acquireReadyCodexForTest } from './codex-structured-session-adapter-fixture' import { expect, vi } from 'vitest' import type { AgentChatPermissionChoice } from '../../shared/agent-chat-permission-mode' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { CodexAppServerConnection, CodexAppServerConnectionHandlers diff --git a/src/main/codex/codex-structured-item-stream-bounds.ts b/src/main/codex/codex-structured-item-stream-bounds.ts index 856deb5ee8b..c352027591f 100644 --- a/src/main/codex/codex-structured-item-stream-bounds.ts +++ b/src/main/codex/codex-structured-item-stream-bounds.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { toolExecutionMetadata } from '../../shared/native-chat/tools/native-chat-tool-identity' import type { CodexItemStreamState } from './codex-structured-item-stream-contracts' import type { CodexThreadItem } from './codex-thread-item-identity' diff --git a/src/main/codex/codex-structured-item-stream-contracts.ts b/src/main/codex/codex-structured-item-stream-contracts.ts index 463267aa7ea..f9e98234f46 100644 --- a/src/main/codex/codex-structured-item-stream-contracts.ts +++ b/src/main/codex/codex-structured-item-stream-contracts.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionDeltaCoalescerDeps } from '../native-chat/agent-session-wire/agent-session-delta-coalescer' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import type { codexJournalItem, CodexThreadItem } from './codex-structured-item-translation' diff --git a/src/main/codex/codex-structured-item-streams.ts b/src/main/codex/codex-structured-item-streams.ts index 0b367cf8dda..9fe20d407e9 100644 --- a/src/main/codex/codex-structured-item-streams.ts +++ b/src/main/codex/codex-structured-item-streams.ts @@ -1,7 +1,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRowAttribution -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { createAgentSessionDeltaCoalescer } from '../native-chat/agent-session-wire/agent-session-delta-coalescer' import { CodexItemStreamRetention } from './codex-item-stream-retention' import { appendCodexItemAndPublish } from './codex-structured-journal-sink' diff --git a/src/main/codex/codex-structured-item-translation.test.ts b/src/main/codex/codex-structured-item-translation.test.ts index dca79ccb5b7..6774b2859e2 100644 --- a/src/main/codex/codex-structured-item-translation.test.ts +++ b/src/main/codex/codex-structured-item-translation.test.ts @@ -1,5 +1,5 @@ import { 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 { briefToolArg, createToolInputDisplay, diff --git a/src/main/codex/codex-structured-item-translation.ts b/src/main/codex/codex-structured-item-translation.ts index 5aa1fee7c3e..4a5e9e8bd7a 100644 --- a/src/main/codex/codex-structured-item-translation.ts +++ b/src/main/codex/codex-structured-item-translation.ts @@ -2,7 +2,7 @@ import { toolExecutionMetadata, toolWebSearchResults } from '../../shared/native-chat/tools/native-chat-tool-identity' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatBlock } from '../../shared/native-chat/native-chat-types' import { CODEX_ASYNC_QUESTION_TOOL } from '../../shared/codex-async-question-input' import { journalPayload } from '../native-chat/agent-session-journal/journal-payload-bounds' diff --git a/src/main/codex/codex-structured-journal-compactions.test.ts b/src/main/codex/codex-structured-journal-compactions.test.ts index 4da87a0c75f..2c54f54ba99 100644 --- a/src/main/codex/codex-structured-journal-compactions.test.ts +++ b/src/main/codex/codex-structured-journal-compactions.test.ts @@ -1,7 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { projectStructuredItemsToNativeChat } from '../../shared/structured-agent-session-projection' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { diff --git a/src/main/codex/codex-structured-journal-context-usage.test.ts b/src/main/codex/codex-structured-journal-context-usage.test.ts index a11b673815a..381a8ca2096 100644 --- a/src/main/codex/codex-structured-journal-context-usage.test.ts +++ b/src/main/codex/codex-structured-journal-context-usage.test.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { selectStructuredAgentContextUsage } from '../../shared/structured-agent-session-context-usage' diff --git a/src/main/codex/codex-structured-journal-contracts.ts b/src/main/codex/codex-structured-journal-contracts.ts index a21b9c5d3f1..f50f52e64d0 100644 --- a/src/main/codex/codex-structured-journal-contracts.ts +++ b/src/main/codex/codex-structured-journal-contracts.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionAccountKind } from '../../shared/agent-session-availability' import type { CodexDispatchEchoes, diff --git a/src/main/codex/codex-structured-journal-exit-convergence.test.ts b/src/main/codex/codex-structured-journal-exit-convergence.test.ts index 51b1e129138..455d141b72d 100644 --- a/src/main/codex/codex-structured-journal-exit-convergence.test.ts +++ b/src/main/codex/codex-structured-journal-exit-convergence.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { AgentSessionRecord } from '../../shared/agent-session-record' diff --git a/src/main/codex/codex-structured-journal-generic-frames.ts b/src/main/codex/codex-structured-journal-generic-frames.ts index 684c1b4458c..81594977053 100644 --- a/src/main/codex/codex-structured-journal-generic-frames.ts +++ b/src/main/codex/codex-structured-journal-generic-frames.ts @@ -1,4 +1,4 @@ -import type { AgentJournalStatusItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { unhandledProviderFrameJournalItem, type UnhandledProviderFrameJournalItem @@ -17,7 +17,7 @@ import { MAX_CODEX_WORDLESS_ROWS_PER_TURN } from './codex-structured-journal-limits' import { readCodexTurnId, readCodexErrorWillRetry } from './codex-structured-thread-facts' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { CODEX_PLAN_UPDATED_FRAME_KIND, isWordlessProviderFrame diff --git a/src/main/codex/codex-structured-journal-goal-admission.test.ts b/src/main/codex/codex-structured-journal-goal-admission.test.ts index f2a3a9b166c..719c7c6e01a 100644 --- a/src/main/codex/codex-structured-journal-goal-admission.test.ts +++ b/src/main/codex/codex-structured-journal-goal-admission.test.ts @@ -1,10 +1,8 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexJournalGoals } from './codex-structured-journal-goals' import { diff --git a/src/main/codex/codex-structured-journal-goal-resume.test.ts b/src/main/codex/codex-structured-journal-goal-resume.test.ts index cf3d45266d3..de7ffeb20fd 100644 --- a/src/main/codex/codex-structured-journal-goal-resume.test.ts +++ b/src/main/codex/codex-structured-journal-goal-resume.test.ts @@ -1,11 +1,11 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { 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 type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { createDeferredStructuredAgentSessionEventSink, type StructuredAgentSessionEventTarget diff --git a/src/main/codex/codex-structured-journal-goal-revision.test.ts b/src/main/codex/codex-structured-journal-goal-revision.test.ts index 59b7d25624d..3567f44a6d7 100644 --- a/src/main/codex/codex-structured-journal-goal-revision.test.ts +++ b/src/main/codex/codex-structured-journal-goal-revision.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { readFileSync } from 'node:fs' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' @@ -7,7 +7,7 @@ import { afterEach, describe, expect, it } from 'vitest' import type { AgentJournalCursor, AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session-journal-identity' import { currentAgentSessionThreadGoal } from '../../shared/agent-session/agent-session-thread-goal' import type { AgentSessionHistoryPage } from '../../shared/agent-session-wire' import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store' diff --git a/src/main/codex/codex-structured-journal-goal-rows.test.ts b/src/main/codex/codex-structured-journal-goal-rows.test.ts index 815991f40ba..74301dd9d2d 100644 --- a/src/main/codex/codex-structured-journal-goal-rows.test.ts +++ b/src/main/codex/codex-structured-journal-goal-rows.test.ts @@ -1,6 +1,6 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexJournalGenericFrames } from './codex-structured-journal-generic-frames' import { CodexJournalGoals } from './codex-structured-journal-goals' diff --git a/src/main/codex/codex-structured-journal-goals.ts b/src/main/codex/codex-structured-journal-goals.ts index 3d2e70ed2f3..9578d1fdc57 100644 --- a/src/main/codex/codex-structured-journal-goals.ts +++ b/src/main/codex/codex-structured-journal-goals.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { unhandledProviderFrameJournalItem } from '../native-chat/agent-session-wire/unhandled-provider-frame' import type { StructuredAgentSessionEventSink, diff --git a/src/main/codex/codex-structured-journal-items.ts b/src/main/codex/codex-structured-journal-items.ts index d0fd9889951..f623b5675fd 100644 --- a/src/main/codex/codex-structured-journal-items.ts +++ b/src/main/codex/codex-structured-journal-items.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemIdentity, - AgentJournalRowAttribution -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalRowAttribution } from '../../shared/agent-session/journal/agent-session-journal-types' import { requiresTerminalSettlement } from '../native-chat/agent-session-journal/journal-terminal-settlement' import { codexItemIdentity, diff --git a/src/main/codex/codex-structured-journal-prompts.ts b/src/main/codex/codex-structured-journal-prompts.ts index c677fbf48f2..d4978fac436 100644 --- a/src/main/codex/codex-structured-journal-prompts.ts +++ b/src/main/codex/codex-structured-journal-prompts.ts @@ -1,4 +1,4 @@ -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { cancelledJournalPromptBody } from '../native-chat/agent-session-journal/journal-prompt-body-bounds' import { codexApprovalItem, diff --git a/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts b/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts index 4f7373783ac..4b3b76bd91e 100644 --- a/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts +++ b/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { nativeChatTurnFold } from '../../shared/native-chat/transcript/native-chat-turn-fold' import { nativeChatTurnMembership } from '../../shared/native-chat/transcript/native-chat-turn-membership' import type { NativeChatMessage } from '../../shared/native-chat/native-chat-types' diff --git a/src/main/codex/codex-structured-journal-settlement.ts b/src/main/codex/codex-structured-journal-settlement.ts index 9eeb711d5c9..27e48e63fb9 100644 --- a/src/main/codex/codex-structured-journal-settlement.ts +++ b/src/main/codex/codex-structured-journal-settlement.ts @@ -1,10 +1,10 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, - type AgentJournalItemIdentity, type AgentJournalTurnLifecycle, type AgentJournalTurnLifecycleState -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { journalLifecycleItemMutation, type JournalLifecycleIdentityMutationInput diff --git a/src/main/codex/codex-structured-journal-sink.ts b/src/main/codex/codex-structured-journal-sink.ts index 78582df8a15..d56d84712db 100644 --- a/src/main/codex/codex-structured-journal-sink.ts +++ b/src/main/codex/codex-structured-journal-sink.ts @@ -1,8 +1,8 @@ import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRowAttribution -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { StructuredAgentSessionItemAppendOptions, StructuredAgentSessionEventSink, diff --git a/src/main/codex/codex-structured-journal-subagent-readers.test.ts b/src/main/codex/codex-structured-journal-subagent-readers.test.ts index 026a3f0cbcc..97d0995d4d7 100644 --- a/src/main/codex/codex-structured-journal-subagent-readers.test.ts +++ b/src/main/codex/codex-structured-journal-subagent-readers.test.ts @@ -2,10 +2,10 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionTurnActivity } from '../../shared/agent-session-wire' import { selectStructuredAgentTurnActivity } from '../../shared/native-chat/transcript/native-chat-turn-activity' -import { latestStructuredAgentSessionAssistantMessage } from '../../shared/structured-agent-session-latest-request' +import { latestStructuredAgentSessionAssistantMessage } from '../../shared/agent-session/requests/structured-agent-session-latest-request' import { isStructuredAgentSessionThinking, statusStructuredAgentSessionToolCall diff --git a/src/main/codex/codex-structured-journal-translation-restore.ts b/src/main/codex/codex-structured-journal-translation-restore.ts index 29635f01a6a..48b81982b7f 100644 --- a/src/main/codex/codex-structured-journal-translation-restore.ts +++ b/src/main/codex/codex-structured-journal-translation-restore.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnLifecycle } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnLifecycle } from '../../shared/agent-session/journal/agent-session-journal-types' import { readCodexThreadItem, type CodexTurnOrdinals } from './codex-structured-item-translation' import type { CodexJournalCompactions } from './codex-structured-journal-compactions' import type { CodexJournalItems } from './codex-structured-journal-items' diff --git a/src/main/codex/codex-structured-journal-translation-settlement.test.ts b/src/main/codex/codex-structured-journal-translation-settlement.test.ts index 323d4b6a8b5..1c9533526bb 100644 --- a/src/main/codex/codex-structured-journal-translation-settlement.test.ts +++ b/src/main/codex/codex-structured-journal-translation-settlement.test.ts @@ -1,9 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { createJournalReducerState } from '../native-chat/agent-session-journal/journal-reducer' import { JournalLifecycleBatchAppender } from '../native-chat/agent-session-journal/journal-lifecycle-batch-appender' import type { JournalLifecycleMutationInput } from '../native-chat/agent-session-journal/journal-row-builders' diff --git a/src/main/codex/codex-structured-journal-translation-streams.test.ts b/src/main/codex/codex-structured-journal-translation-streams.test.ts index ebf97f61eb1..e992b8958f5 100644 --- a/src/main/codex/codex-structured-journal-translation-streams.test.ts +++ b/src/main/codex/codex-structured-journal-translation-streams.test.ts @@ -1,9 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { normalizeNativeChatTaskList } from '../../shared/native-chat/input/native-chat-task-list' import { projectStructuredItemsToNativeChat } from '../../shared/structured-agent-session-projection' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' diff --git a/src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts b/src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts index 63d2ca4a47e..b40e4546095 100644 --- a/src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts +++ b/src/main/codex/codex-structured-journal-translation-subagent-linkage.test.ts @@ -1,10 +1,10 @@ import { 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 type { AgentJournalItemBody, AgentJournalProducerLinkage -} from '../../shared/agent-session-journal-types' -import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import type { CodexThreadItem } from './codex-thread-item-identity' diff --git a/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts b/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts index 0b02d9836bb..fc3a4d59a1c 100644 --- a/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts +++ b/src/main/codex/codex-structured-journal-translation-turn-boundaries.ts @@ -1,11 +1,9 @@ -import type { - AgentJournalTurnLifecycle, - AgentJournalTurnOutcome -} from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnLifecycle } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../shared/agent-turn-outcome' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CODEX_JOURNAL_ADMITTED, diff --git a/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts b/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts index 0accd656a4a..6114f300a7c 100644 --- a/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts +++ b/src/main/codex/codex-structured-journal-translation-turn-settles-once.test.ts @@ -1,12 +1,10 @@ import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../shared/agent-session-journal-item-key' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import type { CodexStructuredSessionEvent } from './codex-structured-session-state' diff --git a/src/main/codex/codex-structured-journal-translation-turn-state.ts b/src/main/codex/codex-structured-journal-translation-turn-state.ts index 6abd7ae7554..e753cf59ebd 100644 --- a/src/main/codex/codex-structured-journal-translation-turn-state.ts +++ b/src/main/codex/codex-structured-journal-translation-turn-state.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnLifecycle } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnLifecycle } from '../../shared/agent-session/journal/agent-session-journal-types' import type { CodexDispatchRequestOrigin } from './codex-structured-dispatch-echo' export const MAX_CODEX_RECENT_TURNS = 256 diff --git a/src/main/codex/codex-structured-journal-translation-turns.ts b/src/main/codex/codex-structured-journal-translation-turns.ts index 941d2f810c2..539f308e1a5 100644 --- a/src/main/codex/codex-structured-journal-translation-turns.ts +++ b/src/main/codex/codex-structured-journal-translation-turns.ts @@ -1,12 +1,12 @@ import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalTurnItem, type AgentJournalTurnLifecycle, - type AgentJournalTurnLifecycleState, - type AgentJournalTurnOutcome -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' + type AgentJournalTurnLifecycleState +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import type { AgentJournalTurnOutcome } from '../../shared/agent-turn-outcome' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../shared/agent-session-turn-record' import { CODEX_USER_MESSAGE_ORDINAL } from './codex-turn-ordinals' import { resolveAgentJournalTurnRowWrite } from '../native-chat/agent-session-timeline/agent-journal-turn-row-revision' diff --git a/src/main/codex/codex-structured-journal-translation.test.ts b/src/main/codex/codex-structured-journal-translation.test.ts index 7a31bbee446..4606a08eb26 100644 --- a/src/main/codex/codex-structured-journal-translation.test.ts +++ b/src/main/codex/codex-structured-journal-translation.test.ts @@ -1,9 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { projectStructuredAgentSessionStatus } from '../../shared/structured-agent-session-projection' import { createDeferredStructuredAgentSessionEventSink, diff --git a/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts b/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts index 7bbf6e99778..0a4e67f28af 100644 --- a/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts +++ b/src/main/codex/codex-structured-journal-turn-endings-replay.test.ts @@ -1,11 +1,9 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import { diff --git a/src/main/codex/codex-structured-message-options.ts b/src/main/codex/codex-structured-message-options.ts index c55f1dee632..9e601de0447 100644 --- a/src/main/codex/codex-structured-message-options.ts +++ b/src/main/codex/codex-structured-message-options.ts @@ -1,5 +1,5 @@ -import { pickedSkillsInText } from '../../shared/structured-agent-session-send-mutation' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import { pickedSkillsInText } from '../../shared/agent-session/requests/structured-agent-session-send-mutation' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatBlock } from '../../shared/native-chat/native-chat-types' import type { CodexTurnHost } from './codex-structured-turn-start' import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' diff --git a/src/main/codex/codex-structured-owner-identity.ts b/src/main/codex/codex-structured-owner-identity.ts index 5d1ef44603c..7203844113b 100644 --- a/src/main/codex/codex-structured-owner-identity.ts +++ b/src/main/codex/codex-structured-owner-identity.ts @@ -1,4 +1,4 @@ -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { agentSessionProviderHandleKey, type AgentSessionProviderHandleLink diff --git a/src/main/codex/codex-structured-prompt-items.ts b/src/main/codex/codex-structured-prompt-items.ts index 39a2c79d809..39217628d5b 100644 --- a/src/main/codex/codex-structured-prompt-items.ts +++ b/src/main/codex/codex-structured-prompt-items.ts @@ -1,9 +1,9 @@ import type { AgentJournalApprovalItem, - AgentJournalItemIdentity, AgentJournalPromptOption, AgentJournalQuestionItem -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { boundInlineText } from '../native-chat/agent-session-journal/journal-payload-bounds' import { boundJournalPromptText } from '../native-chat/agent-session-journal/journal-prompt-body-bounds' import { diff --git a/src/main/codex/codex-structured-prompt-ownership.test.ts b/src/main/codex/codex-structured-prompt-ownership.test.ts index 5fb2d148879..3ef7fd6a034 100644 --- a/src/main/codex/codex-structured-prompt-ownership.test.ts +++ b/src/main/codex/codex-structured-prompt-ownership.test.ts @@ -7,12 +7,10 @@ import { identityFor } from './codex-structured-session-adapter-fixture' import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_SESSION_ID_MAX_LENGTH } from '../../shared/agent-session-wire' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexAppServerRequestError } from './app-server/codex-app-server-request-error' diff --git a/src/main/codex/codex-structured-reasoning-lifecycle.test.ts b/src/main/codex/codex-structured-reasoning-lifecycle.test.ts index 526694e1e69..4d4bc38d5dd 100644 --- a/src/main/codex/codex-structured-reasoning-lifecycle.test.ts +++ b/src/main/codex/codex-structured-reasoning-lifecycle.test.ts @@ -1,9 +1,9 @@ import { 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 { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { CodexJournalItems } from './codex-structured-journal-items' import { MAX_CODEX_ACTIVE_ITEMS } from './codex-structured-journal-limits' diff --git a/src/main/codex/codex-structured-session-adapter-fixture.ts b/src/main/codex/codex-structured-session-adapter-fixture.ts index e847f409df9..9e5e3395721 100644 --- a/src/main/codex/codex-structured-session-adapter-fixture.ts +++ b/src/main/codex/codex-structured-session-adapter-fixture.ts @@ -3,10 +3,8 @@ import type { StructuredAgentSessionOptionsReportedEvent } 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' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { CodexAppServerConnection, CodexAppServerConnectionHandlers diff --git a/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts b/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts index eaa677de968..558d212f50c 100644 --- a/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts +++ b/src/main/codex/codex-structured-session-adapter-lifecycle.test.ts @@ -1,10 +1,8 @@ import { acquireReadyCodexForTest } from './codex-structured-session-adapter-fixture' import { describe, expect, it } from 'vitest' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { CodexAppServerConnection, CodexAppServerConnectionHandlers diff --git a/src/main/codex/codex-structured-session-background-tasks.test.ts b/src/main/codex/codex-structured-session-background-tasks.test.ts index 14d13b7fcc0..51c07f06c6d 100644 --- a/src/main/codex/codex-structured-session-background-tasks.test.ts +++ b/src/main/codex/codex-structured-session-background-tasks.test.ts @@ -1,6 +1,6 @@ import { acquireReadyCodexForTest } from './codex-structured-session-adapter-fixture' import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentChildWorkEvidence } from '../../shared/agent-status-child-work-evidence' import type { CodexAppServerConnection, diff --git a/src/main/codex/codex-structured-session-cancel.test.ts b/src/main/codex/codex-structured-session-cancel.test.ts index bf950b35fd4..3a2b31def4b 100644 --- a/src/main/codex/codex-structured-session-cancel.test.ts +++ b/src/main/codex/codex-structured-session-cancel.test.ts @@ -33,10 +33,8 @@ vi.mock('../windows-process-tree-kill', async (importOriginal) => ({ ...(await importOriginal>()), terminateWindowsProcessTree: processWork.terminateWindowsProcessTree })) -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { CodexAppServerRequestError } from './app-server/codex-app-server-request-error' import type { CodexAppServerConnection, diff --git a/src/main/codex/codex-structured-session-shutdown.test.ts b/src/main/codex/codex-structured-session-shutdown.test.ts index ad2a0dcc666..c444192154a 100644 --- a/src/main/codex/codex-structured-session-shutdown.test.ts +++ b/src/main/codex/codex-structured-session-shutdown.test.ts @@ -1,6 +1,6 @@ import { acquireReadyCodexForTest } from './codex-structured-session-adapter-fixture' import { describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { CodexAppServerConnection } from './app-server/codex-app-server-connection-types' import type { openCodexAppServerConnection } from './codex-app-server-connection' import { CodexStructuredSessionAdapter } from './codex-structured-session-adapter' diff --git a/src/main/codex/codex-structured-session-state.ts b/src/main/codex/codex-structured-session-state.ts index 97b5c979f68..1316396d466 100644 --- a/src/main/codex/codex-structured-session-state.ts +++ b/src/main/codex/codex-structured-session-state.ts @@ -4,10 +4,8 @@ import type { StructuredAgentSessionChildWorkProducer } from '../native-chat/age import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger' import type { StructuredAgentSessionAtRestCommands } from '../native-chat/agent-session-wire/structured-agent-session-at-rest-commands' import type { AgentSessionAccountKind } from '../../shared/agent-session-availability' -import type { - AgentJournalAnsweredTurnIdentity, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import type { AgentJournalAnsweredTurnIdentity } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { randomUUID } from 'node:crypto' import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words' import { cancelProcessAcquisition } from '@orca/process-host/cancel-process-acquisition' diff --git a/src/main/codex/codex-structured-sign-in.test.ts b/src/main/codex/codex-structured-sign-in.test.ts index d14ddf3a105..f831e475b1f 100644 --- a/src/main/codex/codex-structured-sign-in.test.ts +++ b/src/main/codex/codex-structured-sign-in.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import { codexAuthenticationFailure } from './codex-authentication-failure' import { codexTurnEndRejection, readCodexTurnEnd } from './codex-structured-turn-end-settlement' diff --git a/src/main/codex/codex-structured-skill-report.test.ts b/src/main/codex/codex-structured-skill-report.test.ts index 18e105171e8..d09fa381466 100644 --- a/src/main/codex/codex-structured-skill-report.test.ts +++ b/src/main/codex/codex-structured-skill-report.test.ts @@ -1,6 +1,6 @@ import { assert, describe, expect, it } from 'vitest' import { acquired, fakeCodex } from './codex-structured-session-adapter-fixture' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { queuedMessageWithEdit, type QueuedMessageEdit } from '../../shared/queued-message-edit' function skill(name: string, path: string, enabled = true) { diff --git a/src/main/codex/codex-structured-thread-catch-up-echo.spec.ts b/src/main/codex/codex-structured-thread-catch-up-echo.spec.ts index 7f68e9bd03d..5212e51da64 100644 --- a/src/main/codex/codex-structured-thread-catch-up-echo.spec.ts +++ b/src/main/codex/codex-structured-thread-catch-up-echo.spec.ts @@ -1,15 +1,15 @@ import { journalItemEchoFields } from '../native-chat/agent-session-journal/journal-item-echo' import { expect, it } from 'vitest' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import type { chat as catchUpChat, turn as catchUpTurn } from './codex-structured-thread-catch-up.test' -import { agentSessionSendBodyFingerprint } from '../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../shared/agent-session/requests/structured-agent-session-send-mutation' import { agentSessionFailureFact } from '../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../shared/agent-session-failure-words' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { structuredRewindCut } from '../native-chat/agent-session-wire/structured-rewind-cut' import { restoreJournal } from '../native-chat/agent-session-journal/journal-open' diff --git a/src/main/codex/codex-structured-turn-end-settlement.test.ts b/src/main/codex/codex-structured-turn-end-settlement.test.ts index 145bd27380d..03eba5aaf44 100644 --- a/src/main/codex/codex-structured-turn-end-settlement.test.ts +++ b/src/main/codex/codex-structured-turn-end-settlement.test.ts @@ -1,10 +1,8 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { classifyDispatchRejection } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo' import { acquiredCodexAdapter, diff --git a/src/main/codex/codex-structured-turn-end-settlement.ts b/src/main/codex/codex-structured-turn-end-settlement.ts index 660bddd933d..f0ec866ff82 100644 --- a/src/main/codex/codex-structured-turn-end-settlement.ts +++ b/src/main/codex/codex-structured-turn-end-settlement.ts @@ -8,7 +8,7 @@ import { agentSessionFailureWords, type AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words' -import type { AgentJournalAnsweredTurnIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalAnsweredTurnIdentity } from '../../shared/agent-session/journal/agent-session-journal-types' import type { CodexTurnEnd } from './codex-structured-dispatch-echo' import { codexTurnLifecycleIdentity } from './codex-structured-journal-translation-turns' import type { CodexSession } from './codex-structured-session-state' diff --git a/src/main/codex/codex-structured-turn-permission.ts b/src/main/codex/codex-structured-turn-permission.ts index 7332c1b609f..7b058be79ae 100644 --- a/src/main/codex/codex-structured-turn-permission.ts +++ b/src/main/codex/codex-structured-turn-permission.ts @@ -1,4 +1,4 @@ -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' import { StructuredAgentSessionInputNotAdmitted, diff --git a/src/main/codex/codex-structured-turn-start.ts b/src/main/codex/codex-structured-turn-start.ts index ce082e5ec80..15d7f666ddb 100644 --- a/src/main/codex/codex-structured-turn-start.ts +++ b/src/main/codex/codex-structured-turn-start.ts @@ -11,7 +11,7 @@ import { agentSessionFailureFact, providerDiagnosticOf } from '../../shared/agen import type { AgentJournalMessageItem, AgentJournalTurnJoin -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter' import { isCodexAppServerRequestError } from './app-server/codex-app-server-request-error' import type { CodexAppServerConnection } from './app-server/codex-app-server-connection-types' diff --git a/src/main/codex/codex-subagent-execution-projection.test.ts b/src/main/codex/codex-subagent-execution-projection.test.ts index 2a3106be2e0..d5e551162e5 100644 --- a/src/main/codex/codex-subagent-execution-projection.test.ts +++ b/src/main/codex/codex-subagent-execution-projection.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import type { CodexStructuredSessionEvent } from './codex-structured-session-state' import { createCodexJournalTranslator } from './codex-structured-journal-translation' import { CodexBackgroundTaskTracker } from './codex-background-task-tracker' diff --git a/src/main/codex/codex-subagent-linkage.ts b/src/main/codex/codex-subagent-linkage.ts index 5824f23c289..df2160243b2 100644 --- a/src/main/codex/codex-subagent-linkage.ts +++ b/src/main/codex/codex-subagent-linkage.ts @@ -3,7 +3,7 @@ import type { AgentJournalProducerLinkage, AgentJournalRowAttribution -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { CodexSubagentExecutions } from './codex-subagent-executions' export type CodexRowAttribution = ( diff --git a/src/main/codex/codex-thread-catch-up-contract-test-fixture.ts b/src/main/codex/codex-thread-catch-up-contract-test-fixture.ts index 15eb1de0a05..b0c3018fc13 100644 --- a/src/main/codex/codex-thread-catch-up-contract-test-fixture.ts +++ b/src/main/codex/codex-thread-catch-up-contract-test-fixture.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { closeTestJournalHostDatabase, diff --git a/src/main/codex/codex-thread-catch-up-rewind.test.ts b/src/main/codex/codex-thread-catch-up-rewind.test.ts index bd145d5a57f..2954fad0bee 100644 --- a/src/main/codex/codex-thread-catch-up-rewind.test.ts +++ b/src/main/codex/codex-thread-catch-up-rewind.test.ts @@ -1,7 +1,7 @@ import { writeFile } from 'node:fs/promises' import { join } from 'node:path' import { 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 { codexProviderHandle } from '../../shared/agent-session-provider-handle-encoding' import { testEventSinkLogging } from '../native-chat/agent-session-wire/structured-agent-session-logger-test-support' import { importLegacyTranscriptIntoJournal } from '../native-chat/agent-session-journal/journal-legacy-import' diff --git a/src/main/codex/codex-thread-item-identity.ts b/src/main/codex/codex-thread-item-identity.ts index dbfa136c502..3a39fe2a4ba 100644 --- a/src/main/codex/codex-thread-item-identity.ts +++ b/src/main/codex/codex-thread-item-identity.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { CodexTurnOrdinals } from './codex-turn-ordinals' // Count only messages: resumed history can omit other items and renumber provider IDs. diff --git a/src/main/codex/codex-turn-lifecycle-contract-test-fixture.ts b/src/main/codex/codex-turn-lifecycle-contract-test-fixture.ts index dee5210463b..831e2101915 100644 --- a/src/main/codex/codex-turn-lifecycle-contract-test-fixture.ts +++ b/src/main/codex/codex-turn-lifecycle-contract-test-fixture.ts @@ -2,11 +2,9 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-host-database-test-support' import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { createCodexJournalTranslator } from './codex-structured-journal-translation' diff --git a/src/main/codex/codex-unfinished-item-body.ts b/src/main/codex/codex-unfinished-item-body.ts index 5b3c7386d5a..192ef22d78a 100644 --- a/src/main/codex/codex-unfinished-item-body.ts +++ b/src/main/codex/codex-unfinished-item-body.ts @@ -2,7 +2,7 @@ import { endedRunningAgentJournalToolCall, type AgentJournalRunningCallEnd } from '../../shared/agent-journal-tool-call-lifecycle' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { cancelledJournalPromptBody } from '../native-chat/agent-session-journal/journal-prompt-body-bounds' import { endedJournalReasoning, diff --git a/src/main/codex/codex-usage-limits.test.ts b/src/main/codex/codex-usage-limits.test.ts index 3beaac80a67..ffbf4309c2a 100644 --- a/src/main/codex/codex-usage-limits.test.ts +++ b/src/main/codex/codex-usage-limits.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../shared/agent-session/journal/agent-session-journal-types' import { CodexUsageLimits } from './codex-usage-limits' import { createCodexJournalTranslator } from './codex-structured-journal-translation' diff --git a/src/main/jsonl-rpc/timeline-final-tail.test.ts b/src/main/jsonl-rpc/timeline-final-tail.test.ts index aeee59e581c..d802fc7ebf5 100644 --- a/src/main/jsonl-rpc/timeline-final-tail.test.ts +++ b/src/main/jsonl-rpc/timeline-final-tail.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { closeProviderTimelineRigs, openProviderTimelineRig, diff --git a/src/main/jsonl-rpc/timeline-lane.ts b/src/main/jsonl-rpc/timeline-lane.ts index 32f6d54b6d3..d5371b994f8 100644 --- a/src/main/jsonl-rpc/timeline-lane.ts +++ b/src/main/jsonl-rpc/timeline-lane.ts @@ -1,4 +1,4 @@ -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 diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts index a41e9188313..7da61e5999f 100644 --- a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts +++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts @@ -2,10 +2,8 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { formatNativeChatFileReference } from '../../../shared/agent-image-paste' import { createTrackedJournalOpener, @@ -21,7 +19,7 @@ import { agentSessionAttachmentStoreRoot } from './agent-session-attachment-references' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' const UPLOAD_A = '0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01' const UPLOAD_B = '7c2d9e10-3f4a-4b5c-8d6e-2f1a0b9c8d02' diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts index f282efac4e1..d688bee71fb 100644 --- a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts +++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts @@ -4,7 +4,7 @@ import { lstatSync, readdirSync } from 'node:fs' import { join } from 'node:path' import { isDefinitiveAbsence } from '../../../shared/definitive-filesystem-absence' import type Database from '../../sqlite/sync-database' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_ATTACHMENT_PART_FILE, agentSessionAttachmentReferences, diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts index 4b8dc98b067..9a7098b2908 100644 --- a/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts +++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts @@ -1,6 +1,6 @@ import { isAbsolute, join, relative, sep } from 'node:path' import { AGENT_SESSION_ATTACHMENTS_DIR_NAME } from '../../../shared/agent-session-attachments' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' export const AGENT_SESSION_ATTACHMENT_PART_FILE = '.upload.part' diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts index e60a4960ad5..59eff604bcc 100644 --- a/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts +++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts @@ -31,7 +31,7 @@ vi.mock('node:fs', async (original) => { }) import type Database from '../../sqlite/sync-database' import type { JournalHostDatabase } from '../agent-session-journal/journal-host-database' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { closeTestJournalHostDatabases, openTestJournalHostDatabase diff --git a/src/main/native-chat/agent-session-journal/command-receipt-transaction.spec.ts b/src/main/native-chat/agent-session-journal/command-receipt-transaction.spec.ts index 3cecb1ef5b6..466ae9b45b2 100644 --- a/src/main/native-chat/agent-session-journal/command-receipt-transaction.spec.ts +++ b/src/main/native-chat/agent-session-journal/command-receipt-transaction.spec.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { JournalHostDatabase } from './journal-host-database' import { diff --git a/src/main/native-chat/agent-session-journal/journal-approval-revision-validation.spec.ts b/src/main/native-chat/agent-session-journal/journal-approval-revision-validation.spec.ts index cb918aac427..6cd08681e1f 100644 --- a/src/main/native-chat/agent-session-journal/journal-approval-revision-validation.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-approval-revision-validation.spec.ts @@ -1,7 +1,7 @@ import type { createFixture } from './journal-terminal-validation-test-fixture' import { expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' export function registerJournalApprovalRevisionValidationTests( fixture: ReturnType diff --git a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-contract-test-fixture.ts index db8ebf9bb21..3795c2ff52f 100644 --- a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-contract-test-fixture.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { settleObservedExitForTest } from '../agent-session-wire/structured-agent-session-observed-exit.test-fixture' import { diff --git a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-oversized.spec.ts b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-oversized.spec.ts index 426303ae98d..0652297e6be 100644 --- a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-oversized.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-oversized.spec.ts @@ -3,7 +3,7 @@ import { expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalSnapshot -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { settleObservedExitForTest } from '../agent-session-wire/structured-agent-session-observed-exit.test-fixture' import { openTestJournalHostDatabase } from './journal-host-database-test-support' import { MAX_JOURNAL_LIFECYCLE_BATCH_BYTES } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-rollback.spec.ts b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-rollback.spec.ts index 2e2fe11e0e2..3b2f17e82bd 100644 --- a/src/main/native-chat/agent-session-journal/journal-atomic-settlement-rollback.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-atomic-settlement-rollback.spec.ts @@ -3,7 +3,7 @@ import { expect, it, vi } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalSnapshot -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { AgentSessionSubscribers } from '../agent-session-wire/structured-agent-session-subscribers' import { settleStaleStructuredAgentSessionState } from '../agent-session-wire/structured-agent-session-dead-generation-settlement' diff --git a/src/main/native-chat/agent-session-journal/journal-commit.ts b/src/main/native-chat/agent-session-journal/journal-commit.ts index 9b70093c46b..a2956c285b3 100644 --- a/src/main/native-chat/agent-session-journal/journal-commit.ts +++ b/src/main/native-chat/agent-session-journal/journal-commit.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalReducerState } from './journal-reducer' export function retireCoveredJournalFloor( diff --git a/src/main/native-chat/agent-session-journal/journal-completed-content.test.ts b/src/main/native-chat/agent-session-journal/journal-completed-content.test.ts index b08cc3e0234..ceb537a0eb9 100644 --- a/src/main/native-chat/agent-session-journal/journal-completed-content.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-completed-content.test.ts @@ -1,5 +1,5 @@ import { afterEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AcpToolTimeline } from '../../acp/acp-tool-timeline' import { PiRpcMessages } from '../../pi/rpc-messages' import { PiRpcContextUsage } from '../../pi/rpc-context-usage' diff --git a/src/main/native-chat/agent-session-journal/journal-context-controller.ts b/src/main/native-chat/agent-session-journal/journal-context-controller.ts index e509844fb2a..774f1923cc6 100644 --- a/src/main/native-chat/agent-session-journal/journal-context-controller.ts +++ b/src/main/native-chat/agent-session-journal/journal-context-controller.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionProviderContextBoundary } from '../../../shared/agent-session-provider-context' import { latestAgentSessionContextClearSequence } from '../../../shared/agent-session-context-clear' import { appendJournalContextClear } from './journal-context-clear' diff --git a/src/main/native-chat/agent-session-journal/journal-context-rewind.ts b/src/main/native-chat/agent-session-journal/journal-context-rewind.ts index 8216fcea634..bf2ac730755 100644 --- a/src/main/native-chat/agent-session-journal/journal-context-rewind.ts +++ b/src/main/native-chat/agent-session-journal/journal-context-rewind.ts @@ -1,9 +1,9 @@ -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalReplacementItem } from './journal-epoch-replacement' import type { JournalReducerState } from './journal-reducer' import { buildJournalItemRow, buildJournalTombstoneRow } from './journal-row-builders' diff --git a/src/main/native-chat/agent-session-journal/journal-crash-boundary.spec.ts b/src/main/native-chat/agent-session-journal/journal-crash-boundary.spec.ts index 1b6fe3d40df..c2ec6f7d132 100644 --- a/src/main/native-chat/agent-session-journal/journal-crash-boundary.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-crash-boundary.spec.ts @@ -7,13 +7,13 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemIdentity, - AgentJournalMessageItem, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/structured-agent-session-projection' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { digestPayload } from './journal-payload-bounds' diff --git a/src/main/native-chat/agent-session-journal/journal-cursor.ts b/src/main/native-chat/agent-session-journal/journal-cursor.ts index b9584170100..4463f66d26e 100644 --- a/src/main/native-chat/agent-session-journal/journal-cursor.ts +++ b/src/main/native-chat/agent-session-journal/journal-cursor.ts @@ -1,9 +1,7 @@ // Cursors from replaced epochs require a fresh snapshot; partial replay would mix timelines. -import type { - AgentJournalCursor, - AgentJournalResetReason -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalResetReason } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalReadSince } from './journal-store-contracts' import type { JournalReadRow } from './journal-read-row' diff --git a/src/main/native-chat/agent-session-journal/journal-damage.test.ts b/src/main/native-chat/agent-session-journal/journal-damage.test.ts index 0d2b062decb..e07189421d3 100644 --- a/src/main/native-chat/agent-session-journal/journal-damage.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-damage.test.ts @@ -4,10 +4,12 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import Database from '../../sqlite/sync-database' import type { openAgentSessionJournal } from './journal-store-factory' diff --git a/src/main/native-chat/agent-session-journal/journal-database.spec.ts b/src/main/native-chat/agent-session-journal/journal-database.spec.ts index eb287926011..3bf179000b2 100644 --- a/src/main/native-chat/agent-session-journal/journal-database.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-database.spec.ts @@ -26,7 +26,7 @@ import { readJournalSessionEpoch } from './journal-row-table' import type { JournalRow } from './journal-row-schema' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' export function registerJournalDatabaseTests(): void { let root: string diff --git a/src/main/native-chat/agent-session-journal/journal-derived-turn-scope.ts b/src/main/native-chat/agent-session-journal/journal-derived-turn-scope.ts index 52ff383f538..8f473b36fbc 100644 --- a/src/main/native-chat/agent-session-journal/journal-derived-turn-scope.ts +++ b/src/main/native-chat/agent-session-journal/journal-derived-turn-scope.ts @@ -3,9 +3,9 @@ import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { isAgentSessionContextClear } from '../../../shared/agent-session-context-clear' diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts index 1a007cb590d..fbb381d9a92 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts @@ -1,7 +1,7 @@ // Unknown delivery never authorizes redelivery under the same ID; only a new user send rotates it. // Process facts end acknowledgement waits; elapsed time alone proves neither delivery nor rejection. -import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../shared/structured-agent-session-send-evidence' +import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../shared/agent-session/requests/structured-agent-session-send-evidence' export const DISPATCH_DOUBT_HOST_RESTARTED = 'host_restarted_before_acknowledgement' diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-observation.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-observation.ts index 2e59671d880..e1910fae50c 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-observation.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-observation.ts @@ -1,7 +1,7 @@ import type { AgentJournalDispatchState, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' export type AgentJournalDispatchObservation = { state: AgentJournalDispatchState diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.spec.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.spec.ts index 032b57dd17d..a593cc1973d 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-reason-bound.spec.ts @@ -2,12 +2,12 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { classifyDispatchRejection, DISPATCH_REJECTED_WRITE_FAILED, isWriteFailureSubmission -} from '../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { JOURNAL_DISPATCH_REASON_LIMITS } from './journal-payload-bounds' import type { openAgentSessionJournal } from './journal-store-factory' import { createTrackedJournalOpener } from './journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts index 427ba1cd078..bf8dd7693c4 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts @@ -2,8 +2,8 @@ import { readAgentSessionFailureFact, type UnreadAgentSessionFailureFact } from '../../../shared/agent-session-failure' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalAnsweredTurn } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalAnsweredTurn } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalDispatchRowApplies } from './journal-dispatch-settlement' import { boundInlineText, JOURNAL_DISPATCH_REASON_LIMITS } from './journal-payload-bounds' import type { JournalReducerState } from './journal-reducer' diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts index 2202183a114..d56d0eeb146 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts @@ -4,7 +4,7 @@ import { type SubmissionRejectionKind } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { queuedHandOffOutcome } from './journal-dispatch-settlement' import { journalPendingSubmissionResolutions, diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts index 3a0033d6bdc..0b7d4942a12 100644 --- a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts +++ b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts @@ -1,8 +1,8 @@ // Reducer and queue settlement must agree: ignored dispatch rows cannot change card state. -import { agentJournalSubmissionProvenUnwritten } from '../../../shared/agent-session-queued-submission' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { classifyDispatchRejection } from '../../../shared/structured-agent-session-dispatch-rejection' +import { agentJournalSubmissionProvenUnwritten } from '../../../shared/agent-session/requests/agent-session-queued-submission' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { classifyDispatchRejection } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' /** Accepted/rejected states are terminal; late rows must never reopen them. */ export function journalDispatchRowApplies( diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-controller.ts b/src/main/native-chat/agent-session-journal/journal-epoch-controller.ts index c9b1e731e42..6aef1948636 100644 --- a/src/main/native-chat/agent-session-journal/journal-epoch-controller.ts +++ b/src/main/native-chat/agent-session-journal/journal-epoch-controller.ts @@ -1,7 +1,7 @@ import type { AgentJournalCursor, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type { JournalReducerState } from './journal-reducer' import type { JournalHostDatabase } from './journal-host-database' import { replaceJournalEpoch, type JournalReplacementItem } from './journal-epoch-replacement' diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-replacement-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-epoch-replacement-contract-test-fixture.ts index cf08e0b4c13..f2936405996 100644 --- a/src/main/native-chat/agent-session-journal/journal-epoch-replacement-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-epoch-replacement-contract-test-fixture.ts @@ -5,9 +5,9 @@ import { join, dirname } from 'node:path' import { afterEach, beforeEach } from 'vitest' import type { AgentJournalItemIdentity, - AgentJournalMessageItem, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalHostDatabase } from './journal-host-database' import { replaceJournalEpoch } from './journal-epoch-replacement' import type { JournalLoad } from './journal-open' @@ -17,7 +17,7 @@ import { } from './journal-host-database-test-support' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { formatNativeChatFileReference } from '../../../shared/agent-image-paste' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import * as attachmentReferences from '../agent-session-attachments/agent-session-attachment-references' export function createFixture() { diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-replacement-receipts.spec.ts b/src/main/native-chat/agent-session-journal/journal-epoch-replacement-receipts.spec.ts index a6f3e29b683..6f9250e1abb 100644 --- a/src/main/native-chat/agent-session-journal/journal-epoch-replacement-receipts.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-epoch-replacement-receipts.spec.ts @@ -1,5 +1,5 @@ import type { createFixture } from './journal-epoch-replacement-contract-test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readFile } from 'node:fs/promises' import { describe, expect, it, vi } from 'vitest' import type { JournalLoad } from './journal-open' diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts index 6efcdd91cde..85ba4dd834b 100644 --- a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts +++ b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts @@ -8,20 +8,22 @@ import { } from './journal-item-echo' import { sameJournalConversation } from './journal-history-origin' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalCursor, - AgentJournalItemBody, AgentJournalItemIdentity, - AgentJournalProducerLinkage, - AgentJournalTurnScope, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { + AgentJournalItemBody, + AgentJournalProducerLinkage +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { agentSessionJournalProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { JournalHostDatabase } from './journal-host-database' import type { JournalLoad } from './journal-open' diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-rollover.ts b/src/main/native-chat/agent-session-journal/journal-epoch-rollover.ts index 615f622972e..bb6c85d5ac5 100644 --- a/src/main/native-chat/agent-session-journal/journal-epoch-rollover.ts +++ b/src/main/native-chat/agent-session-journal/journal-epoch-rollover.ts @@ -2,8 +2,8 @@ import { journalOutcomeSource } from './journal-outcome-format' import { publishJournalOutcomeEpoch } from './journal-outcome-write' -import { journalRowSchemaVersion } from '../../../shared/agent-session-journal-types' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import { journalRowSchemaVersion } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { agentSessionJournalProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { JournalHostDatabase } from './journal-host-database' import type { JournalLoad } from './journal-open' diff --git a/src/main/native-chat/agent-session-journal/journal-host-database-test-support.ts b/src/main/native-chat/agent-session-journal/journal-host-database-test-support.ts index edf1daa6134..fbdd4e8782e 100644 --- a/src/main/native-chat/agent-session-journal/journal-host-database-test-support.ts +++ b/src/main/native-chat/agent-session-journal/journal-host-database-test-support.ts @@ -1,9 +1,9 @@ -import type { AgentSessionJournalProviderHandle } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalProviderHandle } from '../../../shared/agent-session-journal-identity' // Share one connection per test profile to match production host ownership. import { resolve } from 'node:path' import { randomUUID } from 'node:crypto' -import { journalRowSchemaVersion } from '../../../shared/agent-session-journal-types' +import { journalRowSchemaVersion } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionJournalProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { JournalHostDatabase } from './journal-host-database' import { fields } from './journal-state-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-host-database.spec.ts b/src/main/native-chat/agent-session-journal/journal-host-database.spec.ts index 3da49ac632d..d0077b4c751 100644 --- a/src/main/native-chat/agent-session-journal/journal-host-database.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-host-database.spec.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' @@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import { spawnProcess } from '@orca/process-host' import { tearDownRuntime } from '../../runtime/agent-session/structured-agent-session-runtime-teardown' import { journalDatabasePath } from './journal-host-database' diff --git a/src/main/native-chat/agent-session-journal/journal-input-card-index.ts b/src/main/native-chat/agent-session-journal/journal-input-card-index.ts index 37cdfac5f23..abe23bfca66 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-card-index.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-card-index.ts @@ -1,6 +1,6 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalSubmissionRow } from './journal-row-schema' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { JournalReducerState } from './journal-reducer' import type { QueuedMessageRow } from './queued-message-table' import type { JournalInputPlace } from './journal-input-order' diff --git a/src/main/native-chat/agent-session-journal/journal-input-conversion.ts b/src/main/native-chat/agent-session-journal/journal-input-conversion.ts index 89e003e2681..631d1419b49 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-conversion.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-conversion.ts @@ -1,5 +1,5 @@ import { readJournalLegacyCards } from './journal-queue-import' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { JournalReducerState } from './journal-reducer' import { initializeJournalInputOrder, journalInputOrder } from './journal-input-order' import type { JournalOutcomeFold } from './journal-outcome-codec' diff --git a/src/main/native-chat/agent-session-journal/journal-input-domain-index.ts b/src/main/native-chat/agent-session-journal/journal-input-domain-index.ts index 7b9579f1a5d..0bd96dfc5a4 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-domain-index.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-domain-index.ts @@ -9,7 +9,7 @@ import { type InputPlaceQuery } from './journal-input-place-index' import type { QueuedMessageRow } from './queued-message-table' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' type Node = { index: JournalInputPlaceIndex; left?: Node; right?: Node } const LIMIT = Number.MAX_SAFE_INTEGER diff --git a/src/main/native-chat/agent-session-journal/journal-input-legacy-baseline.test.ts b/src/main/native-chat/agent-session-journal/journal-input-legacy-baseline.test.ts index 431e8c8247b..496a3ea89f5 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-legacy-baseline.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-legacy-baseline.test.ts @@ -17,7 +17,7 @@ import { } from '../../../shared/agent-session-provider-handle-encoding' import type { JournalRow } from './journal-row-schema' import type { JournalReducerState } from './journal-reducer' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { holdUnsentSends } from './journal-unsent-send-hold' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-input-lineage.ts b/src/main/native-chat/agent-session-journal/journal-input-lineage.ts index 3fffb798f85..5322debe1d0 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-lineage.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-lineage.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' export type JournalInputContext = { source: AgentJournalCursor diff --git a/src/main/native-chat/agent-session-journal/journal-input-order-state.ts b/src/main/native-chat/agent-session-journal/journal-input-order-state.ts index 63f2cea2980..e908bdb157f 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-order-state.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-order-state.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalReducerState } from './journal-reducer' import type { JournalInputEntry } from './journal-input-lineage' import type { JournalRow } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-input-order.test.ts b/src/main/native-chat/agent-session-journal/journal-input-order.test.ts index 36821e08c6b..c6aad05c533 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-order.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-order.test.ts @@ -2,7 +2,7 @@ import { journalInputOrder } from './journal-input-order' import { insertCommandReceiptIfAbsent, readCommandReceipt } from './command-receipt-table' import { writeCommandReceiptTestRecord } from './command-receipt-test-support' import type { JournalRow } from './journal-row-schema' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionJournal } from './journal-store' import type { JournalReducerState } from './journal-reducer' import { mkdtemp, rm } from 'node:fs/promises' @@ -13,7 +13,7 @@ import { agentSessionJournalProviderHandle, claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { holdUnsentSends } from './journal-unsent-send-hold' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-input-order.ts b/src/main/native-chat/agent-session-journal/journal-input-order.ts index 2a19fa3237c..a92cd4030b8 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-order.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-order.ts @@ -8,12 +8,10 @@ import { export type { JournalInputPlace } from './journal-input-order-state' import { JournalSubmissionLinks } from './journal-submission-links' -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { JournalReducerState } from './journal-reducer' import type { JournalRow } from './journal-row-schema' import type { QueuedMessageRow } from './queued-message-table' diff --git a/src/main/native-chat/agent-session-journal/journal-input-place-index.ts b/src/main/native-chat/agent-session-journal/journal-input-place-index.ts index f9107817aea..9d9eec06198 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-place-index.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-place-index.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { QueuedMessageRow } from './queued-message-table' export type InputPlaceQuery = { diff --git a/src/main/native-chat/agent-session-journal/journal-input-provenance.ts b/src/main/native-chat/agent-session-journal/journal-input-provenance.ts index b7b09925e1e..d08da0da0e9 100644 --- a/src/main/native-chat/agent-session-journal/journal-input-provenance.ts +++ b/src/main/native-chat/agent-session-journal/journal-input-provenance.ts @@ -1,8 +1,6 @@ import type Database from '../../sqlite/sync-database' -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readCommandReceipt } from './command-receipt-table' /** Only the original send's accepted coordinate can compare a retired enqueue boundary. */ diff --git a/src/main/native-chat/agent-session-journal/journal-item-appender.ts b/src/main/native-chat/agent-session-journal/journal-item-appender.ts index dc1e69d7282..63cd0f9e152 100644 --- a/src/main/native-chat/agent-session-journal/journal-item-appender.ts +++ b/src/main/native-chat/agent-session-journal/journal-item-appender.ts @@ -1,9 +1,9 @@ -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { journalItemRowBuilder } from './journal-row-builders' import type { JournalReducerState } from './journal-reducer' import type { JournalAppendResult, JournalItemAppendOptions } from './journal-store-contracts' diff --git a/src/main/native-chat/agent-session-journal/journal-item-fold.ts b/src/main/native-chat/agent-session-journal/journal-item-fold.ts index 1e1ca568d0b..a823a53c9c4 100644 --- a/src/main/native-chat/agent-session-journal/journal-item-fold.ts +++ b/src/main/native-chat/agent-session-journal/journal-item-fold.ts @@ -1,14 +1,14 @@ import type { AgentJournalItemBody, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' + AgentJournalRenderItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalLinkageFields, isRootAgentJournalItem, namesAgentJournalProducer -} from '../../../shared/agent-session-journal-producer' +} from '../../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { JournalReducerState } from './journal-reducer' diff --git a/src/main/native-chat/agent-session-journal/journal-item-identity.test.ts b/src/main/native-chat/agent-session-journal/journal-item-identity.test.ts index f93d2eae75b..cea7d23398b 100644 --- a/src/main/native-chat/agent-session-journal/journal-item-identity.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-item-identity.test.ts @@ -4,8 +4,8 @@ import { boundJournalKeyComponent, MAX_JOURNAL_KEY_COMPONENT_CHARS, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' const THREAD = '019fd8ca-edbe-7c43-b231-4c7aea3a2d89' const TURN_A = '019fd8ca-edbe-7c43-b231-4c7aea3a2d89' diff --git a/src/main/native-chat/agent-session-journal/journal-item-provenance.spec.ts b/src/main/native-chat/agent-session-journal/journal-item-provenance.spec.ts index 6c76e730fd7..cea9f99dccc 100644 --- a/src/main/native-chat/agent-session-journal/journal-item-provenance.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-item-provenance.spec.ts @@ -2,13 +2,15 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, 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 { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { JournalHostDatabase } from './journal-host-database' import { diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts index bc80056edef..6e4e57997f0 100644 --- a/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts +++ b/src/main/native-chat/agent-session-journal/journal-legacy-identity.ts @@ -2,7 +2,7 @@ // are import-scoped because rollout IDs lack stable structured turn/ordinal identity. import type { AgentType } from '../../../shared/agent-status-types' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { NativeChatTranscriptAgent } from '../../../shared/native-chat/native-chat-agent-support' export type LegacyIdentityTracker = { diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts index 6e3f62261a6..eb78e39d5f5 100644 --- a/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-legacy-import-tool-pairing.test.ts @@ -2,8 +2,8 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { foldToolMessages } from '../../../shared/native-chat/tools/native-chat-tool-fold' import { pairToolBlocks } from '../../../shared/native-chat/tools/native-chat-tool-pairs' import { projectNativeChatTranscriptMessages } from '../../../shared/native-chat/transcript/native-chat-transcript-projection' diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts index 2e3c58e2be9..89899abf87e 100644 --- a/src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.test.ts @@ -1,11 +1,11 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionProviderHandle } from '../../../shared/agent-session-provider-handle' import type { NativeChatMessage } from '../../../shared/native-chat/native-chat-types' import type * as TranscriptLineDecoders from '../transcript-line-decoders' diff --git a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts index f0ceb32f62f..4234879ccc6 100644 --- a/src/main/native-chat/agent-session-journal/journal-legacy-import.ts +++ b/src/main/native-chat/agent-session-journal/journal-legacy-import.ts @@ -8,9 +8,9 @@ import { import type { AgentType } from '../../../shared/agent-status-types' import type { AgentJournalCursor, - AgentJournalItemBody, AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../shared/native-chat/native-chat-types' import { resolveNativeChatTranscriptAgent } from '../../../shared/native-chat/native-chat-agent-support' import { resolveSessionFilePath, type ResolveSessionFileOptions } from '../session-file-resolver' diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.spec.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.spec.ts index f02e0ddf071..c3c89e9ee5d 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.spec.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { JournalLifecycleBatchAppender } from './journal-lifecycle-batch-appender' import { createJournalReducerState } from './journal-reducer' diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.ts index 93afbf2e623..d5960f8dbed 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-appender.ts @@ -1,7 +1,7 @@ import { journalItemEchoFields } from './journal-item-echo' import { isDeepStrictEqual } from 'node:util' -import { agentJournalLinkageFields } from '../../../shared/agent-session-journal-producer' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalReducerState } from './journal-reducer' import { journalLifecycleMutationFitsOneBatch, diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts index 0782e283500..4abfae157dd 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts @@ -3,7 +3,7 @@ import { LEGACY_MIXED_PARTITIONS } from './journal-lifecycle-batch-partition.tes import { AGENT_JOURNAL_THREAD_SCOPE, journalRowSchemaVersion -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalLifecycleMutationFitsOneBatch, partitionJournalLifecycleMutations diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts index 08125998d7a..d7e73c8bd1b 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts @@ -1,4 +1,4 @@ -import { journalRowSchemaVersion } from '../../../shared/agent-session-journal-types' +import { journalRowSchemaVersion } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalLifecycleMutationRow, journalLifecycleMutationItemId, diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-boundaries.spec.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-boundaries.spec.ts index 21693b1221d..b3ec22faec4 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-boundaries.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-boundaries.spec.ts @@ -1,8 +1,8 @@ import type { createFixture } from './journal-store-contract-test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readdir } from 'node:fs/promises' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { boundInlineText, boundPayload, diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-mutation.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-mutation.ts index 63327a811e9..146e609a5b4 100644 --- a/src/main/native-chat/agent-session-journal/journal-lifecycle-mutation.ts +++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-mutation.ts @@ -1,16 +1,16 @@ import { journalItemEchoFields, type JournalItemEcho } from './journal-item-echo' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalProducerLinkage, - AgentJournalRowAttribution, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' + AgentJournalRowAttribution +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalLinkageFields, namesAgentJournalProducer -} from '../../../shared/agent-session-journal-producer' +} from '../../../shared/agent-session/journal/agent-session-journal-producer' import type { JournalLifecycleMutation } from './journal-row-schema' import { boundRunningToolOutput } from './journal-payload-bounds' diff --git a/src/main/native-chat/agent-session-journal/journal-mixed-epoch-replacement.test.ts b/src/main/native-chat/agent-session-journal/journal-mixed-epoch-replacement.test.ts index 312ad155715..f5b4b1e6dee 100644 --- a/src/main/native-chat/agent-session-journal/journal-mixed-epoch-replacement.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-mixed-epoch-replacement.test.ts @@ -4,12 +4,14 @@ import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { createTrackedJournalOpener, insertTestJournalRow, diff --git a/src/main/native-chat/agent-session-journal/journal-outcome-format-1-decode.ts b/src/main/native-chat/agent-session-journal/journal-outcome-format-1-decode.ts index a7495a6274d..df477bec91c 100644 --- a/src/main/native-chat/agent-session-journal/journal-outcome-format-1-decode.ts +++ b/src/main/native-chat/agent-session-journal/journal-outcome-format-1-decode.ts @@ -1,5 +1,5 @@ import { z } from 'zod' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { createJournalReducerState, type JournalReducerState } from './journal-reducer' import { JournalDerivedTurnScope } from './journal-derived-turn-scope' import { diff --git a/src/main/native-chat/agent-session-journal/journal-outcome-format-1.ts b/src/main/native-chat/agent-session-journal/journal-outcome-format-1.ts index 7babc299221..fea8e2a34fc 100644 --- a/src/main/native-chat/agent-session-journal/journal-outcome-format-1.ts +++ b/src/main/native-chat/agent-session-journal/journal-outcome-format-1.ts @@ -1,7 +1,7 @@ import { z } from 'zod' -import { AgentJournalTurnScopeSchema } from '../../../shared/agent-session-journal-schemas' +import { AgentJournalTurnScopeSchema } from '../../../shared/agent-session/journal/agent-session-journal-schemas' import { AgentSessionExecutionOptionsSchema } from '../../../shared/agent-session/options/agent-session-execution-options' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalReducerState } from './journal-reducer' import type { JournalHistoryOrigin } from './journal-history-origin' import type { JournalStopEvent } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-outcome-scaling.test.ts b/src/main/native-chat/agent-session-journal/journal-outcome-scaling.test.ts index 3a083c0fdce..d00d44c6570 100644 --- a/src/main/native-chat/agent-session-journal/journal-outcome-scaling.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-outcome-scaling.test.ts @@ -2,13 +2,13 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { SqliteStatement } from '../../sqlite/sqlite-statement' import { closeTestJournalHostDatabases, diff --git a/src/main/native-chat/agent-session-journal/journal-outcome-wire.test.ts b/src/main/native-chat/agent-session-journal/journal-outcome-wire.test.ts index 0584008e80e..1cc126a6277 100644 --- a/src/main/native-chat/agent-session-journal/journal-outcome-wire.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-outcome-wire.test.ts @@ -7,7 +7,7 @@ import { openTestJournalHostDatabase } from './journal-host-database-test-support' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentSessionHistory } from '../agent-session-wire/agent-session-history-page' import { projectJournalBatch } from '../agent-session-wire/agent-session-journal-batch' import { readJournalOutcomeGroups } from './journal-read-row' diff --git a/src/main/native-chat/agent-session-journal/journal-payload-bounds-retention.test.ts b/src/main/native-chat/agent-session-journal/journal-payload-bounds-retention.test.ts index 1ade76159cb..bc9436fbf37 100644 --- a/src/main/native-chat/agent-session-journal/journal-payload-bounds-retention.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-payload-bounds-retention.test.ts @@ -5,7 +5,7 @@ import { type AgentJournalBoundedPayload, type AgentJournalItemBody, type AgentJournalToolCallState -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexItemBody } from '../../codex/codex-structured-item-translation' import { AGENT_SESSION_WIRE_PAYLOAD_HEAD_BYTES, diff --git a/src/main/native-chat/agent-session-journal/journal-payload-bounds.ts b/src/main/native-chat/agent-session-journal/journal-payload-bounds.ts index 92ef7747b55..7c990dc85a5 100644 --- a/src/main/native-chat/agent-session-journal/journal-payload-bounds.ts +++ b/src/main/native-chat/agent-session-journal/journal-payload-bounds.ts @@ -4,7 +4,7 @@ import { boundSubagentEntryId } from '../subagent-entry-id-bounds' import type { AgentJournalBoundedPayload, AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' const MAX_LEGACY_IMPORT_SUBAGENTS = 64 diff --git a/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts b/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts index 8094132eb62..8be36fa1785 100644 --- a/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts +++ b/src/main/native-chat/agent-session-journal/journal-pending-submission-recovery.ts @@ -1,6 +1,6 @@ import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { DISPATCH_DOUBT_HOST_RESTARTED } from './journal-dispatch-doubt-reasons' import type { JournalReducerState } from './journal-reducer' import { journalDispatchRowBuilder } from './journal-row-builders' diff --git a/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts b/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts index 5fc2a406bcb..42a80e772af 100644 --- a/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts +++ b/src/main/native-chat/agent-session-journal/journal-pi-active-branch.ts @@ -1,5 +1,5 @@ import { performance } from 'node:perf_hooks' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { NativeChatMessage } from '../../../shared/native-chat/native-chat-types' import { asRecord, parseJsonObject, timestampMs } from '../../ai-vault/session-scanner-values' import Database from '../../sqlite/sync-database' diff --git a/src/main/native-chat/agent-session-journal/journal-producer-inheritance.spec.ts b/src/main/native-chat/agent-session-journal/journal-producer-inheritance.spec.ts index 180940de989..427ea0561fc 100644 --- a/src/main/native-chat/agent-session-journal/journal-producer-inheritance.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-producer-inheritance.spec.ts @@ -1,14 +1,14 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, 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 type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { - AgentJournalItemIdentity, AgentJournalMessageItem, AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { applyJournalRow, createJournalReducerState } from './journal-reducer' import { buildJournalItemRow, diff --git a/src/main/native-chat/agent-session-journal/journal-projection-bootstrap.test.ts b/src/main/native-chat/agent-session-journal/journal-projection-bootstrap.test.ts index 73df7e3e238..5c7ebae6374 100644 --- a/src/main/native-chat/agent-session-journal/journal-projection-bootstrap.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-projection-bootstrap.test.ts @@ -1,4 +1,4 @@ -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { journalInputOrder } from './journal-input-order' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' diff --git a/src/main/native-chat/agent-session-journal/journal-projection-failure.test.ts b/src/main/native-chat/agent-session-journal/journal-projection-failure.test.ts index 61468dc7e46..bd06cc291f9 100644 --- a/src/main/native-chat/agent-session-journal/journal-projection-failure.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-projection-failure.test.ts @@ -3,8 +3,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { closeTestJournalHostDatabases, openTestJournalHostDatabase diff --git a/src/main/native-chat/agent-session-journal/journal-projection-streams.test.ts b/src/main/native-chat/agent-session-journal/journal-projection-streams.test.ts index a3440360615..fb88f60fe93 100644 --- a/src/main/native-chat/agent-session-journal/journal-projection-streams.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-projection-streams.test.ts @@ -4,10 +4,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { z } from 'zod' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { codexProviderHandle, claudeProviderHandle diff --git a/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts b/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts index 9710cd9eb5c..15400209da0 100644 --- a/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts +++ b/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts @@ -5,7 +5,7 @@ import type { AgentJournalQuestion, AgentJournalQuestionItem, AgentJournalFreeTextInput -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { isPlanApprovalSubject } from '../../../shared/agent-session-approval-subject' import { boundInlineText, boundPayload } from './journal-payload-bounds' diff --git a/src/main/native-chat/agent-session-journal/journal-provider-activity.ts b/src/main/native-chat/agent-session-journal/journal-provider-activity.ts index ac741fcdc18..9b75eab0c21 100644 --- a/src/main/native-chat/agent-session-journal/journal-provider-activity.ts +++ b/src/main/native-chat/agent-session-journal/journal-provider-activity.ts @@ -1,5 +1,5 @@ -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { JournalReducerState } from './journal-reducer' import type { JournalRow } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-public-read.ts b/src/main/native-chat/agent-session-journal/journal-public-read.ts index f01fe97c566..f41de8e0166 100644 --- a/src/main/native-chat/agent-session-journal/journal-public-read.ts +++ b/src/main/native-chat/agent-session-journal/journal-public-read.ts @@ -1,5 +1,5 @@ -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { renderJournalState, type JournalReducerState } from './journal-reducer' /** Only a committed journal owner can certify reuse across public reads. */ diff --git a/src/main/native-chat/agent-session-journal/journal-queue-adoption-plan.ts b/src/main/native-chat/agent-session-journal/journal-queue-adoption-plan.ts index b3b6b84b658..b1f95e68ca2 100644 --- a/src/main/native-chat/agent-session-journal/journal-queue-adoption-plan.ts +++ b/src/main/native-chat/agent-session-journal/journal-queue-adoption-plan.ts @@ -1,7 +1,7 @@ import type { JournalQueuedMessagesDeps } from './journal-store-contracts' import type { LegacyQueuedCards } from './journal-queue-import' import type { JournalQueuePlan } from './journal-queued-messages' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalQueueRowBuilder, type JournalQueueCardChange } from './journal-queue-events' import { journalAttachmentClaimsReceipt } from './journal-submission-hook' diff --git a/src/main/native-chat/agent-session-journal/journal-queue-events.ts b/src/main/native-chat/agent-session-journal/journal-queue-events.ts index b234057dbaf..3a8628caead 100644 --- a/src/main/native-chat/agent-session-journal/journal-queue-events.ts +++ b/src/main/native-chat/agent-session-journal/journal-queue-events.ts @@ -4,14 +4,14 @@ import type { UnreadAgentSessionFailureFact } from '../../../shared/agent-sessio import type { AgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' import { AGENT_SESSION_JOURNAL_QUEUE_SCHEMA_VERSION, - type AgentJournalCursor, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import { readAgentJournalMessageBody, type AgentJournalContentVerdict -} from '../../../shared/agent-session-journal-body-admission' -import { isJournalTag } from '../../../shared/agent-session-journal-open-union' +} from '../../../shared/agent-session/journal/agent-session-journal-body-admission' +import { isJournalTag } from '../../../shared/agent-session/journal/agent-session-journal-open-union' import type { JournalReducerState } from './journal-reducer' import type { JournalRowBase } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-queue-fold.ts b/src/main/native-chat/agent-session-journal/journal-queue-fold.ts index 9c61f7cc552..30d8c4af234 100644 --- a/src/main/native-chat/agent-session-journal/journal-queue-fold.ts +++ b/src/main/native-chat/agent-session-journal/journal-queue-fold.ts @@ -1,14 +1,12 @@ import { journalInputOrder } from './journal-input-order' // Latch handoff outcomes before rewind can retire their rows; requeue only proven-undelivered sends. -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' import { structuredAgentSessionCommandTurnIdentity } from '../../../shared/structured-agent-session-command-turn-identity' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { readStoredRejectionFact } from './journal-dispatch-reducer' import { queuedHandOffOutcome } from './journal-dispatch-settlement' import type { JournalQueueRow, JournalQueuedChange } from './journal-queue-events' diff --git a/src/main/native-chat/agent-session-journal/journal-queue-import.ts b/src/main/native-chat/agent-session-journal/journal-queue-import.ts index a13f537667b..bbaabe0a570 100644 --- a/src/main/native-chat/agent-session-journal/journal-queue-import.ts +++ b/src/main/native-chat/agent-session-journal/journal-queue-import.ts @@ -3,7 +3,7 @@ import { journalInputOrder } from './journal-input-order' // Adopt legacy cards and delete their rows atomically, using the same fold before and after import. // Retry failed bulk import on next open; do not loop while the host is running. -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalDispatchRowApplies, queuedHandOffOutcome } from './journal-dispatch-settlement' import { journalQueueRowBuilder, type JournalQueuedChange } from './journal-queue-events' import { queuedCardFromChange } from './journal-queue-fold' diff --git a/src/main/native-chat/agent-session-journal/journal-queue-retention.ts b/src/main/native-chat/agent-session-journal/journal-queue-retention.ts index 67d1c1ee487..bb9dfe4d075 100644 --- a/src/main/native-chat/agent-session-journal/journal-queue-retention.ts +++ b/src/main/native-chat/agent-session-journal/journal-queue-retention.ts @@ -1,5 +1,5 @@ -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { JournalQueueCardChange, JournalQueuedChange } from './journal-queue-events' import type { QueuedMessageRow } from './queued-message-table' diff --git a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts index f0b002ca642..b6f83635c53 100644 --- a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts +++ b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts @@ -6,12 +6,12 @@ import { } from './journal-submission-hook' // Fold cards from journal rows, without a second mutable copy. Drafts never count as active work. -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionQueuedMessageMoveAnchor, AgentSessionQueuedMessageMoveResult, AgentSessionQueuedMessageUpdateResult -} from '../../../shared/agent-session-wire' +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' import type { JournalQueueCardChange, JournalQueueRow } from './journal-queue-events' import { LegacyQueuedCards } from './journal-queue-import' diff --git a/src/main/native-chat/agent-session-journal/journal-queued-rejection-batch.spec.ts b/src/main/native-chat/agent-session-journal/journal-queued-rejection-batch.spec.ts index 45bd92de3da..77028045d95 100644 --- a/src/main/native-chat/agent-session-journal/journal-queued-rejection-batch.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-queued-rejection-batch.spec.ts @@ -4,12 +4,10 @@ import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from './journal-store' import { createTrackedJournalOpener } from './journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-journal/journal-reasoning-row.ts b/src/main/native-chat/agent-session-journal/journal-reasoning-row.ts index d2ce476a1d1..6c636d1ef4d 100644 --- a/src/main/native-chat/agent-session-journal/journal-reasoning-row.ts +++ b/src/main/native-chat/agent-session-journal/journal-reasoning-row.ts @@ -1,7 +1,7 @@ import type { AgentJournalItemBody, AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' export type JournalReasoningLifecycle = Pick diff --git a/src/main/native-chat/agent-session-journal/journal-received-content.test.ts b/src/main/native-chat/agent-session-journal/journal-received-content.test.ts index f9ed75c5e54..dcf8fa77430 100644 --- a/src/main/native-chat/agent-session-journal/journal-received-content.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-received-content.test.ts @@ -1,5 +1,5 @@ import { afterEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { adapterFor as claudeAdapter, claudeFrame, diff --git a/src/main/native-chat/agent-session-journal/journal-reducer-producer-linkage.test.ts b/src/main/native-chat/agent-session-journal/journal-reducer-producer-linkage.test.ts index d69fde2c9f3..28c5ec9fa0c 100644 --- a/src/main/native-chat/agent-session-journal/journal-reducer-producer-linkage.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-reducer-producer-linkage.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { applyJournalRow, createJournalReducerState, renderJournalState } from './journal-reducer' import { buildJournalItemRow, journalLifecycleBatchRowBuilder } from './journal-row-builders' diff --git a/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts b/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts index b2aa8613397..0194d240f4a 100644 --- a/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-reducer-rejection-fact.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import { classifyDispatchRejection, DISPATCH_REJECTED_QUEUE_FULL -} from '../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { applyJournalRow, createJournalReducerState, diff --git a/src/main/native-chat/agent-session-journal/journal-reducer.test.ts b/src/main/native-chat/agent-session-journal/journal-reducer.test.ts index 4422fd1ae3d..775d10b0a75 100644 --- a/src/main/native-chat/agent-session-journal/journal-reducer.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-reducer.test.ts @@ -1,18 +1,16 @@ import { journalInputOrder } from './journal-input-order' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey, boundJournalKeyComponent, MAX_JOURNAL_KEY_COMPONENT_CHARS -} from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemIdentity, - AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { applyJournalRow, createJournalReducerState, diff --git a/src/main/native-chat/agent-session-journal/journal-reducer.ts b/src/main/native-chat/agent-session-journal/journal-reducer.ts index 01e107fcb37..4dec58a2aba 100644 --- a/src/main/native-chat/agent-session-journal/journal-reducer.ts +++ b/src/main/native-chat/agent-session-journal/journal-reducer.ts @@ -13,15 +13,15 @@ import type { AgentJournalRenderItem, AgentJournalSnapshot, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalHistoryOrigin, type JournalHistoryOrigin } from './journal-history-origin' import { journalBatchMutationProducer, journalRenderItem } from './journal-render-item' -import { compareAgentJournalItems } from '../../../shared/agent-session-journal-position' +import { compareAgentJournalItems } from '../../../shared/agent-session/journal/agent-session-journal-position' import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { JournalDerivedTurnScope } from './journal-derived-turn-scope' import { removeJournalItem, statedOrDerivedTurnScope, upsertJournalItem } from './journal-item-fold' import { journalItemRevisionIsStale } from './journal-item-revision' @@ -29,7 +29,7 @@ import { observeJournalProviderActivity } from './journal-provider-activity' import { isJournalStopOrResumeRow, type JournalRow } from './journal-row-schema' import { acceptSubmissionFromProviderItem, applyJournalSubmission } from './journal-submission-fold' import { applyJournalDispatchRow } from './journal-dispatch-reducer' -import { isWriteFailureSubmission } from '../../../shared/structured-agent-session-dispatch-rejection' +import { isWriteFailureSubmission } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { projectJournalStopNote } from './journal-stop-note-projection' import { journalItemExecutionFence } from './journal-item-provenance' import { retireRewoundJournalSubmission } from './journal-rewind-submission-retirement' diff --git a/src/main/native-chat/agent-session-journal/journal-rejected-message-placement.test.ts b/src/main/native-chat/agent-session-journal/journal-rejected-message-placement.test.ts index 35da0b43ec5..52c6696ae9a 100644 --- a/src/main/native-chat/agent-session-journal/journal-rejected-message-placement.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-rejected-message-placement.test.ts @@ -1,10 +1,8 @@ import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import { projectJournalBatch } from '../agent-session-wire/agent-session-journal-batch' import { DISPATCH_DOUBT_HOST_RESTARTED } from './journal-dispatch-doubt-reasons' diff --git a/src/main/native-chat/agent-session-journal/journal-render-item.ts b/src/main/native-chat/agent-session-journal/journal-render-item.ts index 4631da6f117..8aa19ce00ac 100644 --- a/src/main/native-chat/agent-session-journal/journal-render-item.ts +++ b/src/main/native-chat/agent-session-journal/journal-render-item.ts @@ -1,13 +1,13 @@ import type { AgentJournalItemBody, AgentJournalProducerLinkage, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + AgentJournalRenderItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { agentJournalLinkageFields, namesAgentJournalProducer -} from '../../../shared/agent-session-journal-producer' +} from '../../../shared/agent-session/journal/agent-session-journal-producer' import type { JournalRow } from './journal-row-schema' /** Centralize row markers: absence means live append/session producer, not missing propagation. */ diff --git a/src/main/native-chat/agent-session-journal/journal-rewind-submission-retirement.ts b/src/main/native-chat/agent-session-journal/journal-rewind-submission-retirement.ts index b6edd1aae21..7c394f47bef 100644 --- a/src/main/native-chat/agent-session-journal/journal-rewind-submission-retirement.ts +++ b/src/main/native-chat/agent-session-journal/journal-rewind-submission-retirement.ts @@ -1,4 +1,4 @@ -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { JournalReducerState } from './journal-reducer' export function retireRewoundJournalSubmission(state: JournalReducerState, itemId: string): void { diff --git a/src/main/native-chat/agent-session-journal/journal-row-builders.ts b/src/main/native-chat/agent-session-journal/journal-row-builders.ts index e69c34cd58a..0b30f3a2a67 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-builders.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-builders.ts @@ -4,17 +4,19 @@ import { journalItemEchoFields, type JournalItemEcho } from './journal-item-echo import type { AgentJournalSubmission, AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalProducerLinkage, - AgentJournalRowAttribution, - AgentJournalTurnScope, + AgentJournalRowAttribution +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, AgentSessionJournalIdentity, AgentSessionJournalProviderHandle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { agentSessionJournalProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { journalRowSchemaVersion } from '../../../shared/agent-session-journal-types' -import { agentJournalLinkageFields } from '../../../shared/agent-session-journal-producer' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { journalRowSchemaVersion } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { journalItemOwnerFence } from './journal-item-provenance' import type { JournalReducerState } from './journal-reducer' import type { diff --git a/src/main/native-chat/agent-session-journal/journal-row-context-usage.spec.ts b/src/main/native-chat/agent-session-journal/journal-row-context-usage.spec.ts index a420b05262c..8a05dedf7d3 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-context-usage.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-context-usage.spec.ts @@ -1,15 +1,15 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import type { AgentSessionContextUsage } from '../../../shared/agent-session-context-usage' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalItemBody, AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import { parseJournalRow } from './journal-row-schema' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-row-schema-version.spec.ts b/src/main/native-chat/agent-session-journal/journal-row-schema-version.spec.ts index f3de0cb7120..a9ff9524ddf 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-schema-version.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-schema-version.spec.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-journal/journal-row-schema.test.ts b/src/main/native-chat/agent-session-journal/journal-row-schema.test.ts index b69645093e2..7022f1d2a12 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-schema.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-schema.test.ts @@ -3,7 +3,7 @@ import { projectStructuredAgentStartItem } from '../../../shared/structured-agen import { AGENT_JOURNAL_THREAD_SCOPE, AGENT_SESSION_JOURNAL_SCHEMA_VERSION -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { MAX_JOURNAL_LIFECYCLE_BATCH_MUTATIONS, parseJournalRow, diff --git a/src/main/native-chat/agent-session-journal/journal-row-schema.ts b/src/main/native-chat/agent-session-journal/journal-row-schema.ts index f5e43167cc1..fc57df829fd 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-schema.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-schema.ts @@ -12,16 +12,16 @@ import { type AgentJournalDispatchState, type AgentJournalItemBody, type AgentJournalMessageItem, - type AgentJournalProducerLinkage, - type AgentJournalTurnScope, - type AgentSessionJournalProviderHandle -} from '../../../shared/agent-session-journal-types' + type AgentJournalProducerLinkage +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import type { AgentSessionJournalProviderHandle } from '../../../shared/agent-session-journal-identity' import { readAgentJournalItemBody, readAgentJournalMessageBody, type AgentJournalContentVerdict -} from '../../../shared/agent-session-journal-body-admission' -import { isJournalTag } from '../../../shared/agent-session-journal-open-union' +} from '../../../shared/agent-session/journal/agent-session-journal-body-admission' +import { isJournalTag } from '../../../shared/agent-session/journal/agent-session-journal-open-union' import type { StructuredAgentSessionStopCause } from '../agent-session-wire/structured-agent-session-stop-cause' import { dropUnusableRowAnnotations } from './journal-row-unusable-annotations' import { journalRowDeclaresMore } from './journal-storage-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-row-writer.spec.ts b/src/main/native-chat/agent-session-journal/journal-row-writer.spec.ts index 487570b660b..52f9e284ecd 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-writer.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-writer.spec.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalHostDatabase } from './journal-host-database' import type { JournalRow } from './journal-row-schema' import { JournalRowWriter } from './journal-row-writer' diff --git a/src/main/native-chat/agent-session-journal/journal-row-writer.ts b/src/main/native-chat/agent-session-journal/journal-row-writer.ts index 40941b40b63..0d04d1d1c8d 100644 --- a/src/main/native-chat/agent-session-journal/journal-row-writer.ts +++ b/src/main/native-chat/agent-session-journal/journal-row-writer.ts @@ -1,7 +1,7 @@ import type Database from '../../sqlite/sync-database' import { insertJournalRow } from './journal-row-table' import type { JournalHostDatabase } from './journal-host-database' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalRow } from './journal-row-schema' import { assertJournalFence, assertJournalWritable } from './journal-write-guards' import type { JournalWriteBody } from './journal-write-queue' diff --git a/src/main/native-chat/agent-session-journal/journal-saved-state.test.ts b/src/main/native-chat/agent-session-journal/journal-saved-state.test.ts index 3d1a2f6404d..456f3dde9ab 100644 --- a/src/main/native-chat/agent-session-journal/journal-saved-state.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-saved-state.test.ts @@ -2,16 +2,14 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { SQLITE_TABLE_DISPOSITIONS } from '../../../shared/wsl-move/wsl-move-storage-dispositions' import { MAX_JOURNAL_APPLIED_SETTLEMENT_IDS, diff --git a/src/main/native-chat/agent-session-journal/journal-sequence-replay.spec.ts b/src/main/native-chat/agent-session-journal/journal-sequence-replay.spec.ts index 8121483857d..d098196a70d 100644 --- a/src/main/native-chat/agent-session-journal/journal-sequence-replay.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-sequence-replay.spec.ts @@ -1,14 +1,14 @@ import type { createFixture } from './journal-store-contract-test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { agentJournalItemKey, boundJournalKeyComponent, MAX_JOURNAL_KEY_COMPONENT_CHARS -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn' -import { AgentSessionJournalError } from './journal-store' +import { AgentSessionJournalError } from './journal-write-guards' import { openTestJournalHostDatabase, liveTestJournalRows, diff --git a/src/main/native-chat/agent-session-journal/journal-stop-acceptance.ts b/src/main/native-chat/agent-session-journal/journal-stop-acceptance.ts index db28ded0d60..000836e671e 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-acceptance.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-acceptance.ts @@ -2,7 +2,7 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import { journalQueuedRejectionRowBuilders } from './journal-pending-submission-recovery' import type { JournalReducerState } from './journal-reducer' import type { JournalStopEvent } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.spec.ts b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.spec.ts index a1106ba211f..43760af64e2 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.spec.ts @@ -4,10 +4,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { projectJournalBatch } from '../agent-session-wire/agent-session-journal-batch' import { createTrackedJournalOpener } from './journal-host-database-test-support' import { startJournalRowFold } from './journal-open' diff --git a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts index bee8132f313..0e6b6f9b300 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts @@ -1,6 +1,6 @@ // Additive tombstone fields keep Stop/Resume/reopen marks compatible with older row-kind readers. -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { JournalReducerState } from './journal-reducer' import { journalRowBase } from './journal-row-builders' import type { JournalStopEvent, JournalTombstoneRow } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-stop-note-projection.ts b/src/main/native-chat/agent-session-journal/journal-stop-note-projection.ts index 09dd516a9a6..056836ff493 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-note-projection.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-note-projection.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { isStructuredAgentSessionStopNote } from '../agent-session-wire/structured-agent-session-command-turn' import { STOP_NOTE_CANCELLATION_REQUESTED } from '../agent-session-wire/structured-agent-session-turn-stop-notes' diff --git a/src/main/native-chat/agent-session-journal/journal-stop-turn-end.test.ts b/src/main/native-chat/agent-session-journal/journal-stop-turn-end.test.ts index 79836db35d6..89e7f176266 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-turn-end.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-turn-end.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import { createJournalReducerState, type JournalReducerState } from './journal-reducer' import type { JournalStopEvent } from './journal-row-schema' import { diff --git a/src/main/native-chat/agent-session-journal/journal-stop-turn-end.ts b/src/main/native-chat/agent-session-journal/journal-stop-turn-end.ts index 61a3791c8da..6d21b3fc33f 100644 --- a/src/main/native-chat/agent-session-journal/journal-stop-turn-end.ts +++ b/src/main/native-chat/agent-session-journal/journal-stop-turn-end.ts @@ -4,11 +4,11 @@ import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { JournalReducerState } from './journal-reducer' import type { JournalStopEvent } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-storage-admission.test.ts b/src/main/native-chat/agent-session-journal/journal-storage-admission.test.ts index aa534b7bb62..0c82d721f21 100644 --- a/src/main/native-chat/agent-session-journal/journal-storage-admission.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-storage-admission.test.ts @@ -5,12 +5,12 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' import { z } from 'zod' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity, - type AgentSessionJournalProviderHandle -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity, + AgentSessionJournalProviderHandle +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-storage-row-schema.ts b/src/main/native-chat/agent-session-journal/journal-storage-row-schema.ts index 060b94e6ad6..d8b3cd29f7d 100644 --- a/src/main/native-chat/agent-session-journal/journal-storage-row-schema.ts +++ b/src/main/native-chat/agent-session-journal/journal-storage-row-schema.ts @@ -2,7 +2,7 @@ import { z } from 'zod' import { AgentJournalProducerLinkageFields, AgentJournalTurnScopeSchema -} from '../../../shared/agent-session-journal-schemas' +} from '../../../shared/agent-session/journal/agent-session-journal-schemas' import type { JournalRow } from './journal-row-schema' import { storedFailureFact, diff --git a/src/main/native-chat/agent-session-journal/journal-storage-schema.ts b/src/main/native-chat/agent-session-journal/journal-storage-schema.ts index b54462b76e2..82b08b6624b 100644 --- a/src/main/native-chat/agent-session-journal/journal-storage-schema.ts +++ b/src/main/native-chat/agent-session-journal/journal-storage-schema.ts @@ -2,14 +2,14 @@ import { z } from 'zod' import { AgentJournalKnownSchemas, AgentJournalRenderItemSchema -} from '../../../shared/agent-session-journal-schemas' -import { AgentJournalSubmissionSchema } from '../../../shared/agent-session-journal-submission-schema' +} from '../../../shared/agent-session/journal/agent-session-journal-schemas' +import { AgentJournalSubmissionSchema } from '../../../shared/agent-session/journal/agent-session-journal-submission-schema' import { AgentSessionFailureFactSchema } from '../../../shared/agent-session-failure-fact-schema' import type { AgentSessionFailureFact } from '../../../shared/agent-session-failure' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StorageDeclaresAll, UndeclaredStorageKeys } from './journal-storage-strict' // What saved outcomes declare beyond the wire's open schemas, which read only the keys their diff --git a/src/main/native-chat/agent-session-journal/journal-storage-strict.ts b/src/main/native-chat/agent-session-journal/journal-storage-strict.ts index c1096ff1be1..3a64c9b4fb5 100644 --- a/src/main/native-chat/agent-session-journal/journal-storage-strict.ts +++ b/src/main/native-chat/agent-session-journal/journal-storage-strict.ts @@ -2,8 +2,8 @@ import { z } from 'zod' import { isJournalOpenUnionFallback, isJournalTag -} from '../../../shared/agent-session-journal-open-union' -import type { AgentJournalUnknownKind } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-open-union' +import type { AgentJournalUnknownKind } from '../../../shared/agent-session/journal/agent-session-journal-types' // The wire reads a peer's or an older build's value openly. A saved value is different: a build // that kept a key it does not declare would restate the value without it, so storage refuses the diff --git a/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts b/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts index 2955d0b42ca..e65efcddb90 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts @@ -1,7 +1,7 @@ import type { AgentJournalCursor, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type { JournalHostDatabase } from './journal-host-database' import { JournalContextController } from './journal-context-controller' import { JournalEpochController } from './journal-epoch-controller' diff --git a/src/main/native-chat/agent-session-journal/journal-store-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-store-contract-test-fixture.ts index 1eaa5c37879..763e9da19b2 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-contract-test-fixture.ts @@ -2,11 +2,11 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach } from 'vitest' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalItemBody, AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type { openAgentSessionJournal } from './journal-store-factory' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts index e969ce87f7a..861403794d8 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts @@ -2,16 +2,18 @@ import type { JournalItemEcho } from './journal-item-echo' import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words' import type { AgentJournalAnsweredTurnIdentity, - AgentJournalCursor, AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalMessageItem, AgentJournalProducerLinkage, AgentJournalResetReason, - AgentJournalRowAttribution, - AgentJournalTurnScope, + AgentJournalRowAttribution +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalCursor, + AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import type { AgentSessionMessageSource } from '../../../shared/agent-session/agent-session-message-source' import type { AgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' import type { JournalHostDatabase } from './journal-host-database' diff --git a/src/main/native-chat/agent-session-journal/journal-store-open.ts b/src/main/native-chat/agent-session-journal/journal-store-open.ts index b73b163001c..24ecb17313b 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-open.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-open.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { JournalLoad } from './journal-open' import { failLoadOnUnloadableJournal } from './journal-open-failure' import { staleSubagentRosterRevisions } from './journal-subagent-liveness' diff --git a/src/main/native-chat/agent-session-journal/journal-store-restore.ts b/src/main/native-chat/agent-session-journal/journal-store-restore.ts index 3fc0a1a1b83..6fae5c6f024 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-restore.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-restore.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalEpochController } from './journal-epoch-controller' import { restoreJournal } from './journal-open' import { journalOpenRefusalError } from './journal-open-failure' diff --git a/src/main/native-chat/agent-session-journal/journal-store-schema.spec.ts b/src/main/native-chat/agent-session-journal/journal-store-schema.spec.ts index 4d632853621..bcd5092672e 100644 --- a/src/main/native-chat/agent-session-journal/journal-store-schema.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-store-schema.spec.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' // Database and row versions evolve independently; both must reject unsupported newer content. import { createHash } from 'node:crypto' @@ -6,11 +6,11 @@ import { mkdtemp, readFile, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalItemBody, AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type Database from '../../sqlite/sync-database' import { JOURNAL_DB_SCHEMA_VERSION } from './journal-database-schema' import { journalDatabasePath } from './journal-host-database' diff --git a/src/main/native-chat/agent-session-journal/journal-store.ts b/src/main/native-chat/agent-session-journal/journal-store.ts index 8042d8165b4..a0a09117c1e 100644 --- a/src/main/native-chat/agent-session-journal/journal-store.ts +++ b/src/main/native-chat/agent-session-journal/journal-store.ts @@ -8,16 +8,18 @@ import { retireCoveredJournalFloor } from './journal-commit' import { createJournalPublicReader } from './journal-public-read' import type { AgentJournalAcceptanceReceipt, - AgentJournalCursor, AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem, AgentJournalSnapshot, AgentJournalSubmission, - AgentJournalTurnLifecycle, + AgentJournalTurnLifecycle +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalCursor, + AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionContextUsage } from '../../../shared/agent-session-context-usage' import { latestStructuredAgentContextFacts } from '../../../shared/structured-agent-session-context-usage' import { @@ -57,8 +59,6 @@ import { journalItemExecutionFence, journalItemProvenance } from './journal-item import { createJournalStoreCollaborators } from './journal-store-collaborators' import { journalThreadGoalSource, type JournalThreadGoalSource } from './journal-thread-goal-source' -export { AgentSessionJournalError } from './journal-write-guards' - type JournalCollaborators = ReturnType export class AgentSessionJournal { diff --git a/src/main/native-chat/agent-session-journal/journal-streamed-revision-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-streamed-revision-contract-test-fixture.ts index 60aa6928d8b..eb148f94b7e 100644 --- a/src/main/native-chat/agent-session-journal/journal-streamed-revision-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-streamed-revision-contract-test-fixture.ts @@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto' import { tmpdir } from 'node:os' import { join, dirname } from 'node:path' import { afterEach, beforeEach, vi } from 'vitest' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalPragmaNumber } from './journal-database' import { closeTestJournalHostDatabases, diff --git a/src/main/native-chat/agent-session-journal/journal-streamed-revision-resolved-lifecycle.test.ts b/src/main/native-chat/agent-session-journal/journal-streamed-revision-resolved-lifecycle.test.ts index 368cd08aa7e..4b3386089c6 100644 --- a/src/main/native-chat/agent-session-journal/journal-streamed-revision-resolved-lifecycle.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-streamed-revision-resolved-lifecycle.test.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestJournalHostDatabase } from './journal-host-database-test-support' import { JournalGoalAttachmentInverse } from './journal-goal-attachment-inverse' import type { JournalOperationReceipt } from './journal-row-writer' diff --git a/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.test.ts b/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.test.ts index 826a480b6f3..1266acef833 100644 --- a/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.test.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexImageItemBody } from '../../codex/codex-image-item-translation' import { journalPragmaNumber } from './journal-database' import { openTestJournalHostDatabase } from './journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.ts b/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.ts index 25c64cf6ebb..23ebcdfea5f 100644 --- a/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.ts +++ b/src/main/native-chat/agent-session-journal/journal-streamed-text-revision.ts @@ -1,5 +1,5 @@ import { isDeepStrictEqual } from 'node:util' -import { agentJournalLinkageFields } from '../../../shared/agent-session-journal-producer' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' import type { JournalReducerState } from './journal-reducer' import type { JournalRow } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts b/src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts index 3cf444e7a36..b5f16b70198 100644 --- a/src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-streaming-replay.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalHostDatabase } from './journal-host-database' import { replayJournal } from './journal-open' import type { JournalRow } from './journal-row-schema' diff --git a/src/main/native-chat/agent-session-journal/journal-subagent-item.spec.ts b/src/main/native-chat/agent-session-journal/journal-subagent-item.spec.ts index 385446f9ce9..0712cf1d393 100644 --- a/src/main/native-chat/agent-session-journal/journal-subagent-item.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-subagent-item.spec.ts @@ -2,12 +2,10 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AgentJournalItemBodySchema } from '../../../shared/agent-session-journal-schemas' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AgentJournalItemBodySchema } from '../../../shared/agent-session/journal/agent-session-journal-schemas' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { isSubagentBlock, type NativeChatSubagentBlock diff --git a/src/main/native-chat/agent-session-journal/journal-subagent-item.ts b/src/main/native-chat/agent-session-journal/journal-subagent-item.ts index 836e213183c..095f9e04f3b 100644 --- a/src/main/native-chat/agent-session-journal/journal-subagent-item.ts +++ b/src/main/native-chat/agent-session-journal/journal-subagent-item.ts @@ -1,11 +1,11 @@ // Child IDs key reusable rows so later runs revise them directly instead of duplicating or scanning. -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { subagentFallbackText } from '../../../shared/native-chat/transcript/native-chat-subagent-items' import { MAX_SUBAGENT_FIELD_CHARS } from '../../../shared/native-chat/transcript/native-chat-subagent-summary' import { diff --git a/src/main/native-chat/agent-session-journal/journal-subagent-liveness.spec.ts b/src/main/native-chat/agent-session-journal/journal-subagent-liveness.spec.ts index 3f0e912fabd..ced0fc1f7f1 100644 --- a/src/main/native-chat/agent-session-journal/journal-subagent-liveness.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-subagent-liveness.spec.ts @@ -1,14 +1,14 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import type { AgentJournalItemBody, - AgentJournalRenderItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' + AgentJournalRenderItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { backgroundTaskFallbackText } from '../../../shared/native-chat/input/native-chat-background-task-row' import { isBackgroundTaskBlock, diff --git a/src/main/native-chat/agent-session-journal/journal-subagent-liveness.ts b/src/main/native-chat/agent-session-journal/journal-subagent-liveness.ts index 896d3a3c7c4..92af0a7a930 100644 --- a/src/main/native-chat/agent-session-journal/journal-subagent-liveness.ts +++ b/src/main/native-chat/agent-session-journal/journal-subagent-liveness.ts @@ -4,12 +4,12 @@ import { agentJournalItemKey, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { isSubagentGroupFallbackText, normalizeSubagentState, diff --git a/src/main/native-chat/agent-session-journal/journal-submission-fold.ts b/src/main/native-chat/agent-session-journal/journal-submission-fold.ts index f168dd18caa..275dbffd72d 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-fold.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-fold.ts @@ -1,8 +1,8 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' import { journalRenderItem } from './journal-render-item' import { statedOrDerivedTurnScope, upsertJournalItem } from './journal-item-fold' @@ -10,7 +10,7 @@ import type { JournalReducerState } from './journal-reducer' import type { JournalRow } from './journal-row-schema' import { journalDispatchRowApplies } from './journal-dispatch-settlement' import { DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED } from './journal-dispatch-doubt-reasons' -import { dispatchWasWithdrawn } from '../../../shared/structured-agent-session-dispatch-rejection' +import { dispatchWasWithdrawn } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' export function applyJournalSubmission( state: JournalReducerState, diff --git a/src/main/native-chat/agent-session-journal/journal-submission-hook.ts b/src/main/native-chat/agent-session-journal/journal-submission-hook.ts index 8765faa6c07..300092eaa82 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-hook.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-hook.ts @@ -1,5 +1,5 @@ import type Database from '../../sqlite/sync-database' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalRow } from './journal-row-schema' /** Claim attachments atomically; required rejects missing uploads except references retained from previous. */ diff --git a/src/main/native-chat/agent-session-journal/journal-submission-links.ts b/src/main/native-chat/agent-session-journal/journal-submission-links.ts index e1d421f17f8..6e1506a62ec 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-links.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-links.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' /** Reverse links derive from submission rows and share the reducer lifetime. */ export class JournalSubmissionLinks { diff --git a/src/main/native-chat/agent-session-journal/journal-submission-positions.spec.ts b/src/main/native-chat/agent-session-journal/journal-submission-positions.spec.ts index a1c41c15ff2..ed2dab565a2 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-positions.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-positions.spec.ts @@ -9,12 +9,12 @@ import { agentSessionFailureWords } from '../../../shared/agent-session-failure- import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalMessageItem, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalMessageItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { readAgentSessionHydrationPage } from '../agent-session-wire/agent-session-history-page' import { createTrackedJournalOpener } from './journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-journal/journal-submission-queued-link.spec.ts b/src/main/native-chat/agent-session-journal/journal-submission-queued-link.spec.ts index 3eae06d6f16..cf19ab19059 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-queued-link.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-queued-link.spec.ts @@ -4,12 +4,10 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AgentJournalSubmissionSchema } from '../../../shared/agent-session-journal-submission-schema' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { AgentJournalSubmissionSchema } from '../../../shared/agent-session/journal/agent-session-journal-submission-schema' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { createJournalReducerState, applyJournalRow } from './journal-reducer' import { parseJournalRow, serializeJournalRow, type JournalRow } from './journal-row-schema' import type { AgentSessionJournal } from './journal-store' diff --git a/src/main/native-chat/agent-session-journal/journal-submission-writer.ts b/src/main/native-chat/agent-session-journal/journal-submission-writer.ts index fdcab7e4fc1..730f4453114 100644 --- a/src/main/native-chat/agent-session-journal/journal-submission-writer.ts +++ b/src/main/native-chat/agent-session-journal/journal-submission-writer.ts @@ -1,7 +1,7 @@ import type { AgentJournalCursor, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import { journalDispatchRowApplies } from './journal-dispatch-settlement' import { journalQueueReopenRowBuilder } from './journal-stop-and-resume-rows' import type { JournalQueuedMessages, JournalQueuePlan } from './journal-queued-messages' diff --git a/src/main/native-chat/agent-session-journal/journal-terminal-settlement.ts b/src/main/native-chat/agent-session-journal/journal-terminal-settlement.ts index 4573c7bb318..4c378cd9750 100644 --- a/src/main/native-chat/agent-session-journal/journal-terminal-settlement.ts +++ b/src/main/native-chat/agent-session-journal/journal-terminal-settlement.ts @@ -4,9 +4,9 @@ import { } from '../../../shared/agent-journal-tool-call-lifecycle' import type { AgentJournalItemBody, - AgentJournalMessageItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + AgentJournalMessageItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { isRunningAgentJournalTurn, readAgentJournalTurn diff --git a/src/main/native-chat/agent-session-journal/journal-terminal-time-validation.spec.ts b/src/main/native-chat/agent-session-journal/journal-terminal-time-validation.spec.ts index bb9930a0d2e..5c1fdb32c1c 100644 --- a/src/main/native-chat/agent-session-journal/journal-terminal-time-validation.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-terminal-time-validation.spec.ts @@ -1,8 +1,8 @@ import type { createFixture } from './journal-terminal-validation-test-fixture' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AgentJournalItemBodySchema } from '../../../shared/agent-session-journal-schemas' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AgentJournalItemBodySchema } from '../../../shared/agent-session/journal/agent-session-journal-schemas' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { liveTestJournalRows, diff --git a/src/main/native-chat/agent-session-journal/journal-terminal-validation-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-terminal-validation-test-fixture.ts index 6ce38691e5f..83603c3bdba 100644 --- a/src/main/native-chat/agent-session-journal/journal-terminal-validation-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-terminal-validation-test-fixture.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { settleStaleStructuredAgentSessionState } from '../agent-session-wire/structured-agent-session-dead-generation-settlement' import { diff --git a/src/main/native-chat/agent-session-journal/journal-thread-goal-source.ts b/src/main/native-chat/agent-session-journal/journal-thread-goal-source.ts index badedd98ffc..8af40561680 100644 --- a/src/main/native-chat/agent-session-journal/journal-thread-goal-source.ts +++ b/src/main/native-chat/agent-session-journal/journal-thread-goal-source.ts @@ -1,9 +1,9 @@ +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { - AgentJournalItemIdentity, AgentJournalRenderItem, AgentJournalThreadGoal -} from '../../../shared/agent-session-journal-types' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { currentAgentSessionThreadGoalSourceBySequence } from '../../../shared/agent-session/agent-session-thread-goal' export type JournalThreadGoalSource = { diff --git a/src/main/native-chat/agent-session-journal/journal-turn-scope.test.ts b/src/main/native-chat/agent-session-journal/journal-turn-scope.test.ts index f97cf0fedda..2b2b4274eaa 100644 --- a/src/main/native-chat/agent-session-journal/journal-turn-scope.test.ts +++ b/src/main/native-chat/agent-session-journal/journal-turn-scope.test.ts @@ -2,13 +2,13 @@ import { describe, expect, it } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { projectNativeChatTranscriptMessages } from '../../../shared/native-chat/transcript/native-chat-transcript-projection' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import { diff --git a/src/main/native-chat/agent-session-journal/journal-unknown-content.spec.ts b/src/main/native-chat/agent-session-journal/journal-unknown-content.spec.ts index c9c2119b230..52b2035db09 100644 --- a/src/main/native-chat/agent-session-journal/journal-unknown-content.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-unknown-content.spec.ts @@ -7,10 +7,12 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - AGENT_SESSION_JOURNAL_SCHEMA_VERSION, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + AGENT_SESSION_JOURNAL_SCHEMA_VERSION +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { closeTestJournalHostDatabase, diff --git a/src/main/native-chat/agent-session-journal/journal-unknown-row-kind.spec.ts b/src/main/native-chat/agent-session-journal/journal-unknown-row-kind.spec.ts index fee7bcd7a47..694ef3b61ae 100644 --- a/src/main/native-chat/agent-session-journal/journal-unknown-row-kind.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-unknown-row-kind.spec.ts @@ -6,10 +6,12 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - AGENT_SESSION_JOURNAL_SCHEMA_VERSION, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + AGENT_SESSION_JOURNAL_SCHEMA_VERSION +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { closeTestJournalHostDatabase, createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-contract-test-fixture.ts index 8d1155259b2..1e8d4f14160 100644 --- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-contract-test-fixture.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach } from 'vitest' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentMessageSource, AgentSessionMessageSource diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-queue.spec.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-queue.spec.ts index 274207b4413..5c890e3b1e7 100644 --- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-queue.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-queue.spec.ts @@ -1,6 +1,6 @@ import type { createFixture } from './journal-unsent-send-hold-contract-test-fixture' import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { USER_MESSAGE_SOURCE } from '../../../shared/agent-session/agent-session-message-source' export function registerJournalUnsentSendHoldQueueTests( diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-recovery.spec.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-recovery.spec.ts index 7b219bb78fc..dbb0d66509c 100644 --- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-recovery.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold-recovery.spec.ts @@ -1,6 +1,6 @@ import type { createFixture } from './journal-unsent-send-hold-contract-test-fixture' import { 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 { USER_MESSAGE_SOURCE } from '../../../shared/agent-session/agent-session-message-source' import { structuredAgentSessionCompactBody } from '../agent-session-wire/structured-agent-session-command-turn' import { unsentSendKeptAsCard } from './journal-unsent-send-hold' diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts index 4817d8abfc5..4f438cdbed7 100644 --- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts +++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts @@ -5,9 +5,9 @@ import type { AgentJournalItemBody, AgentJournalMessageItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { USER_MESSAGE_SOURCE } from '../../../shared/agent-session/agent-session-message-source' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' diff --git a/src/main/native-chat/agent-session-journal/journal-write-queue.spec.ts b/src/main/native-chat/agent-session-journal/journal-write-queue.spec.ts index f4445a5b4ef..5d7575cb140 100644 --- a/src/main/native-chat/agent-session-journal/journal-write-queue.spec.ts +++ b/src/main/native-chat/agent-session-journal/journal-write-queue.spec.ts @@ -2,12 +2,12 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, 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 { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { closeTestJournalHostDatabases, openTestJournalHostDatabase diff --git a/src/main/native-chat/agent-session-journal/queued-edit-host.test-fixture.ts b/src/main/native-chat/agent-session-journal/queued-edit-host.test-fixture.ts index 2f559cbdc4a..7fd0d241a84 100644 --- a/src/main/native-chat/agent-session-journal/queued-edit-host.test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/queued-edit-host.test-fixture.ts @@ -5,7 +5,7 @@ import { } from './queued-message-update' import type { QueuedMessageRow } from './queued-message-table' import type { QueuedEditHostFixtureModule } from '../../../shared/queued-edit-host.test-fixture' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' /** Real CAS/lease decisions; delivery of their answers is controlled by the client harness. */ export const queuedEditHost: QueuedEditHostFixtureModule['queuedEditHost'] = ( diff --git a/src/main/native-chat/agent-session-journal/queued-message-edit-leases.ts b/src/main/native-chat/agent-session-journal/queued-message-edit-leases.ts index 0a93f9f1a44..36163fb201b 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-edit-leases.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-edit-leases.ts @@ -1,6 +1,6 @@ // Ephemeral edit leases block automatic delivery; reads revalidate against deadlines and current cards. -import type { AgentSessionQueuedMessageEditHoldResult } from '../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageEditHoldResult } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import { isUnsettledQueuedMessage, type QueuedMessageRow } from './queued-message-table' export const QUEUED_MESSAGE_EDIT_LEASE_MS = 120_000 diff --git a/src/main/native-chat/agent-session-journal/queued-message-move.ts b/src/main/native-chat/agent-session-journal/queued-message-move.ts index 4d5b00d599e..963de6cf099 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-move.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-move.ts @@ -1,7 +1,7 @@ import type { AgentSessionQueuedMessageMoveAnchor, AgentSessionQueuedMessageMoveResult -} from '../../../shared/agent-session-wire' +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { JournalQueueCardChange } from './journal-queue-events' import { isUnsettledQueuedMessage, type QueuedMessageRow } from './queued-message-table' diff --git a/src/main/native-chat/agent-session-journal/queued-message-pause-contract-test-fixture.ts b/src/main/native-chat/agent-session-journal/queued-message-pause-contract-test-fixture.ts index 38e922d0c5f..f477a7edf82 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-pause-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-pause-contract-test-fixture.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach } from 'vitest' -import type { - AgentJournalMessageItem, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import Database from '../../sqlite/sync-database' import { journalDatabasePath } from './journal-host-database' import { @@ -19,7 +17,7 @@ import { fields } from './journal-state-schema' import type { AgentSessionJournal } from './journal-store' import { queuePauseHolding } from './queued-message-pause' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' export function createFixture() { const IDENTITY: AgentSessionJournalIdentity = { diff --git a/src/main/native-chat/agent-session-journal/queued-message-pause.ts b/src/main/native-chat/agent-session-journal/queued-message-pause.ts index d9524eb99cf..8a02d027e60 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-pause.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-pause.ts @@ -1,10 +1,8 @@ // Derive pauses from journal state: personal Stop, cleared IDs and cards predating reopen. // Later accepted turns/Resume lift pauses; per-card holds still require their own action. -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalStopEvent, JournalTombstoneRow } from './journal-row-schema' export type QueuePauseReason = 'stopped' | 'cleared' | 'restarted' diff --git a/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts b/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts index 79f1d7a5d4a..93a2e4ba38e 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts @@ -1,8 +1,8 @@ // Unreadable legacy cards remain on disk and must never appear as empty messages. import type { UnreadAgentSessionFailureFact } from '../../../shared/agent-session-failure' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' -import { readAgentJournalMessageBody } from '../../../shared/agent-session-journal-body-admission' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { readAgentJournalMessageBody } from '../../../shared/agent-session/journal/agent-session-journal-body-admission' import { readStoredRejectionFact } from './journal-dispatch-reducer' import type { QueuedMessageRow } from './queued-message-table' import { readAgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' diff --git a/src/main/native-chat/agent-session-journal/queued-message-table.ts b/src/main/native-chat/agent-session-journal/queued-message-table.ts index fb881615928..17f1f646b57 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-table.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-table.ts @@ -2,11 +2,9 @@ // refusals, requeue proven non-delivery, and spend uncertain or accepted sends. import type { UnreadAgentSessionFailureFact } from '../../../shared/agent-session-failure' -import type { - AgentJournalCursor, - AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' -import type { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session-queued-message-wire' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionExecutionOptions } from '../../../shared/agent-session/options/agent-session-execution-options' export type QueuedMessageState = 'waiting' | 'dispatched' | 'returned' | 'withdrawn' diff --git a/src/main/native-chat/agent-session-journal/queued-message-update.spec.ts b/src/main/native-chat/agent-session-journal/queued-message-update.spec.ts index fb224cce703..7d0a1926001 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-update.spec.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-update.spec.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from 'vitest' import { queuedMessageUpdateDecision } from './queued-message-update' import type { QueuedMessageRow } from './queued-message-table' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { MAX_PROMPT_BYTES } from '../../../shared/rpc-contract/structured-agent-session-params' export function registerQueuedMessageUpdateTests(): void { diff --git a/src/main/native-chat/agent-session-journal/queued-message-update.ts b/src/main/native-chat/agent-session-journal/queued-message-update.ts index 5eacc8d814a..b13eb030f2c 100644 --- a/src/main/native-chat/agent-session-journal/queued-message-update.ts +++ b/src/main/native-chat/agent-session-journal/queued-message-update.ts @@ -1,6 +1,6 @@ -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' -import type { AgentSessionQueuedMessageUpdateResult } from '../../../shared/agent-session-wire' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessageUpdateResult } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { queuedMessageWithEdit, type QueuedMessageEdit } from '../../../shared/queued-message-edit' import { isUnsettledQueuedMessage, type QueuedMessageRow } from './queued-message-table' diff --git a/src/main/native-chat/agent-session-saved-prompt-text.ts b/src/main/native-chat/agent-session-saved-prompt-text.ts index 59ad2a79581..e438ffe0441 100644 --- a/src/main/native-chat/agent-session-saved-prompt-text.ts +++ b/src/main/native-chat/agent-session-saved-prompt-text.ts @@ -1,9 +1,9 @@ import type { AgentJournalRenderItem, AgentJournalQuestionItem -} from '../../shared/agent-session-journal-types' -import { agentJournalItemRowOrigin } from '../../shared/agent-session-journal-position' -import { agentJournalLinkageFields } from '../../shared/agent-session-journal-producer' +} from '../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemRowOrigin } from '../../shared/agent-session/journal/agent-session-journal-position' +import { agentJournalLinkageFields } from '../../shared/agent-session/journal/agent-session-journal-producer' import { agentSessionPromptQuestions, legacyAgentSessionQuestionAnswers diff --git a/src/main/native-chat/agent-session-timeline/agent-journal-turn-row-revision.ts b/src/main/native-chat/agent-session-timeline/agent-journal-turn-row-revision.ts index 83eeb1421fa..ef2a6f8f8cb 100644 --- a/src/main/native-chat/agent-session-timeline/agent-journal-turn-row-revision.ts +++ b/src/main/native-chat/agent-session-timeline/agent-journal-turn-row-revision.ts @@ -10,12 +10,12 @@ import { import { agentJournalItemKey, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalTurnItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { estimateStructuredAgentSessionItemBytes } from '../agent-session-wire/structured-agent-session-event-sink-estimate' import type { diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-attribution.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-attribution.test.ts index 104088e25e7..700e1d477c9 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-attribution.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-attribution.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { backgroundTask, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-held-rows.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-held-rows.test.ts index 89c5beec32a..1a963fa2462 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-held-rows.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-held-rows.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { closeProviderTimelineRigs, openProviderTimelineRig, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-items.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-items.test.ts index 36e34afec9b..4024a726fdf 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-items.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-items.test.ts @@ -2,7 +2,7 @@ import { afterEach, describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalPlainStatusItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { assistantText, backgroundTask, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-rows.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-rows.test.ts index a17ef0f498e..f4083f6dd3f 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-rows.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-rows.test.ts @@ -1,7 +1,7 @@ // Refused events must consume no keys, rows or admission budget. import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { assistantText, backgroundTask, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-session.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-session.test.ts index 368b1c01e49..8220223ae65 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-session.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-session.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalApprovalItem } from '../../../shared/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalApprovalItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { closeProviderTimelineRigs, openProviderTimelineRig, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-stop.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-stop.test.ts index fa45e505de7..bcbbe836870 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-stop.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-stop.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { MAX_PROVIDER_TIMELINE_OPEN_ENTRIES } from './provider-timeline-budget' import { diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-streams.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-streams.test.ts index a17c7eaf9f7..8c560433f3a 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-streams.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-streams.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { closeProviderTimelineRigs, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-test-support.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-test-support.ts index 820a07e67b6..d66546a1dd2 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-test-support.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-test-support.ts @@ -3,7 +3,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalApprovalItem, AgentJournalItemBody, @@ -11,7 +11,7 @@ import type { AgentJournalRenderItem, AgentJournalToolCallItem, AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { backgroundTaskFallbackText } from '../../../shared/native-chat/input/native-chat-background-task-row' import { diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-tool-ends.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-tool-ends.test.ts index 65806e02ee5..135ec861eaf 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-tool-ends.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-tool-ends.test.ts @@ -3,8 +3,8 @@ import { agentJournalToolCallLifecycle, interruptedAgentJournalToolCall } from '../../../shared/agent-journal-tool-call-lifecycle' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalToolCallItem } from '../../../shared/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalToolCallItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { closeProviderTimelineRigs, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-turns.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-turns.test.ts index 3d4cd86838d..40083ad976c 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-turns.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler-turns.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { closeProviderTimelineRigs, openProviderTimelineRig, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts index 2330bc074f7..3634723fd49 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts @@ -2,8 +2,8 @@ // Deferred writes resolve from current journal state, preserving other writers’ answers and Stops. // Each provider child gets a fresh assembler and generation. -import type { AgentType } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentType } from '../../../shared/agent-status-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { StructuredAgentSessionCommandRun } from '../agent-session-wire/structured-agent-session-adapter' import type { AgentSessionDeltaCoalescerDeps } from '../agent-session-wire/agent-session-delta-coalescer' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-background-tasks.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-background-tasks.ts index e7f1c6d0a05..7d086212de6 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-background-tasks.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-background-tasks.ts @@ -1,6 +1,6 @@ // Background-task rows outlive turn settlement; only their own updates or session end settle them. -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import { canReplaceBackgroundTaskState } from '../../../shared/native-chat/input/native-chat-background-task-row' import { isBackgroundTaskBlock } from '../../../shared/native-chat/native-chat-types' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-context.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-context.ts index 2afb7fcff2e..cb3919e8aa4 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-context.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-context.ts @@ -1,8 +1,6 @@ -import type { - AgentJournalProducerLinkage, - AgentJournalTurnScope, - AgentType -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalProducerLinkage } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import type { AgentType } from '../../../shared/agent-status-types' import type { ProviderTimelineJoin } from './provider-timeline-event' import { providerKey, type ProviderTimelineRows } from './provider-timeline-rows' import type { ProviderTimelineState } from './provider-timeline-state' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-decision.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-decision.ts index 1ed41414b47..b4ec69c2cfb 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-decision.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-decision.ts @@ -1,10 +1,8 @@ // Admission allocates/writes nothing; deferred resolvers read current journal state because recovery // may land after admission but before sink binding. -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders' import type { StructuredAgentSessionItemAppendOptions } from '../agent-session-wire/structured-agent-session-event-sink' import type { StructuredAgentSessionTransitionJournal } from '../agent-session-wire/structured-agent-session-transition' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-event.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-event.ts index 8b777a5211e..61ffe0bf238 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-event.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-event.ts @@ -8,9 +8,9 @@ import type { AgentJournalApprovalItem, AgentJournalItemBody, AgentJournalProducerLinkage, - AgentJournalQuestionItem, - AgentJournalTurnOutcome -} from '../../../shared/agent-session-journal-types' + AgentJournalQuestionItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../../shared/agent-turn-outcome' import type { StructuredAgentSessionTurnVerdict } from '../agent-session-wire/structured-agent-session-stale-turn-verdict' /** The assembler owns turn rows; prompts travel as requests. */ diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-history.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-history.ts index 828c8c06dca..4db019bff10 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-history.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-history.ts @@ -1,5 +1,5 @@ -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 { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' type ItemReader = (itemId: string) => AgentJournalRenderItem | null diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-identity.test.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-identity.test.ts index 6242af3998f..5307b9e620d 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-identity.test.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-identity.test.ts @@ -1,5 +1,5 @@ import { 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 { createLegacyProviderTimelineIdentityScheme, providerTimelineKeyPart, diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-identity.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-identity.ts index 11f3d912c5e..fa5d8aa6bf9 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-identity.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-identity.ts @@ -1,9 +1,7 @@ // Pure identity spelling preserves existing legacy shapes; the assembler decides row equivalence. -import type { - AgentJournalItemIdentity, - AgentType -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentType } from '../../../shared/agent-status-types' import { boundPayload, digestPayload } from '../agent-session-journal/journal-payload-bounds' /** Minted keys are acquisition-unique and need no provider namespace. */ diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-item-decisions.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-item-decisions.ts index fee95a70338..b43935023ac 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-item-decisions.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-item-decisions.ts @@ -2,7 +2,7 @@ import { isDeepStrictEqual } from 'node:util' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { cancelledJournalPromptBody } from '../agent-session-journal/journal-prompt-body-bounds' import { requiresTerminalSettlement } from '../agent-session-journal/journal-terminal-settlement' import { estimateStructuredAgentSessionItemBytes } from '../agent-session-wire/structured-agent-session-event-sink-estimate' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-rows.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-rows.ts index c7fe3b491e0..83b51268b2b 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-rows.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-rows.ts @@ -1,10 +1,8 @@ // Derive row IDs from keys instead of maintaining an index; existing rows retain their original scope. -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemIdentity, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { StructuredAgentSessionTransitionJournal } from '../agent-session-wire/structured-agent-session-transition' import type { diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-settlement.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-settlement.ts index 9ded05c364e..745dc993cbe 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-settlement.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-settlement.ts @@ -2,13 +2,13 @@ import { isHistoricalProviderTimelineItem } from './provider-timeline-history' // Resolve unsettled work from journal bodies, using the same terminal forms as dead-generation recovery. // Preserve client answers and other writers’ settlements; repeated settlement writes nothing. -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, - type AgentJournalItemIdentity, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { agentJournalTurnBody, readAgentJournalTurn diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-state.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-state.ts index 4ca5134cc29..9403a4e981f 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-state.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-state.ts @@ -2,9 +2,9 @@ import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalTurnLifecycle, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalTurnLifecycle +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { requiresTerminalSettlement } from '../agent-session-journal/journal-terminal-settlement' import type { StructuredAgentSessionTransitionJournal } from '../agent-session-wire/structured-agent-session-transition' import type { ProviderTimelineRowId, ProviderTimelineTurnRef } from './provider-timeline-rows' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-text-events.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-text-events.ts index f40b62d4393..1010b687ace 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-text-events.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-text-events.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionSinkAdmission } from '../agent-session-wire/structured-agent-session-event-sink' import type { StructuredAgentSessionTransitionJournal } from '../agent-session-wire/structured-agent-session-transition' import type { ProviderTimelineHold } from './provider-timeline-budget' diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-text-streams.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-text-streams.ts index c4e445fe8c7..1887402c23e 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-text-streams.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-text-streams.ts @@ -5,9 +5,9 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, - type AgentJournalProducerLinkage, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalProducerLinkage +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { createAgentSessionDeltaCoalescer, type AgentSessionDeltaCoalescerDeps diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-turn-decisions.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-turn-decisions.ts index b63b4e420cf..7dddf724516 100644 --- a/src/main/native-chat/agent-session-timeline/provider-timeline-turn-decisions.ts +++ b/src/main/native-chat/agent-session-timeline/provider-timeline-turn-decisions.ts @@ -1,8 +1,8 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentJournalTurnBody, readAgentJournalTurn diff --git a/src/main/native-chat/agent-session-wire/agent-session-bounded-frame-item.ts b/src/main/native-chat/agent-session-wire/agent-session-bounded-frame-item.ts index f415faf4226..9a4f8a61203 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-bounded-frame-item.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-bounded-frame-item.ts @@ -1,5 +1,5 @@ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' -import { boundJournalKeyComponent } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { boundJournalKeyComponent } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { BOUNDED_FRAME_CONTENT_BUDGET_BYTES, measureHistoryItem, diff --git a/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.test.ts b/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.test.ts index f24a6331da6..408d4e63f7c 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.test.ts @@ -7,12 +7,12 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, - type AgentJournalItemIdentity, type AgentJournalSubmission, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentSessionQueuedMessage } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { - AgentSessionQueuedMessage, AgentSessionSlashCommand, AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' diff --git a/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.ts b/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.ts index 58d950cbb6b..e73b2b1429d 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-bounded-frames.ts @@ -1,7 +1,7 @@ // Fit phone bridge limits by splitting queue/roster lists into side batches. // Omit slash commands because phones read them through agentSession.options. -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session/agent-session-background-task-wire' import { boundedFrameItem } from './agent-session-bounded-frame-item' diff --git a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts index e9eede06f44..f636603fff5 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSnapshot -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentSessionConversationOutline } from './agent-session-conversation-outline' import { HISTORY_PAGE_CONTENT_BUDGET_BYTES } from './agent-session-history-page-bounds' diff --git a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts index f3d37d228ce..69f0df3e930 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts @@ -8,7 +8,7 @@ import { type AgentSessionConversationOutline, type AgentSessionConversationOutlineEntry } from '../../../shared/agent-session/agent-session-conversation-outline' -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' import { HISTORY_PAGE_CONTENT_BUDGET_BYTES } from './agent-session-history-page-bounds' const DEGRADED_PREVIEW_MAX_CHARS = 60 diff --git a/src/main/native-chat/agent-session-wire/agent-session-current-requests.test.ts b/src/main/native-chat/agent-session-wire/agent-session-current-requests.test.ts index 697eda638e7..fcc75e0d316 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-current-requests.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-current-requests.test.ts @@ -1,11 +1,11 @@ import { expect, it, vi } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' -import { createAgentSessionCurrentRequestsReader } from '../../../shared/agent-session-current-requests-reader' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { createAgentSessionCurrentRequestsReader } from '../../../shared/agent-session/requests/agent-session-current-requests-reader' import type { AgentSessionCurrentRequestsMarker, AgentSessionCurrentRequestsPiece -} from '../../../shared/agent-session-current-requests-wire' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../shared/agent-session-current-requests-capability' +} from '../../../shared/agent-session/requests/agent-session-current-requests-wire' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../shared/agent-session/requests/agent-session-current-requests-capability' import { EMPTY_STRUCTURED_AGENT_SESSION, reduceStructuredAgentSession, diff --git a/src/main/native-chat/agent-session-wire/agent-session-current-requests.ts b/src/main/native-chat/agent-session-wire/agent-session-current-requests.ts index a2fef56f279..7bff0a5b9de 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-current-requests.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-current-requests.ts @@ -1,11 +1,11 @@ import { randomUUID } from 'node:crypto' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionCurrentRequestsMarker, AgentSessionCurrentRequestsPiece, AgentSessionCurrentRequestsRead -} from '../../../shared/agent-session-current-requests-wire' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../shared/agent-session-current-requests-capability' +} from '../../../shared/agent-session/requests/agent-session-current-requests-wire' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../shared/agent-session/requests/agent-session-current-requests-capability' import type { StructuredAgentSessionCurrentWorkJournal } from './structured-agent-session-current-work' export type CurrentRequestsSubscriber = { diff --git a/src/main/native-chat/agent-session-wire/agent-session-empty-batch.ts b/src/main/native-chat/agent-session-wire/agent-session-empty-batch.ts index fa4289da396..16a8d9a3146 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-empty-batch.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-empty-batch.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournalBatch } from '../../../shared/agent-session-wire' /** A batch that advances nothing: the carrier for fence, roster, and clock updates. */ diff --git a/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts b/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts index 1ab1089d494..8959e89de1a 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-empty-delta-retention.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' import { createCodexStructuredItemStreams } from '../../codex/codex-structured-item-streams' import { createAgentSessionDeltaCoalescer } from './agent-session-delta-coalescer' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-batches.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-batches.test.ts index 6db2091ed53..932155066fb 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-batches.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-batches.test.ts @@ -5,12 +5,10 @@ import { describe, expect, it } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemIdentity, - AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation' import { closeTestJournalHostDatabase, diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts index 0569cdfe87a..ab05da4798b 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts @@ -1,13 +1,13 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalItemBody, AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { readAgentSessionHistory } from './agent-session-history-page' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-byte-limits.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-byte-limits.test.ts index b14576916ea..3d6fb856090 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-byte-limits.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-byte-limits.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { serializeRemoteRuntimePayload } from '../../../shared/remote-runtime/remote-runtime-memory-limits' import { readAgentSessionHistory } from './agent-session-history-page' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/agent-session-history-contract-test-fixture.ts index 7f36479ed85..215db054bd9 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-contract-test-fixture.ts @@ -2,15 +2,15 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach } from 'vitest' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalItemBody, AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import { AGENT_JOURNAL_THREAD_SCOPE, AGENT_SESSION_JOURNAL_SCHEMA_VERSION -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { serializeRemoteRuntimePayload } from '../../../shared/remote-runtime/remote-runtime-memory-limits' import { createTrackedJournalOpener, diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-conversation-window.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-conversation-window.test.ts index b4033eb99f8..66e5a1f1576 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-conversation-window.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-conversation-window.test.ts @@ -4,10 +4,10 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import type { AgentJournalItemBody, - AgentJournalProducerLinkage, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' + AgentJournalProducerLinkage +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage, AgentSessionHistoryRequest diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts index 9a2454080f5..b8a0f558380 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts @@ -3,10 +3,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import Database from '../../sqlite/sync-database' -import { - AGENT_SESSION_JOURNAL_SCHEMA_VERSION, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import * as rowSchema from '../agent-session-journal/journal-row-schema' import { diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-large-identities.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-large-identities.test.ts index 1b1c817d193..41259e70215 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-large-identities.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-large-identities.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' -import { boundJournalKeyComponent } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { boundJournalKeyComponent } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../shared/remote-runtime/remote-runtime-memory-limits' import { readAgentSessionHistory } from './agent-session-history-page' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-latest-turn.ts b/src/main/native-chat/agent-session-wire/agent-session-history-latest-turn.ts index 63dfbc65ff6..8ff468858bc 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-latest-turn.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-latest-turn.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionLatestTurn } from '../../../shared/agent-session-wire' import { latestStructuredAgentSessionTurn } from '../../../shared/structured-agent-session-live-turn' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-page-bounds.ts b/src/main/native-chat/agent-session-wire/agent-session-history-page-bounds.ts index 45ecd38254b..b049a49ae84 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-page-bounds.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-page-bounds.ts @@ -1,11 +1,11 @@ import { agentJournalSubmissionKey, boundJournalKeyComponent -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../shared/remote-runtime/remote-runtime-memory-limits' import { MOBILE_BRIDGE_MAX_FRAME_BYTES } from '../../../shared/mobile-bridge-frame-bytes' import { agentSessionHostStatusBody } from '../../../shared/agent-session-host-status-rows' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts index ce8dcb14270..2e2af340176 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-page-grouping-parity.test.ts @@ -1,5 +1,5 @@ import { expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { boundHistoryItemsByBytes, historyEntryBytes, diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts index 794966b017f..2a173c31cbf 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-page-scaling.test.ts @@ -1,5 +1,5 @@ import { expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { boundHistoryItemsByBytes, newestWholeSequenceGroups diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts b/src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts index 8904d93b663..d91ccff44f9 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-page.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_HISTORY_MAX_LIMIT } from '../../../shared/agent-session-wire' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { hostTestMessage } from './structured-agent-session-host-test-data' diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-page.ts b/src/main/native-chat/agent-session-wire/agent-session-history-page.ts index ed0fe67fd90..ab64ec3aefa 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-page.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-page.ts @@ -4,15 +4,15 @@ export { resolveHistoryLimit } from './agent-session-history-limit' // late revisions keep old creation positions and would be skipped by item windows. Only catch-up // can therefore return cursor_compacted. -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { snapshotLatestTurn } from './agent-session-history-latest-turn' import { isSubagentBlock } from '../../../shared/native-chat/native-chat-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalRenderItem, AgentJournalSnapshot -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_HISTORY_MAX_LIMIT, type AgentSessionHistoryDirection, diff --git a/src/main/native-chat/agent-session-wire/agent-session-history-subagent-roster.ts b/src/main/native-chat/agent-session-wire/agent-session-history-subagent-roster.ts index cd992ec924f..47e00c3ac11 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-history-subagent-roster.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-history-subagent-roster.ts @@ -3,8 +3,8 @@ import { agentJournalItemSubagentId, isRootAgentJournalItem -} from '../../../shared/agent-session-journal-producer' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubagentRosterEntry } from '../../../shared/agent-session-wire' import { namedSubagents } from '../../../shared/native-chat/transcript/native-chat-subagent-items' import type { NativeChatSubagentEntry } from '../../../shared/native-chat/native-chat-types' diff --git a/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.test.ts b/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.test.ts index a1fa4a7350b..f30d7f2a1e0 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.test.ts @@ -1,5 +1,5 @@ import { expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalPayload } from '../agent-session-journal/journal-payload-bounds' import { HISTORY_PAGE_CONTENT_BUDGET_BYTES } from './agent-session-history-page-bounds' import { agentJournalItemForWire, shortenedAgentJournalItem } from './agent-session-item-wire-form' diff --git a/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.ts b/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.ts index 63a266808e9..3c37471d184 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-item-wire-form.ts @@ -5,7 +5,7 @@ import type { AgentJournalBoundedPayload, AgentJournalItemBody, AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { boundToolInput, JOURNAL_RUNNING_PREVIEW_LIMITS, diff --git a/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts b/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts index cf385869ec3..d4ad482c297 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-journal-batch.ts @@ -1,12 +1,12 @@ // Project touched items at current reduced state for idempotent delivery; adopted echoes retain submission keys. -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { compareAgentJournalItems } from '../../../shared/agent-session-journal-position' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { compareAgentJournalItems } from '../../../shared/agent-session/journal/agent-session-journal-position' import type { AgentJournalRenderItem, AgentJournalSnapshot, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournalBatch } from '../../../shared/agent-session-wire' import { isStructuredAgentSessionStopNote } from './structured-agent-session-command-turn' import { findSequenceGap } from '../agent-session-journal/journal-cursor' diff --git a/src/main/native-chat/agent-session-wire/agent-session-stop-note-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/agent-session-stop-note-contract-test-fixture.ts index 548fb9143d1..9eda937a475 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-stop-note-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-stop-note-contract-test-fixture.ts @@ -2,14 +2,14 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/agent-session-stop-note-paging.test.ts b/src/main/native-chat/agent-session-wire/agent-session-stop-note-paging.test.ts index e70fb89fa7b..288a6394ede 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-stop-note-paging.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-stop-note-paging.test.ts @@ -1,5 +1,5 @@ import { expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { readAgentSessionHistory } from './agent-session-history-page' import { AgentSessionSubscribers } from './structured-agent-session-subscribers' diff --git a/src/main/native-chat/agent-session-wire/agent-session-stop-note-projection.test.ts b/src/main/native-chat/agent-session-wire/agent-session-stop-note-projection.test.ts index 35393c9aae3..80c62376c8b 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-stop-note-projection.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-stop-note-projection.test.ts @@ -1,11 +1,11 @@ import { 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 { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { restoreJournal } from '../agent-session-journal/journal-open' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { renderJournalState } from '../agent-session-journal/journal-reducer' diff --git a/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.test.ts b/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.test.ts index a7bc773e157..12d34bbacb6 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.test.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.test.ts @@ -1,8 +1,8 @@ // Rows frames must restate current work or clients interpret them as legacy-host frames. import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { refreshDerivedStopNotes } from './agent-session-stop-note-refresh' diff --git a/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.ts b/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.ts index 6be97f6f59e..0d9e5755552 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-stop-note-refresh.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_HISTORY_MAX_LIMIT } from '../../../shared/agent-session-wire' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { measureHistoryItem, oversizedHistoryItem } from './agent-session-history-page-bounds' diff --git a/src/main/native-chat/agent-session-wire/agent-session-subscribe-input.ts b/src/main/native-chat/agent-session-wire/agent-session-subscribe-input.ts index d1d6376352b..4b059c6673e 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-subscribe-input.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-subscribe-input.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { SubscriberFieldState } from './agent-session-subscriber-frame-fields' diff --git a/src/main/native-chat/agent-session-wire/agent-session-work-refresh.ts b/src/main/native-chat/agent-session-wire/agent-session-work-refresh.ts index 5acea39a6d4..76e514fc3df 100644 --- a/src/main/native-chat/agent-session-wire/agent-session-work-refresh.ts +++ b/src/main/native-chat/agent-session-wire/agent-session-work-refresh.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_HISTORY_MAX_LIMIT, type AgentSessionTurnActivity diff --git a/src/main/native-chat/agent-session-wire/hook-outcome-rows.test.ts b/src/main/native-chat/agent-session-wire/hook-outcome-rows.test.ts index ae3ebf46338..3b037453a68 100644 --- a/src/main/native-chat/agent-session-wire/hook-outcome-rows.test.ts +++ b/src/main/native-chat/agent-session-wire/hook-outcome-rows.test.ts @@ -5,12 +5,12 @@ import { afterEach, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { claudeProviderHandle, codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { withNativeChatCutTurnNotices } from '../../../shared/native-chat/transcript/native-chat-cut-turn-notice' import { diff --git a/src/main/native-chat/agent-session-wire/json-string-shortening.ts b/src/main/native-chat/agent-session-wire/json-string-shortening.ts index 77726183cf4..812d998912a 100644 --- a/src/main/native-chat/agent-session-wire/json-string-shortening.ts +++ b/src/main/native-chat/agent-session-wire/json-string-shortening.ts @@ -1,7 +1,7 @@ // Fit long strings to one common length; preserve identifiers because readers key and answer by them. // Mark clipped heads with truncated and other strings with an ellipsis. -import type { AgentJournalBoundedPayload } from '../../../shared/agent-session-journal-types' +import type { AgentJournalBoundedPayload } from '../../../shared/agent-session/journal/agent-session-journal-types' const ELLIPSIS = '…' const ELLIPSIS_BYTES = Buffer.byteLength(ELLIPSIS, 'utf8') diff --git a/src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts b/src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts index 0d56726c167..2979163f69f 100644 --- a/src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts +++ b/src/main/native-chat/agent-session-wire/provider-turn-activity-routing.test.ts @@ -1,8 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionTurnActivity } from '../../../shared/agent-session-wire' import { createClaudeJournalTranslator } from '../../claude/claude-structured-journal-translation' import { createCodexJournalTranslator } from '../../codex/codex-structured-journal-translation' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts index 00caf693ac6..1102035f069 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' // Exercise durable acceptance before provider delivery through the real host/store/journal. import type { AgentSessionFailureFact } from '../../../shared/agent-session-failure' @@ -7,8 +7,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent, AgentSessionTurnCompletionEvent @@ -16,7 +16,7 @@ import type { import { classifyDispatchRejection, DISPATCH_REJECTED_CANCELLED -} from '../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-account-recovery.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-account-recovery.ts index 2426695feaf..b6845f01ee4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-account-recovery.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-account-recovery.ts @@ -1,11 +1,11 @@ -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { latestNativeChatUsageLimitCut } from '../../../shared/native-chat/native-chat-usage-limit-cut' import { isAgentSessionContextClear } from '../../../shared/agent-session-context-clear' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { isStructuredAgentSessionCommandTurn } from '../../../shared/agent-session/structured-agent-session-command-entry' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-actionable-prompts.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-actionable-prompts.ts index 5117fe2f054..cc0a0cc769f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-actionable-prompts.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-actionable-prompts.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalItemRow, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts index eb34d7570ce..4b423261ab7 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-router.ts @@ -1,6 +1,6 @@ import type { StructuredAgentSessionAtRestCommands } from './structured-agent-session-at-rest-commands' import type { AgentChatPermissionChoice } from '../../../shared/agent-chat-permission-mode' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' import type { StructuredAgentSessionAcquisitionReceipt } from './structured-agent-session-startup-attempt-contract' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-stop.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-stop.ts index ecb536a371a..57a61d8463e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-stop.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter-stop.ts @@ -8,7 +8,7 @@ import type { AgentJournalApprovalItem, AgentJournalDispatchState, AgentJournalQuestionItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { ProviderDiagnostic } from '../../../shared/agent-session-failure' export type AgentSessionCloseEvidence = { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts index 96a81d7aac2..2e92f3ae16b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts @@ -11,11 +11,13 @@ import type { import type { AgentJournalAnsweredTurnIdentity, - AgentJournalItemIdentity, AgentJournalMessageItem, - AgentJournalTurnItem, + AgentJournalTurnItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type { AgentSessionProviderHandleLink } from '../../../shared/agent-session-provider-handle' import type { AgentSessionAccountHome, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts index db5c49ab082..aad983ae200 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { appendFile, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts index fdec1d981d3..c6721365364 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' // Observe existing subscribers: fresh subscribe could hide missed live delivery by rereading the journal. import { mkdtemp, rm } from 'node:fs/promises' @@ -9,7 +9,7 @@ import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-ses import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts index 8c868adf311..e5c1020eb4d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attach.ts @@ -1,7 +1,7 @@ import { activeProviderContext } from '../../../shared/agent-session-provider-context' // Store CAS and idempotency rows make retried create/ensure replay instead of reserving another owner. -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication' import type { StructuredAgentId, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts index aa762115a80..f678f4f9f16 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts @@ -3,7 +3,7 @@ import { mkdir, rm, writeFile } from 'node:fs/promises' import { join } from 'node:path' import { afterEach, beforeEach, 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 { agentSessionAttachmentStoreRoot } from '../agent-session-attachments/agent-session-attachment-references' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts index 6b19113e483..461dcca8999 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-background-task-channel.ts @@ -1,6 +1,6 @@ import { structuredAgentSessionOwnerStatus } from './structured-agent-session-owner-status' import { queuedSendAnswer } from './structured-agent-session-queued-send-answer' -import type { AgentSessionCurrentRequestsRead } from '../../../shared/agent-session-current-requests-wire' +import type { AgentSessionCurrentRequestsRead } from '../../../shared/agent-session/requests/agent-session-current-requests-wire' import { readCurrentRequestsPiece } from './agent-session-current-requests' import type { AgentSessionHistoryRequest, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop-target.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop-target.ts index d1d6c6a254a..38e749e4039 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop-target.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-chat-stop-target.ts @@ -1,13 +1,13 @@ // Capture once at acceptance; afterward only child identity can exclude the accepted target. -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { StructuredAgentSessionProviderChild } from './structured-agent-session-host-types' import { stopReachesUnrecordedWork } from './structured-agent-session-queued-stop' import { isMainAgentWorking } from './structured-agent-session-turns-cancel' import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' import { structuredAgentSessionStoppedTurnId } from './structured-agent-session-turn-stop-notes' import type { AgentSessionTurnContext } from './structured-agent-session-turns' -import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' /** close joins shutdown; starting ends startup; interrupt reaches live work; withdraw only settles queued sends. */ export type ChatStopReach = 'close' | 'starting' | 'interrupt' | 'withdraw' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-child-exit.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-child-exit.ts index f1e4252224f..bb2bb1a2996 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-child-exit.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-child-exit.ts @@ -6,7 +6,7 @@ import { type SubmissionRejectionFact } from '../../../shared/agent-session-failure' import { PROVIDER_EXIT_ROW_PREFIX } from '../../../shared/agent-session-stop-row-identity' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation' import type { StructuredAgentSessionEndedEvent } from './structured-agent-session-adapter' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-child-work-selection.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-child-work-selection.test.ts index 6b65ef068d4..c7d43da86d5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-child-work-selection.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-child-work-selection.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionAgentStatus } from '../../../shared/structured-agent-session-agent-status' import { attach, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts index f75b7f5eec6..c0d275f5390 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { isStructuredAgentSessionMainAgentWorking } from '../../../shared/structured-agent-session-main-agent-working' import { ClaudeStructuredSessionAdapter } from '../../claude/claude-structured-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-hung-start-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-hung-start-stop.test.ts index df3fdec7d94..6182de804ea 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-hung-start-stop.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-hung-start-stop.test.ts @@ -5,7 +5,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn' import { isStructuredAgentSessionMainAgentWorking } from '../../../shared/structured-agent-session-main-agent-working' import { ClaudeStructuredSessionAdapter } from '../../claude/claude-structured-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-opening-send-hold.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-opening-send-hold.test.ts index 826cf6478a6..fa6ee49f59c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-opening-send-hold.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-opening-send-hold.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, assert, beforeEach, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { agentSessionSendSubmission } from '../../../shared/agent-session-wire' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' @@ -40,7 +40,7 @@ import { DISPATCH_DOUBT_PROVIDER_IDLE } from '../agent-session-journal/journal-d import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import * as unheld from './structured-agent-session-unheld-turns' import { claudeUnwrittenUserMessageError } from '../../claude/claude-agent-sdk-user-message-queue' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts index fe3ba8e4832..b5539d1ad79 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-queued-stop.test.ts @@ -7,8 +7,8 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { structuredAgentSessionAgentStatus } from '../../../shared/structured-agent-session-agent-status' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn' import { projectStructuredAgentSessionStatus, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-ends-session.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-ends-session.test.ts index 70fb6112ddf..1a4d21c022e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-ends-session.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-ends-session.test.ts @@ -1,5 +1,5 @@ import { expect, it } from 'vitest' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { ClaudeControlRequestError } from '../../claude/claude-agent-sdk-control-requests' import { CLAUDE_STOP_GRACE_MS } from '../../claude/claude-request-end-wait' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-note-end.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-note-end.test.ts index 3dff1fda4bb..25a63b4f23d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-note-end.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-claude-stop-note-end.test.ts @@ -1,5 +1,5 @@ import { structuredAgentSessionHandingOver } from './structured-agent-session-handing-over' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { mkdtemp, rm } from 'node:fs/promises' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-clear-rewind.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-clear-rewind.test.ts index e31ae2e5ea9..27d98acb235 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-clear-rewind.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-clear-rewind.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { activeProviderContext } from '../../../shared/agent-session-provider-context' import { AgentSessionJournal } from '../agent-session-journal/journal-store' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-close-verdict.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-close-verdict.test.ts index 4314567b36b..91105011845 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-close-verdict.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-close-verdict.test.ts @@ -6,7 +6,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionStatusEvent } from '../../../shared/agent-session-wire' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { describeNativeChatTurnStatus } from '../../../shared/native-chat/transcript/native-chat-turn-status' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-held-goal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-held-goal.test.ts index 01097dd4850..a5dff238b51 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-held-goal.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-held-goal.test.ts @@ -10,8 +10,8 @@ import { HOST_TEST_THREAD as THREAD, hostTestOperationId } from './structured-agent-session-host-test-data' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' let rig: QueuedMessageTestRig diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-admission.spec.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-admission.spec.ts index 4dd23b0e6a0..5fc69f94f9a 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-admission.spec.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-admission.spec.ts @@ -1,5 +1,5 @@ import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import * as autoSandbox from '../../codex/codex-structured-auto-sandbox' import { expect, it, vi } from 'vitest' import { codexInputFinalizationFixture } from './structured-agent-session-codex-input-host.test' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-finalization.spec.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-finalization.spec.ts index a6a74d41951..7bef887a1e3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-finalization.spec.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-finalization.spec.ts @@ -1,6 +1,6 @@ import type { codexInputFinalizationFixture } from './structured-agent-session-codex-input-host.test' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE as turnScope } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE as turnScope } from '../../../shared/agent-session/journal/agent-session-journal-types' import { continuingStructuredAgentSessionInput, finalizingStructuredAgentSessionInput, @@ -14,7 +14,7 @@ import { HOST_TEST_SESSION as SESSION, hostTestMessage } from './structured-agent-session-host-test-data' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import * as lifetime from './structured-agent-session-host-lifetime' import { claimStructuredAgentSessionAgent } from './structured-agent-session-agent-start' import { openStructuredAgentSessionConversationJournal } from './structured-agent-session-conversation-open' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-host.test.ts index 2a7510fd36c..0546e438856 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-host.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-codex-input-host.test.ts @@ -7,16 +7,16 @@ import { } from './structured-agent-session-handing-over' import { measureCodexInputWork } from './structured-agent-session-codex-input-perf-test-support' import { registerCodexInputFinalization } from './structured-agent-session-codex-input-finalization.spec' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { CodexAppServerRequestError } from '../../codex/app-server/codex-app-server-request-error' import { codexStructuredPermissionPolicy } from '../../../shared/codex-permission-policy' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { agentSessionSendSubmission as submission } from '../../../shared/agent-session-wire' -import { AGENT_JOURNAL_THREAD_SCOPE as turnScope } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE as turnScope } from '../../../shared/agent-session/journal/agent-session-journal-types' import { closeTestJournalHostDatabase, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-command-readers.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-command-readers.test.ts index 8a183f936b6..e2c1cdb3188 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-command-readers.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-command-readers.test.ts @@ -1,12 +1,12 @@ // Command turns must not replace user-request summaries, resume markers or legacy labels. import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' -import { latestStructuredAgentSessionRequest } from '../../../shared/structured-agent-session-latest-request' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { latestStructuredAgentSessionRequest } from '../../../shared/agent-session/requests/structured-agent-session-latest-request' import { projectStructuredAgentSessionStatusSummary } from '../../../shared/structured-agent-session-projection' import { projectTurnItemHistory } from '../../runtime/rpc/methods/structured-agent-session-turn-item-capability' import { structuredAgentSessionWorkingAtStop } from './structured-agent-session-working-at-teardown' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-command-turn.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-command-turn.ts index a4e599e7cf3..689f6d8561e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-command-turn.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-command-turn.ts @@ -14,13 +14,13 @@ import { import { 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 AgentJournalItemIdentity, type AgentJournalMessageItem, type AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionConversationCommand } from '../../../shared/agent-session/agent-session-conversation-command' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-context.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-context.ts index 0f639275065..f298fea8ba9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-context.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-context.ts @@ -1,5 +1,5 @@ import { projectSavedChatContextItems } from '../agent-session-saved-prompt-text' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionContinuationContext } from '../../../shared/agent-session-wire' import { agentSessionCurrentContextRows } from '../../../shared/agent-session-context-clear' import { trimAgentSessionContext } from '../../../shared/agent-session-context-budget' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts index 8f53bd583ca..f268c01bbb5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.test.ts @@ -1,9 +1,9 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts index 493d4f4b997..639a4a62f87 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-conversations.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { JournalRow } from '../agent-session-journal/journal-row-schema' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts index 320c8241ebd..a604a423154 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-crash-turn-end.test.ts @@ -11,8 +11,8 @@ import type { AgentSessionStatusSummary, AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { describeNativeChatTurnStatus } from '../../../shared/native-chat/transcript/native-chat-turn-status' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts index 1b49a479f33..0cd5204bf45 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-create.ts @@ -2,7 +2,7 @@ import { agentSessionConversationView } from '../../../shared/agent-session-conv import { isFloatingWorkspaceId } from '../../../shared/floating-workspace-worktree' import { isAgentSessionCreateAdmissionRefusal } from '../../../shared/agent-session-definitive-refusal' import type { StructuredAgentSessionFirstMessage } from '../../../shared/structured-agent-session-create' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { refuse, type AgentSessionAttachResult, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-requests.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-requests.test.ts index 2f9400d1b93..b1a266e81a4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-requests.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-requests.test.ts @@ -1,10 +1,10 @@ -import { createAgentSessionCurrentRequestsReader } from '../../../shared/agent-session-current-requests-reader' +import { createAgentSessionCurrentRequestsReader } from '../../../shared/agent-session/requests/agent-session-current-requests-reader' import { afterEach, expect, it, vi } from 'vitest' -import { selectAgentSessionCurrentRequests } from '../../../shared/agent-session-current-requests' +import { selectAgentSessionCurrentRequests } from '../../../shared/agent-session/requests/agent-session-current-requests' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalResolution -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { MOBILE_BRIDGE_MAX_FRAME_BYTES } from '../../../shared/mobile-bridge-frame-bytes' import { createStructuredAgentSessionEventCoalescer } from '../../../shared/agent-session/structured-agent-session-coalescer' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts index bf0d0a05834..20f223a18a2 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.test.ts @@ -2,7 +2,7 @@ // even when settlement/release writes fail; live generations retain their work. import { afterEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record' import type { AgentSessionStatusEvent, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts index f01019164dc..510c67723be 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-current-work.ts @@ -3,7 +3,7 @@ import { type PromptProjection } from './structured-agent-session-actionable-prompts' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' -import { compareAgentJournalItems } from '../../../shared/agent-session-journal-position' +import { compareAgentJournalItems } from '../../../shared/agent-session/journal/agent-session-journal-position' import type { AgentSessionConversationView } from '../../../shared/agent-session-conversation-view' import { isHistoricalProviderTimelineItem } from '../agent-session-timeline/provider-timeline-history' import { currentRequestsProjection } from './agent-session-current-requests' @@ -13,14 +13,14 @@ import { currentRequestsProjection } from './agent-session-current-requests' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem, - type AgentJournalSubmission, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' + type AgentJournalSubmission +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionLatestTurn } from '../../../shared/agent-session-wire' import type { StructuredAgentSessionWorkScope } from '../../../shared/structured-agent-session-main-agent-working' -import { isUnansweredStructuredAgentSessionDispatch } from '../../../shared/structured-agent-session-unanswered-dispatch' +import { isUnansweredStructuredAgentSessionDispatch } from '../../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { DISPATCH_DOUBT_PROVIDER_ENDED_UNANSWERED } from '../agent-session-journal/journal-dispatch-doubt-reasons' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts index a95f513a8c5..8bcd9ea9911 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts index 37e9725748a..32f9d3fcb8c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-dead-generation-settlement.ts @@ -4,12 +4,12 @@ import { MAX_PROVIDER_DIAGNOSTIC_CHARS, type SubmissionRejectionFact } from '../../../shared/agent-session-failure' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { journalPendingSubmissionResolutions } from '../agent-session-journal/journal-pending-submission-recovery' import { journalLifecycleMutationItemId, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop-deps.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop-deps.ts index dfd55afe4dc..af190bc40c5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop-deps.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop-deps.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { UnsentSendHold } from '../agent-session-journal/journal-unsent-send-hold' import type { AgentChatPermissionChoice } from '../../../shared/agent-chat-permission-mode' import type { StructuredAgentSessionStartFlights } from './structured-agent-session-start-flight' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts index 6ed7fabc334..4c2bb0c62ff 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-delivery-loop.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure' import { acceptedDispatch, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-ended-prompt-cancel.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-ended-prompt-cancel.test.ts index 517653dfc05..7496631544c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-ended-prompt-cancel.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-ended-prompt-cancel.test.ts @@ -4,10 +4,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { claudePromptCancelRoute } from '../../claude/claude-structured-prompt-replies' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-estimate.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-estimate.ts index e16f6a63c9d..545873c2429 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-estimate.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink-estimate.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' export function estimateStructuredAgentSessionItemBytes( identity: AgentJournalItemIdentity, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts index 7b0ce6f1678..d851e9f466d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.test.ts @@ -1,13 +1,11 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionTurnActivity } from '../../../shared/agent-session-wire' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts index 96790b30bf2..6e4bc850369 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-event-sink.ts @@ -1,11 +1,11 @@ import type { JournalItemEcho } from '../agent-session-journal/journal-item-echo' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, - AgentJournalItemIdentity, - AgentJournalProducerLinkage, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + AgentJournalProducerLinkage +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import type { AgentSessionTurnActivity } from '../../../shared/agent-session-wire' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalLifecycleIdentityMutationInput } from '../agent-session-journal/journal-row-builders' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts index 85414fb2149..eb10066f377 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts @@ -1,9 +1,9 @@ -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalRenderItem, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalRenderItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { journalLifecycleMutationItemId, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts index c4f1aea43bf..1e39e3fb68d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-forget-status.test.ts @@ -1,12 +1,12 @@ import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' // Keep conversation/status lifetimes aligned: stale host-owned Working rows bypass freshness expiry. import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import { makeStructuredAgentStatusSubject } from '../../../shared/agent-status-subject' import { AgentHookServer } from '../../agent-hooks/server' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-fork-rewind.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-fork-rewind.test.ts index b38eda6fce8..a903fb89f34 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-fork-rewind.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-fork-rewind.test.ts @@ -2,8 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session-provider-handle' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-goal-steering.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-goal-steering.test.ts index 13917c38c1b..b5f323d4e00 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-goal-steering.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-goal-steering.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } 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 type { CodexAppServerConnection } from '../../codex/app-server/codex-app-server-connection-types' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-handover.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-handover.ts index c3462a40b72..fdf9ee4eddf 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-handover.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-handover.ts @@ -1,7 +1,7 @@ // Commit pending/settlement around an external provider call so concurrent sends remain acceptable. import type { UnsentSendHold } from '../agent-session-journal/journal-unsent-send-hold' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { StructuredAgentSessionInputNotAdmitted } from './structured-agent-session-input-admission' import type { AgentSessionHandoverContext } from './structured-agent-session-host-types' import { @@ -15,11 +15,11 @@ import { agentSessionFailureWords } from '../../../shared/agent-session-failure- import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { resolveHandover } from './structured-agent-session-operation-settlement' import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' import type { AgentSessionDispatchOutcome } from './structured-agent-session-adapter' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { handOverStructuredAgentSessionCommand, structuredAgentSessionHandoverOrigin diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.test.ts index a7d01fe8167..2d57fca567b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.ts index 16bd5a80c22..7bf2ca26486 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-history-catch-up.ts @@ -4,8 +4,8 @@ import { createHash } from 'node:crypto' import { setImmediate } from 'node:timers/promises' import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { agentSessionHostStatusBody } from '../../../shared/agent-session-host-status-rows' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalLifecycleIdentityMutationInput } from '../agent-session-journal/journal-lifecycle-mutation' import type { StructuredAgentSessionEventSink, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts index 92e9c8230d1..22be534ebbc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-delivery.ts @@ -2,7 +2,7 @@ import { selectableStructuredSubmission } from './structured-agent-session-input import { structuredAgentSessionReceivingAccount } from './structured-agent-session-receiving-account' // Open conversations with queued sends always need delivery; opening also wakes leftover recovery. -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { hostStructuredAgentSessionCurrentWork } from './structured-agent-session-host-current-work' import { holdClosedStructuredAgentSessionSends } from './structured-agent-session-host-lifetime' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts index 74afc4ea313..f0fe914b364 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-lifetime.ts @@ -6,8 +6,8 @@ import { finalizingStructuredAgentSessionInput, structuredAgentSessionHandingOver } from './structured-agent-session-handing-over' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { holdUnsentSends, type UnsentSendHold diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts index 38afd88ad15..39153e3af78 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts @@ -13,7 +13,7 @@ import { } from '../../../shared/agent-session-wire' import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' import { shouldQueueStructuredAgentSessionSend } from './structured-agent-session-queued-messages' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionThreadGoalChange, AgentSessionThreadGoalResult diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts index a8f58bd0f50..e037b217687 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data.ts @@ -5,7 +5,7 @@ import type { AgentJournalSnapshot, AgentJournalItemBody, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionHost } from './structured-agent-session-host' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { @@ -14,7 +14,7 @@ import type { } from '../../../shared/agent-session-record' import { projectNativeChatTranscriptMessages } from '../../../shared/native-chat/transcript/native-chat-transcript-projection' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { attachFingerprintFields, type AgentSessionAttachParams diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts index 671bf418586..d8129cbce0b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts @@ -1,10 +1,10 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, vi, type Mock } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionMutationEnvelope } from '../../../shared/agent-session-wire' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts index f6874cd0a01..5029c6e17a4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-types.ts @@ -21,7 +21,7 @@ import type { import type { StructuredAgentSessionStatusObserverOptions } from './structured-agent-session-status-observation' import type { SubmissionRejectionFact } from '../../../shared/agent-session-failure' import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionAccountHome } from '../../../shared/agent-session-account-home' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts index 8a02402edf9..9a580ad6ec2 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts index 70012ad6254..dda6b0f669c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-idle-sweep.ts @@ -1,7 +1,7 @@ // Derive owed work each tick, independent of viewers; retire quiet children and cached folds, // preserving durable conversations for the next send. -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' import type { StructuredAgentSessionLogger } from './structured-agent-session-logger' import type { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-admission.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-admission.ts index 86c9cf17c2e..91011948531 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-admission.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-admission.ts @@ -1,5 +1,5 @@ import type { AgentSessionDispatchOutcome } from './structured-agent-session-adapter' -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' export type StructuredAgentSessionInputAdmission = diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-handover.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-handover.ts index 5d29f54eeae..553101d866f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-handover.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-handover.ts @@ -3,7 +3,7 @@ import { type StructuredAgentSessionInputAdmission } from './structured-agent-session-input-admission' import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { continuingStructuredAgentSessionInput } from './structured-agent-session-handing-over' import type { StructuredAgentSessionDeliveryLoopDeps } from './structured-agent-session-delivery-loop' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-projection.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-projection.test.ts index d49a0386e4a..880477eab5c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-projection.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-projection.test.ts @@ -21,8 +21,8 @@ import { HOST_TEST_SESSION as SESSION, hostTestMessage } from './structured-agent-session-host-test-data' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session-queued-message-wire' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' it.each([10, 100])( 'bounds actual edit/growth, replay, replacement and complete recovery N=%i', diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-reopen.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-reopen.test.ts index 5d4d93fd8de..8ca7fd3fecb 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-reopen.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-reopen.test.ts @@ -6,7 +6,7 @@ import { eventually } from './structured-agent-session-queued-message-rig.test-fixture' import { openRigTurnFor } from './structured-agent-session-queued-rig-turn.test-fixture' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { HOST_TEST_SESSION as SESSION, hostTestMessage diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-rewind.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-rewind.test.ts index 4aa3345ce6f..dda9355d4cc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-rewind.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order-rewind.test.ts @@ -11,7 +11,7 @@ import { import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' it('preserves existing queuedAt across two live replacements despite an older original receipt', async () => { const rewind = vi.fn(async () => ({ ok: true as const })) diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order.test.ts index 2d1d92a97f6..afe8cfd19ab 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-order.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-order.test.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionQueueRequest } from '../../../renderer/src/components/native-chat/structured-agent-session-queue-request' import { createQueuedMessageTestRig, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-input-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-input-selection.ts index 88c9d422000..d060458f4b1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-input-selection.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-input-selection.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { QueuedMessageRow } from '../agent-session-journal/queued-message-table' import type { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-append-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-append-options.ts index 4a52f6e6646..f75a569a89d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-append-options.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-append-options.ts @@ -2,7 +2,7 @@ import { journalItemEchoFields } from '../agent-session-journal/journal-item-ech // Centralize admitted single-item options; lifecycle batches carry producers per mutation. // Child-bound sink fences identify the execution that produced each row. -import { agentJournalLinkageFields } from '../../../shared/agent-session-journal-producer' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' import type { JournalItemAppendOptions } from '../agent-session-journal/journal-store-contracts' import type { StructuredAgentSessionItemAppendOptions } from './structured-agent-session-event-sink' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts index 9c2d112497a..023f264a2f9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts @@ -1,6 +1,6 @@ import { readdir } from 'node:fs/promises' import { afterEach, beforeEach, expect, it, vi, type Mock } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-double-test-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-double-test-support.ts index fb1bb6f9363..2993b261385 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-double-test-support.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-double-test-support.ts @@ -1,9 +1,7 @@ // Run journal-double steps immediately, as on an idle write queue. -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { JournalStep } from '../agent-session-journal/journal-step-writer' import type { JournalItemAppendOptions, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-views.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-views.ts index f562abc49cd..16a146b7024 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-views.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-views.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' export type StructuredAgentSessionLifecycleJournal = Pick< diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts index 6fb25a13e53..6d266ebe2cd 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalAnsweredTurnIdentity, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalAnsweredTurnIdentity } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words' import type { ResolveDispatchInput } from '../agent-session-journal/journal-store-contracts' import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-proof-tool-ends.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-proof-tool-ends.test.ts index a3a5f23473c..624d0022588 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-proof-tool-ends.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-proof-tool-ends.test.ts @@ -3,11 +3,9 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { agentJournalToolCallLifecycle } from '../../../shared/agent-journal-tool-call-lifecycle' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement-cancelled.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement-cancelled.test.ts index e1f897b27aa..051f5d71a9d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement-cancelled.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement-cancelled.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts index 0e7ec86e66d..ac01e85b339 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-settlement.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionDispatchOutcome } from './structured-agent-session-adapter' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-leftover-settlement.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-leftover-settlement.test-fixture.ts index 0c4efcd8055..b35d23953ca 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-leftover-settlement.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-leftover-settlement.test-fixture.ts @@ -1,9 +1,7 @@ import { expect, vi } from 'vitest' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { readTestJournalOutcomes, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-listed-stop-lifetime.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-listed-stop-lifetime.test.ts index 2616e2a612c..60b2be9e48b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-listed-stop-lifetime.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-listed-stop-lifetime.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import type { AgentChildWorkEvidence } from '../../../shared/agent-status-child-work-evidence' import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-live-turn-window.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-live-turn-window.test.ts index 1c195682b33..455566a995f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-live-turn-window.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-live-turn-window.test.ts @@ -5,12 +5,12 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemIdentity, - AgentJournalTurnLifecycle, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnLifecycle } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { activeStructuredAgentSessionTurnId, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-message-choices.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-message-choices.test.ts index 9d548fa1ed3..1ffb7096d38 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-message-choices.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-message-choices.test.ts @@ -6,7 +6,7 @@ import type { ClaudeSession } from '../../claude/structured/claude-structured-se import { dispatchClaudeMessage } from '../../claude/claude-structured-message-options' import { createClaudeUserMessageQueue } from '../../claude/claude-agent-sdk-user-message-queue' import { ClaudeControlRequestError } from '../../claude/claude-stream-json-connection' -import { AgentJournalSubmissionSchema } from '../../../shared/agent-session-journal-submission-schema' +import { AgentJournalSubmissionSchema } from '../../../shared/agent-session/journal/agent-session-journal-submission-schema' import { structuredAgentSessionRecordedRejectionParts, structuredAgentSessionAttemptFailureParts @@ -17,7 +17,7 @@ import { readWholeAgentSessionFailureFact, withProviderDiagnostic } from '../../../shared/agent-session-failure' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { createQueuedMessageTestRig, eventually, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-message-options.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-message-options.ts index a7fac477509..27f0d062d1d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-message-options.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-message-options.ts @@ -1,5 +1,5 @@ -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts index b05d2f34fa0..01111f402f8 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans.ts @@ -3,7 +3,7 @@ import { readNoChoiceOptionResult } from './structured-agent-session-option-observation' import type { AgentChildWorkEvidence } from '../../../shared/agent-status-child-work-evidence' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_MESSAGE_SOURCE, USER_MESSAGE_SOURCE, @@ -25,7 +25,7 @@ import { agentSessionSendBodyFingerprint, agentSessionSendFields, type StructuredAgentSessionSendMutation -} from '../../../shared/structured-agent-session-send-mutation' +} from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { STRUCTURED_AGENT_SESSION_COMPACT_COMMAND, structuredAgentSessionCompactBody diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-native-responses.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-native-responses.ts index 5fa88426233..1a709a168db 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-native-responses.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-native-responses.ts @@ -1,4 +1,4 @@ -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { isJournalStopOrResumeRow } from '../agent-session-journal/journal-row-schema' import { isAgentSessionContextClear } from '../../../shared/agent-session-context-clear' import { StructuredQueuedNativeResponses } from './structured-agent-session-queued-native-responses' @@ -7,14 +7,14 @@ import { readWholeAgentSessionFailureFact } from '../../../shared/agent-session- import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalItemBody, AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalRow } from '../agent-session-journal/journal-row-schema' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-newer-content-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-newer-content-host.test.ts index d6b260f364b..d4f862c69a4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-newer-content-host.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-newer-content-host.test.ts @@ -1,7 +1,7 @@ import { cp, rm } from 'node:fs/promises' import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { closeTestJournalHostDatabases, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-opening-send.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-opening-send.ts index 737d01638d1..7a4fc76dbbc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-opening-send.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-opening-send.ts @@ -1,4 +1,4 @@ -import { structuredAgentSessionSendOpeningTurn } from '../../../shared/structured-agent-session-opening-send' +import { structuredAgentSessionSendOpeningTurn } from '../../../shared/agent-session/requests/structured-agent-session-opening-send' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' import type { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.test.ts index 72c77c31af8..b7ae08d8a2f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-options-read.test.ts @@ -33,7 +33,7 @@ import { import type { StructuredAgentSessionLiveOptions } from './structured-agent-session-adapter' import { describe, expect, it, vi } from 'vitest' import type { AgentSessionRecord } from '../../../shared/agent-session-record' -import type { AgentJournalItemBody } from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { AgentSessionModelOption } from '../../../shared/agent-session-wire' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts index ee18aec0dea..305131eff46 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts @@ -8,12 +8,12 @@ import { agentSessionFailureWords, type AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import type { AgentJournalRenderItem, AgentJournalStatusItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn, readAgentJournalTurnOutcome diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.test.ts index 16f4238c3a5..cda0766b14b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.test.ts @@ -41,7 +41,7 @@ import type { StructuredAgentSessionProviderChild } from './structured-agent-ses import type { AgentJournalItemBody, AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import type { JournalItemLinkageVisitor } from '../agent-session-journal/journal-store-contracts' import type { LegacyAgentSessionAccountHome } from '../../../shared/agent-session-account-home' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.ts index fa98c7a6b11..9561d4bb0c0 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-outgrown-child.ts @@ -1,8 +1,8 @@ // Replace an outgrown child only when its provider needs acquisition to apply the current choice. import { readWholeAgentSessionFailureFact } from '../../../shared/agent-session-failure' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' @@ -12,7 +12,7 @@ import { } from './structured-agent-session-idle-sweep' import type { StructuredAgentSessionLogger } from './structured-agent-session-logger' import type { AgentChatPermissionChoice } from '../../../shared/agent-chat-permission-mode' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionAccountHomesEqual, type AgentSessionAccountHome diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-answer-receipts.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-answer-receipts.test.ts index 6f83926d1ff..e03c643e231 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-answer-receipts.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-answer-receipts.test.ts @@ -3,8 +3,8 @@ import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../../shared/agent-se import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { encodeAgentSessionQuestionAnswers } from '../../../shared/agent-session-question-answer' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel-repeat.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel-repeat.test.ts index 6f058a16612..00d26777a27 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel-repeat.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel-repeat.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { beforeEach, describe, expect, it, type Mock } from 'vitest' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' import type { StructuredAgentSessionHost } from './structured-agent-session-host' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts index aaa088eb352..365bb428a3c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.test.ts @@ -1,12 +1,10 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { - AgentJournalApprovalSubject, - AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalApprovalSubject } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.ts index ee3f90aa903..80aa4aaff32 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-cancel.ts @@ -2,7 +2,7 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { refuse, type AgentSessionCancelResult } from '../../../shared/agent-session-wire' import { AgentSessionPromptUnavailableError } from './structured-agent-session-adapter' import type { StructuredAgentSessionChatStopRun } from './structured-agent-session-chat-stop' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts index be2e3273399..289f63fac33 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-prompt-state.ts @@ -1,7 +1,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { refuse, type AgentSessionCancelResult, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts index 37ad3779953..e56004a6f25 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-child.ts @@ -1,6 +1,6 @@ // Match child endings by generation/fence so stale exits cannot end newer children; conversation state outlives them. -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-contract-test-fixture.ts index f80288b9d12..041766c22e3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-contract-test-fixture.ts @@ -5,9 +5,9 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalAnsweredTurnIdentity, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { activeProviderContext } from '../../../shared/agent-session-provider-context' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { openTestJournalHostDatabase, readTestQueueChanges diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-retained-history.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-retained-history.test.ts index e7205de6c27..f2907094193 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-retained-history.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-retained-history.test.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { EMPTY_STRUCTURED_AGENT_SESSION, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-reuse.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-reuse.test.ts index 2d76613a9cc..67cc016aeae 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-reuse.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-reuse.test.ts @@ -5,7 +5,7 @@ import { LegacyQueuedCards } from '../agent-session-journal/journal-queue-import import { openRigTurnFor } from './structured-agent-session-queued-rig-turn.test-fixture' import { loadTestJournal } from '../agent-session-journal/journal-host-database-test-support' import { expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { AgentSessionSubscribers } from './structured-agent-session-subscribers' import { createAgentSessionCatchUpReader } from './agent-session-history-page' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-scaling.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-scaling.test.ts index cbca679dff6..bf9cc54fb0c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-scaling.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queue-import-scaling.test.ts @@ -6,7 +6,7 @@ import { JournalInputCardIndex } from '../agent-session-journal/journal-input-ca import { JournalInputLineageOwner } from '../agent-session-journal/journal-input-lineage' import { encodeJournalState } from '../agent-session-journal/journal-state-codec' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { AgentSessionSubscribers } from './structured-agent-session-subscribers' import { HOST_TEST_SESSION as SESSION } from './structured-agent-session-host-test-data' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts index 9219d01e7a8..792a9c6cae1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { holdLane } from './structured-agent-session-delivery-hold.test-fixture' import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../../shared/agent-session-host-authority' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command-refusal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command-refusal.ts index 65a9467c414..819bf394b47 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command-refusal.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command-refusal.ts @@ -3,11 +3,11 @@ import { agentSessionFailureWords, type AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionConversationCommand } from '../../../shared/agent-session/agent-session-conversation-command' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { structuredAgentSessionCommandTurn } from '../../../shared/structured-agent-session-command-turn-identity' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts index fcc0e23af4a..c7d27377e61 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts @@ -3,8 +3,8 @@ import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-rec import { StructuredAgentSessionHost } from './structured-agent-session-host' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { activeProviderContext } from '../../../shared/agent-session-provider-context' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { createQueuedMessageTestRig, eventually, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-compact.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-compact.test.ts index c0e516e57a4..6d3c73f7577 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-compact.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-compact.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import { reportedChildWork } from './structured-agent-session-reported-child-work.test-support' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.test.ts index f38583ad9d3..d1c929cd616 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.test.ts @@ -14,7 +14,7 @@ import { hostTestMessage, hostTestOperationId } from './structured-agent-session-host-test-data' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { readQueuePublication, structuredQueueSendGate @@ -23,7 +23,7 @@ import { shouldQueueStructuredAgentSessionSend } from './structured-agent-sessio import { QUEUED_MESSAGES_PUBLISHED_MAX_BYTES } from './structured-agent-session-queued-published-bytes' import { QUEUED_MESSAGE_EDIT_LEASE_MS } from '../agent-session-journal/queued-message-edit-leases' import { agentSessionAttachmentStoreRoot } from '../agent-session-attachments/agent-session-attachment-references' -import type { AgentJournalSkillRef } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSkillRef } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { QueuedMessageImageBlock } from '../../../shared/queued-message-edit' let rig: QueuedMessageTestRig diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.ts index a870be552ce..bfbf3c63f0e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-edit.ts @@ -2,11 +2,13 @@ import type { AgentSessionMutationEnvelope, - AgentSessionMutationResult, + AgentSessionMutationResult +} from '../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageEditHoldParams, AgentSessionQueuedMessageEditHoldResult, AgentSessionQueuedMessageUpdateResult -} from '../../../shared/agent-session-wire' +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import { queuedMessageEditableText } from '../../../shared/queued-message-edit' import { queuedMessageUpdateDecision, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts index 256a6c1718a..d6b3dc38637 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredQueueHold } from './structured-agent-session-queued-messages' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-legacy-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-legacy-import.test.ts index b64235a408e..4eb26b72887 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-legacy-import.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-legacy-import.test.ts @@ -1,6 +1,6 @@ import { expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import { structuredAgentSessionCommandTurnIdentity } from '../../../shared/structured-agent-session-command-turn-identity' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig-provider.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig-provider.test-fixture.ts index 0db59e9a699..5e65df188e6 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig-provider.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig-provider.test-fixture.ts @@ -1,5 +1,5 @@ import { vi, type Mock } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { activeProviderContext } from '../../../shared/agent-session-provider-context' import { claudeProviderHandle, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts index bae85f50c35..f9c85595929 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts @@ -6,11 +6,11 @@ import { activeProviderContext } from '../../../shared/agent-session-provider-co import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import type { AgentSessionQueuePause } from '../../../shared/agent-session-wire' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuePause } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionExecutionLocation } from '../../../shared/agent-session-record' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' -import { agentSessionMessagePayload } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionMessagePayload } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts index 5e3a4672bd0..d0dea1c6d3e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts @@ -1,12 +1,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { QUEUED_MESSAGE_PAUSED_SEND_FAILED, - type AgentSessionQueuedMessage, - type AgentSessionSubscribeEvent -} from '../../../shared/agent-session-wire' + type AgentSessionQueuedMessage +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' +import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { ConversationCommandParams } from '../../../shared/rpc-contract/structured-agent-session-params' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { AgentSessionJournal } from '../agent-session-journal/journal-store' import { JournalStopAcceptor } from '../agent-session-journal/journal-stop-acceptance' import { JournalQueuedMessages } from '../agent-session-journal/journal-queued-messages' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts index 4a2b5c8a132..f9a645dd50c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts @@ -1,11 +1,11 @@ // Drafts owe no execution work; derive delivery gates under serialization before consuming one card per turn. import { randomUUID } from 'node:crypto' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' -import { - QUEUED_MESSAGE_PAUSED_SEND_FAILED, - type AgentSessionSendResult, - type AgentSessionWireRefusal +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' +import type { + AgentSessionSendResult, + AgentSessionWireRefusal } from '../../../shared/agent-session-wire' import { createStructuredAgentSessionOperationId } from '../../../shared/structured-agent-session-mutation' import { queuedSendAnswer } from './structured-agent-session-queued-send-answer' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.test.ts index 7d1be14378d..295d19f4bb1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.test.ts @@ -6,7 +6,7 @@ import { type QueuedMessageTestRig } from './structured-agent-session-queued-message-rig.test-fixture' import { HOST_TEST_SESSION, hostTestOperationId } from './structured-agent-session-host-test-data' -import type { AgentSessionQueuedMessageMoveAnchor } from '../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageMoveAnchor } from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import { QueuedMessageActionParams } from '../../../shared/rpc-contract/structured-agent-session-params' import { QueuedMessageMoveParams } from '../../../shared/rpc-contract/structured-agent-session-queued-edit-params' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.ts index 37f4dfd83d0..491d0f103e5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-move.ts @@ -1,9 +1,11 @@ import type { AgentSessionMutationEnvelope, - AgentSessionMutationResult, + AgentSessionMutationResult +} from '../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageMoveAnchor, AgentSessionQueuedMessageMoveResult -} from '../../../shared/agent-session-wire' +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context' import type { StructuredAgentSessionCaller } from './structured-agent-session-host-types' import { mutateQueued } from './structured-agent-session-queued-mutations' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts index 88763631f31..a0042d4cf7d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts @@ -2,14 +2,16 @@ // Published cards own rendered text; mutation answers carry none. import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionMutationEnvelope, AgentSessionMutationResult, - AgentSessionQueuedMessageDeleteResult, - AgentSessionQueuedMessagesResumeResult, AgentSessionSendResult } from '../../../shared/agent-session-wire' +import type { + AgentSessionQueuedMessageDeleteResult, + AgentSessionQueuedMessagesResumeResult +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import { QueuedMessageNotConsumableError } from '../agent-session-journal/queued-message-consume-error' import { refusingNewerOrcaJournal } from '../agent-session-journal/journal-open-failure' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts index 4f4f61ee035..128d30b6ed1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts @@ -12,7 +12,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { AgentSessionJournal } from '../agent-session-journal/journal-store' import { JournalStopAcceptor } from '../agent-session-journal/journal-stop-acceptance' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { HOST_TEST_SESSION, HOST_TEST_THREAD as THREAD, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts index ce648d337aa..6a7b859427f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts @@ -5,7 +5,7 @@ import { type AgentSessionQueuedMessage, type AgentSessionQueuedMessagePausedReason, type AgentSessionQueuePause -} from '../../../shared/agent-session-wire' +} from '../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-published-bytes.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-published-bytes.ts index 8c3678126eb..d16bd644d17 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-published-bytes.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-published-bytes.ts @@ -1,4 +1,4 @@ -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire' import { refuse } from '../../../shared/agent-session-wire-refusals' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../shared/remote-runtime/remote-runtime-memory-limits' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-refused-card.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-refused-card.test.ts index 4c261cd2337..e65e742c079 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-refused-card.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-refused-card.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { openTestJournalHostDatabase, readTestQueueChanges diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-rig-turn.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-rig-turn.test-fixture.ts index b4a0f52d865..27f4f2313d5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-rig-turn.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-rig-turn.test-fixture.ts @@ -1,7 +1,7 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { HOST_TEST_SESSION as SESSION, HOST_TEST_THREAD as THREAD diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts index 0cd8b127088..a614017cfe4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts @@ -1,5 +1,5 @@ import type { AgentSessionSendResult } from '../../../shared/agent-session-wire' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations' import { maybeQueueStructuredAgentSessionSend } from './structured-agent-session-queued-messages' import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts index 592d4100aac..bf1298c1044 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalAnsweredTurnIdentity } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalAnsweredTurnIdentity } from '../../../shared/agent-session/journal/agent-session-journal-types' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import { HOST_TEST_SESSION, HOST_TEST_THREAD } from './structured-agent-session-host-test-data' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts index bff21e40eed..2f4bf8e9725 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { closeTestJournalHostDatabase, @@ -7,7 +7,7 @@ import { import { StructuredAgentSessionHost } from './structured-agent-session-host' import { abandonStructuredAgentSessionHost } from './structured-agent-session-host-test-abandon' import { expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn' import { CALLER, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-reasoning-sweep.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-reasoning-sweep.test.ts index b7910b93cb7..fce3ed43ec2 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-reasoning-sweep.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-reasoning-sweep.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-perf.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-perf.test.ts index 8ae5cf73ce3..68aff075f48 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-perf.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-perf.test.ts @@ -15,7 +15,7 @@ import { seedTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' import { createReceivingAccountFixture, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-queue.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-queue.test.ts index d2a64e20831..3509a8ee28c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-queue.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account-queue.test.ts @@ -1,6 +1,6 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { StructuredNativeResponses } from './structured-agent-session-native-responses' import { structuredAgentSessionReceivingAccount } from './structured-agent-session-receiving-account' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test-support.ts index c14099d8534..d339ac44143 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test-support.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test-support.ts @@ -9,11 +9,11 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalSubmissionKey, agentJournalItemKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { isOrcaSessionId } from '../../../shared/orca-session-address' import { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' import { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test.ts index c75e4e35eb9..515492a9e8b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.test.ts @@ -1,7 +1,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { describe, expect, it, vi } from 'vitest' import { createReceivingAccountFixture, @@ -11,7 +11,7 @@ import { import { structuredAgentSessionReceivingAccount } from './structured-agent-session-receiving-account' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' const ordinary: AgentJournalMessageItem = { kind: 'message', diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.ts index b1cd535ad92..eee5891129b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-account.ts @@ -3,8 +3,8 @@ import { type ClaudeAccountRecipe } from '../../../shared/agent-session-acquired-account' import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionAccountHome } from '../../../shared/agent-session-account-home' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-callers.test-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-callers.test-support.ts index aef7c5611a5..466d9cc0298 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-callers.test-support.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-callers.test-support.ts @@ -8,8 +8,8 @@ import { testOrcaSessionId } from '../../../shared/orca-session-address-test-fix import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { ClaudeAccountRecipe } from '../../../shared/agent-session-acquired-account' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { OrchestrationSessionCaller } from '../../runtime/orchestration/orchestration-caller-identity' import { resolveOrcaSessionParty } from '../../runtime/orchestration/orchestration-party' import { ReceivingRuntime } from './structured-agent-session-receiving-runtime.test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-nested.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-nested.test.ts index 54f9d8ab810..5e5524ddec3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-nested.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-receiving-nested.test.ts @@ -1,4 +1,4 @@ -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { describe, expect, it, vi } from 'vitest' import { dispatchReportMailbox } from '../../runtime/orchestration/dispatch-report-mailbox' import { OrchestrationStructuredMailboxPointerDelivery } from '../../runtime/orchestration/structured-mailbox-pointer-delivery' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-queue-idle.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-queue-idle.test.ts index 53c8403f727..5323de526dd 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-queue-idle.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-queue-idle.test.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { createQueuedMessageTestRig, eventually diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts index 599205e581b..0676b89990f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovered-turn-clock.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-read.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-read.test.ts index e3d6e9d64f1..ad97a3d4e10 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-read.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-recovery-read.test.ts @@ -6,7 +6,7 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants' import type { AgentJournalSnapshot, AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture' import { readStructuredSessionRecovery } from './structured-agent-session-recovery-read' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-repeated-stop.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-repeated-stop.test.ts index 0b2692ce354..841b868bbfc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-repeated-stop.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-repeated-stop.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, type Mock } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import type { AgentJournalTurnLifecycleState } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnLifecycleState } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-replaced-server-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-replaced-server-turn.test.ts index a35399eb9d4..4f4dc9679d4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-replaced-server-turn.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-replaced-server-turn.test.ts @@ -1,11 +1,11 @@ import { openTestChats } from './structured-agent-session-open-test-chats.test-support' import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } 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 type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-request-failures.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-request-failures.ts index bc4d9fc2735..209b45fc352 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-request-failures.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-request-failures.ts @@ -1,8 +1,8 @@ -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentTurnVerdict } from '../../../shared/agent-turn-outcome' import { isAgentSessionContextClear } from '../../../shared/agent-session-context-clear' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentJournalTurn, readAgentJournalTurnOutcome @@ -11,7 +11,7 @@ import { isStructuredAgentSessionCommandTurn, isStructuredAgentSessionCommandEntry } from '../../../shared/agent-session/structured-agent-session-command-entry' -import { classifyDispatchRejection } from '../../../shared/structured-agent-session-dispatch-rejection' +import { classifyDispatchRejection } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalRow } from '../agent-session-journal/journal-row-schema' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts index be64172efb0..517d83f4957 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.test.ts @@ -1,13 +1,11 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { closeTestJournalHostDatabases, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.ts index 827fa700a0d..2a988026695 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-resolved-append.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { estimateStructuredAgentSessionItemBytes } from './structured-agent-session-event-sink-estimate' import type { StructuredAgentSessionItemAppendOptions, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts index fc2e31a06f7..925ab43b64b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rest-test-rig.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { expect, vi, type Mock } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionMutationEnvelope, AgentSessionStatusEvent, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts index f78a8af6854..7aa9aee7066 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-candidates.ts @@ -3,7 +3,7 @@ import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire' import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker' -import { latestStructuredAgentSessionPrompt } from '../../../shared/structured-agent-session-latest-request' +import { latestStructuredAgentSessionPrompt } from '../../../shared/agent-session/requests/structured-agent-session-latest-request' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' import { hostCanStartRecord } from './structured-agent-session-provider-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-context-clear.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-context-clear.test.ts index 504530f617d..d93b483539e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-context-clear.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-context-clear.test.ts @@ -14,7 +14,7 @@ import { SESSION, TEARDOWN_CURRENT } from './structured-agent-session-restart-resume-test-harness' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' const boundary = { operationId: 'clear', afterFence: 1, clearedAt: NOW } const clear: AgentJournalRenderItem = { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts index 35241ff3a1b..436489e42a9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-envelope.ts @@ -1,5 +1,5 @@ import { createHash } from 'node:crypto' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { restartContinuationMessage } from '../../../shared/agent-session-restart-continuation' import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts index 55d8d6cd49c..24214daa0fc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation-wait.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionRestartResumeSurfaces } from './structured-agent-session-restart-resume-wiring' import { StructuredAgentSessionSendSettlement } from './structured-agent-session-send-settlement' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts index caae857c0ea..844b8186e30 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-continuation.ts @@ -3,7 +3,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionRefusalReference, type AgentSessionRefusalReference diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts index a1f2794bd1d..3b79a72a8f0 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-interruption-test-harness.ts @@ -1,7 +1,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { AgentSessionAcquisitionRootExitObservedError } from './structured-agent-session-adapter' import { withNativeChatCutTurnNotices } from '../../../shared/native-chat/transcript/native-chat-cut-turn-notice' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts index 57ebfaa6254..6887850e5f5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-offer-withdrawal.ts @@ -3,7 +3,7 @@ import type { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule' import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' import { isRestartContinuationOf } from './structured-agent-session-restart-continuation-envelope' import type { StructuredAgentSessionLogger } from './structured-agent-session-logger' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts index f65f41633d4..4c75fd34bd9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-ownership.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdir, rm, writeFile } from 'node:fs/promises' import { AgentSessionRecoveryCapsule, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-provider-output.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-provider-output.test.ts index 7551074dd7a..2929bf7de63 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-provider-output.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-provider-output.test.ts @@ -3,8 +3,8 @@ import { createCodexJournalTranslator } from '../../codex/codex-structured-journ import { codexStreamingJournalItem } from '../../codex/codex-structured-item-translation' import { createClaudeJournalTranslator } from '../../claude/claude-structured-journal-translation' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { completedStructuredAgentTurnSeconds, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts index 78313b7dcc0..c4aed55baf3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-test-harness.ts @@ -2,7 +2,7 @@ import type { AgentJournalApprovalItem, AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts index c419e90b582..a4061a3fa80 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-wiring.ts @@ -1,4 +1,4 @@ -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionMutationEnvelope, AgentSessionMutationResult, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-stream-duration.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-stream-duration.test.ts index 3d1dcc1f180..9964deae414 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-stream-duration.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-stream-duration.test.ts @@ -1,7 +1,7 @@ import { openTestChats } from './structured-agent-session-open-test-chats.test-support' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts index ff2533b2cb5..303537384f8 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-teardown.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-resumed-child-owner.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-resumed-child-owner.test.ts index c360178bc2d..f1b8a02f406 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-resumed-child-owner.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-resumed-child-owner.test.ts @@ -2,9 +2,9 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { isBackgroundTaskBlock, isSubagentBlock diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts index 643ff02b27a..120369fe070 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-at-rest.test.ts @@ -1,10 +1,10 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-live-send.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-live-send.test.ts index 39db5264183..41d7d4595ef 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-live-send.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-live-send.test.ts @@ -1,13 +1,13 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { claudeAndCodexDeclared } from './structured-agent-session-adapter-router-test-support' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-provenance.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-provenance.test.ts index 7cf35d5c343..a1d8d74fa58 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-provenance.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-provenance.test.ts @@ -2,13 +2,15 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, 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 { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-replay.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-replay.test-fixture.ts index c556808246c..a7f66dd161f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-replay.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-replay.test-fixture.ts @@ -1,7 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink' import { expect, type Mock } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' import type { StructuredAgentSessionHost } from './structured-agent-session-host' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-stop-note.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-stop-note.test-fixture.ts index a91c40f5637..5b98ede493d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-stop-note.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind-stop-note.test-fixture.ts @@ -2,8 +2,8 @@ import { expect, vi, type Mock } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts index c2280c2118a..9206f2d26b2 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-rewind.test.ts @@ -4,7 +4,7 @@ import { expectRetainedPrefixRewindReplay } from './structured-agent-session-rewind-replay.test-fixture' import { expectRawStopNoteRewindRecovery } from './structured-agent-session-rewind-stop-note.test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AgentSessionJournal } from '../agent-session-journal/journal-store' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' @@ -13,7 +13,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-saved-status.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-saved-status.test.ts index 4476cb07a12..2528a2fd1fd 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-saved-status.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-saved-status.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import * as journalFactory from '../agent-session-journal/journal-store-factory' import { afterEach, expect, it, vi } from 'vitest' import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts index 8070af28e23..a6cc0814a89 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts @@ -2,8 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/structured-agent-session-projection' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts index baf625eb070..62532e71f43 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts @@ -1,5 +1,5 @@ import { openTestChats } from './structured-agent-session-open-test-chats.test-support' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { cp, rm } from 'node:fs/promises' import { afterEach, expect, it, vi } from 'vitest' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-options.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-options.test.ts index e1454b350cb..47bd56f8195 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-options.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-options.test.ts @@ -1,12 +1,12 @@ import type { StructuredAgentSessionFirstMessage } from '../../../shared/structured-agent-session-create' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { SendParams } from '../../../shared/rpc-contract/structured-agent-session-params' import { agentSessionMessagePayload, agentSessionSendBodyFingerprint -} from '../../../shared/structured-agent-session-send-mutation' +} from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { createQueuedMessageTestRig, eventually, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts index a6e1a8228da..c310328065f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { AgentSessionMutationEnvelope } from '../../../shared/agent-session-wire' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts index 7c8a33f5458..438992c912d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-send-settlement.ts @@ -1,9 +1,7 @@ -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSendResult } from '../../../shared/agent-session-wire' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { isStructuredAgentSessionCommandTurnId } from './structured-agent-session-command-turn' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-settlement-double.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-settlement-double.test-fixture.ts index e7341d68e16..5cbe7099aea 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-settlement-double.test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-settlement-double.test-fixture.ts @@ -1,8 +1,8 @@ +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionChildExitSession } from './structured-agent-session-child-exit' import type { JournalLifecycleBatchInput, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.ts index 47a99a0017e..f1a553130d9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-shown-work.ts @@ -3,7 +3,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import { structuredAgentSessionAgentStatus, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts index 400ed6d42ac..7e93aaa4e7d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts @@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentSessionOrcaStop } from '../../../shared/agent-session-orca-stop' import { withNativeChatCutTurnNotices } from '../../../shared/native-chat/transcript/native-chat-cut-turn-notice' import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat/native-chat-orca-stop-cut' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-state-settlement.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-state-settlement.ts index a10d8bbad16..e9e8385c211 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-state-settlement.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-state-settlement.ts @@ -7,7 +7,7 @@ import type { AgentSessionReplacedRuntime } from '../../runtime/agent-session/ag import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record' import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words' import { journalPendingSubmissionResolutions } from '../agent-session-journal/journal-pending-submission-recovery' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-stop-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-stop-row.ts index 7972315972a..32552b5453c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-stop-row.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-stop-row.ts @@ -5,7 +5,7 @@ import type { AgentSessionFailureWordsContext } from '../../../shared/agent-sess import type { AgentJournalRenderItem, AgentJournalStatusItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { AgentSessionReplacedRuntime } from '../../runtime/agent-session/agent-session-replaced-runtime' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts index 521ae49949f..41b3609ed88 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-open.test.ts @@ -1,6 +1,6 @@ import { openTestChats } from './structured-agent-session-open-test-chats.test-support' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { setStructuredAgentSessionHost } from './structured-agent-session-registry' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts index f482e687bad..4854c290959 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts @@ -1,7 +1,7 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement' import { runningTurnLifecycleRevisions, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts index 178b5e2187f..90b41811c74 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.ts @@ -8,7 +8,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem, type AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody, readAgentJournalTurn diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-contract-test-fixture.ts index 9620ca2989e..a45ef43096e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-contract-test-fixture.ts @@ -1,10 +1,8 @@ import { vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { - AgentJournalItemIdentity, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import type { AgentSessionDeathEvidence } from '../../../shared/agent-session-record' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { plannedBatchThrough } from './structured-agent-session-settlement-double.test-fixture' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-prompts.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-prompts.test.ts index 6506e8a4326..a4633e06ca4 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-prompts.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stale-verdict-prompts.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-admission.test.ts index 00734435e70..9109ddeeaab 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-admission.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-admission.test.ts @@ -5,9 +5,9 @@ import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vite import type { AgentSessionOwnerProbe } from '../../../shared/agent-session-lease-adjudication' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' import { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts index 2d592878ad4..ddb9a27933b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-attempts.ts @@ -4,7 +4,7 @@ import { setTimeout as delay } from 'node:timers/promises' import { throwIfSignalAborted, waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { refuseUnclassified } from '../../../shared/agent-session-wire-refusals' import { agentSessionWriteNoticeEnglish } from '../../../shared/agent-session-refusal-notice' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import type { StructuredAgentSessionAttachContext } from './structured-agent-session-attach-context' import type { StructuredAgentSessionAttachLock } from './structured-agent-session-attach-lock' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts index c63b67de945..569d2457891 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-row.ts @@ -1,9 +1,9 @@ import { selectedStructuredSubmission } from './structured-agent-session-input-selection' import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words' import { structuredAgentSessionStartFailure } from './structured-agent-session-failure-text' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { structuredAgentSessionStartFailureRowIdentity } from '../../../shared/structured-agent-session-start-failure-row-key' import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders' import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' @@ -14,10 +14,8 @@ import type { import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-agent-start' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { failedProviderChildStart } from './structured-agent-session-provider-child' import { structuredAgentSessionEndedChildFailure } from './structured-agent-session-ended-child-failure' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts index 5425e7438ac..f09ea889757 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-start-settlement-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-start-settlement-host.test.ts index 61c02278448..c93768c90be 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-start-settlement-host.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-start-settlement-host.test.ts @@ -5,7 +5,7 @@ import { withProviderRequestTimeout } from '../../provider-process/provider-requ import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import * as startFlight from './structured-agent-session-start-flight' import { STRUCTURED_AGENT_SESSION_START_WAIT_MS } from './structured-agent-session-send-settlement' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-contract.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-contract.ts index 68d2e0fea89..d20431c08bc 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-contract.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-contract.ts @@ -1,7 +1,7 @@ import type { ClaudeAccountRecipe } from '../../../shared/agent-session-acquired-account' // Adapter-reachable contract must remain free of host and Node-only process dependencies. -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionRecord, AgentSessionExecutionLocation, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host-test-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host-test-support.ts index a0259aedb4b..5ad610652e9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host-test-support.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host-test-support.ts @@ -13,7 +13,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, vi, type Mock } from 'vitest' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts index 1e5f2880be5..f8d5dacdefb 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt-host.test.ts @@ -4,9 +4,9 @@ import { withProviderRequestTimeout } from '../../provider-process/provider-requ import { AgentSessionAcquisitionRefusal } from './structured-agent-session-adapter' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' -import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { NATIVE_CHAT_STOPPED_BEFORE_START_TEXT } from '../../../shared/native-chat/native-chat-stopped-before-start' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt.ts index b852ad324fe..5b6de4c56de 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-attempt.ts @@ -6,7 +6,7 @@ import { type StructuredAgentSessionStartReadiness } from './structured-agent-session-start-readiness' export type { StructuredAgentSessionStartReadiness } from './structured-agent-session-start-readiness' -import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink' import type { AgentChatPermissionChoice } from '../../../shared/agent-chat-permission-mode' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts index c5800fe06be..219a451cd80 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-startup-failure-exit.test.ts @@ -11,7 +11,7 @@ import { type StructuredAgentSessionChildExitSession } from './structured-agent-session-child-exit' import { recordingStructuredAgentSessionLogger } from './structured-agent-session-logger-test-support' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { exitJournalDouble } from './structured-agent-session-settlement-double.test-fixture' const SESSION = 'session-1' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-child-work.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-child-work.ts index 1e648e2e684..26c0c8f4e9e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-child-work.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-child-work.ts @@ -1,7 +1,7 @@ // Broadcast only child facts and minute-scale freshness; per-tick usage/clocks stay on the chat’s background channel. import type { StructuredAgentId } from '../../../shared/agent-session-provider-handle' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionBackgroundTask } from '../../../shared/agent-session/agent-session-background-task-wire' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import { agentChildWorkViewsEqual } from '../../../shared/agent-status-child-work-view-wire' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-children.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-children.test.ts index babcf2f1a6d..8cc35cd0e66 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-children.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-children.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHandleProvider } from '../../../shared/agent-session-provider-handle' import type { AgentSessionStatusEvent, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts index 77fbe0250cd..6d2c55bcc1a 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-clock.test.ts @@ -1,13 +1,11 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import { StructuredAgentSessionStatusFeed } from './structured-agent-session-status-feed' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-stopping.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-stopping.test.ts index bd6120474c8..83491417aa2 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-stopping.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed-stopping.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire' import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts index ae8d4bfe487..65ececee73c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.test.ts @@ -1,5 +1,5 @@ import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-first-input-identity.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-first-input-identity.test.ts index c1a3db1f640..8d70304fe60 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-first-input-identity.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-first-input-identity.test.ts @@ -11,7 +11,7 @@ import { createStructuredAgentSessionLogger } from './structured-agent-session-l import { agentSessionRecordFixture } from '../../../shared/agent-session-record.test-fixture' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { AgentSessionStatusEvent } from '../../../shared/agent-session-wire' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' const journals = createTrackedJournalOpener() let directory: string diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-journal-projection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-journal-projection.ts index 5605fe02635..13b68bb4397 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-journal-projection.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-journal-projection.ts @@ -1,5 +1,5 @@ -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { isStructuredAgentSessionCommandEntry } from '../../../shared/agent-session/structured-agent-session-command-entry' import type { AgentSessionConversationView } from '../../../shared/agent-session-conversation-view' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts index 700901ec262..7363e55d25e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-status-reentry.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-aborts-start.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-aborts-start.test.ts index 3db186c5541..b4d8dc1d20b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-aborts-start.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-aborts-start.test.ts @@ -1,7 +1,7 @@ import { afterEach, expect, it, vi } from 'vitest' import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' import { JournalStopAcceptor } from '../agent-session-journal/journal-stop-acceptance' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { HOST_TEST_SESSION as SESSION, HOST_TEST_THREAD as THREAD, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event.test.ts index 4178893ea74..adba6da556c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { JournalStopEvent } from '../agent-session-journal/journal-row-schema' import { HOST_TEST_SESSION, hostTestOperationId } from './structured-agent-session-host-test-data' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-opened-turn.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-opened-turn.test.ts index 91ca57e5693..fd0e8a0caf6 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-opened-turn.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-opened-turn.test.ts @@ -2,12 +2,10 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-withdrawn-send.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-withdrawn-send.test.ts index 1c99e67b3cb..e8f797f0f77 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-withdrawn-send.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-note-withdrawn-send.test.ts @@ -6,10 +6,8 @@ import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import { createStructuredAgentSessionLogger } from './structured-agent-session-logger' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-receipts.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-receipts.test.ts index 89adad2dd81..547497454d9 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-receipts.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-receipts.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import type { JournalStopEvent } from '../agent-session-journal/journal-row-schema' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-unconfirmed-note.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-unconfirmed-note.ts index 67b905ee438..be1024b9cc8 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-unconfirmed-note.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-unconfirmed-note.ts @@ -2,10 +2,8 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import type { - AgentJournalStatusItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn' import { structuredAgentSessionNamedTurnScope } from './structured-agent-session-turn-stop-notes' import type { AgentSessionTurnContext } from './structured-agent-session-turns' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-wind-down.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-wind-down.ts index 2bfebe29887..438baa38a81 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-wind-down.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-wind-down.ts @@ -1,13 +1,13 @@ import type { AgentSessionStopOutcome } from './structured-agent-session-adapter-stop' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { isMainAgentWorking } from './structured-agent-session-turns-cancel' import { contextStructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' import type { AgentSessionTurnContext } from './structured-agent-session-turns' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history-selection.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history-selection.ts index 01d191b8f08..42d8e3b90f5 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history-selection.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history-selection.ts @@ -2,10 +2,10 @@ import type { AgentJournalMessageItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' + AgentJournalSubmission +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionSendCarriesStoppedHistory, agentSessionSendDeliversStoppedHistory, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history.test.ts index 0ba2f5c5b81..426e568d2e7 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stopped-history.test.ts @@ -1,9 +1,9 @@ import { afterEach, describe, expect, it } from 'vitest' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { STOPPED_MESSAGE_INTERRUPTED_MARKER } from '../../../shared/agent-session-stopped-history' -import { AgentJournalSubmissionSchema } from '../../../shared/agent-session-journal-submission-schema' +import { AgentJournalSubmissionSchema } from '../../../shared/agent-session/journal/agent-session-journal-submission-schema' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stopping-journal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stopping-journal.test.ts index f6133b7ed67..7258a735f4f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stopping-journal.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stopping-journal.test.ts @@ -7,10 +7,10 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalRenderItem, type AgentJournalStatusItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stopping.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stopping.ts index 42e27ade384..c087011034a 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-stopping.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stopping.ts @@ -4,7 +4,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { activeStructuredAgentSessionTurnId } from '../../../shared/structured-agent-session-live-turn' import type { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts index 50c409d8403..751c2d70395 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-recency.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.test.ts index 4557fb68dee..f1c593f9cfd 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody } from '../../../shared/agent-session-turn-record' import { isSubagentBlock } from '../../../shared/native-chat/native-chat-types' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.ts index 47bdda86b6f..94f5fb80544 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subagent-rows.ts @@ -2,10 +2,8 @@ // Failed writes retry on the next change; reopen settles any stale working rows as unverifiable. // Use the reporting child’s sink so resumed work belongs to its new execution owner. -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import type { AgentChildWorkInput } from '../../../shared/agent-status-child-work' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-background-tasks.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-background-tasks.test.ts index 78dd4d27342..4e6bc366138 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-background-tasks.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-background-tasks.test.ts @@ -2,7 +2,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session/agent-session-background-task-wire' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-journal-retention.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-journal-retention.test.ts index 500557bc3c7..21568130ffd 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-journal-retention.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-journal-retention.test.ts @@ -1,7 +1,7 @@ import '../../runtime/rpc/unused-default-rpc-methods.test-fixture' import { createHash } from 'node:crypto' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../shared/protocol-version' import { MAX_TIMER_DELAY_MS } from '../../../shared/timer-delay' import { codexItemBody } from '../../codex/codex-structured-item-translation' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-oversized-removal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-oversized-removal.test.ts index 89bd9238006..0e28b453ba3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-oversized-removal.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-oversized-removal.test.ts @@ -1,6 +1,6 @@ import { join } from 'node:path' import { expect, it } from 'vitest' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-publication.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-publication.test.ts index c43d1bf33b4..f29654833c3 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-publication.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscriber-publication.test.ts @@ -1,6 +1,6 @@ import { join } from 'node:path' import { expect, it } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionStatusEvent, AgentSessionSubscribeEvent diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts index a7680e03122..080bcdbc397 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.test.ts @@ -1,6 +1,6 @@ import { join } from 'node:path' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session/agent-session-background-task-wire' import { StructuredAgentSessionCurrentWork } from './structured-agent-session-current-work' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts index 7fcfd946974..4544937c59b 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-subscribers.ts @@ -4,7 +4,7 @@ import type { CurrentRequestsSubscriber } from './agent-session-current-requests // Advance subscriber cursors independently, sending resets or reducer-projected batches as needed. // Advance subscriber cursors independently, sending resets or reducer-projected batches as needed. -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { AgentSessionHistoryPage, AgentSessionSubscribeEvent, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-targeted-cancel.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-targeted-cancel.ts index 7bf19ad00f7..82920a3ccc1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-targeted-cancel.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-targeted-cancel.ts @@ -4,7 +4,7 @@ import { agentChildWorkStopTargets } from '../../../shared/agent-child-work-stop-targets' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionCancelResult } from '../../../shared/agent-session-wire' import { validatePendingPrompt } from './structured-agent-session-prompt-state' import { acceptStopTarget } from './structured-agent-session-stop-acceptance' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts index deb1052a947..3e140c3c94c 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.test.ts @@ -3,7 +3,7 @@ import { sweepAgentSessionAttachments, UNCLAIMED_ATTACHMENT_MAX_AGE_MS } from '../agent-session-attachments/agent-session-attachment-sweep' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { randomUUID } from 'node:crypto' import { mkdir, mkdtemp, rm, writeFile, readFile, stat } from 'node:fs/promises' import { tmpdir } from 'node:os' @@ -11,10 +11,12 @@ import { dirname, join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalThreadGoal, + AgentJournalMessageItem +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity, - AgentJournalMessageItem, AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session-journal-identity' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { closeTestJournalHostDatabase, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts index a1dabdac749..98fbd1e9266 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-thread-goal.ts @@ -5,9 +5,9 @@ import { } from '../../../shared/agent-session-wire-refusals' import type { AgentJournalCursor, - AgentJournalItemIdentity, - AgentJournalThreadGoal -} from '../../../shared/agent-session-journal-types' + AgentJournalItemIdentity +} from '../../../shared/agent-session-journal-identity' +import type { AgentJournalThreadGoal } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionMutationEnvelope } from '../../../shared/agent-session-wire' import type { AgentSessionOptionsResult } from '../../../shared/agent-session/options/agent-session-options-result' import type { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-transition-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-transition-contract-test-fixture.ts index 5cb96331c66..4215976ac61 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-transition-contract-test-fixture.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-transition-contract-test-fixture.ts @@ -4,9 +4,9 @@ import { join } from 'node:path' import { afterEach } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity, type AgentJournalToolCallItem -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-transition-rollback.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-transition-rollback.test.ts index b435d58256c..3def33c809e 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-transition-rollback.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-transition-rollback.test.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import { createAgentSessionDeltaCoalescer } from './agent-session-delta-coalescer' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.test.ts index 77745f29b37..363d50f7d2d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.test.ts @@ -1,6 +1,6 @@ import { expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support' import type { StructuredAgentSessionTransition } from './structured-agent-session-transition' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts index d0d17332536..bf4864a2077 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts @@ -1,10 +1,8 @@ // Admit each event’s writes whole so producer state cannot advance after partial admission. // Execute against the latest fold in one queue turn; failure retains the written prefix and skips later steps. -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalStep } from '../agent-session-journal/journal-step-writer' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts index 70b43ea9077..04d5025d3c0 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.test.ts @@ -3,15 +3,15 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentSessionTurnCompletionEvent } from '../../../shared/agent-session-wire' import { DISPATCH_REJECTED_CANCELLED, DISPATCH_REJECTED_HOST_RESTARTED, DISPATCH_REJECTED_NOT_DELIVERED, DISPATCH_REJECTED_PROVIDER_CLOSED -} from '../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionStatusState } from '../../../shared/structured-agent-session-projection' import type { StructuredAttentionState } from '../../../shared/agent-session-attention' import { StructuredAgentSessionTurnCompletionFeed } from './structured-agent-session-turn-completion-feed' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts index 6872917bba2..4d606137444 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed.ts @@ -10,7 +10,7 @@ import type { AgentSessionAttentionEdge, StructuredAttentionState } from '../../../shared/agent-session-attention' -import type { StructuredAgentSessionLatestRequest } from '../../../shared/structured-agent-session-latest-request' +import type { StructuredAgentSessionLatestRequest } from '../../../shared/agent-session/requests/structured-agent-session-latest-request' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { StructuredAgentSessionStatusState } from './structured-agent-session-status-feed' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-stop-notes.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-stop-notes.ts index ad64f5fa85e..56983ad5734 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turn-stop-notes.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turn-stop-notes.ts @@ -1,9 +1,7 @@ // Key Stop notes by captured turn so repeated Stops revise one row, even after the turn ends. -import type { - AgentJournalStatusItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { structuredAgentSessionStopNoteIdentity } from './structured-agent-session-command-turn' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-cancel.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-cancel.ts index 6486e928d15..45c6d064cf8 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-cancel.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-cancel.ts @@ -1,9 +1,7 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import type { - AgentJournalStatusItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' import type { AgentSessionCancelResult } from '../../../shared/agent-session-wire' import { latestJournalDispatchObservation } from '../agent-session-journal/journal-dispatch-observation' import type { AgentSessionStopOutcome } from './structured-agent-session-adapter-stop' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts index e0071bcb2cb..a2958653423 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns-prompt.ts @@ -1,6 +1,6 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionPromptQuestions, isValidAgentSessionQuestionAnswers, @@ -13,7 +13,7 @@ import type { AgentJournalApprovalItem, AgentJournalQuestionItem, AgentJournalResolution -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { refuse, type AgentSessionPromptResult, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts index 61bfb153fe3..bd4f6b8c022 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts @@ -6,7 +6,7 @@ import type { AgentSessionFailureWordsContext } from '../../../shared/agent-sess import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionMessageSource } from '../../../shared/agent-session/agent-session-message-source' import { refuse, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts index 98a156b1714..d0cb5ae029d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unexpected-exit.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import { agentSessionLeaseFixture, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unfinished-work.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unfinished-work.ts index 1f1e267f17a..d2e9fc9c9d1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unfinished-work.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unfinished-work.ts @@ -3,7 +3,7 @@ import { finalizingStructuredAgentSessionInput } from './structured-agent-session-handing-over' import { providerTimelineExecutionItems } from '../agent-session-timeline/provider-timeline-history' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { requiresTerminalSettlement } from '../agent-session-journal/journal-terminal-settlement' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' @@ -12,7 +12,7 @@ import { type StructuredAgentSessionWatchedExit } from './structured-agent-session-stale-turn-verdict' import type { UnopenedSendJournal } from './structured-agent-session-unopened-send-withdrawal' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' export type DeadGenerationJournal = UnopenedSendJournal & { appendPlannedLifecycleBatch: AgentSessionJournal['appendPlannedLifecycleBatch'] diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unheld-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unheld-turns.ts index c636dfe489f..2a09240a69a 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unheld-turns.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unheld-turns.ts @@ -2,8 +2,8 @@ // Earlier children's rows are swept before attach; this covers rows that reach the live fence // without the child's own lifecycle, such as restored history. -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { runningTurnLifecycleRevisions } from './structured-agent-session-stale-turn-verdict' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.test.ts index 41121f98d80..645e5ef3a07 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.test.ts @@ -1,9 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import type { - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { withdrawCodexSendsNoTurnOpenedFor, type UnopenedSendJournal diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.ts index 11f116ad8a7..befd986d5ef 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-send-withdrawal.ts @@ -2,10 +2,10 @@ import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentType } from '../../../shared/agent-status-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { ResolveDispatchInput } from '../agent-session-journal/journal-store-contracts' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-tab.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-tab.test.ts index 390d1fc550a..025ad83d39d 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-tab.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unopened-tab.test.ts @@ -1,7 +1,7 @@ import { cp, rm } from 'node:fs/promises' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness' -import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session-journal-types' +import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION } from '../../../shared/agent-session/journal/agent-session-journal-types' import type Database from '../../sqlite/sync-database' import { closeTestJournalHostDatabases, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts index 1440d1f3d76..59e42eeb2e1 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts @@ -5,7 +5,7 @@ import { agentSessionFailureWords } from '../../../shared/agent-session-failure- import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { AgentSessionJournal } from '../agent-session-journal/journal-store' import { JournalQueuedMessages } from '../agent-session-journal/journal-queued-messages' import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory' diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts index 4206bbb36f8..88134e66d63 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts @@ -1,5 +1,5 @@ import { openTestChats } from './structured-agent-session-open-test-chats.test-support' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' // Real wedged record shapes must become acquirable while retaining conversation and provider history. // Migration releases the lease; only operations needing the agent may spawn it. diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts index d94d3ec208f..3dd76db5894 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts @@ -2,10 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { - AgentJournalItemBody, - AgentJournalItemIdentity -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalItemBody } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire' import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session/agent-session-background-task-wire' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../shared/remote-runtime/remote-runtime-memory-limits' @@ -13,7 +11,7 @@ import { mobileE2EETextPayloadAdmissionBytes } from '../../runtime/rpc/mobile-e2 import { AGENT_JOURNAL_THREAD_SCOPE, AGENT_SESSION_JOURNAL_SCHEMA_VERSION -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { JournalRow } from '../agent-session-journal/journal-row-schema' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' import { diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts index 42db4b13ee8..eb8de77cb4f 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-session-working-at-teardown.ts @@ -6,8 +6,8 @@ import { agentSessionProviderHandleChainHead, agentSessionProviderHandleRoot } from '../../../shared/agent-session-provider-handle' -import { latestStructuredAgentSessionUserItem } from '../../../shared/structured-agent-session-latest-request' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { latestStructuredAgentSessionUserItem } from '../../../shared/agent-session/requests/structured-agent-session-latest-request' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { AgentSessionRecord } from '../../../shared/agent-session-record' import type { AgentSessionResumeMarker, @@ -17,7 +17,7 @@ import type { import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_RESTART_ACTIVITY_MAX_LABEL_LENGTH, AGENT_SESSION_RESTART_ACTIVITY_MAX_PROMPTS, @@ -28,7 +28,7 @@ import { } from '../../../shared/agent-session-restart-activity' import { isLiveChildWork } from '../../../shared/agent-status-child-work-liveness' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { isStructuredAgentSessionCommandEntry, diff --git a/src/main/native-chat/agent-session-wire/structured-agent-start-journal.ts b/src/main/native-chat/agent-session-wire/structured-agent-start-journal.ts index 338f1e85890..84a2f79f807 100644 --- a/src/main/native-chat/agent-session-wire/structured-agent-start-journal.ts +++ b/src/main/native-chat/agent-session-wire/structured-agent-start-journal.ts @@ -1,6 +1,6 @@ -import type { AgentJournalAgentStartItem } from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import type { AgentJournalAgentStartItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { readJournalSessionEpoch } from '../agent-session-journal/journal-row-table' import type { StructuredAgentSessionHostDeps, diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts index 2d6958d8a7f..ea2120ee0cf 100644 --- a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.test.ts @@ -7,8 +7,8 @@ import { type ConversationCommandAdmissionContext } from './structured-conversation-command-admission' import type { AgentSessionBackgroundTaskStops } from '../../../shared/agent-child-work-stop-targets' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/structured-agent-session-unanswered-dispatch' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' const TARGETED: AgentSessionBackgroundTaskStops = { supportsTaskStop: true, supportsStopAll: true } const UNTARGETED: AgentSessionBackgroundTaskStops = { diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts index 6113eda6967..ae0a51da731 100644 --- a/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts +++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-admission.ts @@ -3,7 +3,7 @@ import { type AgentSessionBackgroundTaskStops } from '../../../shared/agent-child-work-stop-targets' import type { AgentSessionRecord } from '../../../shared/agent-session-record' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import { agentSessionCurrentContextRows } from '../../../shared/agent-session-context-clear' import type { AgentSessionJournal } from '../agent-session-journal/journal-store' diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-command-child-work.test.ts b/src/main/native-chat/agent-session-wire/structured-conversation-command-child-work.test.ts index 2b29f459b6f..3885e351a8a 100644 --- a/src/main/native-chat/agent-session-wire/structured-conversation-command-child-work.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-conversation-command-child-work.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionBackgroundTaskState } from '../../../shared/agent-session/agent-session-background-task-wire' import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view' import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter' diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-compaction.ts b/src/main/native-chat/agent-session-wire/structured-conversation-compaction.ts index 8c48e0bed7b..14d6f1b7265 100644 --- a/src/main/native-chat/agent-session-wire/structured-conversation-compaction.ts +++ b/src/main/native-chat/agent-session-wire/structured-conversation-compaction.ts @@ -4,8 +4,8 @@ import { readAgentSessionFailureFact } from '../../../shared/agent-session-failure' import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' -import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session/requests/agent-session-queued-submission' import type { AgentSessionMutationResult } from '../../../shared/agent-session-wire' import type { StructuredAgentSessionHost } from './structured-agent-session-host' import { diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-cut.test.ts b/src/main/native-chat/agent-session-wire/structured-rewind-cut.test.ts index 20453b3b7d3..2a04dcbf695 100644 --- a/src/main/native-chat/agent-session-wire/structured-rewind-cut.test.ts +++ b/src/main/native-chat/agent-session-wire/structured-rewind-cut.test.ts @@ -2,13 +2,15 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, 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 { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemBody, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity -} from '../../../shared/agent-session-journal-types' + type AgentJournalItemBody +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity +} from '../../../shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../agent-session-journal/journal-host-database-test-support' import { isStructuredRewindTarget, structuredRewindCut } from './structured-rewind-cut' diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-cut.ts b/src/main/native-chat/agent-session-wire/structured-rewind-cut.ts index 4c69304fce6..2b061d5b77b 100644 --- a/src/main/native-chat/agent-session-wire/structured-rewind-cut.ts +++ b/src/main/native-chat/agent-session-wire/structured-rewind-cut.ts @@ -2,12 +2,12 @@ import { savedRewindKeys, isAgentSessionRewindTarget } from '../../../shared/agent-session-rewind' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' -import { agentJournalLinkageFields } from '../../../shared/agent-session-journal-producer' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalLinkageFields } from '../../../shared/agent-session/journal/agent-session-journal-producer' +import { parseAgentJournalItemKey } 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 { AgentSessionJournal } from '../agent-session-journal/journal-store' import type { JournalReplacementItem } from '../agent-session-journal/journal-epoch-replacement' diff --git a/src/main/native-chat/agent-session-wire/structured-rewind-recovery.ts b/src/main/native-chat/agent-session-wire/structured-rewind-recovery.ts index 70b183ce1ef..6980f897f5f 100644 --- a/src/main/native-chat/agent-session-wire/structured-rewind-recovery.ts +++ b/src/main/native-chat/agent-session-wire/structured-rewind-recovery.ts @@ -4,7 +4,7 @@ import type { StructuredAgentSessionHostSession } from './structured-agent-session-host-types' import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' -import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key' +import { parseAgentJournalItemKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session-provider-handle' import { isDeepStrictEqual } from 'node:util' import { structuredRewindCut, type StructuredRewindCut } from './structured-rewind-cut' @@ -16,7 +16,7 @@ import type { StructuredAgentSessionAdapter } from './structured-agent-session-a import { rewindRefusal } from './structured-rewind-refusal' import type { StructuredAgentSessionLogger } from './structured-agent-session-logger' import type { JournalOperationReceipt } from '../agent-session-journal/journal-row-writer' -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' type RewindRecoveryDeps = { store: AgentSessionRecordStore diff --git a/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts b/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts index bb50404bd8e..3f31543f6ed 100644 --- a/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts +++ b/src/main/native-chat/agent-session-wire/unhandled-provider-frame.ts @@ -1,8 +1,6 @@ -import type { - AgentJournalPlainStatusItem, - AgentJournalTurnScope -} from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +import type { AgentJournalPlainStatusItem } from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../shared/agent-session-journal-turn-scope' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import { CLAUDE_LOCAL_COMMAND_OUTPUT_FRAME_KIND } from '../../../shared/native-chat/native-chat-provider-frame-summary' import { boundPayload, diff --git a/src/main/native-chat/native-chat-visuals-delivery.test.ts b/src/main/native-chat/native-chat-visuals-delivery.test.ts index 936cae8a872..ae531108a61 100644 --- a/src/main/native-chat/native-chat-visuals-delivery.test.ts +++ b/src/main/native-chat/native-chat-visuals-delivery.test.ts @@ -18,7 +18,7 @@ import { nativeChatScratchFolderFor, nativeChatScratchRootFor } from './native-c import { buildClaudeChildProcessEnv } from '../claude/claude-child-process-environment' import { createCodexStructuredLaunchResolver } from '../runtime/structured-agent-launch-composition.test-support' import { agentSessionRecordFixture } from './agent-session-record-test-fixture' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import { resolveProviderChildEnv } from '../provider-process/provider-process-launch' import { NATIVE_CHAT_VISUALS_SKILL_NAME, diff --git a/src/main/native-chat/structured-chat-naming.test.ts b/src/main/native-chat/structured-chat-naming.test.ts index c826d591e27..fbb33325cd2 100644 --- a/src/main/native-chat/structured-chat-naming.test.ts +++ b/src/main/native-chat/structured-chat-naming.test.ts @@ -21,7 +21,7 @@ import { agentSessionCurrentContextRows } from '../../shared/agent-session-conte import { firstStructuredAgentSessionPrompt, STRUCTURED_CHAT_NAME_PROMPT_LIMIT -} from '../../shared/structured-agent-session-first-prompt' +} from '../../shared/agent-session/requests/structured-agent-session-first-prompt' import { type AgentSessionUserNameWrite, compareAndSetAgentSessionRecordName, diff --git a/src/main/native-chat/structured-chat-naming.ts b/src/main/native-chat/structured-chat-naming.ts index 7bf6435155f..e5db5774759 100644 --- a/src/main/native-chat/structured-chat-naming.ts +++ b/src/main/native-chat/structured-chat-naming.ts @@ -7,7 +7,7 @@ import { clampConversationNameFirstPrompt, conversationNameSeed } from '../../shared/conversation-name-generation' -import { hasStructuredChatPromptText } from '../../shared/structured-agent-session-first-prompt' +import { hasStructuredChatPromptText } from '../../shared/agent-session/requests/structured-agent-session-first-prompt' import { sliceAtCodeUnitLimit } from '../../shared/surrogate-safe-text-slice' import type { GlobalSettings } from '../../shared/global-settings-types' import type { AgentSessionRecordStore } from '../runtime/agent-session-record-store' diff --git a/src/main/orcad/orcad-chat-restart-offer.test.ts b/src/main/orcad/orcad-chat-restart-offer.test.ts index 37cee0fec44..b13eebb9186 100644 --- a/src/main/orcad/orcad-chat-restart-offer.test.ts +++ b/src/main/orcad/orcad-chat-restart-offer.test.ts @@ -1,5 +1,5 @@ import { afterEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { CALLER, hostTestState diff --git a/src/main/orcad/orcad-managed-idle-exit-chat-provider.test.ts b/src/main/orcad/orcad-managed-idle-exit-chat-provider.test.ts index 30e072de3d0..c22880fc864 100644 --- a/src/main/orcad/orcad-managed-idle-exit-chat-provider.test.ts +++ b/src/main/orcad/orcad-managed-idle-exit-chat-provider.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { createRestTestRig, foundRestTestChat, diff --git a/src/main/orcad/orcad-packaged-structured-chat.integration.test.ts b/src/main/orcad/orcad-packaged-structured-chat.integration.test.ts index 2a083aabaa4..3418591f36c 100644 --- a/src/main/orcad/orcad-packaged-structured-chat.integration.test.ts +++ b/src/main/orcad/orcad-packaged-structured-chat.integration.test.ts @@ -17,7 +17,7 @@ import { folderWorkspaceKey } from '../../shared/workspace-scope' import { spawnProcess } from '@orca/process-host' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { parsePairingCode } from '../../shared/pairing' import { pairedRuntimeConnectionFromOffer, diff --git a/src/main/pi/rpc-history-catch-up.test.ts b/src/main/pi/rpc-history-catch-up.test.ts index 1147c20b204..3111a2bb086 100644 --- a/src/main/pi/rpc-history-catch-up.test.ts +++ b/src/main/pi/rpc-history-catch-up.test.ts @@ -4,8 +4,8 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-host-database-test-support' import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' import { testEventSinkLogging } from '../native-chat/agent-session-wire/structured-agent-session-logger-test-support' diff --git a/src/main/pi/rpc-history-import.ts b/src/main/pi/rpc-history-import.ts index 1681c1b25ca..3ba797024a3 100644 --- a/src/main/pi/rpc-history-import.ts +++ b/src/main/pi/rpc-history-import.ts @@ -1,9 +1,7 @@ import { z } from 'zod' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalItemIdentity -} from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import { legacyItemBody } from '../native-chat/agent-session-journal/journal-legacy-import' import { decodePiSessionEntryLine } from '../native-chat/agent-session-journal/journal-pi-active-branch' import { journalLifecycleItemMutation } from '../native-chat/agent-session-journal/journal-row-builders' diff --git a/src/main/pi/rpc-history-journal-view.ts b/src/main/pi/rpc-history-journal-view.ts index fa3c880d82c..748d9be0e88 100644 --- a/src/main/pi/rpc-history-journal-view.ts +++ b/src/main/pi/rpc-history-journal-view.ts @@ -2,8 +2,8 @@ import { z } from 'zod' import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../shared/agent-session-journal-item-key' -import { isQueuedAgentJournalSubmission } from '../../shared/agent-session-queued-submission' +} from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { isQueuedAgentJournalSubmission } from '../../shared/agent-session/requests/agent-session-queued-submission' import type { StructuredAgentSessionHistoryJournal } from '../native-chat/agent-session-wire/structured-agent-session-event-sink' /** Pi entries through entry are accounted for through this journal epoch/sequence; encoded in the Pi resume cursor. */ diff --git a/src/main/pi/rpc-launch-resolution.test.ts b/src/main/pi/rpc-launch-resolution.test.ts index 0fda994340d..4a41ce9c837 100644 --- a/src/main/pi/rpc-launch-resolution.test.ts +++ b/src/main/pi/rpc-launch-resolution.test.ts @@ -4,7 +4,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionProviderHandleLink } from '../../shared/agent-session-provider-handle' import { agentSessionProviderHandleKey } from '../../shared/agent-session-provider-handle' import { closeTestJournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database-test-support' diff --git a/src/main/pi/rpc-messages.ts b/src/main/pi/rpc-messages.ts index 214279ccc7a..c52c492d5f2 100644 --- a/src/main/pi/rpc-messages.ts +++ b/src/main/pi/rpc-messages.ts @@ -1,7 +1,7 @@ import { z } from 'zod' import { BoundedMap } from '../../shared/bounded-map' import { MAX_PROVIDER_TIMELINE_OPEN_ENTRIES } from '../native-chat/agent-session-timeline/provider-timeline-budget' -import type { AgentJournalToolCallItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalToolCallItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { boundToolInput, JOURNAL_RUNNING_PREVIEW_LIMITS, diff --git a/src/main/pi/rpc-prompt.test.ts b/src/main/pi/rpc-prompt.test.ts index f73dd02e550..c96f27b05ec 100644 --- a/src/main/pi/rpc-prompt.test.ts +++ b/src/main/pi/rpc-prompt.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { PiRpcPromptError, preparePiRpcPrompt } from './rpc-prompt' const PNG = Buffer.from( diff --git a/src/main/pi/rpc-prompt.ts b/src/main/pi/rpc-prompt.ts index 0a406b74f86..30696e07b9b 100644 --- a/src/main/pi/rpc-prompt.ts +++ b/src/main/pi/rpc-prompt.ts @@ -1,6 +1,6 @@ import { extname } from 'node:path' import { resolveJsonlRpcPeerOptions } from '../jsonl-rpc/peer-limits' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatImageRefBlock } from '../../shared/native-chat/native-chat-types' import { agentSessionFailureFact, diff --git a/src/main/pi/rpc-session-adapter.test.ts b/src/main/pi/rpc-session-adapter.test.ts index 753d22c0d18..e59b384e4d9 100644 --- a/src/main/pi/rpc-session-adapter.test.ts +++ b/src/main/pi/rpc-session-adapter.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody } from '../../shared/agent-session-turn-record' import { type StructuredAgentSessionAdapter, diff --git a/src/main/provider-process/provider-spawned-process-identity.ts b/src/main/provider-process/provider-spawned-process-identity.ts index d05b1d3d683..f217a0936f7 100644 --- a/src/main/provider-process/provider-spawned-process-identity.ts +++ b/src/main/provider-process/provider-spawned-process-identity.ts @@ -1,4 +1,4 @@ -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentSessionProcessIdentity } from '../../shared/agent-session-record' import { readProcessStartTimeMs } from '../runtime/agent-session/ownership/agent-session-process-identity-probe' diff --git a/src/main/runtime/agent-session-publication-scale.test.ts b/src/main/runtime/agent-session-publication-scale.test.ts index 203b3dec938..d7db61b657f 100644 --- a/src/main/runtime/agent-session-publication-scale.test.ts +++ b/src/main/runtime/agent-session-publication-scale.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import * as journalReducer from '../native-chat/agent-session-journal/journal-reducer' import type { AgentSessionStatusEvent, diff --git a/src/main/runtime/agent-session-rewind-completion.ts b/src/main/runtime/agent-session-rewind-completion.ts index 0808331b309..d8c8a862dba 100644 --- a/src/main/runtime/agent-session-rewind-completion.ts +++ b/src/main/runtime/agent-session-rewind-completion.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../shared/agent-session-journal-identity' import type { AgentSessionRewindRecord } from '../../shared/agent-session-rewind' import type { AgentSessionStoreState } from './agent-session-store-state' import { settleAgentSessionOperationInto } from './agent-session/ownership/agent-session-operation-admission' diff --git a/src/main/runtime/agent-session-saved-status-scale.test.ts b/src/main/runtime/agent-session-saved-status-scale.test.ts index 7649e990f52..7baabf3e3cd 100644 --- a/src/main/runtime/agent-session-saved-status-scale.test.ts +++ b/src/main/runtime/agent-session-saved-status-scale.test.ts @@ -1,6 +1,6 @@ import { expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionOperationKey } from '../../shared/agent-session-operation-ledger' import type { AgentSessionRecord } from '../../shared/agent-session-record' import type { AgentSessionStatusSummary } from '../../shared/agent-session-wire' diff --git a/src/main/runtime/agent-session-status-cut-scale.test.ts b/src/main/runtime/agent-session-status-cut-scale.test.ts index aaaa08d628e..f686390205f 100644 --- a/src/main/runtime/agent-session-status-cut-scale.test.ts +++ b/src/main/runtime/agent-session-status-cut-scale.test.ts @@ -1,6 +1,6 @@ import { afterEach, expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' -import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-identity' import type { AgentJournalTurnOutcome } from '../../shared/agent-turn-outcome' import { orcaShutdownRowClientMessageId } from '../../shared/native-chat/native-chat-orca-stop-cut' import { agentHookRuntimeDeps } from '../agent-hooks/agent-hook-runtime-deps' diff --git a/src/main/runtime/agent-session-status-cut-work.test-support.ts b/src/main/runtime/agent-session-status-cut-work.test-support.ts index ab26122d95c..801d2ed6d9d 100644 --- a/src/main/runtime/agent-session-status-cut-work.test-support.ts +++ b/src/main/runtime/agent-session-status-cut-work.test-support.ts @@ -4,7 +4,7 @@ import * as commands from '../../shared/agent-session/structured-agent-session-c import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' /** Count only the original status reader, after production context selection. */ export function countStatusCutWork() { diff --git a/src/main/runtime/agent-session-store-load-scale.test.ts b/src/main/runtime/agent-session-store-load-scale.test.ts index 2589be55067..948fd516c6f 100644 --- a/src/main/runtime/agent-session-store-load-scale.test.ts +++ b/src/main/runtime/agent-session-store-load-scale.test.ts @@ -14,7 +14,7 @@ import { readPersistedTestAgentSessionStore } from './agent-session-record-store-test-harness' import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' // Width, link count and malformed bytes vary independently; no clock-dependent budget. describe('SQLite conversation reopen work', () => { diff --git a/src/main/runtime/claude-structured-idle-releases-unknown.test.ts b/src/main/runtime/claude-structured-idle-releases-unknown.test.ts index 2ccfcba5d5c..6d601a580ed 100644 --- a/src/main/runtime/claude-structured-idle-releases-unknown.test.ts +++ b/src/main/runtime/claude-structured-idle-releases-unknown.test.ts @@ -8,7 +8,7 @@ import { DISPATCH_DOUBT_PROVIDER_IDLE, DISPATCH_DOUBT_WRITE_OUTCOME_UNKNOWN } from '../native-chat/agent-session-journal/journal-dispatch-doubt-reasons' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/structured-agent-session-unanswered-dispatch' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import { hostTestMessage } from '../native-chat/agent-session-wire/structured-agent-session-host-test-data' import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host' import { diff --git a/src/main/runtime/claude-structured-session-integration.test.ts b/src/main/runtime/claude-structured-session-integration.test.ts index 5e5c7f2fe85..21d4d757588 100644 --- a/src/main/runtime/claude-structured-session-integration.test.ts +++ b/src/main/runtime/claude-structured-session-integration.test.ts @@ -5,7 +5,7 @@ import { homedir, tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire' import { AGENT_SESSION_TURN_ITEM_CAPABILITY, diff --git a/src/main/runtime/orchestration/chat-worker-error-operation-counts.test-support.ts b/src/main/runtime/orchestration/chat-worker-error-operation-counts.test-support.ts index 68dcf931206..b9821f3bd46 100644 --- a/src/main/runtime/orchestration/chat-worker-error-operation-counts.test-support.ts +++ b/src/main/runtime/orchestration/chat-worker-error-operation-counts.test-support.ts @@ -3,7 +3,7 @@ import { randomUUID } from 'node:crypto' import type { AgentSessionJournal } from '../../native-chat/agent-session-journal/journal-store' import * as stopProjection from '../../native-chat/agent-session-journal/journal-stop-note-projection' import * as lineage from './structured-session-lineage' -import * as journalPosition from '../../../shared/agent-session-journal-position' +import * as journalPosition from '../../../shared/agent-session/journal/agent-session-journal-position' import * as liveTurn from '../../../shared/structured-agent-session-live-turn' import { openTestAgentSessionRecordStore, diff --git a/src/main/runtime/orchestration/chat-worker-error-words.ts b/src/main/runtime/orchestration/chat-worker-error-words.ts index 38fcada929b..55c42cbadef 100644 --- a/src/main/runtime/orchestration/chat-worker-error-words.ts +++ b/src/main/runtime/orchestration/chat-worker-error-words.ts @@ -1,8 +1,8 @@ // Read saved journal failures, not notification events, so every host supplies the same display sentence and provider detail. -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../../shared/agent-session/journal/agent-session-journal-producer' import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record' import { readAgentSessionFailureFact } from '../../../shared/agent-session-failure' import type { StructuredAgentSessionRequestFailure } from '../../native-chat/agent-session-wire/structured-agent-session-request-failures' diff --git a/src/main/runtime/orchestration/chat-worker-legacy-failure-read.test.ts b/src/main/runtime/orchestration/chat-worker-legacy-failure-read.test.ts index 3f45aefd398..bd051c58c80 100644 --- a/src/main/runtime/orchestration/chat-worker-legacy-failure-read.test.ts +++ b/src/main/runtime/orchestration/chat-worker-legacy-failure-read.test.ts @@ -1,9 +1,9 @@ import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' -import { agentSessionSendBodyFingerprint } from '../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { formatOrcaSessionAddress } from '../../../shared/orca-session-address' import { openTestJournalHostDatabase } from '../../native-chat/agent-session-journal/journal-host-database-test-support' diff --git a/src/main/runtime/orchestration/chat-worker-request-failure-rig.test-fixture.ts b/src/main/runtime/orchestration/chat-worker-request-failure-rig.test-fixture.ts index 2a3e02cacc7..a5bb01fb206 100644 --- a/src/main/runtime/orchestration/chat-worker-request-failure-rig.test-fixture.ts +++ b/src/main/runtime/orchestration/chat-worker-request-failure-rig.test-fixture.ts @@ -1,7 +1,7 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../../native-chat/agent-session-journal/journal-store' import type { JournalLifecycleMutationInput } from '../../native-chat/agent-session-journal/journal-row-builders' import { mkdtemp, rm } from 'node:fs/promises' diff --git a/src/main/runtime/orchestration/chat-worker-request-failures.test.ts b/src/main/runtime/orchestration/chat-worker-request-failures.test.ts index 040e182e85b..25e3eca3951 100644 --- a/src/main/runtime/orchestration/chat-worker-request-failures.test.ts +++ b/src/main/runtime/orchestration/chat-worker-request-failures.test.ts @@ -9,8 +9,8 @@ import { batch } from './chat-worker-request-failure-rig.test-fixture' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionStartFailure } from '../../native-chat/agent-session-wire/structured-agent-session-failure-text' import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words' import { recordStructuredAgentSessionStartFailure } from '../../native-chat/agent-session-wire/structured-agent-session-start-failure-row' diff --git a/src/main/runtime/orchestration/send-agent-turn-host.test.ts b/src/main/runtime/orchestration/send-agent-turn-host.test.ts index ba895974578..853c55bfe0b 100644 --- a/src/main/runtime/orchestration/send-agent-turn-host.test.ts +++ b/src/main/runtime/orchestration/send-agent-turn-host.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' -import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../shared/agent-session/journal/agent-session-journal-item-key' import { createQueuedMessageTestRig, eventually, diff --git a/src/main/runtime/orchestration/send-agent-turn.test.ts b/src/main/runtime/orchestration/send-agent-turn.test.ts index 96a69738337..2a64b50d85b 100644 --- a/src/main/runtime/orchestration/send-agent-turn.test.ts +++ b/src/main/runtime/orchestration/send-agent-turn.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope' import type { AgentSessionSendResult } from '../../../shared/agent-session-wire' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' diff --git a/src/main/runtime/orchestration/send-agent-turn.ts b/src/main/runtime/orchestration/send-agent-turn.ts index b9ffb3a5672..dd3dfc40e9a 100644 --- a/src/main/runtime/orchestration/send-agent-turn.ts +++ b/src/main/runtime/orchestration/send-agent-turn.ts @@ -3,14 +3,14 @@ import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionSendSubmission, type AgentSessionQueuedSendReceipt } from '../../../shared/agent-session-wire' import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire-refusals' import { ORCHESTRATION_READINESS_TIMEOUT_MS } from '../../../shared/orchestration-timing-budgets' -import { structuredAgentSessionMessageSendMutation } from '../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionMessageSendMutation } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { StructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-host' import { dispatchPreambleSendOptions, type DispatchPreambleSendOptions } from './preamble' import type { RuntimeAgentPromptWriteOptions } from '../runtime-terminal-contracts' diff --git a/src/main/runtime/orchestration/structured-mail-source.ts b/src/main/runtime/orchestration/structured-mail-source.ts index 774f6a0172e..03c32e1cf30 100644 --- a/src/main/runtime/orchestration/structured-mail-source.ts +++ b/src/main/runtime/orchestration/structured-mail-source.ts @@ -4,7 +4,7 @@ import type { AgentMessageSource, AgentMessageSender } from '../../../shared/agent-session/agent-session-message-source' -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { MessageRow, OrchestrationDb } from './db' import { agentMessageRelation } from './agent-message-relation' import { agentMessageSender, type SenderSnapshotResolver } from './agent-message-sender' diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host-contract.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host-contract.ts index 626998a4f95..5016055a7a7 100644 --- a/src/main/runtime/orchestration/structured-mailbox-pointer-host-contract.ts +++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host-contract.ts @@ -1,6 +1,6 @@ /** What the structured mailbox lane needs from a chat host: session reads and admission-checked sends. */ -import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredPointerSubmission } from './structured-pointer-operation-id' import type { StructuredDispatchState } from './structured-session-pointer-delivery' diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts index 51e8f0b81ea..bc2b46866ad 100644 --- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts +++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts @@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source' const hostRef: { current: unknown } = { current: null } diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts index ba6eafdb0ee..25f18eab711 100644 --- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts +++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts @@ -6,7 +6,7 @@ import type { StructuredMailboxPointerHost, StructuredPointerSessionFacts } from './structured-mailbox-pointer-host-contract' -import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredSessionGateFacts, type StructuredSessionGateFacts diff --git a/src/main/runtime/orchestration/structured-pointer-operation-id.ts b/src/main/runtime/orchestration/structured-pointer-operation-id.ts index b7a7e43174a..d88e03df1c9 100644 --- a/src/main/runtime/orchestration/structured-pointer-operation-id.ts +++ b/src/main/runtime/orchestration/structured-pointer-operation-id.ts @@ -2,7 +2,7 @@ * Age never re-mints recorded sends; only changed identity or journal evidence can justify a new attempt. */ import { createHash, randomBytes } from 'node:crypto' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../../shared/agent-session-host-authority' import type { OrchestrationDb } from './db' import type { StructuredPointerOperationRow } from './db/messages/structured-pointer-operation-store' diff --git a/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts b/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts index 65afa125be4..4e8a7183083 100644 --- a/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts +++ b/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { structuredSessionGateFacts } from './structured-session-pointer-delivery' function statusItem( diff --git a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts index a534a313a05..7399bbe9f8c 100644 --- a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts +++ b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts @@ -1,6 +1,6 @@ /** Pure gate facts for session-turn nudges; busy input steers or queues while the orchestration DB retains mail ownership. */ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionWorkScope } from '../../../shared/structured-agent-session-main-agent-working' import { activeStructuredAgentSessionTurnId, diff --git a/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts b/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts index 2ea9b5b4e20..0dbc5a3c4d8 100644 --- a/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts +++ b/src/main/runtime/orchestration/structured-worker-group-addressing.test.ts @@ -1,7 +1,7 @@ import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding' import { agentSessionConversationView } from '../../../shared/agent-session-conversation-view' import { beforeEach, describe, 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 type { AgentSessionLease } from '../../../shared/agent-session-record' import { agentSessionLeaseFixture, diff --git a/src/main/runtime/orchestration/structured-worker-journal-archive.test.ts b/src/main/runtime/orchestration/structured-worker-journal-archive.test.ts index 42fe67a3996..7b9fee28eee 100644 --- a/src/main/runtime/orchestration/structured-worker-journal-archive.test.ts +++ b/src/main/runtime/orchestration/structured-worker-journal-archive.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../shared/native-chat/native-chat-types' import { buildStructuredJournalArchive } from './structured-worker-journal-archive' import { foldToolMessages } from '../../../shared/native-chat/tools/native-chat-tool-fold' diff --git a/src/main/runtime/orchestration/structured-worker-journal-archive.ts b/src/main/runtime/orchestration/structured-worker-journal-archive.ts index 2c797b45901..1bc2070fd9c 100644 --- a/src/main/runtime/orchestration/structured-worker-journal-archive.ts +++ b/src/main/runtime/orchestration/structured-worker-journal-archive.ts @@ -3,7 +3,7 @@ import type { AgentType } from '../../../shared/agent-status-types' import type { NativeChatMessage } from '../../../shared/native-chat/native-chat-types' import { projectStructuredItemsToNativeChat } from '../../../shared/structured-agent-session-projection' -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { boundWorkerTranscriptTail } from './worker-transcript-payload' import { readRetiredLineageJournalPage } from './structured-worker-journal-page' diff --git a/src/main/runtime/orchestration/structured-worker-journal-page.test.ts b/src/main/runtime/orchestration/structured-worker-journal-page.test.ts index 12c7725ea69..a15a61f8cff 100644 --- a/src/main/runtime/orchestration/structured-worker-journal-page.test.ts +++ b/src/main/runtime/orchestration/structured-worker-journal-page.test.ts @@ -4,10 +4,10 @@ import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalItemBody, - AgentJournalItemIdentity, AgentJournalProducerLinkage -} from '../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session-journal-types' +} from '../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-identity' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryRequest } from '../../../shared/agent-session-wire' import { createTrackedJournalOpener } from '../../native-chat/agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../../native-chat/agent-session-journal/journal-store' diff --git a/src/main/runtime/orchestration/structured-worker-journal-page.ts b/src/main/runtime/orchestration/structured-worker-journal-page.ts index ce86f8dc1b0..e10ae23de2f 100644 --- a/src/main/runtime/orchestration/structured-worker-journal-page.ts +++ b/src/main/runtime/orchestration/structured-worker-journal-page.ts @@ -1,6 +1,6 @@ /** Share newest-first journal reads; filter to the worker's own conversation before limiting so child bursts cannot crowd it out. */ -import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry' export const STRUCTURED_JOURNAL_PAGE_LIMIT = 200 diff --git a/src/main/runtime/rpc/methods/native-chat-rpc-page-bounds.ts b/src/main/runtime/rpc/methods/native-chat-rpc-page-bounds.ts index 2d09382d26a..897dc4f97eb 100644 --- a/src/main/runtime/rpc/methods/native-chat-rpc-page-bounds.ts +++ b/src/main/runtime/rpc/methods/native-chat-rpc-page-bounds.ts @@ -4,7 +4,7 @@ import { type NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { agentSessionHostStatusBody } from '../../../../shared/agent-session-host-status-rows' -import { boundJournalKeyComponent } from '../../../../shared/agent-session-journal-item-key' +import { boundJournalKeyComponent } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { HISTORY_PAGE_CONTENT_BUDGET_BYTES } from '../../../native-chat/agent-session-wire/agent-session-history-page-bounds' function oversizedRow(message: NativeChatMessage): NativeChatMessage { diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts index b4325b428fe..653ec8aa231 100644 --- a/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts +++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-lifecycle.test.ts @@ -5,7 +5,7 @@ import { import { agentSessionConversationView } from '../../../../shared/agent-session-conversation-view' import type { AgentSessionLease } from '../../../../shared/agent-session-record' import { beforeEach, describe, 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 type { StructuredWorkerIdentity } from '../../structured-worker-identity' const hostRef: { current: unknown } = { current: null } diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts index 6a0e68960df..de0153ff931 100644 --- a/src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts +++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-redrive.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { getDefaultWorkspaceSession } from '../../../../shared/constants' import { partialRuntimeStore } from '../../runtime-store-partial-fixture' import { withChatTabChanges } from '../../agent-session/agent-session-tab-layout' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import * as historyPages from '../../../native-chat/agent-session-wire/agent-session-history-page' import * as subscriberFrames from '../../../native-chat/agent-session-wire/agent-session-subscriber-frame-fields' import { hostTestState } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-harness' diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts index ab7ca138690..2e5986a94f6 100644 --- a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts +++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.test.ts @@ -5,10 +5,10 @@ import type { AgentSessionExecutionLocation } from '../../../../shared/agent-ses import { LOCAL_EXECUTION_HOST_ID, toSshExecutionHostId } from '../../../../shared/execution-host' import { join } from 'node:path' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentMessageSource } from '../../../../shared/agent-session/agent-session-message-source' import { getAppEnvironment } from '../../../../shared/app-environment' -import { DISPATCH_REJECTED_WRITE_FAILED } from '../../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_WRITE_FAILED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { agentSessionFailureFact } from '../../../../shared/agent-session-failure' import { codexDispatchRejection } from '../../../codex/codex-structured-turn-end-settlement' diff --git a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts index 51924508d8a..95baa4b5cda 100644 --- a/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts +++ b/src/main/runtime/rpc/methods/orchestration-structured-worker-session.ts @@ -16,7 +16,7 @@ import { quotedProviderDetail } from '../../../../shared/agent-session-failure-q import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host' import { getStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry' import type { TuiAgent } from '../../../../shared/tui-agent' diff --git a/src/main/runtime/rpc/methods/orchestration/agent-message-command-contract.test.ts b/src/main/runtime/rpc/methods/orchestration/agent-message-command-contract.test.ts index e238fba57f5..201102cc729 100644 --- a/src/main/runtime/rpc/methods/orchestration/agent-message-command-contract.test.ts +++ b/src/main/runtime/rpc/methods/orchestration/agent-message-command-contract.test.ts @@ -37,7 +37,7 @@ import { projectStructuredAgentSessionStatusSummary, projectStructuredItemToNativeChat } from '../../../../../shared/structured-agent-session-projection' -import { latestStructuredAgentSessionPrompt } from '../../../../../shared/structured-agent-session-latest-request' +import { latestStructuredAgentSessionPrompt } from '../../../../../shared/agent-session/requests/structured-agent-session-latest-request' import { isOrcaDispatchPrompt } from '../../../../../shared/agent-row-primary-text' import * as placement from './worker/worker-start-agent-placement' import * as topology from './worker/worker-topology' @@ -49,7 +49,7 @@ import { import { agentSessionMessagePayload, agentSessionSendBodyFingerprint -} from '../../../../../shared/structured-agent-session-send-mutation' +} from '../../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { agentMessageHeading, agentMessageSenderCanOpen diff --git a/src/main/runtime/rpc/methods/orchestration/chat-task-delivery.ts b/src/main/runtime/rpc/methods/orchestration/chat-task-delivery.ts index e3cebbb616f..a58a8838fd4 100644 --- a/src/main/runtime/rpc/methods/orchestration/chat-task-delivery.ts +++ b/src/main/runtime/rpc/methods/orchestration/chat-task-delivery.ts @@ -2,7 +2,7 @@ import { conversationRecordReader } from '../../../orchestration/structured-sess /** Queue the chat assignee's task as a composer card while busy; derive operation id from Dispatch so repeat sends replay instead of duplicating cards. */ import { createHash } from 'node:crypto' -import type { AgentJournalMessageItem } from '../../../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentMessageSource } from '../../../../../shared/agent-session/agent-session-message-source' import { getStructuredAgentSessionHost } from '../../../../native-chat/agent-session-wire/structured-agent-session-registry' import { observeChatAssignee } from '../../../orchestration/chat-assignee' diff --git a/src/main/runtime/rpc/methods/orchestration/worker-start-card-operations.test.ts b/src/main/runtime/rpc/methods/orchestration/worker-start-card-operations.test.ts index 4d59fb774bc..de2bf80a104 100644 --- a/src/main/runtime/rpc/methods/orchestration/worker-start-card-operations.test.ts +++ b/src/main/runtime/rpc/methods/orchestration/worker-start-card-operations.test.ts @@ -10,7 +10,7 @@ import { createQueuedMessageTestRig, eventually } from '../../../../native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import { openTestJournalHostDatabase } from '../../../../native-chat/agent-session-journal/journal-host-database-test-support' import { StructuredAgentSessionJournalProjections } from '../../../../native-chat/agent-session-wire/structured-agent-session-status-journal-projection' import { installSqlVisitCounters } from '../../../dispatch-predicate-visits.test-fixture' diff --git a/src/main/runtime/rpc/methods/orchestration/worker-start-card-population.test-fixture.ts b/src/main/runtime/rpc/methods/orchestration/worker-start-card-population.test-fixture.ts index c41d9a9f929..0766aec0435 100644 --- a/src/main/runtime/rpc/methods/orchestration/worker-start-card-population.test-fixture.ts +++ b/src/main/runtime/rpc/methods/orchestration/worker-start-card-population.test-fixture.ts @@ -1,6 +1,6 @@ import type { createOrchestrationRpcHarness } from './rpc-test-harness' import { expect } from 'vitest' -import type { AgentJournalSnapshot } from '../../../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionJournal } from '../../../../native-chat/agent-session-journal/journal-store' import type { JournalHostDatabase } from '../../../../native-chat/agent-session-journal/journal-host-database' import { COORD } from './worker-start-card-contract-test-fixture' diff --git a/src/main/runtime/rpc/methods/orchestration/worker-start-card-scenario.test-fixture.ts b/src/main/runtime/rpc/methods/orchestration/worker-start-card-scenario.test-fixture.ts index 8b4767ee877..46ca3e0a66e 100644 --- a/src/main/runtime/rpc/methods/orchestration/worker-start-card-scenario.test-fixture.ts +++ b/src/main/runtime/rpc/methods/orchestration/worker-start-card-scenario.test-fixture.ts @@ -1,11 +1,11 @@ import { expect, type MockInstance } from 'vitest' -import type { AgentJournalSnapshot } from '../../../../../shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import type { createOrchestrationRpcHarness } from './rpc-test-harness' import type { QueuedMessageTestRig } from '../../../../native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture' import { closeTestJournalHostDatabase } from '../../../../native-chat/agent-session-journal/journal-host-database-test-support' import { projectStructuredAgentStartItem } from '../../../../../shared/structured-agent-start-projection' import { projectStructuredAgentSessionStatusSummary } from '../../../../../shared/structured-agent-session-projection' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import { readFile } from 'node:fs/promises' import '../../../../native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture' import { COORD } from './worker-start-card-contract-test-fixture' diff --git a/src/main/runtime/rpc/methods/orchestration/worker-start-card.test.ts b/src/main/runtime/rpc/methods/orchestration/worker-start-card.test.ts index 9058e39ab09..d720cb1c21f 100644 --- a/src/main/runtime/rpc/methods/orchestration/worker-start-card.test.ts +++ b/src/main/runtime/rpc/methods/orchestration/worker-start-card.test.ts @@ -15,7 +15,7 @@ import { import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../../../shared/agent-session-journal-types' +} from '../../../../../shared/agent-session/journal/agent-session-journal-types' import { ORCHESTRATION_CONTRACT_RUNTIME_CAPABILITY, ORCHESTRATION_FEDERATION_RUNTIME_CAPABILITY diff --git a/src/main/runtime/rpc/methods/orchestration/worker/helper-follow-up-cli.integration.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/helper-follow-up-cli.integration.test.ts index 46b3425f87a..792fc8e8694 100644 --- a/src/main/runtime/rpc/methods/orchestration/worker/helper-follow-up-cli.integration.test.ts +++ b/src/main/runtime/rpc/methods/orchestration/worker/helper-follow-up-cli.integration.test.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto' import { describe, expect, it, vi } from 'vitest' import { getFollowUpDispatch } from '../../../../orchestration/db/dispatch-context/worker-follow-up-lineage' import { ORCHESTRATION_WORKER_START_TASK_SPEC_MAX_BYTES } from '../../../../../../shared/orchestration-worker-start-prompt-budget' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../../shared/agent-session/journal/agent-session-journal-types' import { activeProviderContext } from '../../../../../../shared/agent-session-provider-context' import { HOST_TEST_THREAD } from '../../../../../native-chat/agent-session-wire/structured-agent-session-host-test-data' import { OrchestrationError } from '../../../../orchestration/orchestration-error' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-at-rest-context.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-at-rest-context.test.ts index 29eb1ab731e..cf78e92d0df 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-at-rest-context.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-at-rest-context.test.ts @@ -7,8 +7,8 @@ import type { AgentJournalItemBody, AgentJournalResolution, AgentJournalQuestionItem -} from '../../../../shared/agent-session-journal-types' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' import { hostTestMessage } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data' import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-at-rest-options.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-at-rest-options.test.ts index 820494c34ce..68818fbfa28 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-at-rest-options.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-at-rest-options.test.ts @@ -1,6 +1,6 @@ import '../unused-default-rpc-methods.test-fixture' vi.mock('node:fs/promises', { spy: true }) -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope' import { activeStructuredAgentSessionTurnId } from '../../../../shared/structured-agent-session-projection' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts index 6a68609cf03..2734649f2e6 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-at-rest.test.ts @@ -1,6 +1,6 @@ import '../unused-default-rpc-methods.test-fixture' vi.mock('node:fs/promises', { spy: true }) -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope' import { AGENT_SESSION_OPTIONAL_MODEL_CLIENT_CAPABILITY } from '../../../../shared/agent-session/options/agent-session-optional-model-capability' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-continuation-context.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-continuation-context.test.ts index 8b21b923c9e..38af81c716c 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-continuation-context.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-continuation-context.test.ts @@ -7,9 +7,9 @@ import type { AgentJournalItemBody, AgentJournalResolution, AgentJournalQuestionItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import '../unused-default-rpc-methods.test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version' import { hostTestMessage } from '../../../native-chat/agent-session-wire/structured-agent-session-host-test-data' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-current-requests.ts b/src/main/runtime/rpc/methods/structured-agent-session-current-requests.ts index defad9b90bd..d411f4d468c 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-current-requests.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-current-requests.ts @@ -2,7 +2,7 @@ import { defineMethod } from '../core' import type { RpcContext } from '../core' import { requireInstalledStructuredHost } from './structured-agent-session-gate' import { CurrentRequestsParams } from '../../../../shared/rpc-contract/agent-session-current-requests-params' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session-current-requests-capability' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session/requests/agent-session-current-requests-capability' import { agentSessionRefusalError } from '../../../../shared/agent-session-wire-refusals' export function clientReadsCurrentRequests( diff --git a/src/main/runtime/rpc/methods/structured-agent-session-item.ts b/src/main/runtime/rpc/methods/structured-agent-session-item.ts index 8755141d6a3..40a99e241bd 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-item.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-item.ts @@ -1,6 +1,6 @@ // Negotiate item-detail.v1 for full journal items beyond preview heads; fit replies to transport limits and mark remaining truncation. -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { ItemParams } from '../../../../shared/rpc-contract/structured-agent-session-params' import { shortenedAgentJournalItem } from '../../../native-chat/agent-session-wire/agent-session-item-wire-form' import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../../shared/remote-runtime/remote-runtime-memory-limits' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-legacy-command-wait.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-legacy-command-wait.test.ts index 706271e8506..8aeb65a3eda 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-legacy-command-wait.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-legacy-command-wait.test.ts @@ -18,7 +18,7 @@ import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version' import type { RpcContext } from '../core' -import { agentSessionMessagePayload } from '../../../../shared/structured-agent-session-send-mutation' +import { agentSessionMessagePayload } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' afterEach(() => { setStructuredAgentSessionHost(null) diff --git a/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.test.ts index 8b21a00b8bc..31ff33784ca 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.test.ts @@ -1,8 +1,6 @@ import { afterEach, beforeEach, expect, it } from 'vitest' -import type { - AgentSessionQueuedMessage, - AgentSessionSubscribeEvent -} from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import type { AgentSessionSubscribeEvent } from '../../../../shared/agent-session-wire' import { buildSubscriberFrame, type SubscriberFieldState diff --git a/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.ts b/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.ts index 290d9231dab..5fba7a16d8e 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-queued-image-capability.ts @@ -1,10 +1,10 @@ // Withhold image cards only at RPC for older readers whose copy-text/delete edits would lose images; keep the canonical queue intact. +import type { AgentSessionHistoryResult } from '../../../../shared/agent-session-wire' import type { - AgentSessionHistoryResult, AgentSessionQueuedMessage, AgentSessionQueuePublicationFields -} from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { QueuePublication } from '../../../native-chat/agent-session-wire/structured-agent-session-queued-publication' import { AGENT_SESSION_QUEUED_IMAGE_CARDS_CLIENT_CAPABILITY } from '../../../../shared/protocol-version' import type { RpcContext } from '../core' diff --git a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts index 06297bd6e73..478ad972548 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.test.ts @@ -1,6 +1,6 @@ import '../unused-default-rpc-methods.test-fixture' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage, AgentSessionHistoryResult, diff --git a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.ts b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.ts index 219df890474..9a691513d8d 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.ts @@ -1,7 +1,7 @@ // Remove when every supported release has AGENT_SESSION_TURN_ITEM_CAPABILITY. // Downgrade turn items to legacy status only at RPC; canonical journal/status/in-process readers keep the body. -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { legacyAgentJournalTurnStatusBody } from '../../../../shared/agent-session-turn-record' import type { AgentSessionHistoryPage, diff --git a/src/main/runtime/rpc/methods/structured-agent-session-wire-contracts.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-wire-contracts.test.ts index 67a5d44fbb8..a449cfe22b8 100644 --- a/src/main/runtime/rpc/methods/structured-agent-session-wire-contracts.test.ts +++ b/src/main/runtime/rpc/methods/structured-agent-session-wire-contracts.test.ts @@ -10,7 +10,7 @@ import { RUNTIME_CAPABILITIES, STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session-current-requests-capability' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session/requests/agent-session-current-requests-capability' import { remoteRuntimeClientCapabilities } from '../../../../shared/remote-runtime/remote-runtime-client-capabilities' import { AcpStructuredOptions } from '../../../acp/acp-structured-options' import { NewSessionResponseSchema } from '../../../acp/generated/acp-protocol.generated' diff --git a/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts b/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts index 6d284a65e52..b23fd6217ce 100644 --- a/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts +++ b/src/main/runtime/rpc/methods/structured-worker-read-cursor.test.ts @@ -9,7 +9,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { buildStructuredJournalArchive } from '../../orchestration/structured-worker-journal-archive' import { projectSavedChatContextItems } from '../../../native-chat/agent-session-saved-prompt-text' import { formatWorkerTranscriptMessage } from '../../../../shared/worker-transcript-text' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredWorkerIdentity } from '../../structured-worker-identity' const hostRef: { current: unknown } = { current: null } diff --git a/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts b/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts index 7da16839402..7b1d6385325 100644 --- a/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts +++ b/src/main/runtime/runtime-worktree-agent-rows-verdict.test.ts @@ -1,5 +1,5 @@ import { agentSessionConversationView } from '../../shared/agent-session-conversation-view' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' diff --git a/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts b/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts index 152ebfef976..cf5374e4c64 100644 --- a/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts +++ b/src/main/runtime/runtime-worktree-structured-agent-rows-liveness.test.ts @@ -1,4 +1,4 @@ -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session/journal/agent-session-journal-types' import { makeStructuredAgentStatusSubject } from '../../shared/agent-status-subject' import { collectRuntimeWorktreeAgentSources } from './runtime-worktree-agent-sources' import { mkdtemp, rm } from 'node:fs/promises' diff --git a/src/main/runtime/structured-agent-launch-composition.test-support.ts b/src/main/runtime/structured-agent-launch-composition.test-support.ts index bee578e98d1..9c3d84fa272 100644 --- a/src/main/runtime/structured-agent-launch-composition.test-support.ts +++ b/src/main/runtime/structured-agent-launch-composition.test-support.ts @@ -3,7 +3,7 @@ import type { ClaudeAccountRecipe } from '../../shared/agent-session-acquired-ac import type { AgentSessionRecordStore } from './agent-session-record-store' import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals' -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentChatPermissionChoice } from '../../shared/agent-chat-permission-mode' import type { AcpLaunchSpec } from '../acp/acp-launch-specs' import { acpStructuredAgentDefinition } from '../acp/acp-structured-agent-definitions' diff --git a/src/main/runtime/structured-agent-launch-composition.ts b/src/main/runtime/structured-agent-launch-composition.ts index 465bcb47013..3eba3bef564 100644 --- a/src/main/runtime/structured-agent-launch-composition.ts +++ b/src/main/runtime/structured-agent-launch-composition.ts @@ -1,7 +1,7 @@ import type { ClaudeAccountRecipe } from '../../shared/agent-session-acquired-account' // Compose shared admission, cwd, environment, visuals and child sealing; agent parts add only agent-specific inputs and never set cwd/sealed env. -import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-identity' import type { AgentChatPermissionChoice } from '../../shared/agent-chat-permission-mode' import type { AgentSessionRecord } from '../../shared/agent-session-record' import { isNativeLocalLocation } from '../../shared/execution-host' diff --git a/src/main/runtime/structured-agent-session-codex-held-sends.test.ts b/src/main/runtime/structured-agent-session-codex-held-sends.test.ts index a75b03098ea..defed696a5e 100644 --- a/src/main/runtime/structured-agent-session-codex-held-sends.test.ts +++ b/src/main/runtime/structured-agent-session-codex-held-sends.test.ts @@ -11,9 +11,9 @@ import type { import type { openCodexAppServerConnection } from '../codex/codex-app-server-connection' import { codexTurnLifecycleFake } from '../codex/codex-turn-lifecycle-fake' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire' -import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/structured-agent-session-unanswered-dispatch' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../shared/agent-session/requests/structured-agent-session-unanswered-dispatch' import { HOST_TEST_SESSION as SESSION, HOST_TEST_THREAD as THREAD, diff --git a/src/main/runtime/structured-agent-session-codex-interrupt-order.test.ts b/src/main/runtime/structured-agent-session-codex-interrupt-order.test.ts index 6fd3dbded9d..50cd7f8b6aa 100644 --- a/src/main/runtime/structured-agent-session-codex-interrupt-order.test.ts +++ b/src/main/runtime/structured-agent-session-codex-interrupt-order.test.ts @@ -12,7 +12,7 @@ import type { openCodexAppServerConnection } from '../codex/codex-app-server-con import { readCodexTurnId } from '../codex/codex-structured-thread-facts' import { codexTurnLifecycleFake } from '../codex/codex-turn-lifecycle-fake' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalTurnItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalTurnItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionStatusSummary } from '../../shared/agent-session-wire' import { owesStructuredAgentSessionWork } from '../../shared/structured-agent-session-owed-work' import { diff --git a/src/main/runtime/structured-agent-session-codex-opening-send-hold.test.ts b/src/main/runtime/structured-agent-session-codex-opening-send-hold.test.ts index e705d63b5c8..57f4971a7ae 100644 --- a/src/main/runtime/structured-agent-session-codex-opening-send-hold.test.ts +++ b/src/main/runtime/structured-agent-session-codex-opening-send-hold.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { CODEX_TURN_OPEN_WAIT_MS } from '../codex/codex-structured-turn-open-wait' import { projectStructuredAgentSessionMessages } from '../../shared/structured-agent-session-message-projection' import { projectNativeChatTranscriptMessages } from '../../shared/native-chat/transcript/native-chat-transcript-projection' @@ -20,8 +20,8 @@ import { codexTurnLifecycleFake } from '../codex/codex-turn-lifecycle-fake' import { settledWithin } from '../codex/codex-structured-dispatch-test-support' import type * as CodexTurnOpenWait from '../codex/codex-structured-turn-open-wait' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' -import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' +import { classifyDispatchRejection } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { HOST_TEST_SESSION as SESSION, diff --git a/src/main/runtime/structured-agent-session-codex-settlement-order.test.ts b/src/main/runtime/structured-agent-session-codex-settlement-order.test.ts index 1c969f14a64..c936c71eb6a 100644 --- a/src/main/runtime/structured-agent-session-codex-settlement-order.test.ts +++ b/src/main/runtime/structured-agent-session-codex-settlement-order.test.ts @@ -15,7 +15,7 @@ import type { AgentJournalDispatchState, AgentJournalTurnItem, AgentJournalItemBody -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import { HOST_TEST_SESSION as SESSION, HOST_TEST_THREAD as THREAD, diff --git a/src/main/runtime/structured-agent-session-codex-stopped-send-order.test.ts b/src/main/runtime/structured-agent-session-codex-stopped-send-order.test.ts index c618998815d..3dd04024d20 100644 --- a/src/main/runtime/structured-agent-session-codex-stopped-send-order.test.ts +++ b/src/main/runtime/structured-agent-session-codex-stopped-send-order.test.ts @@ -13,9 +13,9 @@ import { codexTurnLifecycleFake } from '../codex/codex-turn-lifecycle-fake' import { settledWithin } from '../codex/codex-structured-dispatch-test-support' import type * as CodexTurnOpenWait from '../codex/codex-structured-turn-open-wait' import { CODEX_TURN_OPEN_WAIT_MS } from '../codex/codex-structured-turn-open-wait' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { AGENT_SESSION_GOAL_CONTROL_COPY } from '../../shared/agent-session-goal-control-copy' import { NATIVE_CHAT_STOPPED_BEFORE_START_TEXT } from '../../shared/native-chat/native-chat-stopped-before-start' @@ -25,7 +25,7 @@ import { nativeChatTurnMembership, structuredAgentTurnAnchors } from '../../shared/native-chat/transcript/native-chat-turn-membership' -import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection' +import { classifyDispatchRejection } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages } from '../../shared/structured-agent-session-message-projection' import { HOST_TEST_SESSION as SESSION, diff --git a/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts index c7f19271fa6..2074877c9cf 100644 --- a/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts +++ b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts @@ -15,8 +15,8 @@ import { settledWithin } from '../codex/codex-structured-dispatch-test-support' import { CODEX_TURN_OPEN_WAIT_MS } from '../codex/codex-structured-turn-open-wait' import type * as CodexTurnOpenWait from '../codex/codex-structured-turn-open-wait' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' -import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' +import { classifyDispatchRejection } from '../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { owesStructuredAgentSessionWork } from '../../shared/structured-agent-session-owed-work' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import { AGENT_SESSION_GOAL_CONTROL_COPY } from '../../shared/agent-session-goal-control-copy' diff --git a/src/main/runtime/structured-agent-session-integration-replay.test.ts b/src/main/runtime/structured-agent-session-integration-replay.test.ts index 3e1143f15e9..aa73a6717cc 100644 --- a/src/main/runtime/structured-agent-session-integration-replay.test.ts +++ b/src/main/runtime/structured-agent-session-integration-replay.test.ts @@ -1,7 +1,7 @@ // Exercise shipped RPC, schemas, capability gate, stores, lease and adapter; only the Codex app-server child is fake. import { afterEach, beforeEach, describe, 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 { createTrackedJournalOpener } from '../native-chat/agent-session-journal/journal-host-database-test-support' import type * as JournalStoreFactory from '../native-chat/agent-session-journal/journal-store-factory' import { diff --git a/src/main/runtime/structured-agent-session-integration.test.ts b/src/main/runtime/structured-agent-session-integration.test.ts index 8a54f4e8b50..c6fcc2f2093 100644 --- a/src/main/runtime/structured-agent-session-integration.test.ts +++ b/src/main/runtime/structured-agent-session-integration.test.ts @@ -17,7 +17,7 @@ import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from '../../shared/ag import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryResult, AgentSessionSubscribeEvent diff --git a/src/main/runtime/structured-agent-session-legacy-send-behind-command.test.ts b/src/main/runtime/structured-agent-session-legacy-send-behind-command.test.ts index b4f3536a0dd..4dc99a822f3 100644 --- a/src/main/runtime/structured-agent-session-legacy-send-behind-command.test.ts +++ b/src/main/runtime/structured-agent-session-legacy-send-behind-command.test.ts @@ -1,7 +1,7 @@ // Clients without accepted-send support wait for handover; sends queued behind compact must answer when queued to avoid the phone timeout. import { afterEach, beforeEach, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../shared/agent-session/journal/agent-session-journal-types' import { ensureStructuredAgentSessionHost } from './structured-agent-session-runtime' import { openStructuredCodexRpcHarness, diff --git a/src/main/runtime/structured-agent-session-mobile-retirement.test.ts b/src/main/runtime/structured-agent-session-mobile-retirement.test.ts index e14c49849fe..f6e1fca8aab 100644 --- a/src/main/runtime/structured-agent-session-mobile-retirement.test.ts +++ b/src/main/runtime/structured-agent-session-mobile-retirement.test.ts @@ -2,7 +2,7 @@ import { mkdtempSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionPromptAttentionKey } from '../../shared/agent-session-attention' import type { AgentSessionTurnCompletionEvent } from '../../shared/agent-session-wire' import { projectStructuredAgentSessionStatusState } from '../../shared/structured-agent-session-projection' diff --git a/src/main/runtime/structured-agent-session-provider-operations-while-starting.test.ts b/src/main/runtime/structured-agent-session-provider-operations-while-starting.test.ts index 7198c75fd1c..91ab9f7fe22 100644 --- a/src/main/runtime/structured-agent-session-provider-operations-while-starting.test.ts +++ b/src/main/runtime/structured-agent-session-provider-operations-while-starting.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import type { AgentSessionMutationEnvelope } from '../../shared/agent-session-wire' import { CODEX_STRUCTURED_AGENT } from '../codex/codex-structured-agent-definition' diff --git a/src/main/runtime/structured-agent-session-startup-tab-restore.test.ts b/src/main/runtime/structured-agent-session-startup-tab-restore.test.ts index 249b07f958f..1f9cf2501f3 100644 --- a/src/main/runtime/structured-agent-session-startup-tab-restore.test.ts +++ b/src/main/runtime/structured-agent-session-startup-tab-restore.test.ts @@ -24,7 +24,7 @@ import { publishJournalSessionEpoch } from '../native-chat/agent-session-journal import { createQueuedRigProvider } from '../native-chat/agent-session-wire/structured-agent-session-queued-message-rig-provider.test-fixture' import { createStructuredSessionObservationClock } from '../native-chat/agent-session-wire/structured-agent-session-observation-clock.test-fixture' import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host' -import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import { mintAgentSessionOperationId } from './orchestration/structured-pointer-operation-id' import { journalIdentityFor } from '../native-chat/agent-session-wire/structured-agent-session-attach' diff --git a/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts index e6a116a916d..297a762cee9 100644 --- a/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts +++ b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts @@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, expect, 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 { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version' import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host' diff --git a/src/main/runtime/structured-chat-coordinator-mail.test.ts b/src/main/runtime/structured-chat-coordinator-mail.test.ts index 9b928f9e6de..cb28b4edcf3 100644 --- a/src/main/runtime/structured-chat-coordinator-mail.test.ts +++ b/src/main/runtime/structured-chat-coordinator-mail.test.ts @@ -1,7 +1,7 @@ import './rpc/unused-default-rpc-methods.test-fixture' import { describe, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import { AgentSessionAcquisitionRefusal, diff --git a/src/main/runtime/structured-chat-naming-runtime.test.ts b/src/main/runtime/structured-chat-naming-runtime.test.ts index 7aa4f9b97b2..0aa540892f4 100644 --- a/src/main/runtime/structured-chat-naming-runtime.test.ts +++ b/src/main/runtime/structured-chat-naming-runtime.test.ts @@ -15,7 +15,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalSnapshot -} from '../../shared/agent-session-journal-types' +} from '../../shared/agent-session/journal/agent-session-journal-types' import type * as TextGeneration from '../text-generation/commit-message-text-generation' const mocks = vi.hoisted(() => ({ diff --git a/src/main/runtime/structured-chat-naming-runtime.ts b/src/main/runtime/structured-chat-naming-runtime.ts index 1a7af868b76..cd7be4de44b 100644 --- a/src/main/runtime/structured-chat-naming-runtime.ts +++ b/src/main/runtime/structured-chat-naming-runtime.ts @@ -17,7 +17,7 @@ import type { StructuredChatNamingDeps } from '../native-chat/structured-chat-na import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger' import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry' import { firstStructuredChatNamingPrompt } from '../../shared/structured-chat-naming-eligibility' -import { firstStructuredAgentSessionPrompt } from '../../shared/structured-agent-session-first-prompt' +import { firstStructuredAgentSessionPrompt } from '../../shared/agent-session/requests/structured-agent-session-first-prompt' import { LOCAL_COMMIT_MESSAGE_HOST_KEY } from '../../shared/commit-message-host-key' import { generateConversationNameFromContext, diff --git a/src/main/runtime/structured-claude-naming-occurrences.test.ts b/src/main/runtime/structured-claude-naming-occurrences.test.ts index 0efc02bc4c4..d8c601d41e7 100644 --- a/src/main/runtime/structured-claude-naming-occurrences.test.ts +++ b/src/main/runtime/structured-claude-naming-occurrences.test.ts @@ -1,4 +1,4 @@ -import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { claudePromptUuidForSubmission } from '../claude/structured/claude-structured-session-id' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import { CREATE_TEST_CALLER } from '../native-chat/agent-session-wire/structured-agent-session-create-test-fixture' diff --git a/src/main/runtime/structured-claude-pending-rewind.test.ts b/src/main/runtime/structured-claude-pending-rewind.test.ts index 077b503e33b..f25b083255f 100644 --- a/src/main/runtime/structured-claude-pending-rewind.test.ts +++ b/src/main/runtime/structured-claude-pending-rewind.test.ts @@ -4,7 +4,7 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope' import type { AgentSessionRecord } from '../../shared/agent-session-record' import type { AgentSessionRewindFork } from '../../shared/agent-session-rewind' diff --git a/src/main/runtime/structured-worker-cleared-session.test.ts b/src/main/runtime/structured-worker-cleared-session.test.ts index 9d502b93f9a..f671a373fa2 100644 --- a/src/main/runtime/structured-worker-cleared-session.test.ts +++ b/src/main/runtime/structured-worker-cleared-session.test.ts @@ -5,7 +5,7 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, 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 type { AgentSessionRecord } from '../../shared/agent-session-record' import { agentSessionLeaseFixture, diff --git a/src/main/runtime/structured-worker-terminal-read.test.ts b/src/main/runtime/structured-worker-terminal-read.test.ts index 196d4b9101b..97f11c7ad0d 100644 --- a/src/main/runtime/structured-worker-terminal-read.test.ts +++ b/src/main/runtime/structured-worker-terminal-read.test.ts @@ -5,7 +5,7 @@ import { import { agentSessionConversationView } from '../../shared/agent-session-conversation-view' import type { AgentSessionLease } from '../../shared/agent-session-record' import { beforeEach, describe, 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' const hostRef: { current: unknown } = { current: null } diff --git a/src/main/wsl/wsl-orcad-chat-assistant-text.ts b/src/main/wsl/wsl-orcad-chat-assistant-text.ts index 5568ed7dffc..911e83d164f 100644 --- a/src/main/wsl/wsl-orcad-chat-assistant-text.ts +++ b/src/main/wsl/wsl-orcad-chat-assistant-text.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' export function assistantText(row: AgentJournalRenderItem): string { return row.body?.kind === 'message' && row.body.role === 'assistant' diff --git a/src/main/wsl/wsl-orcad-midturn-stop-lane.ts b/src/main/wsl/wsl-orcad-midturn-stop-lane.ts index 9e3dcb04746..7842b9fabb0 100644 --- a/src/main/wsl/wsl-orcad-midturn-stop-lane.ts +++ b/src/main/wsl/wsl-orcad-midturn-stop-lane.ts @@ -4,7 +4,7 @@ import { randomUUID } from 'node:crypto' import { expect, vi } from 'vitest' import { z } from 'zod' import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from '../../shared/agent-session-continue-interrupted-capability' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../shared/agent-session-turn-record' import type { AgentSessionHistoryResult, diff --git a/src/main/wsl/wsl-orcad-scripted-provider-chat.ts b/src/main/wsl/wsl-orcad-scripted-provider-chat.ts index 480d7ffbe90..665eb7cbec4 100644 --- a/src/main/wsl/wsl-orcad-scripted-provider-chat.ts +++ b/src/main/wsl/wsl-orcad-scripted-provider-chat.ts @@ -1,7 +1,7 @@ import { randomUUID } from 'node:crypto' import { expect, vi } from 'vitest' import { z } from 'zod' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionSubscribeEvent } from '../../shared/agent-session-wire' import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/electron-remote-runtime-client-capabilities' import { subscribeRemoteRuntimeRequest } from '../../shared/remote-runtime/remote-runtime-client' diff --git a/src/main/wsl/wsl-orcad-structured-chat-contract.ts b/src/main/wsl/wsl-orcad-structured-chat-contract.ts index bcf9b6f0e20..5c1376c2dc3 100644 --- a/src/main/wsl/wsl-orcad-structured-chat-contract.ts +++ b/src/main/wsl/wsl-orcad-structured-chat-contract.ts @@ -1,7 +1,7 @@ import { randomUUID } from 'node:crypto' import { expect, vi } from 'vitest' import { z } from 'zod' -import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../shared/agent-session/journal/agent-session-journal-types' import { assistantText } from './wsl-orcad-chat-assistant-text' import type { AgentSessionHistoryResult, diff --git a/src/renderer/src/attention/agent-subject-read-actions.ts b/src/renderer/src/attention/agent-subject-read-actions.ts index 968b141e57a..76677a6d2a1 100644 --- a/src/renderer/src/attention/agent-subject-read-actions.ts +++ b/src/renderer/src/attention/agent-subject-read-actions.ts @@ -1,4 +1,4 @@ -import type { AgentJournalCursor } from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' import type { RuntimeClientTarget } from '../../../shared/runtime-client-target' export type StructuredSubjectRead = { diff --git a/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx index 85ce5312d21..62d8da66c90 100644 --- a/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx @@ -33,12 +33,12 @@ import { } from '../../../../shared/structured-agent-session-reducer' import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire' import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection' -import { isAdmissibleAgentJournalRenderItem } from '../../../../shared/agent-session-journal-schemas' +import { isAdmissibleAgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-schemas' import { agentMessageHeading } from '../../../../shared/agent-session/agent-message-presentation' import { nativeChatTurnFoldRow } from '../../../../shared/native-chat/transcript/native-chat-turn-fold' import { isNoiseMessage } from '../../../../shared/native-chat/native-chat-noise' import { nativeChatRowSpeaksOrActs } from '../../../../shared/native-chat/native-chat-trailing-run' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' it('reloads a positioned worker start into the shared card with full task, Copy and navigation', async () => { const task = ` Task with [a link][target].\n\n${'More task text.\n'.repeat(20)}END \n\n[target]: https://example.com\n` diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx index d35306de123..54dc97f5eca 100644 --- a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx @@ -66,11 +66,11 @@ import { import { emitNativeChatMessageSent } from '@/lib/native-chat-telemetry' import { TooltipProvider } from '@/components/ui/tooltip' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' -import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { NativeChatInterruptedContinueButton, diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx index 891be1de159..05c60c62511 100644 --- a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx +++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx @@ -20,7 +20,7 @@ import type { RuntimeClientTarget } from '../../../../shared/runtime-client-targ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { latestNativeChatOrcaStopCut } from '../../../../shared/native-chat/native-chat-orca-stop-cut' import { latestNativeChatUsageLimitCut, diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.live-reasoning.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.live-reasoning.test.tsx index 2ba6ba94ec1..1936e722760 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.live-reasoning.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.live-reasoning.test.tsx @@ -9,7 +9,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalStatusItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection' import { NativeChatMessageList } from './NativeChatMessageList' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx index 3f22853028f..6efe8381392 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx @@ -27,13 +27,13 @@ afterEach(() => { }) import { agentSessionFailureFact } from '../../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalSubmission +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' import { projectStructuredAgentSessionMessages, type StructuredAgentSessionOptimisticMessage @@ -41,7 +41,7 @@ import { import { selectStructuredAgentSettledTurns } from '../../../../shared/structured-agent-session-turn-timing' import { NativeChatMessageList } from './NativeChatMessageList' import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport' -import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' describe('a message sent while the turn ahead is still opening', () => { let restoreViewport = (): void => {} diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.queued-turn-order.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.queued-turn-order.test.tsx index c5c9124c396..25e19d90182 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.queued-turn-order.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.queued-turn-order.test.tsx @@ -27,9 +27,9 @@ afterEach(() => { }) import type { AgentJournalItemBody, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalRenderItem +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import type { NativeChatLiveSession } from './use-native-chat-live-session' import { NativeChatMessageList } from './NativeChatMessageList' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx index 8175c667183..1c0ff49de0c 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx @@ -29,7 +29,7 @@ afterEach(() => { import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection' import { NativeChatMessageList } from './NativeChatMessageList' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.render-cost.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.render-cost.test.tsx index c07eae912a5..9f5b5006243 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.render-cost.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.render-cost.test.tsx @@ -29,7 +29,7 @@ import type * as NativeChatWorkRunModule from '../../../../shared/native-chat/na import type * as NativeChatProseModule from '../../../../shared/native-chat/transcript/native-chat-prose' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { projectStructuredAgentSessionMessages } from '../../../../shared/structured-agent-session-message-projection' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type * as UnifiedPatchModule from '../../../../shared/native-chat/tools/native-chat-unified-patch' import type { NativeChatLiveSession } from './use-native-chat-live-session' import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.rewind-rows.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.rewind-rows.test.tsx index c4ee6d37416..b83b570d8b5 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.rewind-rows.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.rewind-rows.test.tsx @@ -27,13 +27,13 @@ afterEach(() => { import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalSubmission +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' import { projectStructuredAgentSessionMessages } from '../../../../shared/structured-agent-session-message-projection' import { TooltipProvider } from '@/components/ui/tooltip' import { NativeChatRewindContext } from './native-chat-rewind-context' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.subagent-sections.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.subagent-sections.test.tsx index a067b4b8176..84959714f08 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.subagent-sections.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.subagent-sections.test.tsx @@ -31,7 +31,7 @@ import type { AgentJournalItemBody, AgentJournalProducerLinkage, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatSubagentState, diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx index dad89e56a4f..856be56802a 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.test.tsx @@ -40,10 +40,8 @@ import { NativeChatMessageList } from './NativeChatMessageList' import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport' -import type { - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' { const session: NativeChatLiveSession = { diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx index 921ae02edfd..cbb6fb9c0b3 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tool-stream-cost.test.tsx @@ -22,7 +22,7 @@ afterEach(() => { expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled() expect(unusedChatLeaves.openSender).not.toHaveBeenCalled() }) -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type * as EditNormalization from '../../../../shared/native-chat/tools/native-chat-edit-normalize' import type { NativeChatLiveSession } from './use-native-chat-live-session' import { useStructuredAgentSessionMessages } from './use-structured-agent-session-messages' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx index 404a7a1e368..ababf6f86e2 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx @@ -57,7 +57,7 @@ import { useNativeChatMessageListHandle } from './use-native-chat-reveal-latest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire' import { isStructuredAgentSessionThinking } from '../../../../shared/structured-agent-session-live-turn' import type { NativeChatSettledTurns } from '../../../../shared/native-chat/transcript/native-chat-turn-status' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx index e67da33a553..6fd6de2122a 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-indicator.test.tsx @@ -30,9 +30,9 @@ import { NativeChatMessageList } from './NativeChatMessageList' import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport' import type { AgentJournalItemBody, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalRenderItem +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' // The turn record this host writes, and the legacy status row an older host sends. const turnItem: AgentJournalItemBody = { kind: 'turn', turnId: 'turn-1', state: 'running' } diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-membership.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-membership.test.tsx index f752c4bf4aa..1294ab41b3a 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-membership.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-membership.test.tsx @@ -30,14 +30,14 @@ afterEach(() => { import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalSubmission +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' import { projectStructuredAgentSessionMessages } from '../../../../shared/structured-agent-session-message-projection' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx index 3b246d98b58..1254022862d 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.turn-status.test.tsx @@ -31,7 +31,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalTurnItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { selectStructuredAgentSettledTurns } from '../../../../shared/structured-agent-session-turn-timing' import type { NativeChatLiveSession } from './use-native-chat-live-session' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx index 431ac9e1999..1335c66b220 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx @@ -30,12 +30,12 @@ afterEach(() => { import type { AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' + AgentJournalSubmission +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { NativeChatSettledTurns } from '../../../../shared/native-chat/transcript/native-chat-turn-status' -import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { NativeChatMessageList } from './NativeChatMessageList' import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices' import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport' diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx index 43f8ece5b88..afea58dc02e 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.windowing.test.tsx @@ -28,7 +28,7 @@ afterEach(() => { import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection' import { NativeChatMessageList } from './NativeChatMessageList' import { NATIVE_CHAT_BOTTOM_THRESHOLD_PX } from './native-chat-autoscroll' diff --git a/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx b/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx index b8dbbfec92f..835c06d0bf6 100644 --- a/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx @@ -4,8 +4,8 @@ import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection' import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure' -import type { AgentJournalStatusItem } from '../../../../shared/agent-session-journal-types' -import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session-journal-schemas' +import type { AgentJournalStatusItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-schemas' import { TooltipProvider } from '@/components/ui/tooltip' import { MessageRow } from './NativeChatMessageRow' import { NativeChatNoticeRow } from './NativeChatNoticeRow' diff --git a/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx b/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx index c351d277ddd..a7682c7635b 100644 --- a/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx +++ b/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx @@ -11,7 +11,7 @@ import { useNativeChatPromptCardFocus } from './use-native-chat-prompt-card-focu import { useNativeChatQuestionAutoAdvance } from './use-native-chat-question-auto-advance' import { useNativeChatQuestionKeys } from './use-native-chat-question-keys' import { isEditableTarget } from '@/lib/editable-target' -import type { AgentJournalFreeTextInput } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalFreeTextInput } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { askAcceptsEmptyAnswer, askConfirmAction, diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx index a85161b3146..0bf36425f90 100644 --- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx +++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx @@ -23,7 +23,7 @@ import { cn } from '@/lib/utils' import { ShortcutKeyCombo } from '@/components/ShortcutKeyCombo' import { translate } from '@/i18n/i18n' import { agentSessionWriteNoticeText } from './agent-session-write-notice-text' -import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../../shared/agent-session-wire' +import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { isMacPlatform } from './native-chat-shortcut' import { queuedMessageCardLine, diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageComposer.raw-task.test.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageComposer.raw-task.test.tsx index 70b1c978ab4..35ce8dfccc7 100644 --- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageComposer.raw-task.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageComposer.raw-task.test.tsx @@ -10,9 +10,9 @@ import { } from './structured-queued-edit.test-fixture' import { act, fireEvent, screen, waitFor } from '@testing-library/react' import { afterEach, expect, it, vi } from 'vitest' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { ORCA_DISPATCH_STATUS_PREAMBLE_PREFIX } from '../../../../shared/orca-dispatch-status-prompt' -import { agentSessionSendBodyFingerprint } from '../../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { projectQueuedMessageCards } from '../../../../shared/structured-agent-session-queued-cards' import { NativeChatQueuedMessageCard } from './NativeChatQueuedMessageCard' import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types' diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.in-flight.test.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.in-flight.test.tsx index 7c211a7c43c..0fea884c0c8 100644 --- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.in-flight.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.in-flight.test.tsx @@ -21,7 +21,7 @@ import { TooltipProvider } from '@/components/ui/tooltip' import { NativeChatQueuedMessageList } from './NativeChatQueuedMessageList' import { useStructuredAgentSessionQueuedMessages } from './use-structured-agent-session-queued-messages' import type { StructuredAgentSessionWrite } from './use-structured-agent-session-mutate' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' function waitingDraft(messageId: string, position: number): AgentSessionQueuedMessage { return { diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx index fba1ca5e54e..cce2f557ab7 100644 --- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx @@ -18,8 +18,10 @@ import { useStructuredAgentSessionQueuedMessages, type StructuredAgentSessionQueuedMessagesController } from './use-structured-agent-session-queued-messages' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' -import type { AgentSessionQueuePause } from '../../../../shared/agent-session-queued-message-wire' +import type { + AgentSessionQueuedMessage, + AgentSessionQueuePause +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure' function renderList( diff --git a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx index f53bab9191f..a2f9e4a0b65 100644 --- a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.test.tsx @@ -7,7 +7,7 @@ import { i18n } from '@/i18n/i18n' import type { AgentJournalQuestionItem, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { encodeAgentSessionQuestionAnswers } from '../../../../shared/agent-session-question-answer' import { NativeChatResolutionReceipt } from './NativeChatResolutionReceipt' import { structuredQuestionTranscript } from '../../../../shared/structured-agent-question-projection' diff --git a/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx b/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx index b5f2bba199d..3d8638cd122 100644 --- a/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx @@ -17,7 +17,7 @@ import { import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { TooltipProvider } from '@/components/ui/tooltip' import { MessageRow } from './NativeChatMessageRow' diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx index 947da6cf4dc..475500f2e63 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx @@ -3,7 +3,7 @@ import { act } from 'react' import { createRoot } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { NativeChatStructuredQuestionCard } from './NativeChatStructuredQuestionCard' -import type { AgentJournalQuestion } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalQuestion } from '../../../../shared/agent-session/journal/agent-session-journal-types' let container: HTMLDivElement let root: ReturnType diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx index d3dec081866..6f5ad17cfa4 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx @@ -1,5 +1,5 @@ import type { RefObject } from 'react' -import type { AgentJournalQuestion } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalQuestion } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionPromptResponse } from '../../../../shared/agent-session-question-answer' import { structuredQuestionAnswers, diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx index 26db3999303..2590fa7a92f 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.approval-and-start-failure.test.tsx @@ -7,8 +7,8 @@ import { agentSessionFailureWords } from '../../../../shared/agent-session-failu import { agentJournalItemKey, agentJournalSubmissionKey -} 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 { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key' import { NativeChatStructuredSession } from './NativeChatStructuredSession' diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx index b6f8d3def8b..7045adc50f0 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.availability-notice.test.tsx @@ -5,8 +5,8 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, it, vi } from 'vitest' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure' -import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key' import { agentSessionVisibleFailureFacts } from '../../../../shared/agent-session-visible-failures' import type * as AgentSessionVisibleFailures from '../../../../shared/agent-session-visible-failures' diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx index 240ddc83fda..cff164ee29b 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.goal-dock.test.tsx @@ -6,7 +6,7 @@ import { TooltipProvider } from '@/components/ui/tooltip' import type { AgentJournalRenderItem, AgentJournalThreadGoal -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () => (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks() diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx index e56eda6374f..94f7f594dba 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.history-read-state.test.tsx @@ -3,7 +3,7 @@ import { cleanup, render, screen } from '@testing-library/react' import { afterEach, describe, expect, it, vi } from 'vitest' import { TooltipProvider } from '@/components/ui/tooltip' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { NativeChatStructuredSession } from './NativeChatStructuredSession' const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () => diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx index 8ca69738c83..309e1491d2e 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx @@ -4,7 +4,7 @@ import '@testing-library/jest-dom/vitest' import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import type { RuntimeEnvironmentStatus } from '../../../../shared/runtime-host-status' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () => (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks() diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx index 426c13ed8e6..21fb4fd30b5 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.notice-card.test.tsx @@ -23,7 +23,7 @@ vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard()) import { NativeChatStructuredSession } from './NativeChatStructuredSession' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types' const SESSION_ID = 'notice-card-session' diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx index 7ddccafd028..68bef7a0090 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.orca-stop-continue.test.tsx @@ -69,8 +69,8 @@ vi.mock('./NativeChatMessageList', async () => { import { TooltipProvider } from '@/components/ui/tooltip' import { NativeChatStructuredSession } from './NativeChatStructuredSession' -import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' const TURN = agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cut', ordinal: 1 }) diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx index d80928622ec..fe0e396481a 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx @@ -4,7 +4,7 @@ import { } from './native-chat-message-list.test-support' import { useImperativeHandle } from 'react' import { 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 type { QueuedMessageCard } from '../../../../shared/structured-agent-session-queued-cards' import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session/agent-session-background-task-wire' import type { AgentSessionWriteRefusal } from '../../../../shared/agent-session-write-failure' diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx index aca78293fb0..79b40dce08e 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx @@ -4,7 +4,7 @@ import { getDefaultSettings } from '../../../../shared/constants' import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react' import { afterEach, describe, 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 { useAppStore } from '@/store' import { TooltipProvider } from '@/components/ui/tooltip' import { diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx index b8019e74ad9..7f0a8941f46 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx @@ -55,7 +55,7 @@ import { NativeChatStructuredComposerTabStrips } from './NativeChatStructuredCom import { nativeChatPaneHeader } from './NativeChatPaneHeader' import { structuredAgentSessionReadFailureNotice } from './structured-agent-session-read-failure-notice' import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices' -import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection' +import { dispatchWasWithdrawn } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { useNativeChatHostOutage } from './use-native-chat-host-outage' import { useNativeChatHostOutageNotice } from './use-native-chat-host-outage-notice' import { useNativeChatHostSendGate } from './use-native-chat-host-send-gate' diff --git a/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx b/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx index c64d0d15103..e6e757c4af0 100644 --- a/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.test.tsx @@ -3,7 +3,7 @@ import '@testing-library/jest-dom/vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, describe, expect, it, vi } from 'vitest' import { TooltipProvider } from '@/components/ui/tooltip' -import type { AgentJournalThreadGoal } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalThreadGoal } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { NativeChatThreadGoalBanner } from './NativeChatThreadGoalBanner' import { formatNativeChatThreadGoalElapsed } from './native-chat-thread-goal-presentation' diff --git a/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.tsx b/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.tsx index 06658d00d34..1c7df6e4969 100644 --- a/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.tsx +++ b/src/renderer/src/components/native-chat/NativeChatThreadGoalBanner.tsx @@ -6,7 +6,7 @@ import { useNow } from '@/hooks/use-now' import { translate } from '@/i18n/i18n' import { cn } from '@/lib/utils' import { NativeChatComposerTabStrip } from './NativeChatComposerTabStrip' -import type { AgentJournalThreadGoal } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalThreadGoal } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionThreadGoalElapsedSeconds, agentSessionThreadGoalStatusChange diff --git a/src/renderer/src/components/native-chat/NativeChatToolOutput.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolOutput.test.tsx index 5a5e47f7b91..b66eaf39c2d 100644 --- a/src/renderer/src/components/native-chat/NativeChatToolOutput.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatToolOutput.test.tsx @@ -2,7 +2,7 @@ import { act } from 'react' import { createRoot } from 'react-dom/client' 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 type { NativeChatToolResultBlock } from '../../../../shared/native-chat/native-chat-types' import { NativeChatToolOutput } from './NativeChatToolOutput' diff --git a/src/renderer/src/components/native-chat/NativeChatToolOutput.tsx b/src/renderer/src/components/native-chat/NativeChatToolOutput.tsx index 264c7d0bf43..6ee15958975 100644 --- a/src/renderer/src/components/native-chat/NativeChatToolOutput.tsx +++ b/src/renderer/src/components/native-chat/NativeChatToolOutput.tsx @@ -6,7 +6,7 @@ import { readStructuredAgentSessionItem, supportsStructuredAgentSessionItemDetail } from '@/runtime/structured-agent-session-client' -import type { AgentJournalBoundedPayload } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalBoundedPayload } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatToolResultBlock } from '../../../../shared/native-chat/native-chat-types' import { truncateToolDetail } from '../../../../shared/native-chat/tools/native-chat-tool-summary' import { diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx index e5e5e6a6703..a7d0cf24339 100644 --- a/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx @@ -4,7 +4,7 @@ import '@testing-library/jest-dom/vitest' import { cleanup, fireEvent, render, screen, within } from '@testing-library/react' import { afterEach, describe, 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 type { NativeChatBlock } from '../../../../shared/native-chat/native-chat-types' import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection' import { NativeChatToolRun } from './NativeChatToolRun' diff --git a/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx index 1aee6998090..d34342b8ad0 100644 --- a/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx @@ -4,7 +4,7 @@ import '@testing-library/jest-dom/vitest' import { cleanup, render } from '@testing-library/react' import { afterEach, 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 { interruptedAgentJournalToolCall } from '../../../../shared/agent-journal-tool-call-lifecycle' import type { NativeChatBlock } from '../../../../shared/native-chat/native-chat-types' import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection' diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.lifecycle.test.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.lifecycle.test.tsx index 729775a431f..410a4b3fd22 100644 --- a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.lifecycle.test.tsx +++ b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.lifecycle.test.tsx @@ -5,7 +5,7 @@ import { useEffect, useMemo } from 'react' import { act, cleanup, render } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type { AgentJournalTurnOutcome } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../../../shared/agent-turn-outcome' import type { AgentSessionStatusEvent, AgentSessionTurnCompletion, diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx index abaafb41cc6..a460ce051f4 100644 --- a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx +++ b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx @@ -4,7 +4,7 @@ import { act, cleanup, render, waitFor } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest' -import type { AgentJournalTurnOutcome } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../../../shared/agent-turn-outcome' import { modelRefusalReadStates } from './structured-model-refusal.test-fixture' import { structuredAttentionReadObservation } from './structured-attention-read-observation' import type { diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.tsx index ee6469ee770..899f992eee9 100644 --- a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.tsx +++ b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.tsx @@ -17,7 +17,7 @@ import { import { getStructuredAgentSessionTurnCompletionFeed } from '@/runtime/structured-agent-session-turn-completion-feed' import { getStructuredAgentSessionStatusFeed } from '@/runtime/structured-agent-session-status-feed' import { acknowledgeStructuredAgentSessionAttention } from '@/runtime/structured-agent-session-client' -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' import type { AgentSessionExecutionLocation } from '../../../../shared/agent-session-record' import type { AgentSessionStatusSummary } from '../../../../shared/agent-session-wire' import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection' diff --git a/src/renderer/src/components/native-chat/inline-deferred-input.test.tsx b/src/renderer/src/components/native-chat/inline-deferred-input.test.tsx index f471653a70d..4b841d411ed 100644 --- a/src/renderer/src/components/native-chat/inline-deferred-input.test.tsx +++ b/src/renderer/src/components/native-chat/inline-deferred-input.test.tsx @@ -26,7 +26,7 @@ import { import { promptSkillRefs, promptText } from './native-chat-prompt-document' import { changePrompt, promptEditor } from './native-chat-prompt-editor.test-support' import { dispatchNativeChatStructuredComposerText } from './native-chat-structured-composer-dispatch' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { resolveNativeChatPastedText } from './native-chat-composer-pasted-text-references' import { addNativeChatPendingAttachment, diff --git a/src/renderer/src/components/native-chat/inline-queued-edit-lease.test.tsx b/src/renderer/src/components/native-chat/inline-queued-edit-lease.test.tsx index 7b1a8ce9a45..6df38ebd994 100644 --- a/src/renderer/src/components/native-chat/inline-queued-edit-lease.test.tsx +++ b/src/renderer/src/components/native-chat/inline-queued-edit-lease.test.tsx @@ -16,7 +16,7 @@ import { act, waitFor } from '@testing-library/react' import { beforeAll, describe, expect, it, vi } from 'vitest' import { toast } from 'sonner' import type { QueuedEditHostFixtureModule } from '../../../../shared/queued-edit-host.test-fixture' -import type { AgentSessionQueuedMessageEditHoldResult } from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageEditHoldResult } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { readNativeChatDraftCache, writeNativeChatDraftCache } from './native-chat-draft-cache' let queuedEditHost: QueuedEditHostFixtureModule['queuedEditHost'] diff --git a/src/renderer/src/components/native-chat/inline-rich-draft-consumers.test.tsx b/src/renderer/src/components/native-chat/inline-rich-draft-consumers.test.tsx index fe5bf7e55c4..b41ffc36c4f 100644 --- a/src/renderer/src/components/native-chat/inline-rich-draft-consumers.test.tsx +++ b/src/renderer/src/components/native-chat/inline-rich-draft-consumers.test.tsx @@ -32,7 +32,7 @@ import { nativeChatPastedTextToken } from './native-chat-pasted-text-reference' import { structuredAgentSessionSendBody, agentSessionSendBodyFingerprint -} from '../../../../shared/structured-agent-session-send-mutation' +} from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' const scope = 'agent-session:rich-return' let composing = false @@ -267,7 +267,7 @@ import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageEditHoldParams, AgentSessionQueuedMessageEditHoldResult -} from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { queuedMessageWithEdit } from '../../../../shared/queued-message-edit' import type { StructuredAgentSessionWrite } from './use-structured-agent-session-mutate' let controller: ReturnType diff --git a/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx index c59e44c4b87..4088934f57d 100644 --- a/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx +++ b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx @@ -4,7 +4,7 @@ import { act, cleanup, fireEvent, render, renderHook, screen } from '@testing-li import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { getDefaultSettings } from '../../../../shared/constants' import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection' -import type { AgentJournalStatusItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalStatusItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' import type { AgentSessionRefusalReason } from '../../../../shared/agent-session-refusal-details' import { useAppStore } from '@/store' diff --git a/src/renderer/src/components/native-chat/native-chat-compaction-visibility.test.ts b/src/renderer/src/components/native-chat/native-chat-compaction-visibility.test.ts index 1809da8a00a..f9900489a8d 100644 --- a/src/renderer/src/components/native-chat/native-chat-compaction-visibility.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-compaction-visibility.test.ts @@ -9,9 +9,9 @@ import { z } from 'zod' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { isAdmissibleAgentJournalRenderItem } from '../../../../shared/agent-session-journal-schemas' -import { isAdmissibleAgentJournalSubmission } from '../../../../shared/agent-session-journal-submission-schema' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { isAdmissibleAgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-schemas' +import { isAdmissibleAgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-submission-schema' type CapturedJournal = { items: AgentJournalRenderItem[]; submissions: AgentJournalSubmission[] } diff --git a/src/renderer/src/components/native-chat/native-chat-new-rows-marker.ts b/src/renderer/src/components/native-chat/native-chat-new-rows-marker.ts index 9f7c7aa1ad8..7e9e1039aa3 100644 --- a/src/renderer/src/components/native-chat/native-chat-new-rows-marker.ts +++ b/src/renderer/src/components/native-chat/native-chat-new-rows-marker.ts @@ -2,8 +2,8 @@ import { useCallback, useMemo, useState } from 'react' import { useOrcaWindowForegroundFocused } from '@/hooks/use-orca-window-foreground-focused' -import { compareAgentJournalPositions } from '../../../../shared/agent-session-journal-position' -import type { AgentJournalPosition } from '../../../../shared/agent-session-journal-types' +import { compareAgentJournalPositions } from '../../../../shared/agent-session/journal/agent-session-journal-position' +import type { AgentJournalPosition } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { nativeChatSlotKey, type NativeChatTranscriptSlot } from './native-chat-transcript-slots' /** Use journal positions for conversation rows, including folded-turn bars; terminal-backed rows have none and remain unmarked. */ diff --git a/src/renderer/src/components/native-chat/native-chat-prompt-document.ts b/src/renderer/src/components/native-chat/native-chat-prompt-document.ts index 8b4e1b78136..111ae76c671 100644 --- a/src/renderer/src/components/native-chat/native-chat-prompt-document.ts +++ b/src/renderer/src/components/native-chat/native-chat-prompt-document.ts @@ -6,7 +6,7 @@ import { imageReferenceToken } from '../../../../shared/native-chat/native-chat- import { FILE_REFERENCE_NODE, IMAGE_REFERENCE_NODE } from './native-chat-prompt-document-text' import { ReactNodeViewRenderer, Node, type JSONContent } from '@tiptap/react' import type { Node as ProseMirrorNode } from '@tiptap/pm/model' -import type { AgentJournalSkillRef } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSkillRef } from '../../../../shared/agent-session/journal/agent-session-journal-types' export { promptTextContent } from './native-chat-prompt-document-text' export const NativeChatSkill = Node.create({ diff --git a/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.test.ts b/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.test.ts index 5dcd2e7a53e..d43182883c6 100644 --- a/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.test.ts @@ -1,9 +1,9 @@ -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { queuedMessageWithEdit } from '../../../../shared/queued-message-edit' import { promptTextContent } from './native-chat-prompt-document-text' // @vitest-environment happy-dom import { beforeEach, 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 { imageReferenceToken } from '../../../../shared/native-chat/native-chat-image-reference' import { nativeChatPastedTextOperations, diff --git a/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.ts b/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.ts index c858e060d92..fc5470f9bd4 100644 --- a/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.ts +++ b/src/renderer/src/components/native-chat/native-chat-queued-edit-draft.ts @@ -1,5 +1,5 @@ import type { JSONContent } from '@tiptap/react' -import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { withoutImageReference } from '../../../../shared/native-chat/native-chat-image-reference' import { imageReferencesToPromptMarkers, @@ -10,7 +10,7 @@ import { queuedMessageEditableText, type QueuedMessageEdit } from '../../../../shared/queued-message-edit' -import { pickedSkillsInText } from '../../../../shared/structured-agent-session-send-mutation' +import { pickedSkillsInText } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { createUuidV4 } from '../../../../shared/uuid-v4' import { promptSkillRefs } from './native-chat-prompt-document' import { promptTextContent, withoutImageReferenceNodes } from './native-chat-prompt-document-text' diff --git a/src/renderer/src/components/native-chat/native-chat-queued-edit-outcome.ts b/src/renderer/src/components/native-chat/native-chat-queued-edit-outcome.ts index 01cfd121125..1da183b25c6 100644 --- a/src/renderer/src/components/native-chat/native-chat-queued-edit-outcome.ts +++ b/src/renderer/src/components/native-chat/native-chat-queued-edit-outcome.ts @@ -1,5 +1,5 @@ -import type { AgentSessionQueuedMessageUpdateResult } from '../../../../shared/agent-session-wire' -import { agentSessionSendBodyFingerprint } from '../../../../shared/structured-agent-session-send-mutation' +import type { AgentSessionQueuedMessageUpdateResult } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { agentSessionSendBodyFingerprint } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { StructuredAgentSessionWriteOutcome } from './use-structured-agent-session-mutate' import type { NativeChatQueuedEditSession, diff --git a/src/renderer/src/components/native-chat/native-chat-queued-edit-session.ts b/src/renderer/src/components/native-chat/native-chat-queued-edit-session.ts index ba053662645..196bacf7c4c 100644 --- a/src/renderer/src/components/native-chat/native-chat-queued-edit-session.ts +++ b/src/renderer/src/components/native-chat/native-chat-queued-edit-session.ts @@ -19,11 +19,11 @@ import { toast } from 'sonner' import { translate } from '@/i18n/i18n' import { subscribeToNativeChatPendingAttachments } from './native-chat-pending-attachment-cache' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { QueuedEditLease } from './structured-agent-session-queued-edit-lease' import type { QueuedMessageCard } from '../../../../shared/structured-agent-session-queued-cards' import type { StructuredAgentSessionWrite } from './use-structured-agent-session-mutate' diff --git a/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts b/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts index 1ffb290cee7..50c18987be9 100644 --- a/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-rail-outline-parity.test.ts @@ -9,9 +9,9 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' -import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { nativeChatRowsInDrawOrder } from '../../../../shared/native-chat/transcript/native-chat-turn-grouping' import { nativeChatTurnMembership } from '../../../../shared/native-chat/transcript/native-chat-turn-membership' diff --git a/src/renderer/src/components/native-chat/native-chat-structured-alternate-send.test.tsx b/src/renderer/src/components/native-chat/native-chat-structured-alternate-send.test.tsx index 176884901c5..d3b689374ac 100644 --- a/src/renderer/src/components/native-chat/native-chat-structured-alternate-send.test.tsx +++ b/src/renderer/src/components/native-chat/native-chat-structured-alternate-send.test.tsx @@ -14,7 +14,7 @@ import { import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { dispatchStructuredAgentSessionComposerCommand } from '../../../../shared/structured-agent-session-composer' import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' const mocks = vi.hoisted(() => ({ call: vi.fn(), ptySend: vi.fn(() => null) })) @@ -74,8 +74,8 @@ import { import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities' import { i18n } from '@/i18n/i18n' import de from '@/i18n/locales/de.json' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' -import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session-journal-schemas' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-schemas' import { updateNativeChatComposerDraft, clearNativeChatComposerDraftsForTests diff --git a/src/renderer/src/components/native-chat/native-chat-structured-composer-dispatch.ts b/src/renderer/src/components/native-chat/native-chat-structured-composer-dispatch.ts index 091bc185154..3b6190cd13c 100644 --- a/src/renderer/src/components/native-chat/native-chat-structured-composer-dispatch.ts +++ b/src/renderer/src/components/native-chat/native-chat-structured-composer-dispatch.ts @@ -1,6 +1,6 @@ -import type { AgentJournalSkillRef } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSkillRef } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionBlocksTooLarge } from '../../../../shared/rpc-contract/structured-agent-session-message-params' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { AGENT_SESSION_MESSAGE_TOO_LARGE_PARTS } from '../../../../shared/agent-session-refusal-notice' import { agentSessionWriteNoticeText } from './agent-session-write-notice-text' import { imageReferencesToPromptMarkers } from '../../../../shared/native-chat/transcript/native-chat-image-transcript-markers' diff --git a/src/renderer/src/components/native-chat/native-chat-structured-question-test-fixtures.ts b/src/renderer/src/components/native-chat/native-chat-structured-question-test-fixtures.ts index c369cdfd3e1..cb1de908020 100644 --- a/src/renderer/src/components/native-chat/native-chat-structured-question-test-fixtures.ts +++ b/src/renderer/src/components/native-chat/native-chat-structured-question-test-fixtures.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' export const claudeGroupedQuestionPromptItems: AgentJournalRenderItem[] = [ { diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-live-frontier.ts b/src/renderer/src/components/native-chat/native-chat-subagent-live-frontier.ts index 198ae2e36a7..722e02af6b4 100644 --- a/src/renderer/src/components/native-chat/native-chat-subagent-live-frontier.ts +++ b/src/renderer/src/components/native-chat/native-chat-subagent-live-frontier.ts @@ -1,7 +1,7 @@ // Open the newest delegation’s section while its scope runs; newer output supersedes it, and explicit reader choices win. -import { compareAgentJournalPositions } from '../../../../shared/agent-session-journal-position' -import type { AgentJournalPosition } from '../../../../shared/agent-session-journal-types' +import { compareAgentJournalPositions } from '../../../../shared/agent-session/journal/agent-session-journal-position' +import type { AgentJournalPosition } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { normalizeSubagentState } from '../../../../shared/native-chat/transcript/native-chat-subagent-summary' import { nativeChatRowRendersContent } from '../../../../shared/native-chat/transcript/native-chat-row-content' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-sections-retention.test.ts b/src/renderer/src/components/native-chat/native-chat-subagent-sections-retention.test.ts index 429b671f838..a530b88a93f 100644 --- a/src/renderer/src/components/native-chat/native-chat-subagent-sections-retention.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-subagent-sections-retention.test.ts @@ -3,7 +3,7 @@ import type { AgentJournalItemBody, AgentJournalProducerLinkage, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire' import { projectNativeChatTranscript } from '../../../../shared/native-chat/transcript/native-chat-transcript-projection' import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection' diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-sections.test.ts b/src/renderer/src/components/native-chat/native-chat-subagent-sections.test.ts index 5632290642a..cf5c1a8e5ec 100644 --- a/src/renderer/src/components/native-chat/native-chat-subagent-sections.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-subagent-sections.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage, NativeChatSubagentState diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-sections.ts b/src/renderer/src/components/native-chat/native-chat-subagent-sections.ts index 933b97dfbc5..8e2f9143755 100644 --- a/src/renderer/src/components/native-chat/native-chat-subagent-sections.ts +++ b/src/renderer/src/components/native-chat/native-chat-subagent-sections.ts @@ -1,6 +1,6 @@ // Retained roster metadata names windowed-out spawns; place children under loaded roster entries, their parent section or their first conversation row. -import type { AgentJournalPosition } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalPosition } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { isSubagentGroupBlock, type NativeChatMessage, diff --git a/src/renderer/src/components/native-chat/native-chat-thread-goal-presentation.ts b/src/renderer/src/components/native-chat/native-chat-thread-goal-presentation.ts index ca880162b01..c30ba6855c4 100644 --- a/src/renderer/src/components/native-chat/native-chat-thread-goal-presentation.ts +++ b/src/renderer/src/components/native-chat/native-chat-thread-goal-presentation.ts @@ -1,5 +1,5 @@ import { translate } from '@/i18n/i18n' -import type { AgentJournalThreadGoalStatus } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalThreadGoalStatus } from '../../../../shared/agent-session/journal/agent-session-journal-types' /** Active goals read as pursued only during a running turn; between turns they remain set. */ export function nativeChatThreadGoalStatusLabel( diff --git a/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts b/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts index 750ae5039af..ce5fdc27c71 100644 --- a/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-transcript-slots.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, - AgentJournalRenderItem, - AgentJournalTurnScope -} from '../../../../shared/agent-session-journal-types' + AgentJournalRenderItem +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../../../shared/agent-session-journal-turn-scope' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { nativeChatTurnMembership } from '../../../../shared/native-chat/transcript/native-chat-turn-membership' import { diff --git a/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts b/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts index 8c4854efd85..809355bb4e7 100644 --- a/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts +++ b/src/renderer/src/components/native-chat/native-chat-transcript-slots.ts @@ -3,7 +3,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import type { NativeChatTurnStatus } from '../../../../shared/native-chat/transcript/native-chat-turn-status' import { isNativeChatRowInLiveWorkingTurn } from '../../../../shared/native-chat-live-turn-membership' diff --git a/src/renderer/src/components/native-chat/native-chat-transcript-work-runs.ts b/src/renderer/src/components/native-chat/native-chat-transcript-work-runs.ts index 1e3a946331d..c7735d07149 100644 --- a/src/renderer/src/components/native-chat/native-chat-transcript-work-runs.ts +++ b/src/renderer/src/components/native-chat/native-chat-transcript-work-runs.ts @@ -1,6 +1,6 @@ // Combine calls/thoughts after slot selection so every intervening visible row or section boundary ends the run. -import { agentJournalItemSubagentId } from '../../../../shared/agent-session-journal-producer' +import { agentJournalItemSubagentId } from '../../../../shared/agent-session/journal/agent-session-journal-producer' import { nativeChatWorkRunMember, nativeChatWorkRunSpans, diff --git a/src/renderer/src/components/native-chat/native-chat-waiting-partition-budget.test.ts b/src/renderer/src/components/native-chat/native-chat-waiting-partition-budget.test.ts index d5fecdea9fc..2af4e5a82ec 100644 --- a/src/renderer/src/components/native-chat/native-chat-waiting-partition-budget.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-waiting-partition-budget.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, 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 type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { projectNativeChatTranscript } from '../../../../shared/native-chat/transcript/native-chat-transcript-projection' import { nativeChatTurnMembership } from '../../../../shared/native-chat/transcript/native-chat-turn-membership' diff --git a/src/renderer/src/components/native-chat/native-chat-work-run-pairing.test.ts b/src/renderer/src/components/native-chat/native-chat-work-run-pairing.test.ts index 98cc57f8e8c..50f16a25097 100644 --- a/src/renderer/src/components/native-chat/native-chat-work-run-pairing.test.ts +++ b/src/renderer/src/components/native-chat/native-chat-work-run-pairing.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { foldToolMessages } from '../../../../shared/native-chat/tools/native-chat-tool-fold' import { pairToolBlocks } from '../../../../shared/native-chat/tools/native-chat-tool-pairs' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts index 4a310d4c7b4..eb00962d4fb 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts @@ -3,12 +3,12 @@ import type { AgentSessionFailureFact } from '../../../../shared/agent-session-f import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key' import { structuredAgentSessionDeliveryNotices, diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts index d8bd048ba9c..63d2ea080e1 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts @@ -4,9 +4,9 @@ import { type AgentSessionFailureFact } from '../../../../shared/agent-session-failure' import { agentSessionFailureStatedByRow } from '../../../../shared/agent-session-visible-failures' -import { classifyDispatchRejection } from '../../../../shared/structured-agent-session-dispatch-rejection' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import { classifyDispatchRejection } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionRecordedRejectionParts } from '../../../../shared/structured-agent-session-rejection-words' import { structuredAgentSessionRejectedShownInPlace } from '../../../../shared/structured-agent-session-message-projection' import { agentSessionWriteNoticeText } from './agent-session-write-notice-text' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts index 1c1d77e6972..58ca3469c18 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts @@ -1,8 +1,8 @@ // @vitest-environment happy-dom import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' const mocks = vi.hoisted(() => ({ outline: vi.fn(), diff --git a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts index 679944ba394..d08b238d64b 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts @@ -1,11 +1,11 @@ // Return legacy unsent copies to the composer only if the host holds neither message nor card; delete only after durable hand-back. // On the first release on/after 2027-04-01, replace legacy recovery with one-time prefix-key removal. -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalMessageItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/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 '../../../../shared/runtime-client-target' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts index 83d4cf1191c..91ee4fd795f 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts @@ -1,7 +1,7 @@ // @vitest-environment happy-dom import { afterEach, expect, it } from 'vitest' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { clearNativeChatComposerDraftsForTests, readNativeChatComposerDraft, diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts index cbca944a8b0..139f78fb631 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts @@ -1,4 +1,4 @@ -import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store' import { appendNativeChatDraftCache } from './native-chat-draft-cache' import { promptMarkersToImageReferences } from '../../../../shared/native-chat/transcript/native-chat-image-transcript-markers' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts index 8fd622498af..efac81a4a59 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts @@ -4,18 +4,18 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { DISPATCH_REJECTED_CANCELLED, DISPATCH_REJECTED_HOST_RESTARTED -} from '../../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages as projectShared, structuredAgentSessionCommandItemIds } from '../../../../shared/structured-agent-session-message-projection' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts index 40dd51fb301..cd4fde3cb32 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts @@ -2,10 +2,10 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' function optimisticMessage(args: { diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts index 6d9de3acc40..2fbde0116d7 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts @@ -1,7 +1,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' import { projectStructuredAgentSessionMessages as projectMessages } from '../../../../shared/structured-agent-session-message-projection' import { createStructuredQuestionProjection } from '../../../../shared/structured-agent-question-projection' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts index 9b628b3a75f..f371ca60f05 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts @@ -1,6 +1,6 @@ -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' const mocks = vi.hoisted(() => ({ call: vi.fn(), diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts index 98a8b5bbc8a..d49fc8cff6d 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts @@ -1,9 +1,7 @@ // Allow one unanswered send per chat in memory; host rows/cards own admitted messages. Never retry a send or retain it past its deadline. -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionFirstMessage } from '../../../../shared/structured-agent-session-create' import { agentSessionUnconfirmedSendParts, @@ -13,7 +11,7 @@ import type { AgentSessionWriteFailure } from '../../../../shared/agent-session- import { structuredAgentSessionReadCoversSend, structuredAgentSessionSettledSends -} from '../../../../shared/structured-agent-session-send-settlement' +} from '../../../../shared/agent-session/requests/structured-agent-session-send-settlement' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner' import { diff --git a/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts b/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts index 6a01fd64db4..cef34b57cd3 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts @@ -1,7 +1,7 @@ // Keep unanswered sends in memory only for the sender and mounted views. -import type { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' +import type { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' export type StructuredAgentSessionPendingSend = { clientMessageId: string diff --git a/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts index 3667e497290..06dc8b51678 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts @@ -1,8 +1,8 @@ import { nativeChatQueueFollowUps } from '../../../../shared/native-chat-follow-up-behavior' import { describe, expect, it } from 'vitest' -import type { AgentJournalItemBody } from '../../../../shared/agent-session-journal-types' -import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session-journal-schemas' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' +import type { AgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { isAdmissibleAgentJournalItemBody } from '../../../../shared/agent-session/journal/agent-session-journal-schemas' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { structuredAgentSessionQueueRequest, structuredAgentSessionSendQueues, diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-activity.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-activity.ts index 69ce367dee8..d49f88dcb61 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-read-activity.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-read-activity.ts @@ -1,5 +1,5 @@ -import { structuredAgentSessionSettledSends } from '../../../../shared/structured-agent-session-send-settlement' -import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../../shared/structured-agent-session-send-evidence' +import { structuredAgentSessionSettledSends } from '../../../../shared/agent-session/requests/structured-agent-session-send-settlement' +import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../../shared/agent-session/requests/structured-agent-session-send-evidence' import type { StructuredAgentSessionState } from '../../../../shared/structured-agent-session-reducer' import type { StructuredAgentSessionReadOwner } from './structured-agent-session-read-owner-contract' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts index 6633e49383a..bfc1b4ba285 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-read-owner-create.ts @@ -1,4 +1,4 @@ -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentProviderSessionMetadata } from '../../../../shared/agent-session-resume' import { agentProviderSessionsEqual } from '../../../../shared/agent-session-resume' import { diff --git a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts index 60e81867a5c..eadd16544a5 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-read-transport.test.ts @@ -3,8 +3,8 @@ import { EMPTY_STRUCTURED_AGENT_SESSION, reduceStructuredAgentSession } from '../../../../shared/structured-agent-session-reducer' -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' -import type { AgentSessionCurrentRequestsMarker } from '../../../../shared/agent-session-current-requests-wire' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' +import type { AgentSessionCurrentRequestsMarker } from '../../../../shared/agent-session/requests/agent-session-current-requests-wire' import type { AgentSessionHistoryPage, AgentSessionSubscribeEvent @@ -21,7 +21,7 @@ vi.mock('@/runtime/runtime-host-contact-regained', () => ({ subscribeRuntimeHostContactRegained: mocks.watchHostContact })) -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session-current-requests-capability' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../shared/agent-session/requests/agent-session-current-requests-capability' import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result' import { startStructuredAgentSessionReadTransport } from './structured-agent-session-read-transport' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts b/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts index e6a26dac8c4..5e978d09310 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts @@ -1,9 +1,7 @@ // Only agentSession.send mutates; stops during earlier local/read-only work prove the request never went out. -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryResult, AgentSessionMutationResult, @@ -15,13 +13,13 @@ import { agentSessionWriteNotDoneParts } from '../../../../shared/agent-session-refusal-notice' import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy' -import { structuredAgentSessionMessageSendMutation } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionMessageSendMutation } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { structuredAgentSessionBlocksTooLarge } from '../../../../shared/rpc-contract/structured-agent-session-message-params' import { structuredAgentSessionSendEvidence, type StructuredAgentSessionSendAnswer, type StructuredAgentSessionSendEvidence -} from '../../../../shared/structured-agent-session-send-evidence' +} from '../../../../shared/agent-session/requests/structured-agent-session-send-evidence' import { ensureRuntimeEnvironmentCompatible } from '@/runtime/runtime-rpc-client' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-send-runtime.ts b/src/renderer/src/components/native-chat/structured-agent-session-send-runtime.ts index b3c53d993b0..446c3884b60 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-send-runtime.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-send-runtime.ts @@ -1,14 +1,12 @@ -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionWriteNoticeParts, agentSessionWriteNotDoneParts } from '../../../../shared/agent-session-refusal-notice' 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 { dispatchWasWithdrawn } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { agentSessionWriteNoticeText } from './agent-session-write-notice-text' import { getStructuredAgentSessionReadOwner } from './structured-agent-session-read-owner' diff --git a/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts b/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts index d6f4f8e4bb8..a42b9313951 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts @@ -1,9 +1,9 @@ -import type { AgentJournalSkillRef } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSkillRef } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation' import { structuredAgentSessionSendBody, type StructuredAgentSessionAttachment -} from '../../../../shared/structured-agent-session-send-mutation' +} from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { StructuredAgentSessionSendOutcome } from './structured-agent-session-send-runtime' import { createBrowserUuid } from '@/lib/browser-uuid' import { diff --git a/src/renderer/src/components/native-chat/structured-agent-session-sending-queued-cards.ts b/src/renderer/src/components/native-chat/structured-agent-session-sending-queued-cards.ts index f54973c9d57..fa4438496fc 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-sending-queued-cards.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-sending-queued-cards.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { handedOffQueuedMessageIds } from '../../../../shared/structured-agent-session-draft-hand-off' import { queuedMessageCardImages, diff --git a/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts index 582eb2014da..386af408473 100644 --- a/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts +++ b/src/renderer/src/components/native-chat/structured-agent-session-transcript-order.test.ts @@ -3,11 +3,11 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { projectAgentSessionConversationOutline } from '../../../../shared/agent-session/agent-session-conversation-outline' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { createNativeChatMessageListProjection } from './native-chat-message-list-projection' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' diff --git a/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts b/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts index 42b6fce423a..271c40b1b33 100644 --- a/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts +++ b/src/renderer/src/components/native-chat/structured-attention-dispatch.test.ts @@ -6,7 +6,7 @@ import type { FolderWorkspace } from '../../../../shared/folder-workspace-types' import type { GlobalSettings } from '../../../../shared/global-settings-types' import type { AgentSessionTurnCompletion } from '../../../../shared/agent-session-wire' import { agentSessionAttentionKey } from '../../../../shared/agent-session-attention' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection' import { createTestStore, diff --git a/src/renderer/src/components/native-chat/structured-conversation-command-send.ts b/src/renderer/src/components/native-chat/structured-conversation-command-send.ts index 546d1de3536..f395ef580b6 100644 --- a/src/renderer/src/components/native-chat/structured-conversation-command-send.ts +++ b/src/renderer/src/components/native-chat/structured-conversation-command-send.ts @@ -11,7 +11,7 @@ import type { StructuredPromptItem } from '../../../../shared/structured-agent-s import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends' import type { StructuredAgentSessionCommandOutcome, diff --git a/src/renderer/src/components/native-chat/structured-model-refusal.test-fixture.ts b/src/renderer/src/components/native-chat/structured-model-refusal.test-fixture.ts index ae90f2b8c9b..68f822336d5 100644 --- a/src/renderer/src/components/native-chat/structured-model-refusal.test-fixture.ts +++ b/src/renderer/src/components/native-chat/structured-model-refusal.test-fixture.ts @@ -1,5 +1,5 @@ import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../../shared/structured-agent-session-reducer' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' export function modelRefusalReadStates() { diff --git a/src/renderer/src/components/native-chat/structured-queued-edit.test-fixture.tsx b/src/renderer/src/components/native-chat/structured-queued-edit.test-fixture.tsx index 326fd9c807a..24db63343be 100644 --- a/src/renderer/src/components/native-chat/structured-queued-edit.test-fixture.tsx +++ b/src/renderer/src/components/native-chat/structured-queued-edit.test-fixture.tsx @@ -10,14 +10,14 @@ import { toast } from 'sonner' import type * as SonnerModule from 'sonner' import type * as StructuredSessionClient from '@/runtime/structured-agent-session-client' import type * as RendererI18n from '@/i18n/i18n' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageEditHoldParams, AgentSessionQueuedMessageEditHoldResult, AgentSessionQueuedMessageUpdateResult -} from '../../../../shared/agent-session-wire' -import { agentSessionSendBodyFingerprint } from '../../../../shared/structured-agent-session-send-mutation' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { agentSessionSendBodyFingerprint } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { useStructuredAgentSessionQueuedEdit } from './use-structured-agent-session-queued-edit' import { projectQueuedMessageCards } from '../../../../shared/structured-agent-session-queued-cards' import { clearNativeChatDraftCacheForTests } from './native-chat-draft-cache' diff --git a/src/renderer/src/components/native-chat/use-native-chat-availability-notice.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-availability-notice.test.tsx index faa645afa3e..c004c3badfa 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-availability-notice.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-availability-notice.test.tsx @@ -3,8 +3,8 @@ import { cleanup, renderHook } from '@testing-library/react' import { afterEach, describe, expect, it } from 'vitest' import { useNativeChatAvailabilityNotice } from './use-native-chat-availability-notice' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionDeliveryNotices, structuredAgentSessionStartFailureFacts diff --git a/src/renderer/src/components/native-chat/use-native-chat-availability-notice.ts b/src/renderer/src/components/native-chat/use-native-chat-availability-notice.ts index 309351ac6de..e794ab86c96 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-availability-notice.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-availability-notice.ts @@ -5,9 +5,9 @@ import { readAgentSessionFailureFact } from '../../../../shared/agent-session-fa import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentType } from '../../../../shared/agent-status-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { inSendOrder } from '../../../../shared/native-chat/native-chat-send-order' import { agentSessionRefusalReasonWords } from '../../../../shared/agent-session-refusal-reason-words' import type { AgentSessionWriteRefusal } from '../../../../shared/agent-session-write-failure' diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.test.tsx index a66812bccf7..7dd753062dd 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.test.tsx @@ -2,7 +2,7 @@ import { act, renderHook } from '@testing-library/react' import { afterEach, beforeEach, describe, 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 { NATIVE_CHAT_CONTEXT_CLEAR_FADE_MS, useNativeChatContextClearFloor diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.ts b/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.ts index 12bf7da98cb..548a3aa5c58 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-context-clear-floor.ts @@ -1,5 +1,5 @@ import { useEffect, useMemo, useRef, useState } from 'react' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentSessionTranscriptRows, latestAgentSessionContextClearSequence diff --git a/src/renderer/src/components/native-chat/use-native-chat-draft.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-draft.test.tsx index b37bc9818ea..2fdf16bf05a 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-draft.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-draft.test.tsx @@ -2,7 +2,7 @@ import { act, renderHook } from '@testing-library/react' import { afterEach, expect, it } from 'vitest' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { clearNativeChatComposerDraftsForTests, structuredAgentSessionDraftScopeKey diff --git a/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.test.tsx index f8e5053d000..f7aa976eaf9 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.test.tsx @@ -19,7 +19,7 @@ import { nativeChatPastedTextToken } from './native-chat-pasted-text-reference' import { imageReferencesToPromptMarkers } from '../../../../shared/native-chat/transcript/native-chat-image-transcript-markers' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { structuredAgentSessionBlocksTooLarge } from '../../../../shared/rpc-contract/structured-agent-session-message-params' const save = vi.fn(() => new Promise(() => {})) diff --git a/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.ts b/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.ts index 930a04247c5..f759a942602 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-pasted-text-file.ts @@ -10,7 +10,7 @@ import { translate } from '@/i18n/i18n' import { extractIpcErrorMessage } from '@/lib/ipc-error' import { measureUtf8ByteLength } from '../../../../shared/utf8-byte-limits' import { structuredAgentSessionBlocksTooLarge } from '../../../../shared/rpc-contract/structured-agent-session-message-params' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { imageReferencesToPromptMarkers } from '../../../../shared/native-chat/transcript/native-chat-image-transcript-markers' import { nativeChatAttachFailedNotice, diff --git a/src/renderer/src/components/native-chat/use-native-chat-rewind.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-rewind.test.tsx index a97cf1e19ff..30741930570 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-rewind.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-rewind.test.tsx @@ -7,7 +7,7 @@ vi.mock('sonner', () => ({ toast: { error: toastError } })) import { AGENT_SESSION_REWIND_REASONS } from '../../../../shared/agent-session-rewind' import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../../shared/structured-agent-session-reducer' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import { NATIVE_CHAT_REWIND_RESET_TIMEOUT_MS, useNativeChatRewind } from './use-native-chat-rewind' import { nativeChatRowOffersRewind } from './native-chat-rewind-eligibility' diff --git a/src/renderer/src/components/native-chat/use-native-chat-rewind.ts b/src/renderer/src/components/native-chat/use-native-chat-rewind.ts index 5cc94d07205..18551b48b96 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-rewind.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-rewind.ts @@ -30,7 +30,7 @@ import { agentSessionContextFloorSequence, latestAgentSessionContextClearSequence } from '../../../../shared/agent-session-context-clear' -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' /** How long a confirmed rewind waits for its new conversation before letting go. */ export const NATIVE_CHAT_REWIND_RESET_TIMEOUT_MS = 120_000 diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx index 2b48779aef2..a78d6a95734 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx +++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx @@ -1,6 +1,6 @@ // @vitest-environment happy-dom // @vitest-environment happy-dom -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { clearNativeChatComposerDraftsForTests, readNativeChatComposerDraft, diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts index 01e1556ecef..a6e7ed5175d 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts @@ -2,7 +2,7 @@ import { getAgentLabel } from '@/lib/agent-catalog' import { formatAgentTypeLabel } from '../../../../shared/agent-type-label' import { isTuiAgent } from '../../../../shared/tui-agent-config' import { MAX_SKILL_REFS } from '../../../../shared/rpc-contract/structured-agent-session-message-params' -import { SkillRefLimitError } from '../../../../shared/structured-agent-session-send-mutation' +import { SkillRefLimitError } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { promptSkillRefs } from './native-chat-prompt-document' import { useCallback } from 'react' import { completeNativeChatStructuredUserAction } from './native-chat-structured-user-action' diff --git a/src/renderer/src/components/native-chat/use-native-chat-transcript-projection.ts b/src/renderer/src/components/native-chat/use-native-chat-transcript-projection.ts index 9f58818c020..c61ff0eea06 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-transcript-projection.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-transcript-projection.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatSubagentRow } from '../../../../shared/native-chat/transcript/native-chat-transcript-projection' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire' diff --git a/src/renderer/src/components/native-chat/use-native-chat-turn-membership.ts b/src/renderer/src/components/native-chat/use-native-chat-turn-membership.ts index ccda60fc805..8313a49f539 100644 --- a/src/renderer/src/components/native-chat/use-native-chat-turn-membership.ts +++ b/src/renderer/src/components/native-chat/use-native-chat-turn-membership.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire' import { nativeChatTurnMembership } from '../../../../shared/native-chat/transcript/native-chat-turn-membership' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx index 8dd2f63b3ba..f6668ba6196 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx @@ -44,7 +44,7 @@ vi.mock('./use-structured-agent-session-sends', () => ({ }) })) -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionBackgroundTaskState } from '../../../../shared/agent-session/agent-session-background-task-wire' import { useStructuredAgentSession } from './use-structured-agent-session' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx index c32582de4cf..d326a225e5b 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx @@ -4,8 +4,8 @@ import { act, renderHook } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure' import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words' -import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { structuredAgentSessionStartFailureRowIdentity } from '../../../../shared/structured-agent-session-start-failure-row-key' const mocks = vi.hoisted(() => ({ diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx index 29fa9ca64f4..e38ed90d4cf 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx @@ -50,7 +50,7 @@ import type { AgentSessionContextUsage, AgentSessionContextUsed } from '../../../../shared/agent-session-context-usage' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { useStructuredAgentSession } from './use-structured-agent-session' const LOCAL_TARGET = { kind: 'local' } as const diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.ts index 9805865ea40..134d0dda496 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionOptionsResult } from '../../../../shared/agent-session/options/agent-session-options-result' import { selectStructuredAgentContextUsage, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx index fc13d57915c..f50bfed83af 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx @@ -2,8 +2,8 @@ import { cleanup, renderHook } from '@testing-library/react' import { afterEach, expect, it } from 'vitest' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' -import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices' afterEach(cleanup) diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts index d3c03210ea1..990757a1a5e 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts @@ -2,8 +2,8 @@ import { useEffect, useMemo, useRef } from 'react' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { dispatchWasWithdrawn } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' import { structuredAgentSessionCommandItemIds } from '../../../../shared/structured-agent-session-message-projection' import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices' import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx index ffeaaa43179..65d6ae67603 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx @@ -44,8 +44,8 @@ vi.mock('./use-structured-agent-session-read', () => ({ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { useStructuredAgentSession } from './use-structured-agent-session' import { readNativeChatComposerDraft, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx index 670cf961975..96529d7e523 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx @@ -4,9 +4,9 @@ import { afterEach, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' -import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' import { useStructuredAgentSessionMessages } from './use-structured-agent-session-messages' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts index d9592216326..c48958768d8 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx index ef35927ccfd..f53f5135feb 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx @@ -23,7 +23,7 @@ vi.mock('@/runtime/structured-agent-session-client', async (importOriginal) => ( subscribeStructuredAgentSession: mocks.subscribe })) -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire' import { RUNTIME_CAPABILITIES } from '../../../../shared/protocol-version' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx index 6a3eae82210..e980e2142a3 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx @@ -42,7 +42,7 @@ vi.mock('./use-structured-agent-session-sends', () => ({ }) })) -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { useStructuredAgentSession } from './use-structured-agent-session' let items: AgentJournalRenderItem[] = [] diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx index 60142874b00..5a55e6ff644 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx @@ -46,7 +46,7 @@ vi.mock('./use-structured-agent-session-sends', () => ({ }) })) -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { encodeAgentSessionQuestionAnswers } from '../../../../shared/agent-session-question-answer' import { useStructuredAgentSession, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.test.tsx index 9fbe5443056..ee141a9c464 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.test.tsx @@ -27,11 +27,11 @@ import { promptSkillRefs } from './native-chat-prompt-document' import { beforeAll, describe, expect, it, vi } from 'vitest' import { toast } from 'sonner' import type { QueuedEditHostFixtureModule } from '../../../../shared/queued-edit-host.test-fixture' -import { agentSessionSendBodyFingerprint } from '../../../../shared/structured-agent-session-send-mutation' +import { agentSessionSendBodyFingerprint } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageEditHoldResult -} from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { captureInsertionTarget, insertText } from '../dictation/dictation-insertion-target' import { useStructuredAgentSessionQueuedEdit } from './use-structured-agent-session-queued-edit' import { projectQueuedMessageCards } from '../../../../shared/structured-agent-session-queued-cards' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.ts index 5b11631cc7d..f35c519ac71 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-edit.ts @@ -5,8 +5,8 @@ import { queuedEditPublicationKey } from '../../../../shared/queued-message-edit import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from 'react' import { toast } from 'sonner' import { structuredAgentSessionHostKey } from '@/runtime/structured-agent-session-host-capability' -import type { AgentSessionQueuedMessageUpdateResult } from '../../../../shared/agent-session-wire' -import { agentSessionSendBodyFingerprint } from '../../../../shared/structured-agent-session-send-mutation' +import type { AgentSessionQueuedMessageUpdateResult } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { agentSessionSendBodyFingerprint } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { queuedCardOnScreen, queuedEditChangedNotice, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx index d18c4f92a5f..c0eebb1ebc5 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx @@ -8,7 +8,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import type { AgentSessionQueuedMessage, AgentSessionQueuePause -} from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' type ResumeParams = { envelope: { clientOperationId: string } } diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx index 37650de537b..c3abb0b9a5a 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx @@ -8,7 +8,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageDeleteResult -} from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends' const rpc = vi.hoisted(() => vi.fn()) diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts index 8d6af3b95a1..972f520dc89 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts @@ -7,15 +7,15 @@ import { import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { mapSettledWithConcurrency } from '../../../../shared/map-with-concurrency' import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageDeleteResult, AgentSessionQueuedMessagesResumeResult, - AgentSessionQueuePause, - AgentSessionSendResult -} from '../../../../shared/agent-session-wire' + AgentSessionQueuePause +} from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import type { AgentSessionSendResult } from '../../../../shared/agent-session-wire' import { useStructuredAgentSessionQueuedEdit, type QueuedEditTransport, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-reorder.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-reorder.ts index b7f8e01e72a..dd00c049c71 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-reorder.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-reorder.ts @@ -1,7 +1,7 @@ import { useCallback, useRef, useState } from 'react' import { toast } from 'sonner' import { translate } from '@/i18n/i18n' -import type { AgentSessionQueuedMessageMoveResult } from '../../../../shared/agent-session-wire' +import type { AgentSessionQueuedMessageMoveResult } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { structuredAgentSessionHostKey } from '@/runtime/structured-agent-session-host-capability' import type { QueuedMessageCard } from '../../../../shared/structured-agent-session-queued-cards' import type { QueuedEditTransport } from './use-structured-agent-session-queued-edit' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx index 8580ea8c1be..6d771cdf9fb 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.test.tsx @@ -3,7 +3,7 @@ import { act, renderHook, waitFor } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentSessionConversationOutline } from '../../../../shared/agent-session/agent-session-conversation-outline' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' const mocks = vi.hoisted(() => ({ read: vi.fn() })) vi.mock('@/runtime/structured-agent-session-client', () => ({ diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.ts index 510fe1deefa..eafec8deca4 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-rail-outline.ts @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react' import type { AgentSessionConversationOutline } from '../../../../shared/agent-session/agent-session-conversation-outline' -import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' import { agentSessionContextFloorSequence } from '../../../../shared/agent-session-context-clear' import type { StructuredAgentSessionState } from '../../../../shared/structured-agent-session-reducer' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx index e533e7edad7..c976d1aec3b 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-read.test.tsx @@ -4,9 +4,9 @@ import { act, cleanup, renderHook, waitFor } from '@testing-library/react' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalSubmission, - AgentJournalCursor, AgentJournalRenderItem -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' import { AGENT_SESSION_HISTORY_MAX_LIMIT, type AgentSessionHistoryPage, @@ -29,7 +29,7 @@ import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner' -import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../../shared/structured-agent-session-send-evidence' +import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../../shared/agent-session/requests/structured-agent-session-send-evidence' import { STRUCTURED_AGENT_SESSION_CLIENT_COALESCE_MS } from '../../../../shared/agent-session/structured-agent-session-coalescer' import type { StructuredAgentSessionAdmission } from './structured-agent-session-read-owner-contract' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-send-options.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-send-options.ts index b87adbc760b..1918fca8f3b 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-send-options.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-send-options.ts @@ -1,5 +1,5 @@ import { useCallback } from 'react' -import type { StructuredAgentSessionSendControl } from '../../../../shared/structured-agent-session-send-mutation' +import type { StructuredAgentSessionSendControl } from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { structuredAgentSessionMessageSelection, structuredAgentSessionSendSelection diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts index 246dfa13235..fd58dbea3f5 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts @@ -1,15 +1,13 @@ import type { StructuredAgentSessionSendControl, StructuredAgentSessionAttachment -} from '../../../../shared/structured-agent-session-send-mutation' +} from '../../../../shared/agent-session/requests/structured-agent-session-send-mutation' import { useStructuredAgentSessionHostCapabilityState } from '@/runtime/structured-agent-session-host-capability' import { AGENT_SESSION_SEND_SKILLS_RUNTIME_CAPABILITY } from '../../../../shared/agent-session-create-capabilities' import type { StructuredAgentSessionSendRequest } from './structured-agent-session-send-slot' import { useCallback, useEffect, useEffectEvent, useSyncExternalStore } from 'react' -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target' import { structuredAgentSessionQueueRequest, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts index dd09c0dbf61..b9d0847d102 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-start-failure-facts.ts @@ -1,6 +1,6 @@ import { useEffect, useMemo, useRef } from 'react' import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import { sameAgentSessionFailureFact, structuredAgentSessionStartFailureFacts diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx index c85ef0fce0e..c9a4009491f 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.test.tsx @@ -7,7 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends' import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx index 4d0eb304406..eaae967fbb9 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.test.tsx @@ -4,7 +4,7 @@ import { describe, expect, it, vi } from 'vitest' import type { AgentJournalRenderItem, AgentJournalThreadGoal -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { StructuredAgentSessionMutate } from './use-structured-agent-session-mutate' import { useStructuredAgentSessionThreadGoal } from './use-structured-agent-session-thread-goal' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.ts index 29fd13b6f53..cc658f01948 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-thread-goal.ts @@ -2,7 +2,7 @@ import { useCallback, useMemo, useState } from 'react' import type { AgentJournalRenderItem, AgentJournalThreadGoal -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { currentAgentSessionThreadGoal } from '../../../../shared/agent-session/agent-session-thread-goal' import type { AgentSessionOptionsResult } from '../../../../shared/agent-session/options/agent-session-options-result' import type { diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.working.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.working.test.tsx index ee4f18c814e..29f42aa0551 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.working.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session-transport-state.working.test.tsx @@ -4,7 +4,7 @@ import { cleanup, renderHook } from '@testing-library/react' import { afterEach, describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire' import { EMPTY_STRUCTURED_AGENT_SESSION, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx index b3bccd536fb..5b20e101f85 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx @@ -4,7 +4,7 @@ import { act, renderHook } from '@testing-library/react' import { afterEach, beforeEach, 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' const mocks = vi.hoisted(() => ({ call: vi.fn() })) diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx index 0af5841c40a..38e6145945d 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx @@ -7,7 +7,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' const mocks = vi.hoisted(() => ({ call: vi.fn() })) let items: AgentJournalRenderItem[] = [] diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx index c0fcd15ed8c..46776efbd3f 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx @@ -7,10 +7,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices' import type * as RewindModule from './use-structured-agent-session-rewind' import { diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx index 005ca75f916..de250e38672 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx @@ -4,14 +4,14 @@ import { renderHook } from '@testing-library/react' import { beforeEach, expect, it, vi } from 'vitest' -import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' import type { AgentJournalMessageItem, AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire' -import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/structured-agent-session-dispatch-rejection' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' +import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection' let queuedMessages: AgentSessionQueuedMessage[] = [] let submissions: AgentJournalSubmission[] = [] diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx index 762af1d83f7..f6b041db4c0 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx @@ -70,8 +70,8 @@ vi.mock('./use-structured-agent-session-sends', () => ({ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' -import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-queued-message-wire' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session/requests/agent-session-queued-message-wire' import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result' import { useStructuredAgentSession } from './use-structured-agent-session' import { readNativeChatDraftCache, writeNativeChatDraftCache } from './native-chat-draft-cache' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx index 98b753b3810..5a2415b8bef 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx @@ -62,7 +62,7 @@ vi.mock('./use-structured-agent-session-sends', () => ({ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { OPTIONS, FAST_OPTIONS, diff --git a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx index 9628f0923ac..3f1b8ebb9ab 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.test.tsx @@ -6,7 +6,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody } from '../../../../shared/agent-session-turn-record' import { useStructuredAgentTurnTiming } from './use-structured-agent-turn-timing' diff --git a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts index 18ed659db4e..0b5c77d4645 100644 --- a/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts +++ b/src/renderer/src/components/native-chat/use-structured-agent-turn-timing.ts @@ -2,7 +2,7 @@ import { useMemo, useState } from 'react' import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../../../shared/agent-session-journal-types' +} from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { NativeChatSettledTurns } from '../../../../shared/native-chat/transcript/native-chat-turn-status' import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire' import type { StructuredAgentHostClock } from '../../../../shared/structured-agent-session-reducer' diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts index d9c7bc806b3..f42ae2894d4 100644 --- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts +++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts @@ -1,9 +1,7 @@ import type { AgentSessionWriteFailure } from '../../../../../shared/agent-session-write-failure' import type { AgentSessionHistoryResult } from '../../../../../shared/agent-session-wire' -import type { - AgentJournalCursor, - AgentJournalSubmission -} from '../../../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../../../shared/agent-session-journal-identity' +import type { AgentJournalSubmission } from '../../../../../shared/agent-session/journal/agent-session-journal-types' import { launchStructuredAgentSession, type StructuredLaunchHostSeedListener diff --git a/src/renderer/src/lib/structured-agent-session-launch-create-message.test-fixture.ts b/src/renderer/src/lib/structured-agent-session-launch-create-message.test-fixture.ts index 564c01e15b4..6ce078841c9 100644 --- a/src/renderer/src/lib/structured-agent-session-launch-create-message.test-fixture.ts +++ b/src/renderer/src/lib/structured-agent-session-launch-create-message.test-fixture.ts @@ -1,7 +1,7 @@ // @vitest-environment happy-dom import { vi, type Mock } from 'vitest' import type { ExecutionHostId } from '../../../shared/execution-host' -import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage } from '../../../shared/agent-session-wire' import { CreateIntentParams, diff --git a/src/renderer/src/lib/structured-agent-session-launch-prompt.ts b/src/renderer/src/lib/structured-agent-session-launch-prompt.ts index 428f9df5fd0..2ad773d56e2 100644 --- a/src/renderer/src/lib/structured-agent-session-launch-prompt.ts +++ b/src/renderer/src/lib/structured-agent-session-launch-prompt.ts @@ -1,4 +1,4 @@ -import { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation' +import { structuredAgentSessionSendBody } from '../../../shared/agent-session/requests/structured-agent-session-send-mutation' import type { StructuredAgentLaunchReceipt } from './agent-session/launch/structured-agent-session-launch-recovery' import type { StructuredAgentSessionFirstMessage } from '../../../shared/structured-agent-session-create' import { StructuredAgentSessionCreateRefusalError } from './structured-agent-session-launch-errors' diff --git a/src/renderer/src/runtime/structured-agent-session-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts index e3ecb9b31e9..dde27e00f39 100644 --- a/src/renderer/src/runtime/structured-agent-session-client.ts +++ b/src/renderer/src/runtime/structured-agent-session-client.ts @@ -1,7 +1,5 @@ -import type { - AgentJournalCursor, - AgentJournalRenderItem -} from '../../../shared/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../shared/agent-session-journal-identity' +import type { AgentJournalRenderItem } from '../../../shared/agent-session/journal/agent-session-journal-types' import type { AgentSessionStatusEvent, AgentSessionSubscribeEvent, diff --git a/src/shared/agent-journal-tool-call-lifecycle.ts b/src/shared/agent-journal-tool-call-lifecycle.ts index 66f1d115045..f7d96061e2a 100644 --- a/src/shared/agent-journal-tool-call-lifecycle.ts +++ b/src/shared/agent-journal-tool-call-lifecycle.ts @@ -5,7 +5,7 @@ import type { AgentJournalToolCallItem, AgentJournalToolCallState, AgentJournalTurnLifecycleState -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' export type AgentJournalToolCallLifecycle = AgentJournalToolCallState | 'interrupted' diff --git a/src/shared/agent-session-approval-blocked-path.ts b/src/shared/agent-session-approval-blocked-path.ts index c7f31041627..9efbfd3e82e 100644 --- a/src/shared/agent-session-approval-blocked-path.ts +++ b/src/shared/agent-session-approval-blocked-path.ts @@ -1,5 +1,5 @@ import { isPlanApprovalSubject } from './agent-session-approval-subject' -import type { AgentJournalApprovalSubject } from './agent-session-journal-types' +import type { AgentJournalApprovalSubject } from './agent-session/journal/agent-session-journal-types' export type ApprovalCardText = { blockedPath?: string diff --git a/src/shared/agent-session-approval-subject.test.ts b/src/shared/agent-session-approval-subject.test.ts index 999bca464f0..ab4a1d08a37 100644 --- a/src/shared/agent-session-approval-subject.test.ts +++ b/src/shared/agent-session-approval-subject.test.ts @@ -4,11 +4,11 @@ import { isNewerApprovalSubject, pendingPromptsAllUnanswerableHere } from './agent-session-approval-subject' -import type { AgentJournalItemBody } from './agent-session-journal-types' +import type { AgentJournalItemBody } from './agent-session/journal/agent-session-journal-types' import { AGENT_JOURNAL_APPROVAL_SUBJECT_KINDS, isAdmissibleAgentJournalItemBody -} from './agent-session-journal-schemas' +} from './agent-session/journal/agent-session-journal-schemas' it('draws exactly the subject kinds the journal schema knows', () => { expect([...DRAWN_APPROVAL_SUBJECT_KINDS].sort()).toEqual( diff --git a/src/shared/agent-session-approval-subject.ts b/src/shared/agent-session-approval-subject.ts index 2901ad19961..700321da147 100644 --- a/src/shared/agent-session-approval-subject.ts +++ b/src/shared/agent-session-approval-subject.ts @@ -4,7 +4,7 @@ import type { AgentJournalApprovalSubject, AgentJournalItemBody, AgentJournalPlanApprovalSubject -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' /** Schema-independent readers share this supported-kind set; a test keeps it aligned with the schema. */ export const DRAWN_APPROVAL_SUBJECT_KINDS: ReadonlySet = new Set(['plan']) diff --git a/src/shared/agent-session-attention.ts b/src/shared/agent-session-attention.ts index dbd24f3ea38..bc38aac3412 100644 --- a/src/shared/agent-session-attention.ts +++ b/src/shared/agent-session-attention.ts @@ -5,7 +5,7 @@ import { isAgentSessionExecutionLocation, type AgentSessionExecutionLocation } from './agent-session-record' -import type { AgentJournalCursor } from './agent-session-journal-types' +import type { AgentJournalCursor } from './agent-session-journal-identity' import type { AgentSessionTurnCompletionEvent } from './agent-session-wire' import { AGENT_JOURNAL_TURN_OUTCOMES, type AgentJournalTurnOutcome } from './agent-turn-outcome' diff --git a/src/shared/agent-session-context-clear.test.ts b/src/shared/agent-session-context-clear.test.ts index 5d3a64b8aab..6150d978feb 100644 --- a/src/shared/agent-session-context-clear.test.ts +++ b/src/shared/agent-session-context-clear.test.ts @@ -4,7 +4,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalThreadGoal -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { agentSessionCurrentContextRows, agentSessionHasOlderTranscript, diff --git a/src/shared/agent-session-context-clear.ts b/src/shared/agent-session-context-clear.ts index 5590c4ac292..a9b0bbe4ab0 100644 --- a/src/shared/agent-session-context-clear.ts +++ b/src/shared/agent-session-context-clear.ts @@ -1,9 +1,9 @@ +import type { AgentJournalCursor } from './agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { isAgentSessionProviderContextBoundary } from './agent-session-provider-context' import type { NativeChatMessage } from './native-chat/native-chat-types' diff --git a/src/shared/agent-session-failure-words.test.ts b/src/shared/agent-session-failure-words.test.ts index cc2a3c5d042..27bd340b214 100644 --- a/src/shared/agent-session-failure-words.test.ts +++ b/src/shared/agent-session-failure-words.test.ts @@ -19,7 +19,7 @@ import { DISPATCH_REJECTED_CODEX_QUEUE_FULL, DISPATCH_REJECTED_QUEUE_FULL, DISPATCH_REJECTED_WRITE_FAILED -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' /** What Orca's own text looks like: a code or marker, a uuid, a path, an exception. */ const ORCA_INTERNAL = /\b[a-z]+_[a-z_]+\b|[0-9a-f]{8}-[0-9a-f]{4}-|[/\\][\w.-]+[/\\]|Error:|ENOENT/ diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts index dc3edbd6e3a..b0a0914c40a 100644 --- a/src/shared/agent-session-failure-words.ts +++ b/src/shared/agent-session-failure-words.ts @@ -32,7 +32,7 @@ import { DISPATCH_REJECTED_CODEX_QUEUE_FULL, DISPATCH_REJECTED_QUEUE_FULL, DISPATCH_REJECTED_WRITE_FAILED -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' declare const failureSentence: unique symbol diff --git a/src/shared/agent-session-frame-fields.ts b/src/shared/agent-session-frame-fields.ts index 2627876cab2..02c7e03ec36 100644 --- a/src/shared/agent-session-frame-fields.ts +++ b/src/shared/agent-session-frame-fields.ts @@ -1,5 +1,5 @@ -import type { AgentSessionCurrentRequestsMarker } from './agent-session-current-requests-wire' -import type { AgentSessionQueuePublicationFields } from './agent-session-queued-message-wire' +import type { AgentSessionCurrentRequestsMarker } from './agent-session/requests/agent-session-current-requests-wire' +import type { AgentSessionQueuePublicationFields } from './agent-session/requests/agent-session-queued-message-wire' /** Published-frame host wall clock (epoch ms per AgentSessionHistoryPage) and queuedMessages companions. */ export type AgentSessionFrameFields = { diff --git a/src/shared/agent-session-hook-outcome.ts b/src/shared/agent-session-hook-outcome.ts index 957340efb76..36e8e99fab4 100644 --- a/src/shared/agent-session-hook-outcome.ts +++ b/src/shared/agent-session-hook-outcome.ts @@ -1,6 +1,6 @@ // Keep blocked/stopped prompt hooks as visible rows using the hook's reason, consistently across agents. -import type { AgentJournalPlainStatusItem } from './agent-session-journal-types' +import type { AgentJournalPlainStatusItem } from './agent-session/journal/agent-session-journal-types' import { AGENT_SESSION_TURN_NOTICE_PRESENTATION } from './agent-session-turn-notice' export type AgentSessionHookOutcome = 'blocked' | 'stopped' diff --git a/src/shared/agent-session-host-status-rows.ts b/src/shared/agent-session-host-status-rows.ts index 91b07e2fa0a..f88bcfe46dc 100644 --- a/src/shared/agent-session-host-status-rows.ts +++ b/src/shared/agent-session-host-status-rows.ts @@ -1,6 +1,6 @@ // Keep English text for legacy clients and presentation keys for translated host status rows. -import type { AgentJournalPlainStatusItem } from './agent-session-journal-types' +import type { AgentJournalPlainStatusItem } from './agent-session/journal/agent-session-journal-types' export const AGENT_SESSION_HOST_STATUS_COPY = { /** A repair skipped rows it could not read. */ diff --git a/src/shared/agent-session-native-content.ts b/src/shared/agent-session-native-content.ts index a52a49118a5..b1a2e00f2ff 100644 --- a/src/shared/agent-session-native-content.ts +++ b/src/shared/agent-session-native-content.ts @@ -1,4 +1,4 @@ -import type { AgentJournalItemBody } from './agent-session-journal-types' +import type { AgentJournalItemBody } from './agent-session/journal/agent-session-journal-types' export function isNativeConversationMessage(body: AgentJournalItemBody): boolean { return body.kind === 'message' && (body.role === 'user' || body.role === 'assistant') diff --git a/src/shared/agent-session-provider-handle-encoding.ts b/src/shared/agent-session-provider-handle-encoding.ts index d2964a94b1d..dc498e3b4b4 100644 --- a/src/shared/agent-session-provider-handle-encoding.ts +++ b/src/shared/agent-session-provider-handle-encoding.ts @@ -7,7 +7,7 @@ import type { import type { AgentSessionJournalIdentity, AgentSessionJournalProviderHandle -} from './agent-session-journal-types' +} from './agent-session-journal-identity' export const CLAUDE_STRUCTURED_HANDLE_NAMESPACE = { transport: 'claude-sdk', diff --git a/src/shared/agent-session-question-answer.ts b/src/shared/agent-session-question-answer.ts index 3d31e3c40b1..a8523cc4010 100644 --- a/src/shared/agent-session-question-answer.ts +++ b/src/shared/agent-session-question-answer.ts @@ -1,4 +1,7 @@ -import type { AgentJournalQuestion, AgentJournalQuestionItem } from './agent-session-journal-types' +import type { + AgentJournalQuestion, + AgentJournalQuestionItem +} from './agent-session/journal/agent-session-journal-types' const GROUP_ANSWER_PREFIX = 'question-group:' diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts index 2b6c2740d36..418c3e40999 100644 --- a/src/shared/agent-session-refusal-details.ts +++ b/src/shared/agent-session-refusal-details.ts @@ -1,7 +1,7 @@ // Codes span situations with different next steps (cleared chat versus busy command). Name only a listed reason; otherwise omit it for the code fallback, as older hosts do. import type { AgentSessionAccountKind } from './agent-session-availability' -import type { AgentJournalResolution } from './agent-session-journal-types' +import type { AgentJournalResolution } from './agent-session/journal/agent-session-journal-types' import { readAgentCliInstallationProblem, type AgentCliInstallationProblem @@ -14,7 +14,7 @@ import { readAgentSessionArgumentProblem, type AgentSessionArgumentProblem } from './agent-session/agent-session-argument-problem' -import { isAgentJournalResolution } from './agent-session-journal-schemas' +import { isAgentJournalResolution } from './agent-session/journal/agent-session-journal-schemas' import { AGENT_SESSION_REWIND_REASONS, type AgentSessionRewindReason } from './agent-session-rewind' import type { TuiAgent } from './tui-agent' import { TUI_AGENT_DISPLAY_NAMES } from './tui-agent-display-names' diff --git a/src/shared/agent-session-refusal-notice.test.ts b/src/shared/agent-session-refusal-notice.test.ts index de742ea4b6d..b7b8c2be7be 100644 --- a/src/shared/agent-session-refusal-notice.test.ts +++ b/src/shared/agent-session-refusal-notice.test.ts @@ -31,7 +31,7 @@ import { DISPATCH_REJECTED_NOT_DELIVERED, DISPATCH_REJECTED_QUEUE_FULL, DISPATCH_REJECTED_WRITE_FAILED -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' import { structuredAgentSessionRejectionParts } from './structured-agent-session-rejection-words' const WRITES: AgentSessionWriteKind[] = [ diff --git a/src/shared/agent-session-resume-marker.ts b/src/shared/agent-session-resume-marker.ts index 61b6a586a9e..4d57a4240d6 100644 --- a/src/shared/agent-session-resume-marker.ts +++ b/src/shared/agent-session-resume-marker.ts @@ -10,7 +10,7 @@ import { AGENT_SESSION_RESTART_ACTIVITY_MAX_TASKS } from './agent-session-restart-activity' import type { AgentSessionRestartActivity } from './agent-session-restart-activity' -import type { AgentJournalCursor } from './agent-session-journal-types' +import type { AgentJournalCursor } from './agent-session-journal-identity' /** Why the app went away. Recorded because an update install is a restart the user did not choose, * and the surface that offers the resume says so. */ diff --git a/src/shared/agent-session-rewind.ts b/src/shared/agent-session-rewind.ts index 81a8a69185f..0341ca3d50a 100644 --- a/src/shared/agent-session-rewind.ts +++ b/src/shared/agent-session-rewind.ts @@ -3,13 +3,16 @@ import { AgentJournalItemBodySchema, AgentJournalProducerLinkageFields, AgentJournalTurnScopeSchema -} from './agent-session-journal-schemas' +} from './agent-session/journal/agent-session-journal-schemas' import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from './agent-session-journal-item-key' -import { isQueuedAgentJournalSubmission } from './agent-session-queued-submission' -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-item-key' +import { isQueuedAgentJournalSubmission } from './agent-session/requests/agent-session-queued-submission' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' import type { AgentSessionMutationEnvelope } from './agent-session-wire' export const AGENT_SESSION_REWIND_REASONS = [ diff --git a/src/shared/agent-session-runtime-capabilities.ts b/src/shared/agent-session-runtime-capabilities.ts index 0a70338bc5c..0a3f57c9d6d 100644 --- a/src/shared/agent-session-runtime-capabilities.ts +++ b/src/shared/agent-session-runtime-capabilities.ts @@ -2,7 +2,7 @@ import { AGENT_SESSION_ATTENTION_RUNTIME_CAPABILITIES } from './agent-session-at import { AGENT_SESSION_BACKGROUND_TASK_CHILD_VIEWS_CAPABILITY } from './agent-session-background-task-child-views-capability' import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from './agent-session-continue-interrupted-capability' import { AGENT_SESSION_CREATE_RUNTIME_CAPABILITIES } from './agent-session-create-capabilities' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session/requests/agent-session-current-requests-capability' import { AGENT_SESSION_PERMISSION_MODES_RUNTIME_CAPABILITY } from './agent-session-permission-modes-capability' import { AGENT_SESSION_RESUME_RUNTIME_CAPABILITIES } from './agent-session-resume-runtime-capabilities' import { AGENT_SESSION_STOP_RUNTIME_CAPABILITIES } from './agent-session-stop-capabilities' diff --git a/src/shared/agent-session-stopped-history.test.ts b/src/shared/agent-session-stopped-history.test.ts index df6f8a2f326..b68a3e840a4 100644 --- a/src/shared/agent-session-stopped-history.test.ts +++ b/src/shared/agent-session-stopped-history.test.ts @@ -7,7 +7,7 @@ import type { AgentJournalItemBody, AgentJournalMessageItem, AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { MAX_PROMPT_BYTES } from './rpc-contract/structured-agent-session-message-params' import { agentSessionStoppedHistoryOwed, diff --git a/src/shared/agent-session-stopped-history.ts b/src/shared/agent-session-stopped-history.ts index f4fe378458a..9fc51711063 100644 --- a/src/shared/agent-session-stopped-history.ts +++ b/src/shared/agent-session-stopped-history.ts @@ -5,11 +5,11 @@ import type { AgentJournalItemBody, AgentJournalMessageItem, AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { classifyDispatchRejection, dispatchWasWithdrawn -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' import { MAX_PROMPT_BYTES } from './rpc-contract/structured-agent-session-message-params' /** The record Claude writes for its own Stop, carried after each stopped message. */ diff --git a/src/shared/agent-session-turn-completion-wire.ts b/src/shared/agent-session-turn-completion-wire.ts index 59bcb039ffb..dfa04110a21 100644 --- a/src/shared/agent-session-turn-completion-wire.ts +++ b/src/shared/agent-session-turn-completion-wire.ts @@ -1,4 +1,5 @@ -import type { AgentJournalCursor, AgentJournalTurnOutcome } from './agent-session-journal-types' +import type { AgentJournalCursor } from './agent-session-journal-identity' +import type { AgentJournalTurnOutcome } from './agent-turn-outcome' import type { AgentSessionExecutionLocation } from './agent-session-record' // Turn completion feed: the per-turn EDGE beside the status feed's STATE. diff --git a/src/shared/agent-session-turn-record.test.ts b/src/shared/agent-session-turn-record.test.ts index 96ec29fad22..3b538c769d9 100644 --- a/src/shared/agent-session-turn-record.test.ts +++ b/src/shared/agent-session-turn-record.test.ts @@ -3,7 +3,7 @@ import { AGENT_SESSION_JOURNAL_SCHEMA_VERSION, journalRowSchemaVersion, type AgentJournalTurnLifecycle -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody, isRunningAgentJournalTurn, diff --git a/src/shared/agent-session-turn-record.ts b/src/shared/agent-session-turn-record.ts index 2ba64f4b53e..d8eb32adbeb 100644 --- a/src/shared/agent-session-turn-record.ts +++ b/src/shared/agent-session-turn-record.ts @@ -1,13 +1,12 @@ // Read both current turn items and legacy turnLifecycle status rows still sent to older clients. -import { - AGENT_JOURNAL_TURN_OUTCOMES, - type AgentJournalItemBody, - type AgentJournalStatusItem, - type AgentJournalTurnItem, - type AgentJournalTurnLifecycle, - type AgentJournalTurnOutcome -} from './agent-session-journal-types' +import { AGENT_JOURNAL_TURN_OUTCOMES, type AgentJournalTurnOutcome } from './agent-turn-outcome' +import type { + AgentJournalItemBody, + AgentJournalStatusItem, + AgentJournalTurnItem, + AgentJournalTurnLifecycle +} from './agent-session/journal/agent-session-journal-types' import { isAdmissibleAgentSessionContextUsage } from './agent-session-context-usage-schema' import { agentTurnLifecycleText } from './agent-turn-lifecycle-text' import { tuiAgentDisplayName } from './tui-agent-display-names' diff --git a/src/shared/agent-session-visible-failures.ts b/src/shared/agent-session-visible-failures.ts index 23460d0d07f..986ec4f8bc0 100644 --- a/src/shared/agent-session-visible-failures.ts +++ b/src/shared/agent-session-visible-failures.ts @@ -2,7 +2,7 @@ import { readWholeAgentSessionFailureFact, type AgentSessionFailureFact } from './agent-session-failure' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { isStructuredAgentSessionStartFailureRow } from './structured-agent-session-start-failure-row-key' /** Loaded startup causes and authentication explanations already visible in the transcript. */ diff --git a/src/shared/agent-session-wire-refusals.test.ts b/src/shared/agent-session-wire-refusals.test.ts index d6c29d9e74a..3233a614790 100644 --- a/src/shared/agent-session-wire-refusals.test.ts +++ b/src/shared/agent-session-wire-refusals.test.ts @@ -9,7 +9,7 @@ import { withAgentSessionRefusalFacts, type AgentSessionWireRefusal } from './agent-session-wire-refusals' -import type { AgentJournalResolution } from './agent-session-journal-types' +import type { AgentJournalResolution } from './agent-session/journal/agent-session-journal-types' const RESOLUTION: AgentJournalResolution = { state: 'resolved', diff --git a/src/shared/agent-session-wire.ts b/src/shared/agent-session-wire.ts index a03aafc7ce3..72ab2defb66 100644 --- a/src/shared/agent-session-wire.ts +++ b/src/shared/agent-session-wire.ts @@ -1,6 +1,6 @@ import type { AgentSessionUnavailable } from './agent-session-availability' import type { AgentSessionFrameFields } from './agent-session-frame-fields' -import type { AgentSessionCurrentWorkFields } from './agent-session-current-work-wire' +import type { AgentSessionCurrentWorkFields } from './agent-session/requests/agent-session-current-work-wire' import type { AgentSessionBackgroundTask, AgentSessionBackgroundTaskState @@ -11,21 +11,20 @@ import type { AgentChildWorkView } from './agent-status-child-work-view' import type { AgentSessionQueuedMessage, AgentSessionQueuePause -} from './agent-session-queued-message-wire' +} from './agent-session/requests/agent-session-queued-message-wire' export * from './agent-session-wire-refusals' -export * from './agent-session-queued-message-wire' export * from './agent-session-turn-completion-wire' // Use plain JSON and optional additions after structured.v1; hosts/clients update independently (docs/reference/remote-wire-compatibility.md). +import type { AgentJournalCursor } from './agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalRenderItem, AgentJournalResetReason, AgentJournalResolution, AgentJournalSubmission, AgentJournalTurnLifecycle -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import type { AgentTurnOutcome } from './agent-turn-outcome' import type { AgentSessionRecord } from './agent-session-record' import type { AgentProviderSessionMetadata } from './agent-session-resume' diff --git a/src/shared/agent-session/agent-session-compaction.ts b/src/shared/agent-session/agent-session-compaction.ts index ec27b815a3b..d7626e07e65 100644 --- a/src/shared/agent-session/agent-session-compaction.ts +++ b/src/shared/agent-session/agent-session-compaction.ts @@ -1,4 +1,4 @@ -import { parseAgentJournalItemKey } from '../agent-session-journal-item-key' +import { parseAgentJournalItemKey } from './journal/agent-session-journal-item-key' import { spelledProviderTimelineItemKey } from '../provider-timeline-item-key' export const AGENT_SESSION_COMPACTION_SKIPPED_PRESENTATION = 'compaction-skipped' diff --git a/src/shared/agent-session/agent-session-conversation-outline.ts b/src/shared/agent-session/agent-session-conversation-outline.ts index c3f480f0c27..0d9d19df0c4 100644 --- a/src/shared/agent-session/agent-session-conversation-outline.ts +++ b/src/shared/agent-session/agent-session-conversation-outline.ts @@ -1,18 +1,18 @@ // Project every journal user row, including unloaded pages, with the transcript projection so rail identity, order and preview cannot disagree. +import type { AgentJournalCursor } from '../agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalRenderItem, AgentJournalSubmission -} from '../agent-session-journal-types' +} from './journal/agent-session-journal-types' import type { NativeChatBlock, NativeChatMessage } from '../native-chat/native-chat-types' import { deriveNativeChatRowContent, nativeChatRowRendersContent } from '../native-chat/transcript/native-chat-row-content' import { iterateProcessOutputLines } from '../process-output-field-scanner' -import { agentJournalSubmissionKey } from '../agent-session-journal-item-key' -import { dispatchWasWithdrawn } from '../structured-agent-session-dispatch-rejection' +import { agentJournalSubmissionKey } from './journal/agent-session-journal-item-key' +import { dispatchWasWithdrawn } from './requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages } from '../structured-agent-session-message-projection' import { projectNativeChatTranscriptMessages } from '../native-chat/transcript/native-chat-transcript-projection' import { nativeChatTurnMembership } from '../native-chat/transcript/native-chat-turn-membership' diff --git a/src/shared/agent-session/agent-session-thread-goal.test.ts b/src/shared/agent-session/agent-session-thread-goal.test.ts index fc985d4a13a..a7626803788 100644 --- a/src/shared/agent-session/agent-session-thread-goal.test.ts +++ b/src/shared/agent-session/agent-session-thread-goal.test.ts @@ -3,7 +3,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalThreadGoal -} from '../agent-session-journal-types' +} from './journal/agent-session-journal-types' import { agentSessionThreadGoalElapsedSeconds, agentSessionThreadGoalStatusChange, diff --git a/src/shared/agent-session/agent-session-thread-goal.ts b/src/shared/agent-session/agent-session-thread-goal.ts index f57f908da8f..1998ab97eac 100644 --- a/src/shared/agent-session/agent-session-thread-goal.ts +++ b/src/shared/agent-session/agent-session-thread-goal.ts @@ -1,6 +1,6 @@ // Derive the current goal solely from the latest journal transition. -import { isRootAgentJournalItem } from '../agent-session-journal-producer' +import { isRootAgentJournalItem } from './journal/agent-session-journal-producer' import { isAgentSessionContextClear } from '../agent-session-context-clear' import { AGENT_JOURNAL_THREAD_GOAL_STATUSES, @@ -8,7 +8,7 @@ import { type AgentJournalRenderItem, type AgentJournalThreadGoal, type AgentJournalThreadGoalStatus -} from '../agent-session-journal-types' +} from './journal/agent-session-journal-types' const GOAL_FRAME_KINDS = new Set([ 'notification:thread/goal/updated', diff --git a/src/shared/agent-session/journal/agent-session-journal-body-admission.test.ts b/src/shared/agent-session/journal/agent-session-journal-body-admission.test.ts index 0d006e87d33..d5edff6dc85 100644 --- a/src/shared/agent-session/journal/agent-session-journal-body-admission.test.ts +++ b/src/shared/agent-session/journal/agent-session-journal-body-admission.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import { readAgentJournalItemBody, readAgentJournalMessageBody -} from '../../agent-session-journal-body-admission' +} from './agent-session-journal-body-admission' const RESOLUTION = { state: 'pending', selectedOptionId: null, resolvedBy: null, resolvedAt: null } const QUESTION_ENTRY = { diff --git a/src/shared/agent-session-journal-body-admission.ts b/src/shared/agent-session/journal/agent-session-journal-body-admission.ts similarity index 100% rename from src/shared/agent-session-journal-body-admission.ts rename to src/shared/agent-session/journal/agent-session-journal-body-admission.ts diff --git a/src/shared/agent-session-journal-item-key.ts b/src/shared/agent-session/journal/agent-session-journal-item-key.ts similarity index 98% rename from src/shared/agent-session-journal-item-key.ts rename to src/shared/agent-session/journal/agent-session-journal-item-key.ts index 8a41000bbd1..2132797b5d6 100644 --- a/src/shared/agent-session-journal-item-key.ts +++ b/src/shared/agent-session/journal/agent-session-journal-item-key.ts @@ -1,6 +1,6 @@ // Share stable upsert/optimistic-send keys; percent-encode components before joining to prevent delimiter collisions. -import type { AgentJournalItemIdentity } from './agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../agent-session-journal-identity' const KEY_DELIMITER = ':' const VERBATIM_BOUNDED_COMPONENT_TAG = '%FF' diff --git a/src/shared/agent-session-journal-open-union.ts b/src/shared/agent-session/journal/agent-session-journal-open-union.ts similarity index 100% rename from src/shared/agent-session-journal-open-union.ts rename to src/shared/agent-session/journal/agent-session-journal-open-union.ts diff --git a/src/shared/agent-session-journal-position.ts b/src/shared/agent-session/journal/agent-session-journal-position.ts similarity index 94% rename from src/shared/agent-session-journal-position.ts rename to src/shared/agent-session/journal/agent-session-journal-position.ts index 8c804b4a8ac..bf38d3d6c0e 100644 --- a/src/shared/agent-session-journal-position.ts +++ b/src/shared/agent-session/journal/agent-session-journal-position.ts @@ -1,7 +1,7 @@ // Order by creation sequence then write index, never time: crash recovery can append an earlier provider clock at a later sequence. import type { AgentJournalPosition, AgentJournalRenderItem } from './agent-session-journal-types' -import type { NativeChatMessage } from './native-chat/native-chat-types' +import type { NativeChatMessage } from '../../native-chat/native-chat-types' type PositionedItem = Pick diff --git a/src/shared/agent-session/journal/agent-session-journal-producer.test.ts b/src/shared/agent-session/journal/agent-session-journal-producer.test.ts index fd92654703b..0ecda0bea52 100644 --- a/src/shared/agent-session/journal/agent-session-journal-producer.test.ts +++ b/src/shared/agent-session/journal/agent-session-journal-producer.test.ts @@ -1,8 +1,5 @@ import { describe, expect, it } from 'vitest' -import { - agentJournalLinkageFields, - isRootAgentJournalItem -} from '../../agent-session-journal-producer' +import { agentJournalLinkageFields, isRootAgentJournalItem } from './agent-session-journal-producer' describe('isRootAgentJournalItem', () => { it('reads an id that failed to resolve as a subagent’s, not as root', () => { diff --git a/src/shared/agent-session-journal-producer.ts b/src/shared/agent-session/journal/agent-session-journal-producer.ts similarity index 100% rename from src/shared/agent-session-journal-producer.ts rename to src/shared/agent-session/journal/agent-session-journal-producer.ts diff --git a/src/shared/agent-session-journal-schemas.test.ts b/src/shared/agent-session/journal/agent-session-journal-schemas.test.ts similarity index 100% rename from src/shared/agent-session-journal-schemas.test.ts rename to src/shared/agent-session/journal/agent-session-journal-schemas.test.ts diff --git a/src/shared/agent-session-journal-schemas.ts b/src/shared/agent-session/journal/agent-session-journal-schemas.ts similarity index 98% rename from src/shared/agent-session-journal-schemas.ts rename to src/shared/agent-session/journal/agent-session-journal-schemas.ts index 22a77fecac5..2213a457837 100644 --- a/src/shared/agent-session-journal-schemas.ts +++ b/src/shared/agent-session/journal/agent-session-journal-schemas.ts @@ -6,9 +6,9 @@ // History pages lack row v: extensions must also remain safe for older clients. import { z } from 'zod' -import { AgentSessionContextUsageSchema } from './agent-session-context-usage-schema' +import { AgentSessionContextUsageSchema } from '../../agent-session-context-usage-schema' import { AgentJournalThreadGoalStateSchema } from './agent-session-journal-thread-goal-schema' -import { AgentSessionFailureFactSchema } from './agent-session-failure-fact-schema' +import { AgentSessionFailureFactSchema } from '../../agent-session-failure-fact-schema' import { knownTags, openDiscriminatedUnion } from './agent-session-journal-open-union' import type { AgentJournalItemBody, diff --git a/src/shared/agent-session-journal-submission-schema.spec.ts b/src/shared/agent-session/journal/agent-session-journal-submission-schema.spec.ts similarity index 100% rename from src/shared/agent-session-journal-submission-schema.spec.ts rename to src/shared/agent-session/journal/agent-session-journal-submission-schema.spec.ts diff --git a/src/shared/agent-session-journal-submission-schema.ts b/src/shared/agent-session/journal/agent-session-journal-submission-schema.ts similarity index 85% rename from src/shared/agent-session-journal-submission-schema.ts rename to src/shared/agent-session/journal/agent-session-journal-submission-schema.ts index da2e227383e..3ac9f0fc058 100644 --- a/src/shared/agent-session-journal-submission-schema.ts +++ b/src/shared/agent-session/journal/agent-session-journal-submission-schema.ts @@ -1,10 +1,10 @@ // Deep-validate dispatch submissions with open string vocabularies, as in agent-session-journal-schemas.ts. import { z } from 'zod' -import { AgentJournalAnsweredTurnSchema } from './agent-session-answered-turn-schema' -import { AgentSessionFailureFactSchema } from './agent-session-failure-fact-schema' +import { AgentJournalAnsweredTurnSchema } from '../../agent-session-answered-turn-schema' +import { AgentSessionFailureFactSchema } from '../../agent-session-failure-fact-schema' import type { AgentJournalSubmission } from './agent-session-journal-types' -import { AgentSessionExecutionOptionsSchema } from './agent-session/options/agent-session-execution-options' +import { AgentSessionExecutionOptionsSchema } from '../options/agent-session-execution-options' // Every persisted field is listed, or a parse strips it: this schema drops unknown keys. export const AgentJournalSubmissionSchema = z.object({ diff --git a/src/shared/agent-session-journal-thread-goal-schema.ts b/src/shared/agent-session/journal/agent-session-journal-thread-goal-schema.ts similarity index 100% rename from src/shared/agent-session-journal-thread-goal-schema.ts rename to src/shared/agent-session/journal/agent-session-journal-thread-goal-schema.ts diff --git a/src/shared/agent-session-journal-types.ts b/src/shared/agent-session/journal/agent-session-journal-types.ts similarity index 93% rename from src/shared/agent-session-journal-types.ts rename to src/shared/agent-session/journal/agent-session-journal-types.ts index dd6d9e4a83b..dc42941cd06 100644 --- a/src/shared/agent-session-journal-types.ts +++ b/src/shared/agent-session/journal/agent-session-journal-types.ts @@ -1,31 +1,21 @@ -import type { AgentJournalCursor, AgentJournalItemIdentity } from './agent-session-journal-identity' -export type { +import type { AgentJournalCursor, - AgentJournalItemIdentity, - AgentSessionJournalIdentity, - AgentSessionJournalProviderHandle -} from './agent-session-journal-identity' -import type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' -export type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' -import type { AgentSessionProviderContextBoundary } from './agent-session-provider-context' + AgentJournalItemIdentity +} from '../../agent-session-journal-identity' +import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' +import type { AgentSessionProviderContextBoundary } from '../../agent-session-provider-context' // Persist/republish plain JSON only. Append-only rows are upcast on read, never rewritten; // unreadable versions/kinds must refuse writes rather than be skipped or compacted away. -import type { UnreadAgentSessionFailureFact } from './agent-session-failure' -import type { AgentSessionFailureRowWords } from './agent-session-failure-words' -import type { AgentType } from './agent-status-types' -import type { AgentSessionQuestionAnswer } from './agent-session-question-answer' -import type { AgentJournalTurnOutcome } from './agent-turn-outcome' -import type { NativeChatToolMetadata } from './native-chat/tools/native-chat-tool-identity' -import type { AgentSessionContextUsage } from './agent-session-context-usage' -import type { NativeChatBlock, NativeChatRole } from './native-chat/native-chat-types' -import type { - AgentMessageSender, - AgentMessageSource -} from './agent-session/agent-session-message-source' -import type { AgentSessionExecutionOptions } from './agent-session/options/agent-session-execution-options' - -export { type AgentType } +import type { UnreadAgentSessionFailureFact } from '../../agent-session-failure' +import type { AgentSessionFailureRowWords } from '../../agent-session-failure-words' +import type { AgentSessionQuestionAnswer } from '../../agent-session-question-answer' +import type { AgentJournalTurnOutcome } from '../../agent-turn-outcome' +import type { NativeChatToolMetadata } from '../../native-chat/tools/native-chat-tool-identity' +import type { AgentSessionContextUsage } from '../../agent-session-context-usage' +import type { NativeChatBlock, NativeChatRole } from '../../native-chat/native-chat-types' +import type { AgentMessageSender, AgentMessageSource } from '../agent-session-message-source' +import type { AgentSessionExecutionOptions } from '../options/agent-session-execution-options' /** Bump only alongside a read-time upcaster in `journal-row-schema.ts`. */ /** v3 introduced turn items; other rows stay v2. The first v3 row stops older hosts writing (read-only on released builds, failed load here) rather than allowing truncation. */ @@ -217,10 +207,6 @@ export const AGENT_JOURNAL_TURN_LIFECYCLE_STATES = [ ] as const export type AgentJournalTurnLifecycleState = (typeof AGENT_JOURNAL_TURN_LIFECYCLE_STATES)[number] -// The turn verdict vocabulary lives in agent-turn-outcome.ts so the agent-status -// row can share it without importing the journal; re-exported to keep one import site. -export { AGENT_JOURNAL_TURN_OUTCOMES, type AgentJournalTurnOutcome } from './agent-turn-outcome' - export type AgentJournalTurnLifecycle = { turnId: string state: AgentJournalTurnLifecycleState diff --git a/src/shared/agent-session/options/agent-session-options-result.ts b/src/shared/agent-session/options/agent-session-options-result.ts index af5dc95d642..50b404b6a49 100644 --- a/src/shared/agent-session/options/agent-session-options-result.ts +++ b/src/shared/agent-session/options/agent-session-options-result.ts @@ -1,5 +1,5 @@ import type { AgentJournalCursor } from '../../agent-session-journal-identity' -import type { AgentJournalThreadGoal } from '../../agent-session-journal-types' +import type { AgentJournalThreadGoal } from '../journal/agent-session-journal-types' import type { AgentSessionConversationCommand } from '../agent-session-conversation-command' import type { AgentSessionContextUsage } from '../../agent-session-context-usage' import type { AgentSessionRewindSupport } from '../../agent-session-rewind' diff --git a/src/shared/agent-session-current-requests-capability.ts b/src/shared/agent-session/requests/agent-session-current-requests-capability.ts similarity index 100% rename from src/shared/agent-session-current-requests-capability.ts rename to src/shared/agent-session/requests/agent-session-current-requests-capability.ts diff --git a/src/shared/agent-session-current-requests-reader.ts b/src/shared/agent-session/requests/agent-session-current-requests-reader.ts similarity index 91% rename from src/shared/agent-session-current-requests-reader.ts rename to src/shared/agent-session/requests/agent-session-current-requests-reader.ts index 8577b436b2d..c6a9790eb44 100644 --- a/src/shared/agent-session-current-requests-reader.ts +++ b/src/shared/agent-session/requests/agent-session-current-requests-reader.ts @@ -1,9 +1,9 @@ import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability' -import type { AgentJournalRenderItem } from './agent-session-journal-types' -import { isAdmissibleAgentJournalRenderItem } from './agent-session-journal-schemas' -import { readAgentSessionErrorRefusal } from './agent-session-write-failure' -import { isFinalAgentSessionReadRefusal } from './structured-agent-session-read-refusal' -import { createReconnectScheduler } from './agent-session/structured-agent-session-reconnect' +import type { AgentJournalRenderItem } from '../journal/agent-session-journal-types' +import { isAdmissibleAgentJournalRenderItem } from '../journal/agent-session-journal-schemas' +import { readAgentSessionErrorRefusal } from '../../agent-session-write-failure' +import { isFinalAgentSessionReadRefusal } from '../../structured-agent-session-read-refusal' +import { createReconnectScheduler } from '../structured-agent-session-reconnect' import type { AgentSessionCurrentRequestsMarker, AgentSessionCurrentRequestsPiece, diff --git a/src/shared/agent-session-current-requests-wire.ts b/src/shared/agent-session/requests/agent-session-current-requests-wire.ts similarity index 100% rename from src/shared/agent-session-current-requests-wire.ts rename to src/shared/agent-session/requests/agent-session-current-requests-wire.ts diff --git a/src/shared/agent-session-current-requests.ts b/src/shared/agent-session/requests/agent-session-current-requests.ts similarity index 92% rename from src/shared/agent-session-current-requests.ts rename to src/shared/agent-session/requests/agent-session-current-requests.ts index 122aca20f6b..5e7f8a97d2c 100644 --- a/src/shared/agent-session-current-requests.ts +++ b/src/shared/agent-session/requests/agent-session-current-requests.ts @@ -1,6 +1,6 @@ -import { agentSessionCurrentContextRows } from './agent-session-context-clear' -import type { AgentJournalRenderItem } from './agent-session-journal-types' -import type { AgentSessionSubscribeEvent } from './agent-session-wire' +import { agentSessionCurrentContextRows } from '../../agent-session-context-clear' +import type { AgentJournalRenderItem } from '../journal/agent-session-journal-types' +import type { AgentSessionSubscribeEvent } from '../../agent-session-wire' import type { AgentSessionCurrentRequestsMarker } from './agent-session-current-requests-wire' import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability' diff --git a/src/shared/agent-session-current-work-wire.ts b/src/shared/agent-session/requests/agent-session-current-work-wire.ts similarity index 100% rename from src/shared/agent-session-current-work-wire.ts rename to src/shared/agent-session/requests/agent-session-current-work-wire.ts diff --git a/src/shared/agent-session-queued-message-wire.ts b/src/shared/agent-session/requests/agent-session-queued-message-wire.ts similarity index 95% rename from src/shared/agent-session-queued-message-wire.ts rename to src/shared/agent-session/requests/agent-session-queued-message-wire.ts index 06b3e85fe10..3079726b087 100644 --- a/src/shared/agent-session-queued-message-wire.ts +++ b/src/shared/agent-session/requests/agent-session-queued-message-wire.ts @@ -1,7 +1,7 @@ // Publish queued cards, queue pause and draft mutation results together. -import type { UnreadAgentSessionFailureFact } from './agent-session-failure' -import type { AgentJournalMessageItem } from './agent-session-journal-types' +import type { UnreadAgentSessionFailureFact } from '../../agent-session-failure' +import type { AgentJournalMessageItem } from '../journal/agent-session-journal-types' /** The draft could not be converted into a send; an explicit Send retries it. */ export const QUEUED_MESSAGE_PAUSED_SEND_FAILED = 'send_failed' as const diff --git a/src/shared/agent-session-queued-submission.ts b/src/shared/agent-session/requests/agent-session-queued-submission.ts similarity index 86% rename from src/shared/agent-session-queued-submission.ts rename to src/shared/agent-session/requests/agent-session-queued-submission.ts index 4fdc0fa562b..cedfc9fbbd3 100644 --- a/src/shared/agent-session-queued-submission.ts +++ b/src/shared/agent-session/requests/agent-session-queued-submission.ts @@ -1,5 +1,5 @@ -import { readAgentSessionFailureFact } from './agent-session-failure' -import type { AgentJournalSubmission } from './agent-session-journal-types' +import { readAgentSessionFailureFact } from '../../agent-session-failure' +import type { AgentJournalSubmission } from '../journal/agent-session-journal-types' /** Accepted but not handed over proves unwritten; only delivery/rejection can follow, never doubt. */ export function isQueuedAgentJournalSubmission( diff --git a/src/shared/structured-agent-session-dispatch-rejection.test.ts b/src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.test.ts similarity index 96% rename from src/shared/structured-agent-session-dispatch-rejection.test.ts rename to src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.test.ts index e1e2bf1717a..83dcdffc1dd 100644 --- a/src/shared/structured-agent-session-dispatch-rejection.test.ts +++ b/src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { agentSessionFailureFact } from './agent-session-failure' -import { agentSessionFailureWords } from './agent-session-failure-words' +import { agentSessionFailureFact } from '../../agent-session-failure' +import { agentSessionFailureWords } from '../../agent-session-failure-words' import { classifyDispatchRejection, DISPATCH_REJECTED_CANCELLED, diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.ts similarity index 98% rename from src/shared/structured-agent-session-dispatch-rejection.ts rename to src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.ts index 40b8d3053a3..3b0ce0becad 100644 --- a/src/shared/structured-agent-session-dispatch-rejection.ts +++ b/src/shared/agent-session/requests/structured-agent-session-dispatch-rejection.ts @@ -5,8 +5,8 @@ import { isSubmissionRejectionKind, readAgentSessionFailureFact, type SubmissionRejectionKind -} from './agent-session-failure' -import type { AgentJournalSubmission } from './agent-session-journal-types' +} from '../../agent-session-failure' +import type { AgentJournalSubmission } from '../journal/agent-session-journal-types' /** Bare marker is hidden by released clients; log the error separately. Older hosts append : . */ export const DISPATCH_REJECTED_WRITE_FAILED = 'provider_write_failed' diff --git a/src/shared/structured-agent-session-first-prompt.spec.ts b/src/shared/agent-session/requests/structured-agent-session-first-prompt.spec.ts similarity index 97% rename from src/shared/structured-agent-session-first-prompt.spec.ts rename to src/shared/agent-session/requests/structured-agent-session-first-prompt.spec.ts index 82502b77e46..4789fca795e 100644 --- a/src/shared/structured-agent-session-first-prompt.spec.ts +++ b/src/shared/agent-session/requests/structured-agent-session-first-prompt.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from '../journal/agent-session-journal-types' import { firstStructuredAgentSessionPrompt, STRUCTURED_CHAT_NAME_PROMPT_LIMIT diff --git a/src/shared/structured-agent-session-first-prompt.ts b/src/shared/agent-session/requests/structured-agent-session-first-prompt.ts similarity index 73% rename from src/shared/structured-agent-session-first-prompt.ts rename to src/shared/agent-session/requests/structured-agent-session-first-prompt.ts index b62c6ad38cf..a3b39e78c95 100644 --- a/src/shared/structured-agent-session-first-prompt.ts +++ b/src/shared/agent-session/requests/structured-agent-session-first-prompt.ts @@ -1,8 +1,8 @@ -import type { AgentJournalRenderItem } from './agent-session-journal-types' -import { isRootAgentJournalItem } from './agent-session-journal-producer' -import { isStructuredAgentSessionCommandEntry } from './agent-session/structured-agent-session-command-entry' -import { sliceAtCodeUnitLimit } from './surrogate-safe-text-slice' -import { stripSentImagePromptMarkers } from './native-chat/transcript/native-chat-image-transcript-markers' +import type { AgentJournalRenderItem } from '../journal/agent-session-journal-types' +import { isRootAgentJournalItem } from '../journal/agent-session-journal-producer' +import { isStructuredAgentSessionCommandEntry } from '../structured-agent-session-command-entry' +import { sliceAtCodeUnitLimit } from '../../surrogate-safe-text-slice' +import { stripSentImagePromptMarkers } from '../../native-chat/transcript/native-chat-image-transcript-markers' export const STRUCTURED_CHAT_NAME_PROMPT_LIMIT = 4000 diff --git a/src/shared/structured-agent-session-latest-request.test.ts b/src/shared/agent-session/requests/structured-agent-session-latest-request.test.ts similarity index 96% rename from src/shared/structured-agent-session-latest-request.test.ts rename to src/shared/agent-session/requests/structured-agent-session-latest-request.test.ts index 9e09a71071c..df3dbcb1aa9 100644 --- a/src/shared/structured-agent-session-latest-request.test.ts +++ b/src/shared/agent-session/requests/structured-agent-session-latest-request.test.ts @@ -3,9 +3,9 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle -} from './agent-session-journal-types' -import { AGENT_SESSION_FAILURE_KINDS, isSubmissionRejectionKind } from './agent-session-failure' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' +} from '../journal/agent-session-journal-types' +import { AGENT_SESSION_FAILURE_KINDS, isSubmissionRejectionKind } from '../../agent-session-failure' +import { agentJournalSubmissionKey } from '../journal/agent-session-journal-item-key' import { DISPATCH_REJECTED_CANCELLED, DISPATCH_REJECTED_CODEX_QUEUE_FULL, @@ -19,9 +19,9 @@ import { hasStructuredAgentSessionRequest, latestStructuredAgentSessionRequest } from './structured-agent-session-latest-request' -import { projectStructuredAgentSessionStatusSummary } from './structured-agent-session-projection' -import { latestNativeChatTurnSinceRequest } from './native-chat/native-chat-orca-stop-cut' -import { selectStructuredAgentTurnTimings } from './structured-agent-session-turn-timing' +import { projectStructuredAgentSessionStatusSummary } from '../../structured-agent-session-projection' +import { latestNativeChatTurnSinceRequest } from '../../native-chat/native-chat-orca-stop-cut' +import { selectStructuredAgentTurnTimings } from '../../structured-agent-session-turn-timing' const START_FAILURE = 'Claude is not signed in.' diff --git a/src/shared/structured-agent-session-latest-request.ts b/src/shared/agent-session/requests/structured-agent-session-latest-request.ts similarity index 92% rename from src/shared/structured-agent-session-latest-request.ts rename to src/shared/agent-session/requests/structured-agent-session-latest-request.ts index 03353b85b7c..91487895cf0 100644 --- a/src/shared/structured-agent-session-latest-request.ts +++ b/src/shared/agent-session/requests/structured-agent-session-latest-request.ts @@ -4,21 +4,21 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle, - AgentJournalTurnLifecycleState, - AgentJournalTurnOutcome -} from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { isRootAgentJournalItem } from './agent-session-journal-producer' -import { readAgentJournalTurn, readAgentJournalTurnOutcome } from './agent-session-turn-record' + AgentJournalTurnLifecycleState +} from '../journal/agent-session-journal-types' +import type { AgentJournalTurnOutcome } from '../../agent-turn-outcome' +import { agentJournalSubmissionKey } from '../journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../journal/agent-session-journal-producer' +import { readAgentJournalTurn, readAgentJournalTurnOutcome } from '../../agent-session-turn-record' import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection' -import { withoutNativeChatVisualDirectiveLines } from './native-chat/native-chat-visual-directive' +import { withoutNativeChatVisualDirectiveLines } from '../../native-chat/native-chat-visual-directive' import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch' import { isStructuredAgentSessionCommandEntry, isStructuredAgentSessionCommandRow, structuredAgentSessionCommandTurnItemIds -} from './agent-session/structured-agent-session-command-entry' -import type { NativeChatBlock } from './native-chat/native-chat-types' +} from '../structured-agent-session-command-entry' +import type { NativeChatBlock } from '../../native-chat/native-chat-types' export type StructuredAgentSessionLatestRequest = { kind: 'turn' | 'refused-send' diff --git a/src/shared/structured-agent-session-opening-send.test.ts b/src/shared/agent-session/requests/structured-agent-session-opening-send.test.ts similarity index 94% rename from src/shared/structured-agent-session-opening-send.test.ts rename to src/shared/agent-session/requests/structured-agent-session-opening-send.test.ts index 0393b61cdb8..a5d18ee1d3d 100644 --- a/src/shared/structured-agent-session-opening-send.test.ts +++ b/src/shared/agent-session/requests/structured-agent-session-opening-send.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../journal/agent-session-journal-item-key' import { structuredAgentSessionSendOpeningTurn, type StructuredAgentSessionOpeningSendItem diff --git a/src/shared/structured-agent-session-opening-send.ts b/src/shared/agent-session/requests/structured-agent-session-opening-send.ts similarity index 87% rename from src/shared/structured-agent-session-opening-send.ts rename to src/shared/agent-session/requests/structured-agent-session-opening-send.ts index 0f5c0ddd4e9..e57120d8ba8 100644 --- a/src/shared/structured-agent-session-opening-send.ts +++ b/src/shared/agent-session/requests/structured-agent-session-opening-send.ts @@ -1,14 +1,14 @@ // Hold subsequent sends while one opens a turn; clients draw held sends after live work. -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import { agentJournalSubmissionKey } from '../journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../journal/agent-session-journal-producer' import type { AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from './agent-session-journal-types' -import { readAgentJournalTurn } from './agent-session-turn-record' + AgentJournalSubmission +} from '../journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' +import { readAgentJournalTurn } from '../../agent-session-turn-record' /** Minimal fold shape lets the host read without rendering a snapshot. */ export type StructuredAgentSessionOpeningSendItem = { diff --git a/src/shared/structured-agent-session-projection-sender.spec.ts b/src/shared/agent-session/requests/structured-agent-session-projection-sender.spec.ts similarity index 82% rename from src/shared/structured-agent-session-projection-sender.spec.ts rename to src/shared/agent-session/requests/structured-agent-session-projection-sender.spec.ts index b2236102c1b..39510a53307 100644 --- a/src/shared/structured-agent-session-projection-sender.spec.ts +++ b/src/shared/agent-session/requests/structured-agent-session-projection-sender.spec.ts @@ -1,7 +1,10 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalMessageItem, AgentJournalRenderItem } from './agent-session-journal-types' -import type { AgentMessageSource } from './agent-session/agent-session-message-source' -import { projectStructuredItemToNativeChat } from './structured-agent-session-projection' +import type { + AgentJournalMessageItem, + AgentJournalRenderItem +} from '../journal/agent-session-journal-types' +import type { AgentMessageSource } from '../agent-session-message-source' +import { projectStructuredItemToNativeChat } from '../../structured-agent-session-projection' const FROM: AgentMessageSource = { kind: 'agent', diff --git a/src/shared/structured-agent-session-queue-publication-field.ts b/src/shared/agent-session/requests/structured-agent-session-queue-publication-field.ts similarity index 100% rename from src/shared/structured-agent-session-queue-publication-field.ts rename to src/shared/agent-session/requests/structured-agent-session-queue-publication-field.ts diff --git a/src/shared/structured-agent-session-send-evidence.test.ts b/src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts similarity index 96% rename from src/shared/structured-agent-session-send-evidence.test.ts rename to src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts index 767bb73b85e..41958fd7731 100644 --- a/src/shared/structured-agent-session-send-evidence.test.ts +++ b/src/shared/agent-session/requests/structured-agent-session-send-evidence.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalSubmission } from './agent-session-journal-types' -import type { AgentSessionWireRefusal } from './agent-session-wire' +import type { AgentJournalSubmission } from '../journal/agent-session-journal-types' +import type { AgentSessionWireRefusal } from '../../agent-session-wire-refusals' import { structuredAgentSessionSendEvidence, type StructuredAgentSessionSendAnswer diff --git a/src/shared/structured-agent-session-send-evidence.ts b/src/shared/agent-session/requests/structured-agent-session-send-evidence.ts similarity index 97% rename from src/shared/structured-agent-session-send-evidence.ts rename to src/shared/agent-session/requests/structured-agent-session-send-evidence.ts index a14062486de..6020ca057fa 100644 --- a/src/shared/structured-agent-session-send-evidence.ts +++ b/src/shared/agent-session/requests/structured-agent-session-send-evidence.ts @@ -1,10 +1,10 @@ -import type { AgentSessionMutationResult, AgentSessionSendResult } from './agent-session-wire' +import type { AgentSessionMutationResult, AgentSessionSendResult } from '../../agent-session-wire' import { agentSessionRefusalFailure, agentSessionRpcErrorFailure, readAgentSessionErrorRefusal, type AgentSessionWriteFailure -} from './agent-session-write-failure' +} from '../../agent-session-write-failure' /** Synthetic unknown row: ledger holds the ID but journal lost it, so recording is unproved. */ export const STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING = 'durable_send_submission_missing' diff --git a/src/shared/structured-agent-session-send-mutation.spec.ts b/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts similarity index 93% rename from src/shared/structured-agent-session-send-mutation.spec.ts rename to src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts index aeacf966732..b8f0fa357b6 100644 --- a/src/shared/structured-agent-session-send-mutation.spec.ts +++ b/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalMessageItem } from './agent-session-journal-types' -import type { AgentMessageSource } from './agent-session/agent-session-message-source' -import { AgentJournalSubmissionSchema } from './agent-session-journal-submission-schema' -import { SendParams } from './rpc-contract/structured-agent-session-params' -import { structuredAgentSessionPayloadFingerprint } from './structured-agent-session-mutation' +import type { AgentJournalMessageItem } from '../journal/agent-session-journal-types' +import type { AgentMessageSource } from '../agent-session-message-source' +import { AgentJournalSubmissionSchema } from '../journal/agent-session-journal-submission-schema' +import { SendParams } from '../../rpc-contract/structured-agent-session-params' +import { structuredAgentSessionPayloadFingerprint } from '../../structured-agent-session-mutation' import { agentSessionSendBodyFingerprint, structuredAgentSessionMessageSendMutation diff --git a/src/shared/structured-agent-session-send-mutation.ts b/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts similarity index 94% rename from src/shared/structured-agent-session-send-mutation.ts rename to src/shared/agent-session/requests/structured-agent-session-send-mutation.ts index d7bb1717482..f38bf07185f 100644 --- a/src/shared/structured-agent-session-send-mutation.ts +++ b/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts @@ -2,14 +2,14 @@ import type { AgentJournalItemBody, AgentJournalMessageItem, AgentJournalSkillRef -} from './agent-session-journal-types' -import type { AgentSessionMutationEnvelope } from './agent-session-wire' +} from '../journal/agent-session-journal-types' +import type { AgentSessionMutationEnvelope } from '../../agent-session-wire' import type { z } from 'zod' import { MAX_SKILL_REFS, type SendBody -} from './rpc-contract/structured-agent-session-message-params' -import { structuredAgentSessionPayloadFingerprint } from './structured-agent-session-mutation' +} from '../../rpc-contract/structured-agent-session-message-params' +import { structuredAgentSessionPayloadFingerprint } from '../../structured-agent-session-mutation' /** Control fields affect the operation fingerprint, never the body hash used for provider echoes. */ export type StructuredAgentSessionSendControl = { diff --git a/src/shared/structured-agent-session-send-settlement.ts b/src/shared/agent-session/requests/structured-agent-session-send-settlement.ts similarity index 79% rename from src/shared/structured-agent-session-send-settlement.ts rename to src/shared/agent-session/requests/structured-agent-session-send-settlement.ts index 89319f59a58..c957ebcac72 100644 --- a/src/shared/structured-agent-session-send-settlement.ts +++ b/src/shared/agent-session/requests/structured-agent-session-send-settlement.ts @@ -1,5 +1,6 @@ -import type { AgentJournalCursor, AgentJournalSubmission } from './agent-session-journal-types' -import { handedOffQueuedMessageIds } from './structured-agent-session-draft-hand-off' +import type { AgentJournalCursor } from '../../agent-session-journal-identity' +import type { AgentJournalSubmission } from '../journal/agent-session-journal-types' +import { handedOffQueuedMessageIds } from '../../structured-agent-session-draft-hand-off' /** A bounded read supersedes acknowledged sends even when their rows are outside its page. */ export function structuredAgentSessionReadCoversSend( diff --git a/src/shared/structured-agent-session-unanswered-dispatch.ts b/src/shared/agent-session/requests/structured-agent-session-unanswered-dispatch.ts similarity index 93% rename from src/shared/structured-agent-session-unanswered-dispatch.ts rename to src/shared/agent-session/requests/structured-agent-session-unanswered-dispatch.ts index a604e89b10d..ce5fc57bec7 100644 --- a/src/shared/structured-agent-session-unanswered-dispatch.ts +++ b/src/shared/agent-session/requests/structured-agent-session-unanswered-dispatch.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from './agent-session-journal-types' +import type { AgentJournalSubmission } from '../journal/agent-session-journal-types' import { isQueuedAgentJournalSubmission } from './agent-session-queued-submission' export function isUnansweredStructuredAgentSessionDispatch( diff --git a/src/shared/agent-session/structured-agent-session-coalescer.test.ts b/src/shared/agent-session/structured-agent-session-coalescer.test.ts index bfd52101a23..bf8347bb1d1 100644 --- a/src/shared/agent-session/structured-agent-session-coalescer.test.ts +++ b/src/shared/agent-session/structured-agent-session-coalescer.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { AgentJournalRenderItem } from '../agent-session-journal-types' +import type { AgentJournalRenderItem } from './journal/agent-session-journal-types' import { projectNativeChatTranscriptMessages } from '../native-chat/transcript/native-chat-transcript-projection' import { projectStructuredAgentSessionMessages } from '../structured-agent-session-message-projection' import { diff --git a/src/shared/agent-session/structured-agent-session-command-entry.ts b/src/shared/agent-session/structured-agent-session-command-entry.ts index 26dcaa6e59b..5c4cf931909 100644 --- a/src/shared/agent-session/structured-agent-session-command-entry.ts +++ b/src/shared/agent-session/structured-agent-session-command-entry.ts @@ -4,7 +4,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalTurnLifecycle -} from '../agent-session-journal-types' +} from './journal/agent-session-journal-types' import { readAgentJournalTurn } from '../agent-session-turn-record' export function isStructuredAgentSessionCommandEntry( diff --git a/src/shared/agent-session/structured-agent-session-live-read.ts b/src/shared/agent-session/structured-agent-session-live-read.ts index 152cb2319d8..8c9efadcbec 100644 --- a/src/shared/agent-session/structured-agent-session-live-read.ts +++ b/src/shared/agent-session/structured-agent-session-live-read.ts @@ -8,11 +8,11 @@ import { } from '../structured-agent-session-read-refusal' import type { AgentSessionRefusalReference } from '../agent-session-wire-refusals' import { readAgentSessionErrorRefusal } from '../agent-session-write-failure' -import { createAgentSessionCurrentRequestsReader } from '../agent-session-current-requests-reader' +import { createAgentSessionCurrentRequestsReader } from './requests/agent-session-current-requests-reader' import type { AgentSessionCurrentRequestsPiece, AgentSessionCurrentRequestsRead -} from '../agent-session-current-requests-wire' +} from './requests/agent-session-current-requests-wire' import type { StructuredAgentSessionAction } from '../structured-agent-session-reducer' import { createReconnectScheduler } from './structured-agent-session-reconnect' diff --git a/src/shared/agent-session/structured-agent-session-tool-call-block.ts b/src/shared/agent-session/structured-agent-session-tool-call-block.ts index 7ea025967ac..32ecd407bba 100644 --- a/src/shared/agent-session/structured-agent-session-tool-call-block.ts +++ b/src/shared/agent-session/structured-agent-session-tool-call-block.ts @@ -4,7 +4,7 @@ import type { AgentJournalDiffItem, AgentJournalItemBody, AgentJournalToolCallItem -} from '../agent-session-journal-types' +} from './journal/agent-session-journal-types' import type { NativeChatToolCallBlock } from '../native-chat/native-chat-types' export type StructuredAgentSessionToolAction = AgentJournalToolCallItem | AgentJournalDiffItem diff --git a/src/shared/agent-turn-lifecycle-text.ts b/src/shared/agent-turn-lifecycle-text.ts index b938d046379..d1b2ec9ee33 100644 --- a/src/shared/agent-turn-lifecycle-text.ts +++ b/src/shared/agent-turn-lifecycle-text.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnLifecycleState } from './agent-session-journal-types' +import type { AgentJournalTurnLifecycleState } from './agent-session/journal/agent-session-journal-types' /** Legacy raw status text must not call an unobserved end completed. */ export function agentTurnLifecycleText( diff --git a/src/shared/agent-turn-outcome.ts b/src/shared/agent-turn-outcome.ts index 3c85adf7e06..f1d3ddb4814 100644 --- a/src/shared/agent-turn-outcome.ts +++ b/src/shared/agent-turn-outcome.ts @@ -1,4 +1,4 @@ -import type { AgentJournalTurnLifecycleState } from './agent-session-journal-types' +import type { AgentJournalTurnLifecycleState } from './agent-session/journal/agent-session-journal-types' /** Keep recorded provider/Stop/supersede verdicts separate from host lifecycle state. cancellation is requested, failure is a provider fault, superseded names no sender. Derive interruption/unconfirmed on read, never journal them. Absent/newer arms mean unknown, never success. */ export const AGENT_JOURNAL_TURN_OUTCOMES = [ diff --git a/src/shared/mobile-queued-edit-host.test-fixture-contract.ts b/src/shared/mobile-queued-edit-host.test-fixture-contract.ts index 4cdc242237a..d526c591930 100644 --- a/src/shared/mobile-queued-edit-host.test-fixture-contract.ts +++ b/src/shared/mobile-queued-edit-host.test-fixture-contract.ts @@ -1,7 +1,7 @@ -import type { AgentJournalMessageItem } from './agent-session-journal-types' +import type { AgentJournalMessageItem } from './agent-session/journal/agent-session-journal-types' import type { AgentSessionExecutionOptions } from './agent-session/options/agent-session-execution-options' +import type { AgentSessionQueuedMessage } from './agent-session/requests/agent-session-queued-message-wire' import type { - AgentSessionQueuedMessage, AgentSessionSlashCommand, AgentSessionCommandsResult, AgentSessionSubscribeEvent diff --git a/src/shared/native-chat-ask-card-rules.ts b/src/shared/native-chat-ask-card-rules.ts index 47c3d5f0bee..dc7cab4c11f 100644 --- a/src/shared/native-chat-ask-card-rules.ts +++ b/src/shared/native-chat-ask-card-rules.ts @@ -1,4 +1,4 @@ -import type { AgentJournalFreeTextInput } from './agent-session-journal-types' +import type { AgentJournalFreeTextInput } from './agent-session/journal/agent-session-journal-types' import type { AskQuestion } from './native-chat/input/native-chat-ask-types' // How a stepped question card picks, labels and confirms; desktop and mobile draw it differently. diff --git a/src/shared/native-chat-composer-autocomplete.test.ts b/src/shared/native-chat-composer-autocomplete.test.ts index 8ea959430c9..8a546f00e19 100644 --- a/src/shared/native-chat-composer-autocomplete.test.ts +++ b/src/shared/native-chat-composer-autocomplete.test.ts @@ -16,7 +16,7 @@ import { import { sessionSlashCommandSuggestions } from './native-chat/input/native-chat-slash-commands' import type { DiscoveredSkill } from './skills' import { getNativeChatAgentProfile } from './native-chat/native-chat-agent-profiles' -import { pickedSkillsInText } from './structured-agent-session-send-mutation' +import { pickedSkillsInText } from './agent-session/requests/structured-agent-session-send-mutation' const COMMANDS: SlashCommandSuggestion[] = [ { name: 'clear' }, diff --git a/src/shared/native-chat-interactive-prompt.ts b/src/shared/native-chat-interactive-prompt.ts index 43d32ae1631..18c064424e1 100644 --- a/src/shared/native-chat-interactive-prompt.ts +++ b/src/shared/native-chat-interactive-prompt.ts @@ -2,7 +2,7 @@ import { parseNativeChatApprovalEnvelope } from './native-chat-approval-envelope import type { AgentJournalApprovalItem, AgentJournalApprovalSubject -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { parseAskFromStatus, resolveNativeChatAsk } from './native-chat/input/native-chat-ask' import type { AskPrompt } from './native-chat/input/native-chat-ask-types' import type { NativeChatMessage } from './native-chat/native-chat-types' diff --git a/src/shared/native-chat-live-turn-membership.ts b/src/shared/native-chat-live-turn-membership.ts index 0c30fd97a28..710d5904765 100644 --- a/src/shared/native-chat-live-turn-membership.ts +++ b/src/shared/native-chat-live-turn-membership.ts @@ -1,5 +1,5 @@ import type { NativeChatRole } from './native-chat/native-chat-types' -import type { AgentJournalTurnScope } from './agent-session-journal-types' +import type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' export function unresolvedNativeChatRowIds( messages: readonly { id: string }[], diff --git a/src/shared/native-chat/input/native-chat-background-task-row.ts b/src/shared/native-chat/input/native-chat-background-task-row.ts index df473d92cff..ed351333cfb 100644 --- a/src/shared/native-chat/input/native-chat-background-task-row.ts +++ b/src/shared/native-chat/input/native-chat-background-task-row.ts @@ -1,6 +1,6 @@ // Build durable task blocks and frozen plain-text twins together so clients without block support read the same report. -import type { AgentJournalMessageItem } from '../../agent-session-journal-types' +import type { AgentJournalMessageItem } from '../../agent-session/journal/agent-session-journal-types' import { isBackgroundTaskBlock, type NativeChatBackgroundTaskBlock, diff --git a/src/shared/native-chat/native-chat-orca-stop-cut.test.ts b/src/shared/native-chat/native-chat-orca-stop-cut.test.ts index 36cdd92561a..fb9d4c0c172 100644 --- a/src/shared/native-chat/native-chat-orca-stop-cut.test.ts +++ b/src/shared/native-chat/native-chat-orca-stop-cut.test.ts @@ -2,8 +2,8 @@ import { describe, expect, it } from 'vitest' import { agentSessionFailureFact } from '../agent-session-failure' import { agentSessionFailureWords } from '../agent-session-failure-words' import { readAgentSessionOrcaStop } from '../agent-session-orca-stop' -import { agentJournalItemKey } from '../agent-session-journal-item-key' -import type { AgentJournalRenderItem } from '../agent-session-journal-types' +import { agentJournalItemKey } from '../agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalRenderItem } from '../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnOutcome } from '../agent-turn-outcome' import { withNativeChatCutTurnNotices } from './transcript/native-chat-cut-turn-notice' import { diff --git a/src/shared/native-chat/native-chat-orca-stop-cut.ts b/src/shared/native-chat/native-chat-orca-stop-cut.ts index 1ad6bbb51e3..1f6eb6e8768 100644 --- a/src/shared/native-chat/native-chat-orca-stop-cut.ts +++ b/src/shared/native-chat/native-chat-orca-stop-cut.ts @@ -4,8 +4,11 @@ import { readAgentSessionOrcaStop, type AgentSessionOrcaStopCause } from '../agent-session-orca-stop' -import { isRootAgentJournalItem } from '../agent-session-journal-producer' -import type { AgentJournalRenderItem, AgentJournalSubmission } from '../agent-session-journal-types' +import { isRootAgentJournalItem } from '../agent-session/journal/agent-session-journal-producer' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from '../agent-session/journal/agent-session-journal-types' import { STALE_SESSION_ROW_PREFIX } from '../agent-session-stop-row-identity' import { readAgentJournalTurn, readAgentJournalTurnOutcome } from '../agent-session-turn-record' import { agentTurnVerdict, type AgentTurnOutcome } from '../agent-turn-outcome' @@ -13,7 +16,7 @@ import { structuredAgentSessionCommandTurnItemIds } from '../agent-session/struc import { isStructuredAgentSessionNonRequestRow, type StructuredAgentSessionLatestRequest -} from '../structured-agent-session-latest-request' +} from '../agent-session/requests/structured-agent-session-latest-request' // Dedupe shutdown rows by stopped child; preserve the legacy prefix so older clients add no duplicate notice. export function orcaShutdownRowClientMessageId( diff --git a/src/shared/native-chat/native-chat-provider-retry-runs.test.ts b/src/shared/native-chat/native-chat-provider-retry-runs.test.ts index c8fd828dc19..a5b9de71c5c 100644 --- a/src/shared/native-chat/native-chat-provider-retry-runs.test.ts +++ b/src/shared/native-chat/native-chat-provider-retry-runs.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from '../agent-session-journal-types' +import type { AgentJournalRenderItem } from '../agent-session/journal/agent-session-journal-types' import { agentSessionFailureWords } from '../agent-session-failure-words' -import { agentJournalSubmissionKey } from '../agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../agent-session/journal/agent-session-journal-item-key' import { collapseProviderRetryRuns } from './native-chat-provider-retry-runs' import { projectNativeChatTranscript } from './transcript/native-chat-transcript-projection' import type { NativeChatMessage } from './native-chat-types' diff --git a/src/shared/native-chat/native-chat-provider-retry-runs.ts b/src/shared/native-chat/native-chat-provider-retry-runs.ts index dbca4a89b9a..7aadc68f778 100644 --- a/src/shared/native-chat/native-chat-provider-retry-runs.ts +++ b/src/shared/native-chat/native-chat-provider-retry-runs.ts @@ -1,6 +1,6 @@ // Keep every retry in the journal but draw only each agent run’s latest retry row, preserving intervening non-retry rows. -import { agentJournalItemSubagentId } from '../agent-session-journal-producer' +import { agentJournalItemSubagentId } from '../agent-session/journal/agent-session-journal-producer' import type { NativeChatMessage } from './native-chat-types' import { isNativeChatContextClear } from '../agent-session-context-clear' diff --git a/src/shared/native-chat/native-chat-resolution-receipt.ts b/src/shared/native-chat/native-chat-resolution-receipt.ts index 0f4d40f95fd..e3ad5309c14 100644 --- a/src/shared/native-chat/native-chat-resolution-receipt.ts +++ b/src/shared/native-chat/native-chat-resolution-receipt.ts @@ -1,7 +1,7 @@ import type { AgentJournalApprovalItem, AgentJournalQuestionItem -} from '../agent-session-journal-types' +} from '../agent-session/journal/agent-session-journal-types' import { agentSessionPromptQuestions, legacyAgentSessionQuestionAnswers diff --git a/src/shared/native-chat/native-chat-send-order.ts b/src/shared/native-chat/native-chat-send-order.ts index f4389dad7b8..652f9511191 100644 --- a/src/shared/native-chat/native-chat-send-order.ts +++ b/src/shared/native-chat/native-chat-send-order.ts @@ -1,4 +1,4 @@ -import type { AgentJournalSubmission } from '../agent-session-journal-types' +import type { AgentJournalSubmission } from '../agent-session/journal/agent-session-journal-types' type SendTimes = Pick diff --git a/src/shared/native-chat/native-chat-stopped-before-start.ts b/src/shared/native-chat/native-chat-stopped-before-start.ts index 4ecdf557aa3..594be08cf11 100644 --- a/src/shared/native-chat/native-chat-stopped-before-start.ts +++ b/src/shared/native-chat/native-chat-stopped-before-start.ts @@ -1,14 +1,14 @@ -import { agentJournalSubmissionKey } from '../agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../agent-session/journal/agent-session-journal-item-key' import { agentJournalItemPosition, compareAgentJournalItems, compareAgentJournalPositions -} from '../agent-session-journal-position' +} from '../agent-session/journal/agent-session-journal-position' import type { AgentJournalPosition, AgentJournalRenderItem, AgentJournalSubmission -} from '../agent-session-journal-types' +} from '../agent-session/journal/agent-session-journal-types' import { inSendOrder } from './native-chat-send-order' import { stoppedTurnOpeners, diff --git a/src/shared/native-chat/native-chat-types.ts b/src/shared/native-chat/native-chat-types.ts index 6d246ce773a..3c2bab38738 100644 --- a/src/shared/native-chat/native-chat-types.ts +++ b/src/shared/native-chat/native-chat-types.ts @@ -16,7 +16,7 @@ import type { AgentJournalProducerLinkage, AgentJournalToolCallEnding, AgentJournalToolCallState -} from '../agent-session-journal-types' +} from '../agent-session/journal/agent-session-journal-types' import type { AgentType } from '../agent-status-types' import type { NativeChatToolMetadata } from './tools/native-chat-tool-identity' import type { AgentMessageSource } from '../agent-session/agent-session-message-source' diff --git a/src/shared/native-chat/native-chat-usage-limit-cut.ts b/src/shared/native-chat/native-chat-usage-limit-cut.ts index e1c1fd5d02f..8807cc647a1 100644 --- a/src/shared/native-chat/native-chat-usage-limit-cut.ts +++ b/src/shared/native-chat/native-chat-usage-limit-cut.ts @@ -1,8 +1,11 @@ // Derive usage-limit cuts from journal rows on each read for Continue; never store derived state. -import { isRootAgentJournalItem } from '../agent-session-journal-producer' +import { isRootAgentJournalItem } from '../agent-session/journal/agent-session-journal-producer' import { readAgentSessionFailureFact } from '../agent-session-failure' -import type { AgentJournalRenderItem, AgentJournalSubmission } from '../agent-session-journal-types' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from '../agent-session/journal/agent-session-journal-types' import type { AgentSessionUsageLimit } from '../agent-session-usage-limit' import { findInNativeChatTurn, latestNativeChatTurnSinceRequest } from './native-chat-orca-stop-cut' diff --git a/src/shared/native-chat/tools/native-chat-tool-output.ts b/src/shared/native-chat/tools/native-chat-tool-output.ts index 58912f10377..0b132de1c97 100644 --- a/src/shared/native-chat/tools/native-chat-tool-output.ts +++ b/src/shared/native-chat/tools/native-chat-tool-output.ts @@ -1,7 +1,7 @@ import type { AgentJournalBoundedPayload, AgentJournalItemBody -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import { formatBytes } from '../../format-bytes' import type { NativeChatToolResultBlock } from '../native-chat-types' import { MAX_TOOL_DETAIL_LENGTH } from './native-chat-tool-summary' diff --git a/src/shared/native-chat/tools/native-chat-turn-membership-derived-tool-row.test.ts b/src/shared/native-chat/tools/native-chat-turn-membership-derived-tool-row.test.ts index 5603aa5c4e2..91b9b43ab7d 100644 --- a/src/shared/native-chat/tools/native-chat-turn-membership-derived-tool-row.test.ts +++ b/src/shared/native-chat/tools/native-chat-turn-membership-derived-tool-row.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' import { foldToolMessages } from './native-chat-tool-fold' import { nativeChatRowsInDrawOrder } from '../transcript/native-chat-turn-grouping' diff --git a/src/shared/native-chat/transcript/native-chat-cut-turn-notice.test.ts b/src/shared/native-chat/transcript/native-chat-cut-turn-notice.test.ts index 865bf28c4e6..e27c1b2f8f8 100644 --- a/src/shared/native-chat/transcript/native-chat-cut-turn-notice.test.ts +++ b/src/shared/native-chat/transcript/native-chat-cut-turn-notice.test.ts @@ -4,12 +4,12 @@ import { agentSessionFailureWords } from '../../agent-session-failure-words' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../agent-session-journal-item-key' +} from '../../agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalSubmission, AgentJournalRenderItem -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnOutcome } from '../../agent-turn-outcome' import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' import { withNativeChatCutTurnNotices } from './native-chat-cut-turn-notice' diff --git a/src/shared/native-chat/transcript/native-chat-cut-turn-notice.ts b/src/shared/native-chat/transcript/native-chat-cut-turn-notice.ts index f555f0cbc61..88eae8b8499 100644 --- a/src/shared/native-chat/transcript/native-chat-cut-turn-notice.ts +++ b/src/shared/native-chat/transcript/native-chat-cut-turn-notice.ts @@ -6,9 +6,12 @@ import { agentSessionFailureWords, type AgentSessionFailureWordsContext } from '../../agent-session-failure-words' -import { agentJournalItemKey, parseAgentJournalItemKey } from '../../agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../agent-session-journal-producer' -import type { AgentJournalRenderItem } from '../../agent-session-journal-types' +import { + agentJournalItemKey, + parseAgentJournalItemKey +} from '../../agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../agent-session/journal/agent-session-journal-producer' +import type { AgentJournalRenderItem } from '../../agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn, readAgentJournalTurnOutcome } from '../../agent-session-turn-record' import { agentTurnVerdict } from '../../agent-turn-outcome' import { diff --git a/src/shared/native-chat/transcript/native-chat-messages-waiting-behind-live-turn.ts b/src/shared/native-chat/transcript/native-chat-messages-waiting-behind-live-turn.ts index ed679827db4..e82259b5076 100644 --- a/src/shared/native-chat/transcript/native-chat-messages-waiting-behind-live-turn.ts +++ b/src/shared/native-chat/transcript/native-chat-messages-waiting-behind-live-turn.ts @@ -1,13 +1,13 @@ import type { AgentJournalRenderItem, AgentJournalSubmission -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentSessionLatestTurn } from '../../agent-session-wire' import { readAgentJournalTurn } from '../../agent-session-turn-record' import type { NativeChatRole } from '../native-chat-types' import { isStructuredAgentSessionCommandTurn } from '../../agent-session/structured-agent-session-command-entry' import { runningStructuredAgentSessionTurnScope } from '../../structured-agent-session-live-turn' -import { structuredAgentSessionOpeningSendIn } from '../../structured-agent-session-opening-send' +import { structuredAgentSessionOpeningSendIn } from '../../agent-session/requests/structured-agent-session-opening-send' /** Place pending sends after live activity when host handover waits: during conversation commands (/compact), Stop, or a send still opening its turn. * Include this client’s unrecorded sends; ordinary running turns accept sends promptly, and pre-Stop sends stay put. diff --git a/src/shared/native-chat/transcript/native-chat-reasoning-row.ts b/src/shared/native-chat/transcript/native-chat-reasoning-row.ts index 0be7c288d09..062f9df8f53 100644 --- a/src/shared/native-chat/transcript/native-chat-reasoning-row.ts +++ b/src/shared/native-chat/transcript/native-chat-reasoning-row.ts @@ -1,6 +1,6 @@ // Derive reasoning disclosure/headlines from host start/end facts so desktop/mobile show the same lifecycle. -import { isRootAgentJournalItem } from '../../agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../agent-session/journal/agent-session-journal-producer' import { deriveNativeChatRowContent, nativeChatRowRendersContent } from './native-chat-row-content' import { formatNativeChatDuration } from './native-chat-turn-status' import type { NativeChatMessage } from '../native-chat-types' diff --git a/src/shared/native-chat/transcript/native-chat-stopped-send-turn.test.ts b/src/shared/native-chat/transcript/native-chat-stopped-send-turn.test.ts index 9b7e4f808a4..ff1691fde74 100644 --- a/src/shared/native-chat/transcript/native-chat-stopped-send-turn.test.ts +++ b/src/shared/native-chat/transcript/native-chat-stopped-send-turn.test.ts @@ -1,15 +1,15 @@ import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from '../../agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' import { projectNativeChatTranscript } from './native-chat-transcript-projection' import { nativeChatRowsInDrawOrder } from './native-chat-turn-grouping' import { nativeChatTurnMembership, structuredAgentTurnAnchors } from './native-chat-turn-membership' -import { DISPATCH_REJECTED_CANCELLED } from '../../structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_CANCELLED } from '../../agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages } from '../../structured-agent-session-message-projection' const STOPPED_ROW = 'stopped-before-start:' diff --git a/src/shared/native-chat/transcript/native-chat-transcript-projection.test.ts b/src/shared/native-chat/transcript/native-chat-transcript-projection.test.ts index 74280990179..e59fec236d5 100644 --- a/src/shared/native-chat/transcript/native-chat-transcript-projection.test.ts +++ b/src/shared/native-chat/transcript/native-chat-transcript-projection.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' import type { NativeChatMessage } from '../native-chat-types' import { diff --git a/src/shared/native-chat/transcript/native-chat-transcript-projection.ts b/src/shared/native-chat/transcript/native-chat-transcript-projection.ts index 357b18b9cb2..a27b75bc979 100644 --- a/src/shared/native-chat/transcript/native-chat-transcript-projection.ts +++ b/src/shared/native-chat/transcript/native-chat-transcript-projection.ts @@ -2,8 +2,8 @@ // Journal subagent rows belong to separate agent transcripts and fold beside their spawn, never into the conversation. import { nativeChatSemanticRowId, type NativeChatMessage } from '../native-chat-types' -import { compareAgentJournalPositions } from '../../agent-session-journal-position' -import { agentJournalItemSubagentId } from '../../agent-session-journal-producer' +import { compareAgentJournalPositions } from '../../agent-session/journal/agent-session-journal-position' +import { agentJournalItemSubagentId } from '../../agent-session/journal/agent-session-journal-producer' import { stripNoiseMessages } from '../native-chat-noise' import { foldToolMessages } from '../tools/native-chat-tool-fold' import { foldSubagentItems } from './native-chat-subagent-items' diff --git a/src/shared/native-chat/transcript/native-chat-turn-activity.test.ts b/src/shared/native-chat/transcript/native-chat-turn-activity.test.ts index ac51aac3a09..8335c52f857 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-activity.test.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-activity.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalItemBody, AgentJournalRenderItem -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import { selectStructuredAgentTurnActivity } from './native-chat-turn-activity' function item(sequence: number, body: AgentJournalItemBody): AgentJournalRenderItem { diff --git a/src/shared/native-chat/transcript/native-chat-turn-activity.ts b/src/shared/native-chat/transcript/native-chat-turn-activity.ts index bc5ac7fdd21..9e136b60bf3 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-activity.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-activity.ts @@ -1,7 +1,7 @@ import { readAgentJournalTurn } from '../../agent-session-turn-record' -import type { AgentJournalRenderItem } from '../../agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../agent-session/journal/agent-session-journal-types' import type { AgentSessionTurnActivity } from '../../agent-session-wire' -import { isRootAgentJournalItem } from '../../agent-session-journal-producer' +import { isRootAgentJournalItem } from '../../agent-session/journal/agent-session-journal-producer' import { normalizePromptField } from '../../agent-status-field-normalization' import { describeActiveToolCall, formatActiveToolLabel } from '../tools/native-chat-tool-activity' diff --git a/src/shared/native-chat/transcript/native-chat-turn-grouping.ts b/src/shared/native-chat/transcript/native-chat-turn-grouping.ts index 8e842cd255a..19b122f6d94 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-grouping.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-grouping.ts @@ -1,6 +1,6 @@ // Share desktop/mobile turn ownership, bar placement and row order. -import type { AgentJournalRenderItem } from '../../agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../agent-session-turn-record' import type { NativeChatRole } from '../native-chat-types' diff --git a/src/shared/native-chat/transcript/native-chat-turn-membership.test.ts b/src/shared/native-chat/transcript/native-chat-turn-membership.test.ts index f84f26dcb50..c3c8e481039 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-membership.test.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-membership.test.ts @@ -2,12 +2,12 @@ import { describe, expect, it } from 'vitest' import { agentJournalItemKey, agentJournalSubmissionKey -} from '../../agent-session-journal-item-key' +} from '../../agent-session/journal/agent-session-journal-item-key' import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import type { AgentJournalTurnScope } from '../../agent-session-journal-turn-scope' import { nativeChatRowsInDrawOrder } from './native-chat-turn-grouping' import { nativeChatTurnMembership, structuredAgentTurnAnchors } from './native-chat-turn-membership' diff --git a/src/shared/native-chat/transcript/native-chat-turn-membership.ts b/src/shared/native-chat/transcript/native-chat-turn-membership.ts index 3ce923122c5..bc72dba1522 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-membership.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-membership.ts @@ -5,14 +5,14 @@ import { // Share desktop/mobile keys anchored on the opening user entry or provider-resumed turn record. // Explicit conversation/missing-turn scopes own no turn; legacy hosts fall back to journal order, then position. -import { agentJournalSubmissionKey } from '../../agent-session-journal-item-key' -import { isRootAgentJournalItem } from '../../agent-session-journal-producer' -import { isQueuedAgentJournalSubmission } from '../../agent-session-queued-submission' +import { agentJournalSubmissionKey } from '../../agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from '../../agent-session/journal/agent-session-journal-producer' +import { isQueuedAgentJournalSubmission } from '../../agent-session/requests/agent-session-queued-submission' import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from '../../agent-session-turn-record' import { nativeChatJournalOrderTurnKeys, @@ -22,7 +22,7 @@ import { type NativeChatOpensTurn } from './native-chat-turn-grouping' import type { NativeChatMessage, NativeChatRole } from '../native-chat-types' -import { dispatchWasWithdrawn } from '../../structured-agent-session-dispatch-rejection' +import { dispatchWasWithdrawn } from '../../agent-session/requests/structured-agent-session-dispatch-rejection' import { inSendOrder } from '../native-chat-send-order' import { runningStructuredAgentSessionTurnScope } from '../../structured-agent-session-live-turn' import { nativeChatOpeningTurnKey } from './native-chat-messages-waiting-behind-live-turn' diff --git a/src/shared/native-chat/transcript/native-chat-turn-row-attribution.ts b/src/shared/native-chat/transcript/native-chat-turn-row-attribution.ts index b28d5d185c9..ad78384e2ac 100644 --- a/src/shared/native-chat/transcript/native-chat-turn-row-attribution.ts +++ b/src/shared/native-chat/transcript/native-chat-turn-row-attribution.ts @@ -1,5 +1,5 @@ -import { agentJournalItemPosition } from '../../agent-session-journal-position' -import type { AgentJournalRenderItem } from '../../agent-session-journal-types' +import { agentJournalItemPosition } from '../../agent-session/journal/agent-session-journal-position' +import type { AgentJournalRenderItem } from '../../agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from '../native-chat-types' /** A split result row keeps its source's journal position while gaining its own render identity. */ diff --git a/src/shared/native-chat/transcript/native-chat-unverifiable-turn-status.test.ts b/src/shared/native-chat/transcript/native-chat-unverifiable-turn-status.test.ts index 8d8c672ec3f..71e56d7ad50 100644 --- a/src/shared/native-chat/transcript/native-chat-unverifiable-turn-status.test.ts +++ b/src/shared/native-chat/transcript/native-chat-unverifiable-turn-status.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalTurnItem -} from '../../agent-session-journal-types' +} from '../../agent-session/journal/agent-session-journal-types' import { reduceNativeChatTurnTiming, selectNativeChatTurnStatuses } from './native-chat-turn-status' import { selectStructuredAgentSettledTurns } from '../../structured-agent-session-turn-timing' diff --git a/src/shared/queued-edit-host.test-fixture.ts b/src/shared/queued-edit-host.test-fixture.ts index d8ff2c948bc..3d91b59af1d 100644 --- a/src/shared/queued-edit-host.test-fixture.ts +++ b/src/shared/queued-edit-host.test-fixture.ts @@ -1,9 +1,9 @@ -import type { AgentJournalMessageItem } from './agent-session-journal-types' +import type { AgentJournalMessageItem } from './agent-session/journal/agent-session-journal-types' import type { AgentSessionQueuedMessage, AgentSessionQueuedMessageEditHoldResult, AgentSessionQueuedMessageUpdateResult -} from './agent-session-wire' +} from './agent-session/requests/agent-session-queued-message-wire' import type { QueuedMessageEdit } from './queued-message-edit' type LeaseKey = { callerKey: string; editId: string } diff --git a/src/shared/queued-message-edit-lease.test.ts b/src/shared/queued-message-edit-lease.test.ts index 00fde35f690..99450e1b354 100644 --- a/src/shared/queued-message-edit-lease.test.ts +++ b/src/shared/queued-message-edit-lease.test.ts @@ -4,7 +4,7 @@ import type { QueuedEditHostFixtureModule } from './queued-edit-host.test-fixtur import type { AgentSessionQueuedMessageEditHoldParams, AgentSessionQueuedMessageEditHoldResult -} from './agent-session-wire' +} from './agent-session/requests/agent-session-queued-message-wire' let queuedEditHost: QueuedEditHostFixtureModule['queuedEditHost'] beforeAll(async () => { diff --git a/src/shared/queued-message-edit-lease.ts b/src/shared/queued-message-edit-lease.ts index 6bbc429fcf5..3ab1a941a68 100644 --- a/src/shared/queued-message-edit-lease.ts +++ b/src/shared/queued-message-edit-lease.ts @@ -1,7 +1,7 @@ import type { AgentSessionQueuedMessageEditHoldParams, AgentSessionQueuedMessageEditHoldResult -} from './agent-session-wire' +} from './agent-session/requests/agent-session-queued-message-wire' /** A quarter of the host's two-minute lease. */ export const QUEUED_EDIT_LEASE_RENEW_MS = 30_000 diff --git a/src/shared/queued-message-edit-publication.ts b/src/shared/queued-message-edit-publication.ts index 36456576739..5d82a50a679 100644 --- a/src/shared/queued-message-edit-publication.ts +++ b/src/shared/queued-message-edit-publication.ts @@ -1,6 +1,6 @@ -import type { AgentSessionQueuedMessage } from './agent-session-wire' -import type { AgentJournalSubmission } from './agent-session-journal-types' -import { agentSessionSendBodyFingerprint } from './structured-agent-session-send-mutation' +import type { AgentSessionQueuedMessage } from './agent-session/requests/agent-session-queued-message-wire' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' +import { agentSessionSendBodyFingerprint } from './agent-session/requests/structured-agent-session-send-mutation' /** React container identity is not a new host publication. */ export function queuedEditPublicationKey( diff --git a/src/shared/queued-message-edit.ts b/src/shared/queued-message-edit.ts index 4fb9cd9cf70..982824b40cc 100644 --- a/src/shared/queued-message-edit.ts +++ b/src/shared/queued-message-edit.ts @@ -2,12 +2,12 @@ import type { AgentJournalMessageItem, AgentJournalSkillRef, AgentJournalSubmission -} from './agent-session-journal-types' -import type { AgentSessionQueuedMessage } from './agent-session-queued-message-wire' +} from './agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessage } from './agent-session/requests/agent-session-queued-message-wire' import { pickedSkillsInText, agentSessionSendBodyFingerprint -} from './structured-agent-session-send-mutation' +} from './agent-session/requests/structured-agent-session-send-mutation' import { MAX_SKILL_REFS } from './rpc-contract/structured-agent-session-message-params' import { MAX_BLOCKS, MAX_PROMPT_BYTES } from './rpc-contract/structured-agent-session-params' import { diff --git a/src/shared/structured-agent-question-card.ts b/src/shared/structured-agent-question-card.ts index 22e9812eb2c..a3a79170a8b 100644 --- a/src/shared/structured-agent-question-card.ts +++ b/src/shared/structured-agent-question-card.ts @@ -1,4 +1,7 @@ -import type { AgentJournalFreeTextInput, AgentJournalQuestion } from './agent-session-journal-types' +import type { + AgentJournalFreeTextInput, + AgentJournalQuestion +} from './agent-session/journal/agent-session-journal-types' import type { AgentSessionQuestionAnswer } from './agent-session-question-answer' import type { AskAnswerSelection } from './native-chat-ask-answer' import type { AskPrompt } from './native-chat/input/native-chat-ask-types' diff --git a/src/shared/structured-agent-question-projection.test.ts b/src/shared/structured-agent-question-projection.test.ts index 394ac922cc5..514129c39d4 100644 --- a/src/shared/structured-agent-question-projection.test.ts +++ b/src/shared/structured-agent-question-projection.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { projectStructuredItemToNativeChat } from './structured-agent-session-projection' import { projectStructuredQuestionMessages, diff --git a/src/shared/structured-agent-question-projection.ts b/src/shared/structured-agent-question-projection.ts index 6b9d359c506..40ce24785bb 100644 --- a/src/shared/structured-agent-question-projection.ts +++ b/src/shared/structured-agent-question-projection.ts @@ -1,11 +1,11 @@ import type { AgentJournalRenderItem, AgentJournalQuestionItem -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { isAskUserQuestionTool } from './agent-question-answered-intent' import { parseAskFromToolInput } from './native-chat/input/native-chat-ask' -import { agentJournalItemRowOrigin } from './agent-session-journal-position' -import { agentJournalLinkageFields } from './agent-session-journal-producer' +import { agentJournalItemRowOrigin } from './agent-session/journal/agent-session-journal-position' +import { agentJournalLinkageFields } from './agent-session/journal/agent-session-journal-producer' import type { NativeChatMessage } from './native-chat/native-chat-types' import { projectStructuredItemToNativeChat } from './structured-agent-session-projection' import { readAgentJournalTurn } from './agent-session-turn-record' diff --git a/src/shared/structured-agent-session-command-turn-identity.ts b/src/shared/structured-agent-session-command-turn-identity.ts index 2624c71f6d9..8e53ea04028 100644 --- a/src/shared/structured-agent-session-command-turn-identity.ts +++ b/src/shared/structured-agent-session-command-turn-identity.ts @@ -1,5 +1,5 @@ -import { agentJournalItemKey } from './agent-session-journal-item-key' -import type { AgentJournalItemIdentity } from './agent-session-journal-types' +import { agentJournalItemKey } from './agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from './agent-session-journal-identity' /** Submission-keyed command turn; the queue retains refused cards until this turn records why. */ export function structuredAgentSessionCommandTurnIdentity( diff --git a/src/shared/structured-agent-session-context-usage.test.ts b/src/shared/structured-agent-session-context-usage.test.ts index 47b9ff3995f..51316a8dca5 100644 --- a/src/shared/structured-agent-session-context-usage.test.ts +++ b/src/shared/structured-agent-session-context-usage.test.ts @@ -4,7 +4,10 @@ import type { AgentSessionContextUsage, AgentSessionContextWindow } from './agent-session-context-usage' -import type { AgentJournalItemBody, AgentJournalRenderItem } from './agent-session-journal-types' +import type { + AgentJournalItemBody, + AgentJournalRenderItem +} from './agent-session/journal/agent-session-journal-types' import { latestStructuredAgentContextFacts, selectStructuredAgentContextUsage diff --git a/src/shared/structured-agent-session-context-usage.ts b/src/shared/structured-agent-session-context-usage.ts index d4d304fa0a1..812c342fa02 100644 --- a/src/shared/structured-agent-session-context-usage.ts +++ b/src/shared/structured-agent-session-context-usage.ts @@ -7,7 +7,7 @@ import { type AgentSessionContextUsed, type AgentSessionContextWindow } from './agent-session-context-usage' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn } from './agent-session-turn-record' import { isAgentSessionContextClear, diff --git a/src/shared/structured-agent-session-draft-hand-off.ts b/src/shared/structured-agent-session-draft-hand-off.ts index 35c513f2d7d..0b2d5620e43 100644 --- a/src/shared/structured-agent-session-draft-hand-off.ts +++ b/src/shared/structured-agent-session-draft-hand-off.ts @@ -1,6 +1,6 @@ // Fresh submission IDs differ from draft IDs; queuedMessageId alone proves the host took over a queued draft. -import type { AgentJournalSubmission } from './agent-session-journal-types' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' /** Include handoffs in every dispatch state; the host card/bubble now owns their text. */ export function handedOffQueuedMessageIds( diff --git a/src/shared/structured-agent-session-history-state.ts b/src/shared/structured-agent-session-history-state.ts index 4338754f4c8..347c602c600 100644 --- a/src/shared/structured-agent-session-history-state.ts +++ b/src/shared/structured-agent-session-history-state.ts @@ -1,11 +1,11 @@ -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage, AgentSessionTurnActivity } from './agent-session-wire' import type { AgentSessionBackgroundTaskState } from './agent-session/agent-session-background-task-wire' import type { StructuredAgentHostClock, StructuredAgentSessionState } from './structured-agent-session-reducer' -import { compareAgentJournalItems } from './agent-session-journal-position' +import { compareAgentJournalItems } from './agent-session/journal/agent-session-journal-position' import { MAX_RETAINED_ITEMS, MAX_RETAINED_OWN_ITEMS, diff --git a/src/shared/structured-agent-session-item-retention.test.ts b/src/shared/structured-agent-session-item-retention.test.ts index 51242fa7841..3466e580bf1 100644 --- a/src/shared/structured-agent-session-item-retention.test.ts +++ b/src/shared/structured-agent-session-item-retention.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage } from './agent-session-wire' import { EMPTY_STRUCTURED_AGENT_SESSION, diff --git a/src/shared/structured-agent-session-item-retention.ts b/src/shared/structured-agent-session-item-retention.ts index a3f8efe31c4..63c21ac6a73 100644 --- a/src/shared/structured-agent-session-item-retention.ts +++ b/src/shared/structured-agent-session-item-retention.ts @@ -1,6 +1,9 @@ -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' // Above initial 300-row reads plus a page; trims remain pageable. Count own rows so hidden child output cannot crowd out the conversation. export const MAX_RETAINED_OWN_ITEMS = 1024 diff --git a/src/shared/structured-agent-session-live-turn.test.ts b/src/shared/structured-agent-session-live-turn.test.ts index 7043ef480e0..e2226e72ab5 100644 --- a/src/shared/structured-agent-session-live-turn.test.ts +++ b/src/shared/structured-agent-session-live-turn.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { statusStructuredAgentSessionToolCall, isStructuredAgentSessionThinking diff --git a/src/shared/structured-agent-session-live-turn.ts b/src/shared/structured-agent-session-live-turn.ts index 02decff8df8..7742a86c023 100644 --- a/src/shared/structured-agent-session-live-turn.ts +++ b/src/shared/structured-agent-session-live-turn.ts @@ -5,10 +5,10 @@ import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalRenderItem, - type AgentJournalTurnLifecycle, - type AgentJournalTurnScope -} from './agent-session-journal-types' -import { isRootAgentJournalItem } from './agent-session-journal-producer' + type AgentJournalTurnLifecycle +} from './agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' import type { AgentSessionLatestTurn, AgentSessionSubscribeEvent } from './agent-session-wire' import { readAgentJournalTurn } from './agent-session-turn-record' import { isAgentSessionContextClear } from './agent-session-context-clear' diff --git a/src/shared/structured-agent-session-main-agent-working.ts b/src/shared/structured-agent-session-main-agent-working.ts index 9ff547e5bb5..16b72b8824f 100644 --- a/src/shared/structured-agent-session-main-agent-working.ts +++ b/src/shared/structured-agent-session-main-agent-working.ts @@ -1,5 +1,5 @@ -import type { AgentJournalSubmission } from './agent-session-journal-types' -import { hasUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' +import { hasUnansweredStructuredAgentSessionDispatch } from './agent-session/requests/structured-agent-session-unanswered-dispatch' /** Host operational projections scope current generations; clients without scope retain legacy running-turn/pending-prompt/unanswered-send reads. */ export type StructuredAgentSessionWorkScope = { diff --git a/src/shared/structured-agent-session-message-projection-stopped-before-start.test.ts b/src/shared/structured-agent-session-message-projection-stopped-before-start.test.ts index 29e10828211..de77ef55276 100644 --- a/src/shared/structured-agent-session-message-projection-stopped-before-start.test.ts +++ b/src/shared/structured-agent-session-message-projection-stopped-before-start.test.ts @@ -1,14 +1,14 @@ // Stopped-before-start sends keep their original place plus one notice; the journal already holds the send and refusal. import { describe, expect, it } from 'vitest' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' import type { AgentJournalAnsweredTurn, AgentJournalItemBody, AgentJournalRenderItem, - AgentJournalSubmission, - AgentJournalTurnScope -} from './agent-session-journal-types' + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' import { NATIVE_CHAT_STOPPED_BEFORE_START_PRESENTATION, NATIVE_CHAT_STOPPED_BEFORE_START_TEXT @@ -16,7 +16,7 @@ import { import { DISPATCH_REJECTED_CANCELLED, DISPATCH_REJECTED_WRITE_FAILED -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection' import { projectNativeChatTranscript, diff --git a/src/shared/structured-agent-session-message-projection.test.ts b/src/shared/structured-agent-session-message-projection.test.ts index ff164803236..ebd9b1fc5ea 100644 --- a/src/shared/structured-agent-session-message-projection.test.ts +++ b/src/shared/structured-agent-session-message-projection.test.ts @@ -6,9 +6,9 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { structuredAgentSessionSendBody } from './structured-agent-session-send-mutation' +} from './agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' +import { structuredAgentSessionSendBody } from './agent-session/requests/structured-agent-session-send-mutation' import { projectStructuredAgentSessionMessages, structuredAgentSessionRejectedShownInPlace @@ -17,7 +17,7 @@ import { projectNativeChatTranscriptMessages } from './native-chat/transcript/na import { DISPATCH_REJECTED_CANCELLED, DISPATCH_REJECTED_WRITE_FAILED -} from './structured-agent-session-dispatch-rejection' +} from './agent-session/requests/structured-agent-session-dispatch-rejection' import { withNativeChatCutTurnNotices } from './native-chat/transcript/native-chat-cut-turn-notice' import { agentSessionFailureFact } from './agent-session-failure' import { agentSessionFailureWords } from './agent-session-failure-words' diff --git a/src/shared/structured-agent-session-message-projection.ts b/src/shared/structured-agent-session-message-projection.ts index 041c8ebddca..d68791ce962 100644 --- a/src/shared/structured-agent-session-message-projection.ts +++ b/src/shared/structured-agent-session-message-projection.ts @@ -1,12 +1,12 @@ +import type { AgentJournalCursor } from './agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalMessageItem, AgentJournalRenderItem, AgentJournalSubmission -} from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { selectAgentSessionCurrentRequests } from './agent-session-current-requests' -import { isQueuedAgentJournalSubmission } from './agent-session-queued-submission' +} from './agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' +import { selectAgentSessionCurrentRequests } from './agent-session/requests/agent-session-current-requests' +import { isQueuedAgentJournalSubmission } from './agent-session/requests/agent-session-queued-submission' import { collapseProviderRetryRuns } from './native-chat/native-chat-provider-retry-runs' import { keepStoppedSendsInSendOrder, @@ -15,7 +15,7 @@ import { } from './native-chat/native-chat-stopped-before-start' import { compareNativeChatTranscriptMessages } from './native-chat/transcript/native-chat-transcript-projection' import type { NativeChatMessage } from './native-chat/native-chat-types' -import { dispatchWasWithdrawn } from './structured-agent-session-dispatch-rejection' +import { dispatchWasWithdrawn } from './agent-session/requests/structured-agent-session-dispatch-rejection' import { projectStructuredItemsToNativeChat } from './structured-agent-session-projection' import { isActionableStructuredAgentSessionPrompt } from './structured-agent-session-live-turn' import { diff --git a/src/shared/structured-agent-session-owed-work.ts b/src/shared/structured-agent-session-owed-work.ts index be3891041e7..c230eabd64c 100644 --- a/src/shared/structured-agent-session-owed-work.ts +++ b/src/shared/structured-agent-session-owed-work.ts @@ -1,4 +1,7 @@ -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' import { activeStructuredAgentSessionTurnId } from './structured-agent-session-live-turn' import { isStructuredAgentSessionMainAgentWorking, diff --git a/src/shared/structured-agent-session-projection-turn-verdict.test.ts b/src/shared/structured-agent-session-projection-turn-verdict.test.ts new file mode 100644 index 00000000000..23ca2b261c8 --- /dev/null +++ b/src/shared/structured-agent-session-projection-turn-verdict.test.ts @@ -0,0 +1,91 @@ +import { describe, expect, it } from 'vitest' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' +import { + projectStructuredAgentSessionStatusState, + projectStructuredAgentSessionStatusSummary +} from './structured-agent-session-projection' + +function item( + itemId: string, + sequence: number, + body: AgentJournalRenderItem['body'] +): AgentJournalRenderItem { + return { itemId, sequence, revision: 1, observedAt: sequence, body } +} + +describe('the turn verdict on the status summary', () => { + const user = item('u1', 1, { + kind: 'message', + role: 'user', + blocks: [{ type: 'text', text: 'go' }] + }) + + it('carries the newest settled turn verdict only while the session is idle', () => { + const running = item('turn-running', 2, { + kind: 'turn', + turnId: 'turn-1', + state: 'running' + }) + expect(projectStructuredAgentSessionStatusSummary([user, running])).not.toHaveProperty( + 'turnOutcome' + ) + const cancelled = item('turn-cancelled', 3, { + kind: 'turn', + turnId: 'turn-1', + state: 'interrupted', + outcome: 'cancellation' + }) + expect(projectStructuredAgentSessionStatusSummary([user, cancelled])).toMatchObject({ + status: 'idle', + turnOutcome: 'cancellation' + }) + }) + + it('reports no verdict for a completed turn the provider never judged', () => { + const completed = item('turn-completed', 2, { + kind: 'turn', + turnId: 'turn-1', + state: 'completed' + }) + expect(projectStructuredAgentSessionStatusSummary([user, completed])).not.toHaveProperty( + 'turnOutcome' + ) + }) + + // With no verdict from the provider, the lifecycle the host settled is what the row reports. + it.each([ + ['interrupted', 'interruption'], + ['unverifiable', 'unconfirmed'] + ] as const)( + 'reads an %s turn the provider never judged as its host-observed end', + (state, outcome) => { + const ended = item('turn-ended', 2, { kind: 'turn', turnId: 'turn-1', state }) + expect(projectStructuredAgentSessionStatusSummary([user, ended])).toMatchObject({ + status: 'idle', + turnOutcome: outcome + }) + } + ) + + it("keeps the provider's own verdict over what the host observed of the end", () => { + for (const outcome of ['cancellation', 'failure', 'success'] as const) { + const judged = item('turn-judged', 2, { + kind: 'turn', + turnId: 'turn-1', + state: 'interrupted', + outcome + }) + expect(projectStructuredAgentSessionStatusSummary([user, judged])).toMatchObject({ + turnOutcome: outcome + }) + } + }) + + it('keeps the observed end off the request the completion feed announces', () => { + const ended = item('turn-ended', 2, { kind: 'turn', turnId: 'turn-1', state: 'interrupted' }) + expect(projectStructuredAgentSessionStatusState([user, ended]).latestRequest).toMatchObject({ + turnState: 'interrupted', + outcome: null + }) + }) +}) diff --git a/src/shared/structured-agent-session-projection.test.ts b/src/shared/structured-agent-session-projection.test.ts index 69e0ef827d6..31a37c427aa 100644 --- a/src/shared/structured-agent-session-projection.test.ts +++ b/src/shared/structured-agent-session-projection.test.ts @@ -1,12 +1,14 @@ import { describe, expect, it } from 'vitest' import { AGENT_STATUS_MAX_FIELD_LENGTH } from './agent-status-field-normalization' import { agentSessionFailureWords } from './agent-session-failure-words' -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' -import { AgentJournalRenderItemSchema } from './agent-session-journal-schemas' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' +import { AgentJournalRenderItemSchema } from './agent-session/journal/agent-session-journal-schemas' import { parsePaneKey } from './stable-pane-id' import { activeStructuredAgentSessionTurnId, - hasUnansweredStructuredAgentSessionDispatch, projectStructuredItemToNativeChat, projectStructuredItemsToNativeChat, projectStructuredAgentSessionStatus, @@ -14,8 +16,9 @@ import { projectStructuredAgentSessionStatusSummary, structuredAgentSessionPaneKey } from './structured-agent-session-projection' +import { hasUnansweredStructuredAgentSessionDispatch } from './agent-session/requests/structured-agent-session-unanswered-dispatch' import { statusStructuredAgentSessionToolCall } from './structured-agent-session-live-turn' -import { latestStructuredAgentSessionAssistantMessage } from './structured-agent-session-latest-request' +import { latestStructuredAgentSessionAssistantMessage } from './agent-session/requests/structured-agent-session-latest-request' function item( itemId: string, @@ -798,80 +801,3 @@ describe("producer linkage — a subagent's output never speaks for the parent", ).toBe('legacy child line') }) }) - -describe('the turn verdict on the status summary', () => { - const user = item('u1', 1, { - kind: 'message', - role: 'user', - blocks: [{ type: 'text', text: 'go' }] - }) - - it('carries the newest settled turn verdict only while the session is idle', () => { - const running = item('turn-running', 2, { - kind: 'turn', - turnId: 'turn-1', - state: 'running' - }) - expect(projectStructuredAgentSessionStatusSummary([user, running])).not.toHaveProperty( - 'turnOutcome' - ) - const cancelled = item('turn-cancelled', 3, { - kind: 'turn', - turnId: 'turn-1', - state: 'interrupted', - outcome: 'cancellation' - }) - expect(projectStructuredAgentSessionStatusSummary([user, cancelled])).toMatchObject({ - status: 'idle', - turnOutcome: 'cancellation' - }) - }) - - it('reports no verdict for a completed turn the provider never judged', () => { - const completed = item('turn-completed', 2, { - kind: 'turn', - turnId: 'turn-1', - state: 'completed' - }) - expect(projectStructuredAgentSessionStatusSummary([user, completed])).not.toHaveProperty( - 'turnOutcome' - ) - }) - - // With no verdict from the provider, the lifecycle the host settled is what the row reports. - it.each([ - ['interrupted', 'interruption'], - ['unverifiable', 'unconfirmed'] - ] as const)( - 'reads an %s turn the provider never judged as its host-observed end', - (state, outcome) => { - const ended = item('turn-ended', 2, { kind: 'turn', turnId: 'turn-1', state }) - expect(projectStructuredAgentSessionStatusSummary([user, ended])).toMatchObject({ - status: 'idle', - turnOutcome: outcome - }) - } - ) - - it("keeps the provider's own verdict over what the host observed of the end", () => { - for (const outcome of ['cancellation', 'failure', 'success'] as const) { - const judged = item('turn-judged', 2, { - kind: 'turn', - turnId: 'turn-1', - state: 'interrupted', - outcome - }) - expect(projectStructuredAgentSessionStatusSummary([user, judged])).toMatchObject({ - turnOutcome: outcome - }) - } - }) - - it('keeps the observed end off the request the completion feed announces', () => { - const ended = item('turn-ended', 2, { kind: 'turn', turnId: 'turn-1', state: 'interrupted' }) - expect(projectStructuredAgentSessionStatusState([user, ended]).latestRequest).toMatchObject({ - turnState: 'interrupted', - outcome: null - }) - }) -}) diff --git a/src/shared/structured-agent-session-projection.ts b/src/shared/structured-agent-session-projection.ts index 8729f101dd7..91bb7edfd41 100644 --- a/src/shared/structured-agent-session-projection.ts +++ b/src/shared/structured-agent-session-projection.ts @@ -10,12 +10,12 @@ import { type AgentJournalMessageSendMode, type AgentJournalRenderItem, type AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import type { AgentTurnOutcome } from './agent-turn-outcome' import { agentJournalToolCallLifecycle } from './agent-journal-tool-call-lifecycle' -import { agentJournalLinkageFields } from './agent-session-journal-producer' +import { agentJournalLinkageFields } from './agent-session/journal/agent-session-journal-producer' import { structuredAgentSessionStatusBlock } from './structured-agent-session-status-block' -import { agentJournalItemRowOrigin } from './agent-session-journal-position' +import { agentJournalItemRowOrigin } from './agent-session/journal/agent-session-journal-position' import { AGENT_STATUS_TOOL_INPUT_MAX_LENGTH, AGENT_STATUS_TOOL_NAME_MAX_LENGTH @@ -28,7 +28,7 @@ import { latestStructuredAgentSessionPrompt, latestStructuredAgentSessionRequest, type StructuredAgentSessionLatestRequest -} from './structured-agent-session-latest-request' +} from './agent-session/requests/structured-agent-session-latest-request' import { isStructuredAgentSessionToolAction, structuredAgentSessionToolCallBlock @@ -43,12 +43,10 @@ import type { StructuredAgentSessionWorkScope } from './structured-agent-session import { agentSessionCurrentContextRows } from './agent-session-context-clear' import { nativeChatStatusTurnOutcome } from './native-chat/native-chat-orca-stop-cut' -// Keep existing live-turn/unanswered-send consumers on one import path. export { activeStructuredAgentSessionTurnId, newestStructuredAgentSessionTurn } from './structured-agent-session-live-turn' -export { hasUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch' /** Only transport-clipped output has a fetchable remainder; older saved truncations have none. */ function toolResult( diff --git a/src/shared/structured-agent-session-queued-cards.test.ts b/src/shared/structured-agent-session-queued-cards.test.ts index a634507f92c..fca97a66391 100644 --- a/src/shared/structured-agent-session-queued-cards.test.ts +++ b/src/shared/structured-agent-session-queued-cards.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalSubmission } from './agent-session-journal-types' -import type { AgentSessionQueuedMessage } from './agent-session-wire' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' +import type { AgentSessionQueuedMessage } from './agent-session/requests/agent-session-queued-message-wire' import { headSteerableQueuedMessageCard, projectQueuedMessageCards, diff --git a/src/shared/structured-agent-session-queued-cards.ts b/src/shared/structured-agent-session-queued-cards.ts index cfc1b85ab59..dd35354f173 100644 --- a/src/shared/structured-agent-session-queued-cards.ts +++ b/src/shared/structured-agent-session-queued-cards.ts @@ -9,16 +9,19 @@ import { import { agentSessionFailureStatedByRow } from './agent-session-visible-failures' import { agentSessionWriteNotDoneParts } from './agent-session-refusal-notice' import type { AgentSessionWriteNoticePart } from './agent-session-write-notice-copy' -import { dispatchWasWithdrawn } from './structured-agent-session-dispatch-rejection' +import { dispatchWasWithdrawn } from './agent-session/requests/structured-agent-session-dispatch-rejection' import { structuredAgentSessionAttemptFailureParts } from './structured-agent-session-rejection-words' -import type { AgentJournalItemBody, AgentJournalSubmission } from './agent-session-journal-types' +import type { + AgentJournalItemBody, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' import { pendingPromptsAllUnanswerableHere } from './agent-session-approval-subject' import type { NativeChatImageRefBlock } from './native-chat/native-chat-types' import { QUEUED_MESSAGE_PAUSED_SEND_FAILED, type AgentSessionQueuedMessage, type AgentSessionQueuePause -} from './agent-session-wire' +} from './agent-session/requests/agent-session-queued-message-wire' import { readAgentMessageSource, type AgentMessageSource diff --git a/src/shared/structured-agent-session-reasoning-projection.spec.ts b/src/shared/structured-agent-session-reasoning-projection.spec.ts index 594c29504da..ef200f097a0 100644 --- a/src/shared/structured-agent-session-reasoning-projection.spec.ts +++ b/src/shared/structured-agent-session-reasoning-projection.spec.ts @@ -3,7 +3,7 @@ import type { AgentJournalMessageItem, AgentJournalMessageState, AgentJournalRenderItem -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { projectStructuredItemToNativeChat } from './structured-agent-session-projection' function item( diff --git a/src/shared/structured-agent-session-reducer.queued-messages.test.ts b/src/shared/structured-agent-session-reducer.queued-messages.test.ts index 09f3aa2f45e..7fffa180ea8 100644 --- a/src/shared/structured-agent-session-reducer.queued-messages.test.ts +++ b/src/shared/structured-agent-session-reducer.queued-messages.test.ts @@ -1,12 +1,11 @@ // Live lists own queue state: omission means unchanged, stale history cannot overwrite them, and older-host absence stays absent. import { describe, expect, it } from 'vitest' +import type { AgentSessionHistoryPage, AgentSessionSubscribeEvent } from './agent-session-wire' import type { - AgentSessionHistoryPage, AgentSessionQueuedMessage, - AgentSessionQueuePause, - AgentSessionSubscribeEvent -} from './agent-session-wire' + AgentSessionQueuePause +} from './agent-session/requests/agent-session-queued-message-wire' import { EMPTY_STRUCTURED_AGENT_SESSION, reduceStructuredAgentSession, diff --git a/src/shared/structured-agent-session-reducer.test.ts b/src/shared/structured-agent-session-reducer.test.ts index 38915eb7aa1..aa18edfaf74 100644 --- a/src/shared/structured-agent-session-reducer.test.ts +++ b/src/shared/structured-agent-session-reducer.test.ts @@ -1,5 +1,8 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage, AgentSessionLatestTurn } from './agent-session-wire' import { runningStructuredAgentSessionTurnId } from './structured-agent-session-live-turn' import { diff --git a/src/shared/structured-agent-session-reducer.ts b/src/shared/structured-agent-session-reducer.ts index 5002e0038cb..8f27a7b544b 100644 --- a/src/shared/structured-agent-session-reducer.ts +++ b/src/shared/structured-agent-session-reducer.ts @@ -1,4 +1,4 @@ -import type { AgentSessionCurrentRequestsMarker } from './agent-session-current-requests-wire' +import type { AgentSessionCurrentRequestsMarker } from './agent-session/requests/agent-session-current-requests-wire' import { hostClockField, replacePage, @@ -10,21 +10,23 @@ import { currentRequestsState, applyCurrentRequestsMarker, type AgentSessionCurrentRequestsState -} from './agent-session-current-requests' +} from './agent-session/requests/agent-session-current-requests' +import type { AgentJournalCursor } from './agent-session-journal-identity' import type { - AgentJournalCursor, AgentJournalRenderItem, AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import type { AgentSessionSlashCommand, AgentSessionHistoryPage, AgentSessionLatestTurn, - AgentSessionQueuedMessage, - AgentSessionQueuePause, AgentSessionSubscribeEvent, AgentSessionTurnActivity } from './agent-session-wire' +import type { + AgentSessionQueuedMessage, + AgentSessionQueuePause +} from './agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionBackgroundTaskState } from './agent-session/agent-session-background-task-wire' import type { AgentSessionRefusalReference } from './agent-session-wire-refusals' import { backgroundTaskStatesEqual } from './agent-session/agent-session-background-task-state-equality' @@ -38,7 +40,7 @@ import { } from './structured-agent-session-item-retention' import { readAgentJournalTurn } from './agent-session-turn-record' import { agentSessionHasOlderTranscript } from './agent-session-context-clear' -import { queuePublicationField } from './structured-agent-session-queue-publication-field' +import { queuePublicationField } from './agent-session/requests/structured-agent-session-queue-publication-field' import { actionablePromptIdsAfterStructuredAgentSessionBatch, hostWorkingAfterStructuredAgentSessionBatch, diff --git a/src/shared/structured-agent-session-rejection-words.test.ts b/src/shared/structured-agent-session-rejection-words.test.ts index 7709d3caae9..4efd8b07427 100644 --- a/src/shared/structured-agent-session-rejection-words.test.ts +++ b/src/shared/structured-agent-session-rejection-words.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from 'vitest' import type { AgentSessionFailureFact } from './agent-session-failure' -import type { AgentJournalSubmission } from './agent-session-journal-types' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' import { agentSessionWriteNoticeEnglish } from './agent-session-refusal-notice' -import { DISPATCH_REJECTED_QUEUE_FULL } from './structured-agent-session-dispatch-rejection' +import { DISPATCH_REJECTED_QUEUE_FULL } from './agent-session/requests/structured-agent-session-dispatch-rejection' import { structuredAgentSessionRecordedRejectionParts, structuredAgentSessionRejectionParts diff --git a/src/shared/structured-agent-session-rejection-words.ts b/src/shared/structured-agent-session-rejection-words.ts index 7b0752f5fb5..367e195d626 100644 --- a/src/shared/structured-agent-session-rejection-words.ts +++ b/src/shared/structured-agent-session-rejection-words.ts @@ -8,9 +8,9 @@ import { type AgentSessionFailureFact } from './agent-session-failure' import type { AgentSessionFailureWordsContext } from './agent-session-failure-words' -import type { AgentJournalSubmission } from './agent-session-journal-types' +import type { AgentJournalSubmission } from './agent-session/journal/agent-session-journal-types' import { agentSessionFailureStatedByRow } from './agent-session-visible-failures' -import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection' +import { classifyDispatchRejection } from './agent-session/requests/structured-agent-session-dispatch-rejection' /** Show provider content refusals verbatim, but replace internal transport markers with actionable copy across desktop/mobile. * Proven non-delivery permits resend without duplication; a null reason claims no unknown cause or next step. */ diff --git a/src/shared/structured-agent-session-renderer-client-capabilities.ts b/src/shared/structured-agent-session-renderer-client-capabilities.ts index 568fbc580d9..ca6fea4692c 100644 --- a/src/shared/structured-agent-session-renderer-client-capabilities.ts +++ b/src/shared/structured-agent-session-renderer-client-capabilities.ts @@ -2,7 +2,7 @@ import { AGENT_SESSION_COMMANDS_ON_REQUEST_CAPABILITY, AGENT_SESSION_COHERENT_MODEL_CATALOG_CAPABILITY } from './structured-agent-session-surface-capabilities' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session-current-requests-capability' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from './agent-session/requests/agent-session-current-requests-capability' import { AGENT_SESSION_BACKGROUND_TASK_CHILD_VIEWS_CAPABILITY } from './agent-session-background-task-child-views-capability' import { AGENT_SESSION_CREATE_MESSAGE_RUNTIME_CAPABILITY } from './agent-session-create-capabilities' import { AGENT_SESSION_OPTIONAL_MODEL_CLIENT_CAPABILITY } from './agent-session/options/agent-session-optional-model-capability' diff --git a/src/shared/structured-agent-session-start-failure-row-key.ts b/src/shared/structured-agent-session-start-failure-row-key.ts index e5e6d772f76..70d19306d37 100644 --- a/src/shared/structured-agent-session-start-failure-row-key.ts +++ b/src/shared/structured-agent-session-start-failure-row-key.ts @@ -1,7 +1,7 @@ // Key failure rows by start identity so readers never match by prose. -import { parseAgentJournalItemKey } from './agent-session-journal-item-key' -import type { AgentJournalItemIdentity } from './agent-session-journal-types' +import { parseAgentJournalItemKey } from './agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalItemIdentity } from './agent-session-journal-identity' const START_FAILURE_ROW = 'start-failure:' diff --git a/src/shared/structured-agent-session-status-block.ts b/src/shared/structured-agent-session-status-block.ts index 413ee4d7830..48fbdc2f061 100644 --- a/src/shared/structured-agent-session-status-block.ts +++ b/src/shared/structured-agent-session-status-block.ts @@ -1,5 +1,6 @@ import { readWholeAgentSessionFailureFact } from './agent-session-failure' -import type { AgentJournalStatusItem, AgentJournalTurnScope } from './agent-session-journal-types' +import type { AgentJournalStatusItem } from './agent-session/journal/agent-session-journal-types' +import type { AgentJournalTurnScope } from './agent-session-journal-turn-scope' import { readAgentSessionOrcaStop } from './agent-session-orca-stop' import type { NativeChatTextBlock } from './native-chat/native-chat-types' import { diff --git a/src/shared/structured-agent-session-status-started-at.test.ts b/src/shared/structured-agent-session-status-started-at.test.ts index 4f1a7592281..eb000a28abf 100644 --- a/src/shared/structured-agent-session-status-started-at.test.ts +++ b/src/shared/structured-agent-session-status-started-at.test.ts @@ -3,7 +3,7 @@ import type { AgentJournalItemBody, AgentJournalRenderItem, AgentJournalSubmission -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { projectStructuredAgentSessionStatusSummary } from './structured-agent-session-projection' import { structuredAgentSessionRowStateStartedAt } from './structured-agent-session-status-started-at' diff --git a/src/shared/structured-agent-session-status-started-at.ts b/src/shared/structured-agent-session-status-started-at.ts index e42ee97b722..65fffe872ae 100644 --- a/src/shared/structured-agent-session-status-started-at.ts +++ b/src/shared/structured-agent-session-status-started-at.ts @@ -1,15 +1,18 @@ // Date status from own turn/send/prompt edges, never newest-row time: child output would keep redating an idle lead. // Turn records need no producer filter because they never carry child linkage (structured-agent-session-live-turn.ts). -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' import { readAgentJournalTurn } from './agent-session-turn-record' import type { StructuredAgentSessionProjectedStatus } from './structured-agent-session-projection' -import type { StructuredAgentSessionLatestRequest } from './structured-agent-session-latest-request' +import type { StructuredAgentSessionLatestRequest } from './agent-session/requests/structured-agent-session-latest-request' import type { AgentSessionStatusSummary } from './agent-session-wire' import type { AgentMainAgentStatus } from './main-agent-status' import type { AgentStatusState } from './agent-status-types' -import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch' +import { isUnansweredStructuredAgentSessionDispatch } from './agent-session/requests/structured-agent-session-unanswered-dispatch' /** Undefined when the journal records no edge that dates `status`; readers keep their own rule. */ export function structuredAgentSessionStatusStartedAt( diff --git a/src/shared/structured-agent-session-status-tool-line.test.ts b/src/shared/structured-agent-session-status-tool-line.test.ts index b5dc99a0479..ad3c6785d09 100644 --- a/src/shared/structured-agent-session-status-tool-line.test.ts +++ b/src/shared/structured-agent-session-status-tool-line.test.ts @@ -3,7 +3,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalToolCallState -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { describeToolInput } from './native-chat/tools/native-chat-tool-summary' import { projectStructuredAgentSessionStatusSummary, diff --git a/src/shared/structured-agent-session-subagent-roster.test.ts b/src/shared/structured-agent-session-subagent-roster.test.ts index 5e79338b0aa..bb8f1898e37 100644 --- a/src/shared/structured-agent-session-subagent-roster.test.ts +++ b/src/shared/structured-agent-session-subagent-roster.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import type { NativeChatSubagentState } from './native-chat/native-chat-types' import { foldStructuredAgentSubagentRoster, diff --git a/src/shared/structured-agent-session-subagent-roster.ts b/src/shared/structured-agent-session-subagent-roster.ts index e951bcce9f0..1a43ffd432f 100644 --- a/src/shared/structured-agent-session-subagent-roster.ts +++ b/src/shared/structured-agent-session-subagent-roster.ts @@ -1,12 +1,15 @@ // Retain names/state beyond the loaded window using all roster rows/revisions and page-side entries for older rows. // Rebuild on replacement pages across epoch/reconnect; removals and revisions discard names their source row no longer carries. -import type { AgentJournalPosition, AgentJournalRenderItem } from './agent-session-journal-types' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import type { + AgentJournalPosition, + AgentJournalRenderItem +} from './agent-session/journal/agent-session-journal-types' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' import { agentJournalItemPosition, compareAgentJournalPositions -} from './agent-session-journal-position' +} from './agent-session/journal/agent-session-journal-position' import type { AgentSessionHistoryPage, AgentSessionSubagentRosterEntry } from './agent-session-wire' import { namedSubagents } from './native-chat/transcript/native-chat-subagent-items' import type { NativeChatSubagentEntry } from './native-chat/native-chat-types' diff --git a/src/shared/structured-agent-session-turn-bars.test.ts b/src/shared/structured-agent-session-turn-bars.test.ts index 00dfd04f6a0..fd0e7cd8b35 100644 --- a/src/shared/structured-agent-session-turn-bars.test.ts +++ b/src/shared/structured-agent-session-turn-bars.test.ts @@ -3,7 +3,7 @@ import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycle -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import type { NativeChatMessage } from './native-chat/native-chat-types' import { nativeChatTurnMembership } from './native-chat/transcript/native-chat-turn-membership' import { diff --git a/src/shared/structured-agent-session-turn-timing-retention.test.ts b/src/shared/structured-agent-session-turn-timing-retention.test.ts index bb8fbb10238..57fc6c2f8b7 100644 --- a/src/shared/structured-agent-session-turn-timing-retention.test.ts +++ b/src/shared/structured-agent-session-turn-timing-retention.test.ts @@ -1,5 +1,8 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from './agent-session/journal/agent-session-journal-types' import type { AgentSessionHistoryPage } from './agent-session-wire' import { EMPTY_STRUCTURED_AGENT_SESSION, diff --git a/src/shared/structured-agent-session-turn-timing.test.ts b/src/shared/structured-agent-session-turn-timing.test.ts index cf2517e8277..53aa222ebef 100644 --- a/src/shared/structured-agent-session-turn-timing.test.ts +++ b/src/shared/structured-agent-session-turn-timing.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { selectNativeChatTurnStatuses } from './native-chat/transcript/native-chat-turn-status' import { completedStructuredAgentTurnSeconds, diff --git a/src/shared/structured-agent-session-turn-timing.ts b/src/shared/structured-agent-session-turn-timing.ts index c78ed6e2592..cb6c2c44b2a 100644 --- a/src/shared/structured-agent-session-turn-timing.ts +++ b/src/shared/structured-agent-session-turn-timing.ts @@ -1,11 +1,11 @@ // Durable host-clock lifecycle endpoints/provider durations keep settled timing identical on desktop/mobile without client clocks. -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' import type { AgentJournalRenderItem, AgentJournalSubmission, AgentJournalTurnLifecycleState -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { readAgentJournalTurn, readAgentJournalTurnOutcome } from './agent-session-turn-record' import { agentTurnVerdict, type AgentTurnOutcome } from './agent-turn-outcome' import { structuredAgentTurnAnchors } from './native-chat/transcript/native-chat-turn-membership' diff --git a/src/shared/structured-agent-session-unknown-item.spec.ts b/src/shared/structured-agent-session-unknown-item.spec.ts index 429f69e81b3..0c65627eac9 100644 --- a/src/shared/structured-agent-session-unknown-item.spec.ts +++ b/src/shared/structured-agent-session-unknown-item.spec.ts @@ -1,8 +1,8 @@ // Retain unknown item kinds for compatibility without rendering them or deriving host/client work state from them. import { expect, it } from 'vitest' -import { isAdmissibleAgentJournalItemBody } from './agent-session-journal-schemas' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import { isAdmissibleAgentJournalItemBody } from './agent-session/journal/agent-session-journal-schemas' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import { activeStructuredAgentSessionTurnId } from './structured-agent-session-live-turn' import { projectStructuredAgentSessionStatusSummary, diff --git a/src/shared/structured-agent-start-projection.ts b/src/shared/structured-agent-start-projection.ts index de7573c6f2d..5dd4db02c30 100644 --- a/src/shared/structured-agent-start-projection.ts +++ b/src/shared/structured-agent-start-projection.ts @@ -1,6 +1,6 @@ -import type { AgentJournalRenderItem } from './agent-session-journal-types' -import { agentJournalItemRowOrigin } from './agent-session-journal-position' -import { agentJournalLinkageFields } from './agent-session-journal-producer' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' +import { agentJournalItemRowOrigin } from './agent-session/journal/agent-session-journal-position' +import { agentJournalLinkageFields } from './agent-session/journal/agent-session-journal-producer' import { readAgentMessageSource } from './agent-session/agent-session-message-source' import type { NativeChatMessage } from './native-chat/native-chat-types' import { projectStructuredItemToNativeChat } from './structured-agent-session-projection' diff --git a/src/shared/structured-agent-turn-clock-anchor.test.ts b/src/shared/structured-agent-turn-clock-anchor.test.ts index e875f00059c..40149ad31d5 100644 --- a/src/shared/structured-agent-turn-clock-anchor.test.ts +++ b/src/shared/structured-agent-turn-clock-anchor.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import type { AgentJournalRenderItem, AgentJournalTurnLifecycle -} from './agent-session-journal-types' +} from './agent-session/journal/agent-session-journal-types' import { agentJournalTurnBody } from './agent-session-turn-record' import { stepStructuredAgentTurnClock, diff --git a/src/shared/structured-chat-naming-eligibility.test.ts b/src/shared/structured-chat-naming-eligibility.test.ts index 1f36bd513dd..73e1d11b8de 100644 --- a/src/shared/structured-chat-naming-eligibility.test.ts +++ b/src/shared/structured-chat-naming-eligibility.test.ts @@ -1,6 +1,9 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem, AgentJournalSnapshot } from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' +import type { + AgentJournalRenderItem, + AgentJournalSnapshot +} from './agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' import { firstStructuredChatNamingPrompt } from './structured-chat-naming-eligibility' function message( diff --git a/src/shared/structured-chat-naming-eligibility.ts b/src/shared/structured-chat-naming-eligibility.ts index a1e06df1e83..bc6a54a3f7a 100644 --- a/src/shared/structured-chat-naming-eligibility.ts +++ b/src/shared/structured-chat-naming-eligibility.ts @@ -1,9 +1,9 @@ import { agentSessionCurrentContextRows } from './agent-session-context-clear' -import type { AgentJournalSnapshot } from './agent-session-journal-types' -import { agentJournalSubmissionKey } from './agent-session-journal-item-key' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import type { AgentJournalSnapshot } from './agent-session/journal/agent-session-journal-types' +import { agentJournalSubmissionKey } from './agent-session/journal/agent-session-journal-item-key' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' import { isStructuredAgentSessionCommandEntry } from './agent-session/structured-agent-session-command-entry' -import { firstStructuredAgentSessionPrompt } from './structured-agent-session-first-prompt' +import { firstStructuredAgentSessionPrompt } from './agent-session/requests/structured-agent-session-first-prompt' export function firstStructuredChatNamingPrompt( snapshot: AgentJournalSnapshot, diff --git a/src/shared/structured-session-foreground-commands.spec.ts b/src/shared/structured-session-foreground-commands.spec.ts index 508d5817904..c03608a07d9 100644 --- a/src/shared/structured-session-foreground-commands.spec.ts +++ b/src/shared/structured-session-foreground-commands.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AgentJournalRenderItem } from './agent-session-journal-types' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' import type { AgentSessionLatestTurn } from './agent-session-wire' import type { AgentSessionBackgroundTaskState } from './agent-session/agent-session-background-task-wire' import { structuredSessionForegroundCommands } from './structured-session-foreground-commands' diff --git a/src/shared/structured-session-foreground-commands.ts b/src/shared/structured-session-foreground-commands.ts index 4f79b4ca2c9..83ba4515e94 100644 --- a/src/shared/structured-session-foreground-commands.ts +++ b/src/shared/structured-session-foreground-commands.ts @@ -1,5 +1,5 @@ -import type { AgentJournalRenderItem } from './agent-session-journal-types' -import { isRootAgentJournalItem } from './agent-session-journal-producer' +import type { AgentJournalRenderItem } from './agent-session/journal/agent-session-journal-types' +import { isRootAgentJournalItem } from './agent-session/journal/agent-session-journal-producer' import type { AgentSessionLatestTurn } from './agent-session-wire' import type { AgentSessionBackgroundTaskState } from './agent-session/agent-session-background-task-wire' import { diff --git a/src/shared/structured-session-message-contracts.test.ts b/src/shared/structured-session-message-contracts.test.ts index 0bc2c29f171..248d19be9b1 100644 --- a/src/shared/structured-session-message-contracts.test.ts +++ b/src/shared/structured-session-message-contracts.test.ts @@ -1,10 +1,10 @@ import './structured-agent-session-reasoning-projection.spec' -import './structured-agent-session-send-mutation.spec' +import './agent-session/requests/structured-agent-session-send-mutation.spec' import './structured-agent-session-unknown-item.spec' import './structured-session-foreground-commands.spec' -import './structured-agent-session-first-prompt.spec' -import './agent-session-journal-submission-schema.spec' -import './structured-agent-session-projection-sender.spec' +import './agent-session/requests/structured-agent-session-first-prompt.spec' +import './agent-session/journal/agent-session-journal-submission-schema.spec' +import './agent-session/requests/structured-agent-session-projection-sender.spec' import './structured-agent-session-mutation.spec' import './agent-session/options/structured-agent-session-option-codec.spec' import './structured-agent-session-first-frame-picker.spec' diff --git a/tests/e2e/ai-vault-manual-name-clear.unit.test.ts b/tests/e2e/ai-vault-manual-name-clear.unit.test.ts index 02b95491ebb..584ea1d8606 100644 --- a/tests/e2e/ai-vault-manual-name-clear.unit.test.ts +++ b/tests/e2e/ai-vault-manual-name-clear.unit.test.ts @@ -10,7 +10,7 @@ import { agentSessionLeaseFixture, agentSessionRecordFixture } from '../../src/shared/agent-session-record.test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session/journal/agent-session-journal-types' import { computeAgentSessionPayloadFingerprint } from '../../src/shared/agent-session-mutation-envelope' import type { AiVaultListResult, AiVaultSession } from '../../src/shared/ai-vault-types' import { diff --git a/tests/e2e/codex-child-approval-activity-row.unit.test.ts b/tests/e2e/codex-child-approval-activity-row.unit.test.ts index d6c9d5c0da3..a245bd23f8d 100644 --- a/tests/e2e/codex-child-approval-activity-row.unit.test.ts +++ b/tests/e2e/codex-child-approval-activity-row.unit.test.ts @@ -15,8 +15,8 @@ import type { import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../src/shared/agent-session-journal-types' -import { parseAgentJournalItemKey } from '../../src/shared/agent-session-journal-item-key' +} from '../../src/shared/agent-session/journal/agent-session-journal-types' +import { parseAgentJournalItemKey } from '../../src/shared/agent-session/journal/agent-session-journal-item-key' import type { Tab } from '../../src/shared/tab-types' import type { AppState } from '../../src/renderer/src/store/types' import { createCodexJournalTranslator } from '../../src/main/codex/codex-structured-journal-translation' diff --git a/tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts index a7a48bd6927..2a755b3e93e 100644 --- a/tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-clear-old-client.unit.test.ts @@ -11,7 +11,7 @@ import { HOST_TEST_SESSION as SESSION, hostTestOperationId } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-host-test-data' -import { agentJournalSubmissionKey } from '../../../src/shared/agent-session-journal-item-key' +import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../src/shared/structured-agent-session-reducer' import type { useNativeChatRewind } from '../../../src/renderer/src/components/native-chat/use-native-chat-rewind' diff --git a/tests/e2e/cross-version-wire/agent-session-interrupted-tool-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-interrupted-tool-downgrade.unit.test.ts index ff2fec58e5d..9918ffc936c 100644 --- a/tests/e2e/cross-version-wire/agent-session-interrupted-tool-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-interrupted-tool-downgrade.unit.test.ts @@ -7,7 +7,7 @@ import { endedRunningAgentJournalToolCall, interruptedAgentJournalToolCall } from '../../../src/shared/agent-journal-tool-call-lifecycle' -import type { AgentJournalItemIdentity } from '../../../src/shared/agent-session-journal-types' +import type { AgentJournalItemIdentity } from '../../../src/shared/agent-session-journal-identity' import { createTrackedJournalOpener } from '../../../src/main/native-chat/agent-session-journal/journal-host-database-test-support' import type { JournalRow } from '../../../src/main/native-chat/agent-session-journal/journal-row-schema' import type { JournalReadRow } from '../../../src/main/native-chat/agent-session-journal/journal-read-row' diff --git a/tests/e2e/cross-version-wire/agent-session-newer-chat-refusal.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-newer-chat-refusal.unit.test.ts index 5322b956e7c..77f53326823 100644 --- a/tests/e2e/cross-version-wire/agent-session-newer-chat-refusal.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-newer-chat-refusal.unit.test.ts @@ -4,10 +4,12 @@ import { join } from 'node:path' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - AGENT_SESSION_JOURNAL_TURN_ITEM_SCHEMA_VERSION, - type AgentSessionJournalIdentity, - type AgentSessionJournalProviderHandle -} from '../../../src/shared/agent-session-journal-types' + AGENT_SESSION_JOURNAL_TURN_ITEM_SCHEMA_VERSION +} from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { + AgentSessionJournalIdentity, + AgentSessionJournalProviderHandle +} from '../../../src/shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../src/shared/agent-session-provider-handle-encoding' import type { AgentSessionRefusalReference } from '../../../src/shared/agent-session-wire-refusals' import { diff --git a/tests/e2e/cross-version-wire/agent-session-outcome-chat-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-outcome-chat-downgrade.unit.test.ts index dfeaab76920..95abc512ce5 100644 --- a/tests/e2e/cross-version-wire/agent-session-outcome-chat-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-outcome-chat-downgrade.unit.test.ts @@ -4,11 +4,11 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { isDeepStrictEqual } from 'node:util' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentSessionJournalIdentity, - type AgentSessionJournalProviderHandle -} from '../../../src/shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { + AgentSessionJournalIdentity, + AgentSessionJournalProviderHandle +} from '../../../src/shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../src/shared/agent-session-provider-handle-encoding' import Database from '../../../src/main/sqlite/sync-database' import { diff --git a/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts index 4f5cb4f7c58..e230c49b706 100644 --- a/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts @@ -4,11 +4,13 @@ import { join } from 'node:path' import { expect, test } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, - AGENT_SESSION_JOURNAL_TURN_ITEM_SCHEMA_VERSION, - type AgentJournalItemIdentity, - type AgentSessionJournalIdentity, - type AgentSessionJournalProviderHandle -} from '../../../src/shared/agent-session-journal-types' + AGENT_SESSION_JOURNAL_TURN_ITEM_SCHEMA_VERSION +} from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { + AgentJournalItemIdentity, + AgentSessionJournalIdentity, + AgentSessionJournalProviderHandle +} from '../../../src/shared/agent-session-journal-identity' import { codexProviderHandle } from '../../../src/shared/agent-session-provider-handle-encoding' import Database from '../../../src/main/sqlite/sync-database' import { journalDatabasePath } from '../../../src/main/native-chat/agent-session-journal/journal-host-database' @@ -27,7 +29,7 @@ import { materializeReleaseCheckout, releaseModuleExport } from './release-checkout' -import { agentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure' import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words' import { diff --git a/tests/e2e/cross-version-wire/cross-version-host-observed-turn-end.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-host-observed-turn-end.unit.test.ts index cc8fe3453f2..769e66d50cc 100644 --- a/tests/e2e/cross-version-wire/cross-version-host-observed-turn-end.unit.test.ts +++ b/tests/e2e/cross-version-wire/cross-version-host-observed-turn-end.unit.test.ts @@ -1,7 +1,7 @@ import { beforeAll, describe, expect, it } from 'vitest' import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout' import { projectStructuredAgentSessionStatusSummary } from '../../../src/shared/structured-agent-session-projection' -import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types' // Pin an older reader that validates mainAgent.outcome; new interruption/unconfirmed arms must retain its normal done fallback. const OLD_REF = 'v1.4.214' diff --git a/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts b/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts index b6886719eb7..57438f8d332 100644 --- a/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts +++ b/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts @@ -1,11 +1,11 @@ import { describe, expect, it } from 'vitest' -import { agentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure' import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalItemBody -} from '../../../src/shared/agent-session-journal-types' +} from '../../../src/shared/agent-session/journal/agent-session-journal-types' import { HISTORY_PAGE_CONTENT_BUDGET_BYTES } from '../../../src/main/native-chat/agent-session-wire/agent-session-history-page-bounds' import { createReleasedStopNoteRig, diff --git a/tests/e2e/cross-version-wire/cross-version-stop-note-test-rig.ts b/tests/e2e/cross-version-wire/cross-version-stop-note-test-rig.ts index 7511644e1d8..5f250077f4d 100644 --- a/tests/e2e/cross-version-wire/cross-version-stop-note-test-rig.ts +++ b/tests/e2e/cross-version-wire/cross-version-stop-note-test-rig.ts @@ -13,17 +13,17 @@ import { openTestJournalHostDatabase } from '../../../src/main/native-chat/agent-session-journal/journal-host-database-test-support' import type { AgentSessionJournal } from '../../../src/main/native-chat/agent-session-journal/journal-store' -import { agentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key' +import { agentJournalItemKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure' import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words' import { AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalCursor, type AgentJournalItemBody, type AgentJournalRenderItem, type AgentJournalTurnLifecycle -} from '../../../src/shared/agent-session-journal-types' -import { isAdmissibleAgentJournalRenderItem } from '../../../src/shared/agent-session-journal-schemas' +} from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalCursor } from '../../../src/shared/agent-session-journal-identity' +import { isAdmissibleAgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-schemas' import type { AgentSessionHistoryPage, AgentSessionHistoryResult, diff --git a/tests/e2e/cross-version-wire/cross-version-structured-attention-frames.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-structured-attention-frames.unit.test.ts index a9fb613cb76..ff0e7114baf 100644 --- a/tests/e2e/cross-version-wire/cross-version-structured-attention-frames.unit.test.ts +++ b/tests/e2e/cross-version-wire/cross-version-structured-attention-frames.unit.test.ts @@ -4,7 +4,7 @@ import { beforeAll, describe, expect, it, vi } from 'vitest' import { StructuredAgentSessionTurnCompletionFeed } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-turn-completion-feed' import { RuntimeSubscriptionRegistry } from '../../../src/main/runtime/runtime-subscription-registry' -import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types' +import type { AgentJournalRenderItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types' import { projectStructuredAgentSessionStatusState } from '../../../src/shared/structured-agent-session-projection' import { AGENT_SESSION_ATTENTION_ACK_RUNTIME_CAPABILITY, diff --git a/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts index 8bf07d39196..3ce39c4c56d 100644 --- a/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts @@ -2,11 +2,11 @@ import { mkdtempSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { expect, test } from 'vitest' +import type { AgentJournalMessageItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types' import type { - AgentJournalMessageItem, AgentSessionJournalIdentity, AgentSessionJournalProviderHandle -} from '../../../src/shared/agent-session-journal-types' +} from '../../../src/shared/agent-session-journal-identity' import { claudeProviderHandle } from '../../../src/shared/agent-session-provider-handle-encoding' import { USER_MESSAGE_SOURCE } from '../../../src/shared/agent-session/agent-session-message-source' import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure' diff --git a/tests/e2e/cross-version-wire/released-chat-continuation.ts b/tests/e2e/cross-version-wire/released-chat-continuation.ts index 561223ce309..4ef30a5b78a 100644 --- a/tests/e2e/cross-version-wire/released-chat-continuation.ts +++ b/tests/e2e/cross-version-wire/released-chat-continuation.ts @@ -1,6 +1,6 @@ -import { agentJournalLinkageFields } from '../../../src/shared/agent-session-journal-producer' -import { parseAgentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key' -import type { AgentJournalMessageItem } from '../../../src/shared/agent-session-journal-types' +import { agentJournalLinkageFields } from '../../../src/shared/agent-session/journal/agent-session-journal-producer' +import { parseAgentJournalItemKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' +import type { AgentJournalMessageItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types' import type { JournalReplacementItem } from '../../../src/main/native-chat/agent-session-journal/journal-epoch-replacement' import type { AgentSessionJournal } from '../../../src/main/native-chat/agent-session-journal/journal-store' diff --git a/tests/e2e/cross-version-wire/released-chat-queue.ts b/tests/e2e/cross-version-wire/released-chat-queue.ts index 5cc8491b26a..77d406303fe 100644 --- a/tests/e2e/cross-version-wire/released-chat-queue.ts +++ b/tests/e2e/cross-version-wire/released-chat-queue.ts @@ -1,5 +1,5 @@ -import type { AgentJournalMessageItem } from '../../../src/shared/agent-session-journal-types' -import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../src/shared/agent-session-queued-message-wire' +import type { AgentJournalMessageItem } from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../src/shared/agent-session/requests/agent-session-queued-message-wire' import type { AgentSessionJournal } from '../../../src/main/native-chat/agent-session-journal/journal-store' // Queue edits as each release's queue writes them: two cards, an edit, a move, a hold and a diff --git a/tests/e2e/cross-version-wire/released-chat-upgrade.unit.test.ts b/tests/e2e/cross-version-wire/released-chat-upgrade.unit.test.ts index be6ba97f883..bbd849f843f 100644 --- a/tests/e2e/cross-version-wire/released-chat-upgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/released-chat-upgrade.unit.test.ts @@ -12,7 +12,7 @@ import { import { restoreJournal } from '../../../src/main/native-chat/agent-session-journal/journal-open' import { JOURNAL_PREFIX_ORDINAL } from '../../../src/main/native-chat/agent-session-journal/journal-outcome-codec' import { journalOutcomeSource } from '../../../src/main/native-chat/agent-session-journal/journal-outcome-format' -import type { AgentJournalSnapshot } from '../../../src/shared/agent-session-journal-types' +import type { AgentJournalSnapshot } from '../../../src/shared/agent-session/journal/agent-session-journal-types' import { parseJournalRow } from '../../../src/main/native-chat/agent-session-journal/journal-row-schema' import type { JournalStoredRow } from '../../../src/main/native-chat/agent-session-journal/journal-row-table' import { JournalWriteProjection } from '../../../src/main/native-chat/agent-session-journal/journal-write-projection' diff --git a/tests/e2e/cross-version-wire/released-chat-writers.ts b/tests/e2e/cross-version-wire/released-chat-writers.ts index fff6bff1afa..dc64750778c 100644 --- a/tests/e2e/cross-version-wire/released-chat-writers.ts +++ b/tests/e2e/cross-version-wire/released-chat-writers.ts @@ -5,9 +5,9 @@ import { z } from 'zod' import { AGENT_JOURNAL_THREAD_SCOPE, type AgentJournalMessageItem, - type AgentJournalSnapshot, - type AgentSessionJournalIdentity -} from '../../../src/shared/agent-session-journal-types' + type AgentJournalSnapshot +} from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../src/shared/agent-session-journal-identity' import { claudeProviderHandle, codexProviderHandle diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts index 6048f5a59d0..01ee468aa40 100644 --- a/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts +++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts @@ -1,5 +1,5 @@ import { expect } from 'vitest' -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' export const SESSION = 'session-alpha' export const WORKSPACE = 'workspace-1' diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts index 18186645935..5c7d8f3b1b9 100644 --- a/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts +++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-manifest.ts @@ -6,7 +6,7 @@ import { computeAgentSessionPayloadFingerprint } from '../../../src/shared/agent import { structuredAgentSessionMessageSendMutation, structuredAgentSessionSendBody -} from '../../../src/shared/structured-agent-session-send-mutation' +} from '../../../src/shared/agent-session/requests/structured-agent-session-send-mutation' import { SESSION, diff --git a/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts index a3ff4ec8fff..604497b3b77 100644 --- a/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts +++ b/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts @@ -5,10 +5,8 @@ import { expect, test } from 'vitest' import { codexProviderHandle } from '../../../src/shared/agent-session-provider-handle-encoding' import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure' import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words' -import type { - AgentJournalSubmission, - AgentSessionJournalIdentity -} from '../../../src/shared/agent-session-journal-types' +import type { AgentJournalSubmission } from '../../../src/shared/agent-session/journal/agent-session-journal-types' +import type { AgentSessionJournalIdentity } from '../../../src/shared/agent-session-journal-identity' import type { AgentSessionHistoryPage } from '../../../src/shared/agent-session-wire' import { createTrackedJournalOpener, diff --git a/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts b/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts index 4e070981aa3..e34c767adcd 100644 --- a/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts +++ b/tests/e2e/cross-version-wire/versioned-agent-session-wire.ts @@ -1,6 +1,6 @@ import type * as ClientReducer from '../../../src/shared/structured-agent-session-reducer' import type * as ClientProjection from '../../../src/shared/structured-agent-session-projection' -import type * as ClientSchemas from '../../../src/shared/agent-session-journal-schemas' +import type * as ClientSchemas from '../../../src/shared/agent-session/journal/agent-session-journal-schemas' import type { sendPlan } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-mutation-plans' import { importReleaseCheckoutModule, @@ -179,7 +179,7 @@ async function loadWorkingTreeBuild(): Promise { const [reducer, projection, schemas] = await Promise.all([ import('../../../src/shared/structured-agent-session-reducer'), import('../../../src/shared/structured-agent-session-projection'), - import('../../../src/shared/agent-session-journal-schemas') + import('../../../src/shared/agent-session/journal/agent-session-journal-schemas') ]) return { ...reducer, ...projection, ...schemas } }, diff --git a/tests/e2e/helpers/automation-chat-reuse-test-harness.ts b/tests/e2e/helpers/automation-chat-reuse-test-harness.ts index 2b1f6802345..7d08b3a4649 100644 --- a/tests/e2e/helpers/automation-chat-reuse-test-harness.ts +++ b/tests/e2e/helpers/automation-chat-reuse-test-harness.ts @@ -15,8 +15,8 @@ import { createRuntimeAutomationService } from '../../../src/main/automations/ru import { createAutomationRunWriter } from '../../../src/main/automations/automation-run-writer' import type { AutomationChatLaunchRequest } from '../../../src/main/automations/automation-chat-agent-launch' import { automationRunOperationId } from '../../../src/main/automations/automation-run-operation' -import { agentJournalItemKey } from '../../../src/shared/agent-session-journal-item-key' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../src/shared/agent-session-journal-types' +import { agentJournalItemKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../src/shared/agent-session/journal/agent-session-journal-types' import { HOST_TEST_NOW, HOST_TEST_THREAD, diff --git a/tests/e2e/journal-restored-consumers.unit.test.ts b/tests/e2e/journal-restored-consumers.unit.test.ts index e7f7aaa2109..0ad2887793a 100644 --- a/tests/e2e/journal-restored-consumers.unit.test.ts +++ b/tests/e2e/journal-restored-consumers.unit.test.ts @@ -8,10 +8,10 @@ import { afterAll, afterEach, beforeAll, expect, it, vi } from 'vitest' import { AGENT_JOURNAL_THREAD_SCOPE, AGENT_SESSION_JOURNAL_SCHEMA_VERSION, - type AgentJournalCursor, type AgentJournalMessageItem -} from '../../src/shared/agent-session-journal-types' -import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../src/shared/agent-session-current-requests-capability' +} from '../../src/shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalCursor } from '../../src/shared/agent-session-journal-identity' +import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../src/shared/agent-session/requests/agent-session-current-requests-capability' import { AGENT_SESSION_HISTORY_MAX_LIMIT, type AgentSessionHistoryRequest, diff --git a/tests/e2e/native-chat-rewind-boundary.unit.test.ts b/tests/e2e/native-chat-rewind-boundary.unit.test.ts index 54dad253a2d..5ec8b010e44 100644 --- a/tests/e2e/native-chat-rewind-boundary.unit.test.ts +++ b/tests/e2e/native-chat-rewind-boundary.unit.test.ts @@ -7,9 +7,9 @@ import { afterEach, expect, it, vi } 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 { EMPTY_STRUCTURED_AGENT_SESSION } from '../../src/shared/structured-agent-session-reducer' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session/journal/agent-session-journal-types' import { codexProviderHandle } from '../../src/shared/agent-session-provider-handle-encoding' import { createTrackedJournalOpener } from '../../src/main/native-chat/agent-session-journal/journal-host-database-test-support' import { structuredRewindCut } from '../../src/main/native-chat/agent-session-wire/structured-rewind-cut' diff --git a/tests/e2e/structured-agent-session-read-owner.unit.test.ts b/tests/e2e/structured-agent-session-read-owner.unit.test.ts index d0867b9a03a..8995d90d288 100644 --- a/tests/e2e/structured-agent-session-read-owner.unit.test.ts +++ b/tests/e2e/structured-agent-session-read-owner.unit.test.ts @@ -9,18 +9,14 @@ import type { AgentSessionStatusSummary, AgentSessionSubscribeEvent } from '../../src/shared/agent-session-wire' -import { - AGENT_JOURNAL_THREAD_SCOPE, - type AgentJournalCursor -} from '../../src/shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session/journal/agent-session-journal-types' +import type { AgentJournalCursor } from '../../src/shared/agent-session-journal-identity' import { EMPTY_STRUCTURED_AGENT_SESSION, reduceStructuredAgentSession } from '../../src/shared/structured-agent-session-reducer' -import { - hasUnansweredStructuredAgentSessionDispatch, - projectStructuredAgentSessionStatus -} from '../../src/shared/structured-agent-session-projection' +import { hasUnansweredStructuredAgentSessionDispatch } from '../../src/shared/agent-session/requests/structured-agent-session-unanswered-dispatch' +import { projectStructuredAgentSessionStatus } from '../../src/shared/structured-agent-session-projection' import { createTrackedJournalOpener } from '../../src/main/native-chat/agent-session-journal/journal-host-database-test-support' import { readAgentSessionHistory } from '../../src/main/native-chat/agent-session-wire/agent-session-history-page' import { AgentSessionSubscribers } from '../../src/main/native-chat/agent-session-wire/structured-agent-session-subscribers' diff --git a/tests/e2e/structured-attention-host-read-retirement.unit.test.ts b/tests/e2e/structured-attention-host-read-retirement.unit.test.ts index dacfa14841f..b7b0dd44aec 100644 --- a/tests/e2e/structured-attention-host-read-retirement.unit.test.ts +++ b/tests/e2e/structured-attention-host-read-retirement.unit.test.ts @@ -2,7 +2,7 @@ import { mkdtempSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' 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 { agentSessionPromptAttentionKey } from '../../src/shared/agent-session-attention' import { projectStructuredAgentSessionStatusState } from '../../src/shared/structured-agent-session-projection' import { AGENT_SESSION_ATTENTION_ACK_RUNTIME_CAPABILITY } from '../../src/shared/protocol-version' diff --git a/tests/e2e/structured-attention-prompt-relay.unit.test.ts b/tests/e2e/structured-attention-prompt-relay.unit.test.ts index 5e80f4e62ed..44fdbe60221 100644 --- a/tests/e2e/structured-attention-prompt-relay.unit.test.ts +++ b/tests/e2e/structured-attention-prompt-relay.unit.test.ts @@ -25,7 +25,7 @@ import type { NotificationDispatchRequest, StructuredNotificationRead } from '../../src/shared/notification-settings-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 { agentSessionPromptAttentionKey, agentSessionAttentionSubjectPrefix, diff --git a/tests/e2e/structured-attention-read-retirement.test-fixture.tsx b/tests/e2e/structured-attention-read-retirement.test-fixture.tsx index b186f49878f..b357618f079 100644 --- a/tests/e2e/structured-attention-read-retirement.test-fixture.tsx +++ b/tests/e2e/structured-attention-read-retirement.test-fixture.tsx @@ -8,7 +8,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import type { RuntimeClientTarget } from '../../src/shared/runtime-client-target' import type { NotificationSettings } from '../../src/shared/notification-settings-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 { AgentSessionHistoryPage } from '../../src/shared/agent-session-wire' import type { RuntimeRpcResponse } from '../../src/shared/runtime-rpc-envelope' import { createGlobalSettingsFixture } from '../../src/shared/global-settings-test-fixture' diff --git a/tests/e2e/structured-attention-read-retirement.unit.test.ts b/tests/e2e/structured-attention-read-retirement.unit.test.ts index 7daa9b006ff..6dd01e3c64a 100644 --- a/tests/e2e/structured-attention-read-retirement.unit.test.ts +++ b/tests/e2e/structured-attention-read-retirement.unit.test.ts @@ -18,7 +18,7 @@ import { import { Fragment, createElement, StrictMode } from 'react' import { act, render, waitFor } from '@testing-library/react' import { expect, it, describe } 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 { agentSessionAttentionSubjectPrefix, agentSessionPromptAttentionKey diff --git a/tests/e2e/structured-session-workspace-authority.unit.test.ts b/tests/e2e/structured-session-workspace-authority.unit.test.ts index 9677852b15b..e1d085a7a12 100644 --- a/tests/e2e/structured-session-workspace-authority.unit.test.ts +++ b/tests/e2e/structured-session-workspace-authority.unit.test.ts @@ -11,7 +11,7 @@ import { finishRuntimeLocalWorktreeRemoval } from '../../src/main/runtime/runtim import { getRuntimeFolderWorkspaceInstanceId } from '../../src/main/runtime/runtime-folder-workspace' import '../../src/main/runtime/rpc/unused-default-rpc-methods.test-fixture' import { expect, it, vi } from 'vitest' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session-journal-types' +import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session/journal/agent-session-journal-types' import { openAgentSessionJournal } from '../../src/main/native-chat/agent-session-journal/journal-store-factory' import { RpcDispatcher } from '../../src/main/runtime/rpc/dispatcher' import { STRUCTURED_AGENT_SESSION_REVEAL_METHODS } from '../../src/main/runtime/rpc/methods/structured-agent-session-reveal'