diff --git a/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-handing-over.ts b/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-handing-over.ts index 2fe9e9bed6d..5426acdefb1 100644 --- a/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-handing-over.ts +++ b/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-handing-over.ts @@ -3,9 +3,10 @@ import type { AgentJournalSubmission } from '../../../../shared/agent-session/journal/agent-session-journal-types' import type { UnsentSendHold } from '../../agent-session-journal/queued-messages/journal-unsent-send-hold' +import type { AgentSessionJournal } from '../../agent-session-journal/journal-store' /** The chat's journal, which identifies the conversation for as long as it is held. */ -type HandoverJournal = object +type HandoverJournal = AgentSessionJournal type HandoverInput = { owner: () => void @@ -174,7 +175,7 @@ export function beginStructuredAgentSessionHandover( /** Finite policy snapshots retain their synchronous membership check. Live handles read it in-worker. */ function hasSubmissionSnapshot( - journal: object -): journal is { submission: (id: string) => AgentJournalSubmission | undefined } { + journal: HandoverJournal +): journal is HandoverJournal & { submission: (id: string) => AgentJournalSubmission | undefined } { return 'submission' in journal && typeof journal.submission === 'function' } 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 18121fab78f..8f6d717dee2 100644 --- a/tests/e2e/ai-vault-manual-name-clear.unit.test.ts +++ b/tests/e2e/ai-vault-manual-name-clear.unit.test.ts @@ -33,7 +33,7 @@ import { import { StructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/host/structured-agent-session-host' import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry' import { structuredAgentsDeclaringNothing } from '../../src/main/native-chat/agent-session-wire/providers/testing/structured-agent-session-adapter-router-test-support' -import { recordingStructuredAgentSessionLogger } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' +import { recordingStructuredAgentSessionLogger } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-logger.test-fixture' import { createStructuredChatNamingHandler } from '../../src/main/native-chat/structured-chat-naming' import { PI_RPC_AGENT } from '../../src/main/pi/rpc-agent-definition' import type { AgentSessionStatusEvent } from '../../src/shared/agent-session/agent-session-wire' diff --git a/tests/e2e/automation-terminal-launch.unit.test.ts b/tests/e2e/automation-terminal-launch.unit.test.ts index f380669fd20..83af30d33ac 100644 --- a/tests/e2e/automation-terminal-launch.unit.test.ts +++ b/tests/e2e/automation-terminal-launch.unit.test.ts @@ -12,7 +12,7 @@ import { HOST_TEST_NOW, HOST_TEST_SESSION, HOST_TEST_LOCATION -} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import type { callStructuredAgentSession } from '@/runtime/structured-agent-session-client' import type { StructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/host/structured-agent-session-host' import { createQueuedMessageTestRig } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-message-rig.test-fixture' 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 c8f8c573a05..0b46aaaa27f 100644 --- a/tests/e2e/codex-child-approval-activity-row.unit.test.ts +++ b/tests/e2e/codex-child-approval-activity-row.unit.test.ts @@ -25,7 +25,7 @@ import { CODEX_COMMAND_APPROVAL_METHOD } from '../../src/main/codex/structured/p import { createTrackedJournalOpener } from '../../src/main/native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' import { createDeferredStructuredAgentSessionEventSink } from '../../src/main/native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import { StructuredAgentSessionStatusFeed } from '../../src/main/native-chat/agent-session-wire/observations/structured-agent-session-status-feed' -import { indexedStatusFeedSession } from '../../src/main/native-chat/agent-session-wire/observations/testing/structured-agent-session-status-feed-test-session' +import { indexedStatusFeedSession } from '../../src/main/native-chat/agent-session-wire/observations/testing/structured-agent-session-status-feed-test-session.test-fixture' import { makeRepo, makeWorktree @@ -67,7 +67,7 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({ import { StructuredAgentSessionStatusBridge } from '../../src/renderer/src/components/native-chat/session/status/StructuredAgentSessionStatusBridge' import { resetStructuredAgentSessionStatusFeedsForTests } from '../../src/renderer/src/runtime/structured-agent-session-status-feed' import { createStructuredAgentSessionLogger } from '../../src/main/native-chat/agent-session-wire/host/structured-agent-session-logger' -import { testEventSinkLogging } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-logger-test-support' +import { testEventSinkLogging } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-logger.test-fixture' import { codexProviderHandle } from '../../src/shared/agent-session/lifecycle/agent-session-provider-handle-encoding' const SESSION = 'codex-child-approval' 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 c3887c98867..5c4d1de79c0 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 { eventually } from '../../../src/main/native-chat/agent-session-wire/hos import { HOST_TEST_SESSION as SESSION, hostTestOperationId -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { agentJournalSubmissionKey } from '../../../src/shared/agent-session/journal/agent-session-journal-item-key' import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../src/shared/agent-session/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-clear-old-tab-mirror.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-clear-old-tab-mirror.unit.test.ts index dcd8ee4b1de..f5453ff94bb 100644 --- a/tests/e2e/cross-version-wire/agent-session-clear-old-tab-mirror.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-clear-old-tab-mirror.unit.test.ts @@ -3,7 +3,7 @@ import { importReleaseCheckoutModule, materializeReleaseCheckout } from './relea import { HOST_TEST_SESSION, HOST_TEST_NOW -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { WORKTREE, createChat, diff --git a/tests/e2e/cross-version-wire/agent-session-saved-name-old-client.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-saved-name-old-client.unit.test.ts index 4b5d4e9b43a..633354242b4 100644 --- a/tests/e2e/cross-version-wire/agent-session-saved-name-old-client.unit.test.ts +++ b/tests/e2e/cross-version-wire/agent-session-saved-name-old-client.unit.test.ts @@ -7,7 +7,7 @@ import { listResult } from '../../../src/main/ai-vault/structured-session-owners import { HOST_TEST_SESSION, HOST_TEST_LOCATION -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { WORKTREE, createChat, diff --git a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts index 2682991be02..3a38fa9d44d 100644 --- a/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts +++ b/tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts @@ -8,7 +8,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vite import type { StructuredAgentSessionAdapter } from '../../../src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { StructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-host' import { emptyAgentSessionBatch } from '../../../src/main/native-chat/agent-session-wire/publication/subscribers/agent-session-empty-batch' -import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-support' +import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-fixture' import { setStructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry' import type { AgentSessionRecordStore } from '../../../src/main/runtime/agent-session/records/agent-session-record-store' import { openTestAgentSessionRecordStore } from '../../../src/main/runtime/agent-session/records/agent-session-record-store-test-harness' 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 487c01839b5..e81d39a3ff7 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 @@ -4,7 +4,7 @@ import { join } from 'node:path' import { afterEach, beforeAll, beforeEach, expect } from 'vitest' import { StructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-host' import { NO_STRUCTURED_AGENTS } from '../../../src/main/native-chat/agent-session-wire/providers/testing/structured-agent-session-adapter-router-test-support' -import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-support' +import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-fixture' import { setStructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry' import { createStructuredAgentSessionLogger } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-logger' import { openTestAgentSessionRecordStore } from '../../../src/main/runtime/agent-session/records/agent-session-record-store-test-harness' diff --git a/tests/e2e/cross-version-wire/paired-agent-session-option-persistence.unit.test.ts b/tests/e2e/cross-version-wire/paired-agent-session-option-persistence.unit.test.ts index 31d155461a7..118593bc1e3 100644 --- a/tests/e2e/cross-version-wire/paired-agent-session-option-persistence.unit.test.ts +++ b/tests/e2e/cross-version-wire/paired-agent-session-option-persistence.unit.test.ts @@ -19,7 +19,7 @@ import { HOST_TEST_SESSION as REST_TEST_SESSION, hostTestAttachParams, hostTestOperationId -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { setStructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry' import { computeAgentSessionPayloadFingerprint } from '../../../src/shared/agent-session/lifecycle/agent-session-mutation-envelope' diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts index be640a1bf5a..226dd9ef36d 100644 --- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts +++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts @@ -2,7 +2,7 @@ import { agentSessionRecordFixture } from '../../../src/shared/agent-session/lif import { agentSessionConversationView } from '../../../src/shared/agent-session/lifecycle/agent-session-conversation-view' import { vi, type Mock } from 'vitest' import type { StructuredAgentSessionAdapter } from '../../../src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-support' +import { startsWhenPublished } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-instant-start.test-fixture' import type { AgentSessionRecordStore } from '../../../src/main/runtime/agent-session/records/agent-session-record-store' import { codexProviderHandle } from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle-encoding' import type { StructuredAgentSessionHost } from '../../../src/main/native-chat/agent-session-wire/host/structured-agent-session-host' diff --git a/tests/e2e/helpers/automation-chat-reuse-test-harness.ts b/tests/e2e/helpers/automation-chat-reuse-test-harness.ts index 7d0507a66a5..b0f4524cba0 100644 --- a/tests/e2e/helpers/automation-chat-reuse-test-harness.ts +++ b/tests/e2e/helpers/automation-chat-reuse-test-harness.ts @@ -22,7 +22,7 @@ import { HOST_TEST_NOW, HOST_TEST_THREAD, HOST_TEST_LOCATION -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { createQueuedMessageTestRig } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-message-rig.test-fixture' import { eventually } from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-message-rig-provider.test-fixture' diff --git a/tests/e2e/journal-restored-consumers.unit.test.ts b/tests/e2e/journal-restored-consumers.unit.test.ts index 0cd671a8534..103d4429c36 100644 --- a/tests/e2e/journal-restored-consumers.unit.test.ts +++ b/tests/e2e/journal-restored-consumers.unit.test.ts @@ -43,7 +43,7 @@ import type { JournalRow } from '../../src/main/native-chat/agent-session-journa import { hostTestAttachParams, HOST_TEST_SESSION as SESSION -} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { seedQueuedRigLegacyJournal } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-legacy-journal.test-fixture' import { createRestTestRig, diff --git a/tests/e2e/native-chat-startup-option-pickers.unit.test.ts b/tests/e2e/native-chat-startup-option-pickers.unit.test.ts index ab658574f43..546ac155cba 100644 --- a/tests/e2e/native-chat-startup-option-pickers.unit.test.ts +++ b/tests/e2e/native-chat-startup-option-pickers.unit.test.ts @@ -5,7 +5,7 @@ import { createElement } from 'react' import { afterEach, expect, it, vi } from 'vitest' import { computeAgentSessionPayloadFingerprint } from '../../src/shared/agent-session/lifecycle/agent-session-mutation-envelope' import { claudeSessionIdForOrcaSession } from '../../src/main/claude/structured/claude-structured-session-id' -import { hostTestMessage } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +import { hostTestMessage } from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { StructuredAgentSessionStartupAttempts } from '../../src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt' import { createScriptedClaudeRuntime } from '../../src/main/runtime/agent-session/installation/structured-claude-scripted-runtime-test-support' import { TooltipProvider } from '../../src/renderer/src/components/ui/tooltip' diff --git a/tests/e2e/structured-chat-tab-lifetime.unit.test.ts b/tests/e2e/structured-chat-tab-lifetime.unit.test.ts index afc88129802..6a7cd86e735 100644 --- a/tests/e2e/structured-chat-tab-lifetime.unit.test.ts +++ b/tests/e2e/structured-chat-tab-lifetime.unit.test.ts @@ -13,7 +13,7 @@ import { import { HOST_TEST_LOCATION, HOST_TEST_SESSION -} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { OrcaRuntimeService } from '../../src/main/runtime/orca-runtime' import { readPersistedTestAgentSessionStore } from '../../src/main/runtime/agent-session/records/agent-session-record-store-test-harness' import { openTestJournalHostDatabase } from '../../src/main/native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' diff --git a/tests/e2e/structured-permission-report-publication.unit.test.ts b/tests/e2e/structured-permission-report-publication.unit.test.ts index 0a8e105cbe8..63aba6ab78f 100644 --- a/tests/e2e/structured-permission-report-publication.unit.test.ts +++ b/tests/e2e/structured-permission-report-publication.unit.test.ts @@ -34,11 +34,11 @@ import { attachParams, envelope, CALLER -} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-harness' +} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host.test-fixture' import { HOST_TEST_NOW, HOST_TEST_SESSION as sessionId -} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' +} from '../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data.test-fixture' import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities' import { AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY } from '../../src/shared/agent-session/agent-session-permission-modes-capability' import { resetStructuredAgentSessionStatusFeedsForTests } from '@/runtime/structured-agent-session-status-feed'