diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index ae12bf8460f..51f7e456389 100644 --- a/.github/workflows/mobile.yml +++ b/.github/workflows/mobile.yml @@ -54,7 +54,65 @@ on: - 'src/main/codex/structured/journal/codex-goal-journal-rows.ts' - 'src/main/codex/__fixtures__/codex-hook-outcomes.jsonl' - 'src/main/ai-vault/session-scanner-*.ts' - - 'src/main/ai-vault/ai-vault-scan-cancellation.ts' + - 'src/main/ai-vault/discovery/agent-session-directories.ts' + - 'src/main/ai-vault/discovery/session-file-discovery.ts' + - 'src/main/ai-vault/discovery/session-json-file.ts' + - 'src/main/ai-vault/discovery/session-path-absence.ts' + - 'src/main/ai-vault/discovery/session-scanner-agent-root-overrides.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-agent-sources.ts' + - 'src/main/ai-vault/discovery/session-scanner-candidates.ts' + - 'src/main/ai-vault/discovery/session-scanner-directory-reader.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-discovery-pipeline.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-discovery.ts' + - 'src/main/ai-vault/discovery/session-scanner-roots.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-roots.ts' + - 'src/main/ai-vault/discovery/session-scanner-source-discovery.ts' + - 'src/main/ai-vault/parsing/session-json-object.ts' + - 'src/main/ai-vault/parsing/session-record-fields.ts' + - 'src/main/ai-vault/parsing/session-record-time.ts' + - 'src/main/ai-vault/parsing/session-scanner-accumulator.ts' + - 'src/main/ai-vault/parsing/session-scanner-agent-parser.ts' + - 'src/main/ai-vault/parsing/session-scanner-candidate-parse.ts' + - 'src/main/ai-vault/parsing/session-scanner-conversation-name-requests.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-core-parser-wsl-stall.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-injected-title.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-jsonl-reader.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-jsonl-reader.ts' + - 'src/main/ai-vault/parsing/session-scanner-messages.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-messages.ts' + - 'src/main/ai-vault/parsing/session-scanner-parse-wsl-stall.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-parser-stream-cleanup.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-record-budget.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-recoverable-empty.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-text-normalization.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-text-normalization.ts' + - 'src/main/ai-vault/parsing/session-scanner-timeline.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-token-values.ts' + - 'src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt-capture.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt.test.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-document-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-every-agent-fixture.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-incremental-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-log-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-prime-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-vault-roots.ts' + - 'src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts' + - 'src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-discovery.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-inventory.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-inventory.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-only.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-walk.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-walk.ts' + - 'src/main/ai-vault/scope/session-scanner-scope.test.ts' + - 'src/main/ai-vault/session-scanner.ts' + - 'src/shared/error-message.ts' + - 'src/shared/surrogate-safe-text-slice.ts' + - 'src/shared/trimmed-string.ts' + - 'src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.ts' - 'src/main/ai-vault/scan-service/session-scanner-service-env.ts' - 'src/main/ai-vault/scanners/grok/session-scanner-grok-user-text.ts' - 'src/main/provider-process/provider-json-record.ts' @@ -142,7 +200,65 @@ on: - 'src/main/codex/structured/journal/codex-goal-journal-rows.ts' - 'src/main/codex/__fixtures__/codex-hook-outcomes.jsonl' - 'src/main/ai-vault/session-scanner-*.ts' - - 'src/main/ai-vault/ai-vault-scan-cancellation.ts' + - 'src/main/ai-vault/discovery/agent-session-directories.ts' + - 'src/main/ai-vault/discovery/session-file-discovery.ts' + - 'src/main/ai-vault/discovery/session-json-file.ts' + - 'src/main/ai-vault/discovery/session-path-absence.ts' + - 'src/main/ai-vault/discovery/session-scanner-agent-root-overrides.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-agent-sources.ts' + - 'src/main/ai-vault/discovery/session-scanner-candidates.ts' + - 'src/main/ai-vault/discovery/session-scanner-directory-reader.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-discovery-pipeline.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-discovery.ts' + - 'src/main/ai-vault/discovery/session-scanner-roots.test.ts' + - 'src/main/ai-vault/discovery/session-scanner-roots.ts' + - 'src/main/ai-vault/discovery/session-scanner-source-discovery.ts' + - 'src/main/ai-vault/parsing/session-json-object.ts' + - 'src/main/ai-vault/parsing/session-record-fields.ts' + - 'src/main/ai-vault/parsing/session-record-time.ts' + - 'src/main/ai-vault/parsing/session-scanner-accumulator.ts' + - 'src/main/ai-vault/parsing/session-scanner-agent-parser.ts' + - 'src/main/ai-vault/parsing/session-scanner-candidate-parse.ts' + - 'src/main/ai-vault/parsing/session-scanner-conversation-name-requests.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-core-parser-wsl-stall.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-injected-title.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-jsonl-reader.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-jsonl-reader.ts' + - 'src/main/ai-vault/parsing/session-scanner-messages.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-messages.ts' + - 'src/main/ai-vault/parsing/session-scanner-parse-wsl-stall.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-parser-stream-cleanup.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-record-budget.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-recoverable-empty.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-text-normalization.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-text-normalization.ts' + - 'src/main/ai-vault/parsing/session-scanner-timeline.test.ts' + - 'src/main/ai-vault/parsing/session-scanner-token-values.ts' + - 'src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt-capture.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt.test.ts' + - 'src/main/ai-vault/prompts/session-scanner-first-user-prompt.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-document-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-every-agent-fixture.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-incremental-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-log-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-prime-agent-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts' + - 'src/main/ai-vault/scanner-fixtures/session-scanner-vault-roots.ts' + - 'src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts' + - 'src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-discovery.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-inventory.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-inventory.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-only.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-walk.test.ts' + - 'src/main/ai-vault/scope/session-scanner-scope-walk.ts' + - 'src/main/ai-vault/scope/session-scanner-scope.test.ts' + - 'src/main/ai-vault/session-scanner.ts' + - 'src/shared/error-message.ts' + - 'src/shared/surrogate-safe-text-slice.ts' + - 'src/shared/trimmed-string.ts' + - 'src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.ts' - 'src/main/ai-vault/scan-service/session-scanner-service-env.ts' - 'src/main/ai-vault/scanners/grok/session-scanner-grok-user-text.ts' - 'src/main/provider-process/provider-json-record.ts' diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index f7721319691..1485eab2a40 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -408,7 +408,6 @@ 2 test-no-wall-clock:src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.test.ts 1 test-no-wall-clock:src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts 2 test-no-wall-clock:src/main/ai-vault/scanners/grok/session-scanner-grok-parser.test.ts -1 test-no-wall-clock:src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.test.ts 1 test-no-wall-clock:src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-process.test.ts 2 test-no-wall-clock:src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.test.ts 2 test-no-wall-clock:src/main/antigravity/posix-hook-invocation.test.ts diff --git a/config/scripts/performance/session-transcripts/session-dedup-batches-benchmark.mjs b/config/scripts/performance/session-transcripts/session-dedup-batches-benchmark.mjs index 44a0bbd187c..6dac3efbbf3 100644 --- a/config/scripts/performance/session-transcripts/session-dedup-batches-benchmark.mjs +++ b/config/scripts/performance/session-transcripts/session-dedup-batches-benchmark.mjs @@ -5,7 +5,7 @@ import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-ben const bundled = await build({ stdin: { - contents: "export * from './src/main/ai-vault/session-root-dedup.ts'", + contents: "export * from './src/main/ai-vault/parsing/session-root-dedup.ts'", resolveDir: process.cwd(), loader: 'ts' }, diff --git a/config/scripts/performance/session-transcripts/session-scan-cutoff-benchmark.mjs b/config/scripts/performance/session-transcripts/session-scan-cutoff-benchmark.mjs index b7311577324..07e54291087 100644 --- a/config/scripts/performance/session-transcripts/session-scan-cutoff-benchmark.mjs +++ b/config/scripts/performance/session-transcripts/session-scan-cutoff-benchmark.mjs @@ -32,10 +32,10 @@ async function load(contents) { return import(`data:text/javascript;base64,${encoded}`) } const [baselineModule, currentModule] = await Promise.all([ - load(`import { sessionSortTime } from './session-scanner-accumulator'; + load(`import { sessionSortTime } from './parsing/session-scanner-accumulator'; export ${baselineFunction.getText(baselineSource)}`), - load(`export { canStopParsingSessions } from './session-scan-cutoff'; -export { ScannedSessionCollection } from './session-root-dedup';`) + load(`export { canStopParsingSessions } from './parsing/session-scan-cutoff'; +export { ScannedSessionCollection } from './parsing/session-root-dedup';`) ]) const baseline = baselineModule.canStopParsingSessions const current = currentModule.canStopParsingSessions diff --git a/config/scripts/performance/session-transcripts/session-timeline-benchmark.mjs b/config/scripts/performance/session-transcripts/session-timeline-benchmark.mjs index 7e53173fcaf..71373dbab13 100644 --- a/config/scripts/performance/session-transcripts/session-timeline-benchmark.mjs +++ b/config/scripts/performance/session-transcripts/session-timeline-benchmark.mjs @@ -1,28 +1,81 @@ import assert from 'node:assert/strict' import { readFileSync } from 'node:fs' -import { dirname, resolve } from 'node:path' +import { mkdtemp, rm, writeFile } from 'node:fs/promises' +import { createRequire } from 'node:module' +import { tmpdir } from 'node:os' +import { dirname, join, resolve } from 'node:path' import { performance } from 'node:perf_hooks' import { build } from 'esbuild' import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs' import { summarizeBenchmarkSamples } from '../measurement/benchmark-sample-summary.mjs' +import ts from 'typescript-api' + +const baselineSourcePathArgument = process.argv.find((arg) => + arg.startsWith('--baseline-source-path=') +) +const baselineSourcePath = resolve( + baselineSourcePathArgument?.slice('--baseline-source-path='.length) ?? + 'src/main/ai-vault/session-scanner-accumulator.ts' +) + +function retargetLegacyAccumulatorValueImports(source) { + const program = ts.createSourceFile(baselineSourcePath, source, ts.ScriptTarget.Latest, true) + assert.equal(program.parseDiagnostics.length, 0, 'Baseline source must parse') + const replacements = [] + for (const statement of program.statements) { + if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier)) { + continue + } + if ( + resolve(dirname(baselineSourcePath), statement.moduleSpecifier.text) !== + resolve('src/main/ai-vault/session-scanner-values') + ) { + continue + } + const clause = statement.importClause + assert( + clause && !clause.name && clause.namedBindings && ts.isNamedImports(clause.namedBindings) + ) + const imports = clause.namedBindings.elements.map((binding) => { + const name = (binding.propertyName ?? binding.name).text + const owner = + name === 'extractString' + ? 'src/shared/trimmed-string.ts' + : name === 'timestampMs' + ? 'src/main/ai-vault/parsing/session-record-time.ts' + : null + assert(owner, `Unsupported historical accumulator value import: ${name}`) + return `import ${clause.isTypeOnly ? 'type ' : ''}{ ${binding.getText(program)} } from ${JSON.stringify(resolve(owner))}` + }) + replacements.push({ + start: statement.getStart(program), + end: statement.end, + text: imports.join('\n') + }) + } + for (const replacement of replacements.toReversed()) { + source = source.slice(0, replacement.start) + replacement.text + source.slice(replacement.end) + } + return source +} // git show :src/main/ai-vault/session-scanner-accumulator.ts | node config/scripts/session-timeline-benchmark.mjs -const target = resolve('src/main/ai-vault/session-scanner-accumulator.ts') -async function load(source) { +const target = resolve('src/main/ai-vault/parsing/session-scanner-accumulator.ts') +async function load(source, sourcePath = target) { const result = await build({ stdin: { contents: ` export {createAccumulator, cloneSessionAccumulator, updateTimeline, finalizeSession} from './session-scanner-accumulator'; export {createClaudeSessionParseState, consumeClaudeSessionLine} - from './session-scanner-primary-parsers';`, + from '../scanners/claude/session-scanner-primary-parsers';`, loader: 'ts', resolveDir: dirname(target) }, bundle: true, write: false, platform: 'node', - format: 'esm', + format: 'cjs', plugins: [ { name: 'timeline-baseline', @@ -30,18 +83,26 @@ async function load(source) { plugin.onLoad({ filter: /session-scanner-accumulator\.ts$/ }, () => ({ contents: source, loader: 'ts', - resolveDir: dirname(target) + resolveDir: dirname(sourcePath) })) } } ] }) - return import( - `data:text/javascript;base64,${Buffer.from(result.outputFiles[0].text).toString('base64')}` - ) + const directory = await mkdtemp(join(tmpdir(), 'orca-session-timeline-')) + try { + const file = join(directory, 'timeline.cjs') + await writeFile(file, result.outputFiles[0].text) + return createRequire(import.meta.url)(file) + } finally { + await rm(directory, { recursive: true, force: true }) + } } const implementations = { - before: await load(readFileSync(0, 'utf8')), + before: await load( + retargetLegacyAccumulatorValueImports(readFileSync(0, 'utf8')), + baselineSourcePath + ), after: await load(readFileSync(target, 'utf8')) } const file = { path: 'timeline.jsonl', mtimeMs: 0, modifiedAt: '2026-01-01T00:00:00.000Z' } diff --git a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs index e7b02e1fa75..2f7c88aabb6 100644 --- a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs +++ b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs @@ -12,12 +12,11 @@ const NODE_RUNTIME_INCLUDE = [ 'tests/e2e/cursor-quota-transport.unit.test.ts', 'tests/e2e/helpers/electron-process-shutdown.unit.test.ts', 'src/main/ai-vault-search/storage/session-search-index-writer.test.ts', - 'src/main/ai-vault/session-scanner-unlimited-dedup.test.ts', + 'src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts', // The parse cache persists through node:sqlite. 'src/main/ai-vault/parse-cache/session-parse-cache-antigravity-upgrade.test.ts', 'src/main/ai-vault/parse-cache/session-parse-cache-persistence.test.ts', - 'src/main/ai-vault/session-scanner-scope-cwd-facts.test.ts', - 'src/main/ai-vault/session-scanner-scope-walk.test.ts', + 'src/main/ai-vault/scope/session-scanner-scope-walk.test.ts', // The forced-probe handoff race opens only under V8's promise scheduling, which Electron main uses. 'src/main/github/rate-limit.test.ts', // Electron main bridges streams with Node's implementation. diff --git a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs index 3aa1e8002b0..089fd4e407b 100644 --- a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs +++ b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs @@ -241,7 +241,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [ 'src/shared/agent-session-record', 'src/shared/agent-session-provider-handle', 'src/shared/agent-session/journal/', - 'src/main/ai-vault/structured-session-ownership.ts', + 'src/main/ai-vault/structured-sessions/structured-session-ownership.ts', 'src/main/native-chat/agent-session-journal/', 'src/main/native-chat/agent-session-wire/', // The released phone contract runs the current discovery owner and Claude producer. diff --git a/src/main/ai-vault-search/discovery/session-search-scan-roots.ts b/src/main/ai-vault-search/discovery/session-search-scan-roots.ts index 77d3761ad64..afaddde30eb 100644 --- a/src/main/ai-vault-search/discovery/session-search-scan-roots.ts +++ b/src/main/ai-vault-search/discovery/session-search-scan-roots.ts @@ -1,8 +1,8 @@ import type { AiVaultScanIssue } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { AI_VAULT_AGENT_SOURCES } from '../../ai-vault/session-scanner-agent-sources' -import { normalizedWslHomeDirs } from '../../ai-vault/session-scanner-roots' -import { sessionCandidatesFromDiscoveries } from '../../ai-vault/session-scanner-candidates' -import { discoverAiVaultSessionSources } from '../../ai-vault/session-scanner-source-discovery' +import { AI_VAULT_AGENT_SOURCES } from '../../ai-vault/discovery/session-scanner-agent-sources' +import { normalizedWslHomeDirs } from '../../ai-vault/discovery/session-scanner-roots' +import { sessionCandidatesFromDiscoveries } from '../../ai-vault/discovery/session-scanner-candidates' +import { discoverAiVaultSessionSources } from '../../ai-vault/discovery/session-scanner-source-discovery' import type { AiVaultScanOptions, SessionFileCandidate, diff --git a/src/main/ai-vault-search/indexing/session-search-index-pass.ts b/src/main/ai-vault-search/indexing/session-search-index-pass.ts index 5614a5511b6..eba7126f7cb 100644 --- a/src/main/ai-vault-search/indexing/session-search-index-pass.ts +++ b/src/main/ai-vault-search/indexing/session-search-index-pass.ts @@ -1,4 +1,4 @@ -import { throwIfAiVaultScanCancelled } from '../../ai-vault/ai-vault-scan-cancellation' +import { throwIfAiVaultScanCancelled } from '../../ai-vault/scan-lifecycle/ai-vault-scan-cancellation' import { createSessionParseStats, parseAgentSessionFileCached, diff --git a/src/main/ai-vault-search/indexing/session-search-indexer-test-fixture.ts b/src/main/ai-vault-search/indexing/session-search-indexer-test-fixture.ts index 0b1a9c5461f..a61b717a8f0 100644 --- a/src/main/ai-vault-search/indexing/session-search-indexer-test-fixture.ts +++ b/src/main/ai-vault-search/indexing/session-search-indexer-test-fixture.ts @@ -3,7 +3,7 @@ import { mkdir, mkdtemp, rename, rm, stat, utimes, writeFile } from 'node:fs/pro import { tmpdir } from 'node:os' import { dirname, join } from 'node:path' import SyncDatabase from '../../sqlite/sync-database' -import { isolatedScanRoots } from '../../ai-vault/session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../ai-vault/scanner-fixtures/session-scanner-test-fixtures' import type { SessionSearchClock, SessionSearchTimerHandle } from './session-search-clock' import type { SessionSearchScanRoots } from '../discovery/session-search-scan-roots' import { assistantRecord, userRecord } from './session-search-transcript-fixtures' diff --git a/src/main/ai-vault-search/indexing/session-search-pass.ts b/src/main/ai-vault-search/indexing/session-search-pass.ts index f2fc1fbf442..9463caa6ebf 100644 --- a/src/main/ai-vault-search/indexing/session-search-pass.ts +++ b/src/main/ai-vault-search/indexing/session-search-pass.ts @@ -3,7 +3,7 @@ import { cursorChatMetaRefusals, withCursorChatMetaScan } from '../../ai-vault/scanners/cursor/session-scanner-cursor-chat-meta' -import { recordSessionScanIssue } from '../../ai-vault/session-scan-issues' +import { recordSessionScanIssue } from '../../ai-vault/parsing/session-scan-issues' import { mergeDegradedRoots, scanIssueDegradedRoots, diff --git a/src/main/ai-vault-search/query/session-search-engine.ts b/src/main/ai-vault-search/query/session-search-engine.ts index 39a3f1c669e..a61862339f5 100644 --- a/src/main/ai-vault-search/query/session-search-engine.ts +++ b/src/main/ai-vault-search/query/session-search-engine.ts @@ -1,6 +1,6 @@ import type SyncDatabase from '../../sqlite/sync-database' import type { TranscriptMessageRole } from '../../ai-vault/transcripts/session-transcript-consumers' -import '../../ai-vault/session-scanner-text-normalization' +import '../../ai-vault/parsing/session-scanner-text-normalization' import { sliceAtCodeUnitLimit } from '../../../shared/surrogate-safe-text-slice' import { hasAiVaultSearchQueryOperators, diff --git a/src/main/ai-vault-search/session-search-host-registration.test.ts b/src/main/ai-vault-search/session-search-host-registration.test.ts index bca9c53218a..92676a7ae85 100644 --- a/src/main/ai-vault-search/session-search-host-registration.test.ts +++ b/src/main/ai-vault-search/session-search-host-registration.test.ts @@ -14,7 +14,7 @@ import { resetSessionSearchPolicyForTests } from './session-search-policy' import { resetSessionSearchServiceInitForTests } from './session-search-service-init' const localAiVaultScanRoots = vi.hoisted(() => vi.fn()) -vi.mock('../ai-vault/cached-session-list', async (importOriginal) => ({ +vi.mock('../ai-vault/discovery/ai-vault-scan-roots', async (importOriginal) => ({ ...(await importOriginal()), localAiVaultScanRoots })) diff --git a/src/main/ai-vault-search/session-search-request-deadline.ts b/src/main/ai-vault-search/session-search-request-deadline.ts index 41ac7abddc3..4835a5015b6 100644 --- a/src/main/ai-vault-search/session-search-request-deadline.ts +++ b/src/main/ai-vault-search/session-search-request-deadline.ts @@ -1,4 +1,4 @@ -import { abandonRemoteSessionScanOnCancel } from '../ai-vault/ai-vault-scan-cancellation' +import { abandonRemoteSessionScanOnCancel } from '../ai-vault/scan-lifecycle/ai-vault-scan-cancellation' /** Cleanup continues after a caller leaves; native retirement must never extend an IPC deadline. */ export async function withinSessionSearchDeadline( diff --git a/src/main/ai-vault-search/storage/session-search-schema.ts b/src/main/ai-vault-search/storage/session-search-schema.ts index adddb55eb8b..a93533593c6 100644 --- a/src/main/ai-vault-search/storage/session-search-schema.ts +++ b/src/main/ai-vault-search/storage/session-search-schema.ts @@ -2,7 +2,7 @@ import { removeTree } from '../../../shared/windows-transient-lock-removal' import { randomUUID } from 'node:crypto' import type SyncDatabase from '../../sqlite/sync-database' import { openVersionedCacheDatabase } from '../../sqlite/versioned-cache-database' -import { asRecord } from '../../ai-vault/session-scanner-record-value' +import { asRecord } from '../../ai-vault/parsing/session-record-fields' // Cache transcript content verbatim; outbound snippet policy belongs at the transport boundary. diff --git a/src/main/ai-vault-search/storage/session-search-store.ts b/src/main/ai-vault-search/storage/session-search-store.ts index 16b8b5d6ce8..eb695d17643 100644 --- a/src/main/ai-vault-search/storage/session-search-store.ts +++ b/src/main/ai-vault-search/storage/session-search-store.ts @@ -6,7 +6,7 @@ import type { SessionSearchStateCounts } from './session-search-store-types' import type SyncDatabase from '../../sqlite/sync-database' -import { asRecord } from '../../ai-vault/session-scanner-record-value' +import { asRecord } from '../../ai-vault/parsing/session-record-fields' import type { SessionFileCandidate } from '../../ai-vault/session-scanner-types' import type { TranscriptSessionIdentity } from '../../ai-vault/transcripts/session-transcript-consumers' import { diff --git a/src/main/ai-vault-search/worker/session-search-worker-store-base.ts b/src/main/ai-vault-search/worker/session-search-worker-store-base.ts index 52771a1985f..e282821a999 100644 --- a/src/main/ai-vault-search/worker/session-search-worker-store-base.ts +++ b/src/main/ai-vault-search/worker/session-search-worker-store-base.ts @@ -1,7 +1,7 @@ import { createAiVaultScanCancelledError, abandonRemoteSessionScanOnCancel -} from '../../ai-vault/ai-vault-scan-cancellation' +} from '../../ai-vault/scan-lifecycle/ai-vault-scan-cancellation' import { SessionSearchWorkerClient, SessionSearchOperationError diff --git a/src/main/ai-vault-search/worker/session-search-worker-store.ts b/src/main/ai-vault-search/worker/session-search-worker-store.ts index f3dc113b30a..7a5f15fe0fb 100644 --- a/src/main/ai-vault-search/worker/session-search-worker-store.ts +++ b/src/main/ai-vault-search/worker/session-search-worker-store.ts @@ -8,7 +8,7 @@ import type { import { createAiVaultScanCancelledError, abandonRemoteSessionScanOnCancel -} from '../../ai-vault/ai-vault-scan-cancellation' +} from '../../ai-vault/scan-lifecycle/ai-vault-scan-cancellation' import { EMPTY_CONTENT_HASH, foldContentHash } from '../storage/session-search-content-hash' import { searchMessageRows } from '../storage/session-search-message-rows' import type { SessionSearchFileWrite } from '../storage/session-search-index-writer' diff --git a/src/main/ai-vault/ai-vault-scan-progress-flow.test.ts b/src/main/ai-vault/ai-vault-scan-progress-flow.test.ts deleted file mode 100644 index 67478154722..00000000000 --- a/src/main/ai-vault/ai-vault-scan-progress-flow.test.ts +++ /dev/null @@ -1,187 +0,0 @@ -import { mkdtemp, rm, utimes } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { basename, join } from 'node:path' -import { afterEach, expect, it, vi } from 'vitest' -import type { AiVaultScanWork } from '../../shared/ai-vault/scanning/ai-vault-scan-progress' -import { resetLocalAiVaultScanProgressForTests } from './ai-vault-local-scan-progress' -import * as parseCache from './parse-cache/session-scanner-parse-cache' -import * as transcriptFs from '../native-chat/wsl-transcript-fs-access' -import { aiVaultScanWork, trackAiVaultScanProgress } from './ai-vault-scan-progress' -import { scanAiVaultSessions } from './session-scanner' -import { resetSessionParseCacheForTests } from './parse-cache/session-parse-cache-store' -import { isolatedScanRoots, writeJsonlFile } from './session-scanner-test-fixtures' - -// Source fixtures exercise the real SQLite readers without a packaged worker bundle. -vi.mock( - './scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn', - async () => { - const { listOpenCodeSqliteSessions } = - await import('./scanners/opencode/sqlite/session-scanner-opencode-sqlite-list') - const { listOpenCode2SqliteSessions } = - await import('./scanners/opencode2/session-scanner-opencode2-sqlite-list') - const { parseOpenCodeSqliteSession } = - await import('./scanners/opencode/sqlite/session-scanner-opencode-sqlite') - return { - listOpenCode2SqliteSessionsViaWorker: listOpenCode2SqliteSessions, - listOpenCodeSqliteSessionsViaWorker: listOpenCodeSqliteSessions, - listZcodeSqliteSessionsViaWorker: (args: Parameters[0]) => - listOpenCodeSqliteSessions({ ...args, agent: 'zcode' }), - parseOpenCodeSqliteSessionViaWorker: parseOpenCodeSqliteSession - } - } -) - -let tempRoot: string | null = null - -afterEach(async () => { - vi.useRealTimers() - vi.restoreAllMocks() - resetSessionParseCacheForTests() - resetLocalAiVaultScanProgressForTests() - if (tempRoot) { - await rm(tempRoot, { recursive: true, force: true }) - tempRoot = null - } -}) - -it.each(['cutoff', 'bucket', 'filtered'] as const)( - 'freezes %s work without changing cold/warm execution', - async (flow) => { - tempRoot = await mkdtemp(join(tmpdir(), 'orca-scan-frozen-')) - const roots = isolatedScanRoots(tempRoot) - for (let index = 0; index < (flow === 'filtered' ? 27 : 6); index++) { - const timestamp = new Date(Date.UTC(2026, 9, 19) - index * 60_000).toISOString() - const cwd = - index >= 3 && (flow === 'bucket' || (index - 3) % 8 === 0) ? '/repo' : '/elsewhere' - const path = - flow === 'filtered' - ? join(roots.codexSessionsDir, `rollout-${index}.jsonl`) - : join( - roots.claudeProjectsDir, - cwd === '/repo' ? '-repo' : '-elsewhere', - `${index}.jsonl` - ) - await writeJsonlFile( - path, - flow === 'filtered' - ? [ - { timestamp, type: 'session_meta', payload: { id: `fixture-${index}`, cwd } }, - { - timestamp, - type: 'event_msg', - payload: { type: 'user_message', message: `Generated ${index}` } - } - ] - : [ - { - type: 'user', - sessionId: `fixture-${index}`, - timestamp, - cwd, - message: { role: 'user', content: `Generated ${index}` } - } - ] - ) - await utimes(path, Date.parse(timestamp) / 1000, Date.parse(timestamp) / 1000) - } - const listed = vi.spyOn(parseCache, 'parseListedSessionFile') - const walked = vi.spyOn(parseCache, 'parseAgentSessionFileCached') - const stats = vi.spyOn(parseCache, 'createSessionParseStats') - const opened = vi.spyOn(transcriptFs, 'openTranscriptReadStream') - const ids = - flow === 'cutoff' - ? [0, 1, 2] - : flow === 'filtered' - ? [0, 1, 2, 3, 11, 19] - : [0, 1, 2, 3, 4, 5] - for (const warm of [false, true]) { - const reports: AiVaultScanWork[] = [] - const signal = new AbortController().signal - let now = 0 - const stop = trackAiVaultScanProgress( - signal, - (work) => reports.push(work), - () => (now += 1000) - ) - try { - const result = await scanAiVaultSessions({ - ...roots, - platform: 'darwin', - limit: 3, - limitPerAgent: 50, - signal, - ...(flow === 'cutoff' ? {} : { scopePaths: ['/repo'] }) - }) - expect(result.issues).toEqual([]) - expect(result.sessions.map((row) => row.sessionId)).toEqual( - ids.map((id) => `fixture-${id}`) - ) - const attempts = [...listed.mock.calls, ...walked.mock.calls].map( - ([candidate]) => candidate.file.path - ) - expect( - attempts.map((path) => - Number(basename(path).replace('rollout-', '').replace('.jsonl', '')) - ) - ).toEqual(ids) - expect(opened.mock.calls).toHaveLength(warm ? 0 : flow === 'bucket' ? 7 : ids.length) - expect(stats.mock.results.at(-1)?.value).toEqual({ - reused: warm ? ids.length : 0, - incremental: 0, - fullParses: warm ? 0 : ids.length, - earlyStopped: 0, - bytesRead: warm ? 0 : flow === 'filtered' ? 1363 : flow === 'bucket' ? 873 : 444 - }) - const reading = reports.filter((work) => work.stage === 'reading') - const total = flow === 'filtered' ? 27 : 6 - let settled = 0 - for (const work of reading) { - expect(work.read.total).toBe(total) - expect(work.read.done + (work.read.skipped ?? 0)).toBeGreaterThanOrEqual(settled) - settled = work.read.done + (work.read.skipped ?? 0) - expect(work.agents.reduce((sum, agent) => sum + (agent.read?.total ?? 0), 0)).toBe(total) - expect(work.agents.reduce((sum, agent) => sum + (agent.read?.done ?? 0), 0)).toBe( - work.read.done - ) - expect(work.agents.reduce((sum, agent) => sum + (agent.read?.skipped ?? 0), 0)).toBe( - work.read.skipped - ) - } - expect(aiVaultScanWork(signal)?.read).toEqual({ - done: ids.length, - total, - skipped: total - ids.length - }) - } finally { - stop() - } - listed.mockClear() - walked.mockClear() - opened.mockClear() - } - } -) - -it('does not settle a batch interrupted during its real parser invocation', async () => { - tempRoot = await mkdtemp(join(tmpdir(), 'orca-scan-abort-')) - const roots = isolatedScanRoots(tempRoot) - await writeJsonlFile(join(roots.claudeProjectsDir, 'project', 'a.jsonl'), [ - { type: 'user', sessionId: 'a', message: { role: 'user', content: 'Generated' } } - ]) - const controller = new AbortController() - const original = parseCache.parseListedSessionFile - vi.spyOn(parseCache, 'parseListedSessionFile').mockImplementation(async (...args) => { - const result = await original(...args) - controller.abort() - return result - }) - const stop = trackAiVaultScanProgress(controller.signal, () => undefined) - try { - await expect( - scanAiVaultSessions({ ...roots, signal: controller.signal }) - ).rejects.toMatchObject({ name: 'AbortError' }) - expect(aiVaultScanWork(controller.signal)?.read).toEqual({ done: 0, total: 1, skipped: 0 }) - } finally { - stop() - } -}) diff --git a/src/main/ai-vault/host-session-delete.ts b/src/main/ai-vault/deletion/host-session-delete.ts similarity index 82% rename from src/main/ai-vault/host-session-delete.ts rename to src/main/ai-vault/deletion/host-session-delete.ts index a84e123c710..d666f722dea 100644 --- a/src/main/ai-vault/host-session-delete.ts +++ b/src/main/ai-vault/deletion/host-session-delete.ts @@ -1,14 +1,15 @@ import { rm } from 'node:fs/promises' -import { getAiVaultWslHomeDirs, invalidateAiVaultSessionListCache } from './cached-session-list' +import { getAiVaultWslHomeDirs } from '../discovery/ai-vault-scan-roots' +import { invalidateAiVaultSessionListCache } from '../listing/cached-session-list' import { deleteAiVaultSessionFile, type AiVaultSessionPathRemover } from './session-delete' -import { invalidateSessionParseCacheEntry } from './parse-cache/session-parse-cache-store' -import { invalidateAiVaultBackgroundCache } from './scan-service/session-scanner-background' -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' +import { invalidateSessionParseCacheEntry } from '../parse-cache/session-parse-cache-store' +import { invalidateAiVaultBackgroundCache } from '../scan-service/session-scanner-background' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import type { AiVaultDeleteSessionArgs, AiVaultDeleteSessionResult -} from '../../shared/ai-vault/contracts/ai-vault-session-deletion' +} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' export type HostAiVaultSessionDeleteDeps = { removePath: AiVaultSessionPathRemover diff --git a/src/main/ai-vault/session-delete-target.ts b/src/main/ai-vault/deletion/session-delete-target.ts similarity index 88% rename from src/main/ai-vault/session-delete-target.ts rename to src/main/ai-vault/deletion/session-delete-target.ts index 99ce155b836..3efb816883f 100644 --- a/src/main/ai-vault/session-delete-target.ts +++ b/src/main/ai-vault/deletion/session-delete-target.ts @@ -1,5 +1,5 @@ import { basename, dirname, extname, join, resolve } from 'node:path' -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' import { isAiVaultDeletableAgent, isAiVaultSyntheticSessionPath, @@ -7,20 +7,20 @@ import { type AiVaultSessionDeleteRejectionCode, type AiVaultSessionDeleteRemoval, type AiVaultSessionDeleteValidationResult -} from '../../shared/ai-vault/contracts/ai-vault-session-deletion' +} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' import { LOCAL_EXECUTION_HOST_ID, normalizeExecutionHostId, type ExecutionHostId -} from '../../shared/execution-host' -import { isPathInsideOrEqual } from '../../shared/cross-platform-path' +} from '../../../shared/execution-host' +import { isPathInsideOrEqual } from '../../../shared/cross-platform-path' import { AI_VAULT_AGENT_SOURCES, - isDiscoverableSessionFile, sessionRowRootDirs -} from './session-scanner-agent-sources' -import { subagentTranscriptsDirFor } from './scanners/claude/session-scanner-subagent-transcripts' -import type { AiVaultScanOptions } from './session-scanner-types' +} from '../discovery/session-scanner-agent-sources' +import { isDiscoverableSessionFile } from '../discovery/session-file-discovery' +import { subagentTranscriptsDirFor } from '../scanners/claude/session-scanner-subagent-transcripts' +import type { AiVaultScanOptions } from '../session-scanner-types' // These sessions own their containing directory, including companion files. const AI_VAULT_WHOLE_DIRECTORY_DELETE_AGENTS = new Set([ diff --git a/src/main/ai-vault/session-delete.ts b/src/main/ai-vault/deletion/session-delete.ts similarity index 92% rename from src/main/ai-vault/session-delete.ts rename to src/main/ai-vault/deletion/session-delete.ts index 6f3786cbe5c..14711cac51c 100644 --- a/src/main/ai-vault/session-delete.ts +++ b/src/main/ai-vault/deletion/session-delete.ts @@ -2,14 +2,14 @@ import { lstat, realpath } from 'node:fs/promises' import type { AiVaultDeleteSessionResult, AiVaultSessionDeleteRemoval -} from '../../shared/ai-vault/contracts/ai-vault-session-deletion' -import { isPathInsideOrEqual } from '../../shared/cross-platform-path' +} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' +import { isPathInsideOrEqual } from '../../../shared/cross-platform-path' import { validateAiVaultSessionDeleteTarget, type ValidateAiVaultSessionDeleteTargetArgs } from './session-delete-target' -import { tryDeleteWslUncPath, WslDeleteValidationError } from '../wsl/filesystem/wsl-unc-delete' -import { isENOENT } from '../ipc/filesystem/access/filesystem-path-containment' +import { tryDeleteWslUncPath, WslDeleteValidationError } from '../../wsl/filesystem/wsl-unc-delete' +import { isENOENT } from '../../ipc/filesystem/access/filesystem-path-containment' /** Desktop moves to Trash; a plain-Node host has none, so it removes permanently after the user confirmed. */ export type AiVaultSessionPathRemover = (removal: AiVaultSessionDeleteRemoval) => Promise diff --git a/src/main/ai-vault/discovery/agent-session-directories.ts b/src/main/ai-vault/discovery/agent-session-directories.ts new file mode 100644 index 00000000000..51b12529528 --- /dev/null +++ b/src/main/ai-vault/discovery/agent-session-directories.ts @@ -0,0 +1,54 @@ +import { homedir } from 'node:os' +import { basename, join } from 'node:path' +import { resolveAbsoluteDirOverride } from '../../../shared/absolute-dir-override' + +// Accept Pi/OMP home, agent, or sessions paths. +export function normalizeAgentSessionsDir( + rawValue: string, + agentHomeDirName: '.pi' | '.omp' +): string { + const trimmed = rawValue.trim() + if (!trimmed) { + return join(homedir(), agentHomeDirName, 'agent', 'sessions') + } + const normalized = trimmed.replace(/[\\/]+$/, '') + const leaf = basename(normalized) + if (leaf === 'sessions') { + return normalized + } + if (leaf === 'agent') { + return join(normalized, 'sessions') + } + if (leaf === agentHomeDirName) { + return join(normalized, 'agent', 'sessions') + } + return normalized +} + +function defaultPrimeAgentSessionsDir(): string { + return join(homedir(), '.prime', 'agent', 'sessions') +} + +// Pi/Prime expand leading ~ themselves; other CLIs such as Grok treat it literally. +function absoluteConfiguredDir(rawValue: string): string | null { + const expanded = rawValue === '~' ? homedir() : rawValue.replace(/^~(?=[\\/])/, homedir()) + const normalized = expanded.replace(/[\\/]+$/, '') + return resolveAbsoluteDirOverride(normalized, '') || null +} + +// Prime always appends sessions, even when the configured agent directory is named sessions. +export function normalizePrimeAgentSessionsDir(rawAgentDir: string): string { + const agentDir = absoluteConfiguredDir(rawAgentDir.trim()) + return agentDir ? join(agentDir, 'sessions') : defaultPrimeAgentSessionsDir() +} + +// Explicit session-root overrides outrank the agent directory and are used verbatim. +export function primeAgentSessionsDirFromEnv(env: NodeJS.ProcessEnv = process.env): string { + const sessionDir = + env.PRIME_AGENT_SESSION_DIR?.trim() || env.PRIME_AGENT_CODING_AGENT_SESSION_DIR?.trim() + if (sessionDir) { + return absoluteConfiguredDir(sessionDir) ?? defaultPrimeAgentSessionsDir() + } + const agentDir = env.PRIME_AGENT_CODING_AGENT_DIR?.trim() + return agentDir ? normalizePrimeAgentSessionsDir(agentDir) : defaultPrimeAgentSessionsDir() +} diff --git a/src/main/ai-vault/ai-vault-scan-roots.ts b/src/main/ai-vault/discovery/ai-vault-scan-roots.ts similarity index 80% rename from src/main/ai-vault/ai-vault-scan-roots.ts rename to src/main/ai-vault/discovery/ai-vault-scan-roots.ts index df30c789acd..b707e6dbcfa 100644 --- a/src/main/ai-vault/ai-vault-scan-roots.ts +++ b/src/main/ai-vault/discovery/ai-vault-scan-roots.ts @@ -1,18 +1,18 @@ import { join } from 'node:path' -import { isWslUncPath } from '../../shared/wsl-paths' -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' -import { claudeProfileHistoryDirs } from '../claude-accounts/profiles/routing/claude-profile-installed-router' -import { getCachedWslDistros, hasCachedWslDistros } from '../wsl/discovery/distro-catalog' +import { isWslUncPath } from '../../../shared/wsl-paths' +import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' +import { claudeProfileHistoryDirs } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' +import { getCachedWslDistros, hasCachedWslDistros } from '../../wsl/discovery/distro-catalog' import { listLastKnownRunningWslHomeDirs, readRunningWslHomeDirsUnlessStopped -} from '../wsl/discovery/wsl-home-unless-stopped' -import { filterPathsToRunningWslDistrosAsync } from '../wsl/filesystem/wsl-running-path-filter' -import type { AiVaultScanOptions } from './session-scanner-types' -import { managedOpenCodeAccountDataDirs } from '../opencode/accounts/opencode-managed-account-data-dirs' -import { antigravityChatBrainDir } from '../antigravity/antigravity-chat-home' -import { getProfileUserDataPath } from '../orca-profiles/profile-storage-paths' -import { prepareOpenCodeWslReaders } from './scanners/opencode/reader-transport/opencode-wsl-runtime-preparation' +} from '../../wsl/discovery/wsl-home-unless-stopped' +import { filterPathsToRunningWslDistrosAsync } from '../../wsl/filesystem/wsl-running-path-filter' +import type { AiVaultScanOptions } from '../session-scanner-types' +import { managedOpenCodeAccountDataDirs } from '../../opencode/accounts/opencode-managed-account-data-dirs' +import { antigravityChatBrainDir } from '../../antigravity/antigravity-chat-home' +import { getProfileUserDataPath } from '../../orca-profiles/profile-storage-paths' +import { prepareOpenCodeWslReaders } from '../scanners/opencode/reader-transport/opencode-wsl-runtime-preparation' // Configure sources through the runtime service; headless serve never runs window-only IPC registration. export type AiVaultSessionSources = { diff --git a/src/main/ai-vault/session-file-discovery.ts b/src/main/ai-vault/discovery/session-file-discovery.ts similarity index 100% rename from src/main/ai-vault/session-file-discovery.ts rename to src/main/ai-vault/discovery/session-file-discovery.ts diff --git a/src/main/ai-vault/discovery/session-json-file.ts b/src/main/ai-vault/discovery/session-json-file.ts new file mode 100644 index 00000000000..461edd3034d --- /dev/null +++ b/src/main/ai-vault/discovery/session-json-file.ts @@ -0,0 +1,22 @@ +import { wslGatedReadFile } from '../../native-chat/wsl-transcript-fs-access' +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' +import { asRecord } from '../parsing/session-record-fields' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' + +export async function readJsonObjectIfExists( + filePath: string, + signal?: AbortSignal +): Promise | null> { + try { + const parsed: unknown = JSON.parse(await wslGatedReadFile(filePath, 'utf-8', 'scan', signal)) + return asRecord(parsed) + } catch (error) { + // Propagate cancellation so it cannot be cached as absent enrichment. + throwIfAiVaultScanCancelled(signal) + // Propagate WSL refusal as an issue; caching null can prevent retries for unchanged files. + if (error instanceof WslTranscriptFsError) { + throw error + } + return null + } +} diff --git a/src/main/ai-vault/session-newest-files.ts b/src/main/ai-vault/discovery/session-newest-files.ts similarity index 95% rename from src/main/ai-vault/session-newest-files.ts rename to src/main/ai-vault/discovery/session-newest-files.ts index 6b938f351a8..b2479b4a8ff 100644 --- a/src/main/ai-vault/session-newest-files.ts +++ b/src/main/ai-vault/discovery/session-newest-files.ts @@ -1,4 +1,4 @@ -import type { FileWithMtime } from './session-scanner-types' +import type { FileWithMtime } from '../session-scanner-types' /** Retain only the requested newest files, preserving traversal order on ties. */ export class SessionNewestFiles { diff --git a/src/main/ai-vault/discovery/session-path-absence.ts b/src/main/ai-vault/discovery/session-path-absence.ts new file mode 100644 index 00000000000..ef5aae3969f --- /dev/null +++ b/src/main/ai-vault/discovery/session-path-absence.ts @@ -0,0 +1,13 @@ +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' + +/** A missing file or folder is absence, not a refusal; WSL gate errors are always refusals. */ +export function isMissingTranscriptPathError(error: unknown): boolean { + if (error instanceof WslTranscriptFsError) { + return false + } + const code = + error && typeof error === 'object' && 'code' in error && typeof error.code === 'string' + ? error.code + : null + return code === 'ENOENT' || code === 'ENOTDIR' +} diff --git a/src/main/ai-vault/discovery/session-scanner-agent-root-overrides.test.ts b/src/main/ai-vault/discovery/session-scanner-agent-root-overrides.test.ts new file mode 100644 index 00000000000..7fca9e632fd --- /dev/null +++ b/src/main/ai-vault/discovery/session-scanner-agent-root-overrides.test.ts @@ -0,0 +1,56 @@ +import { homedir } from 'node:os' +import { join } from 'node:path' +import { afterEach, describe, expect, it, vi } from 'vitest' +import type { AiVaultScanOptions } from '../session-scanner-types' + +/** Exercise root consumers: module-time constants can bypass an otherwise correct override validator (#13082). */ + +const NO_OPTIONS: AiVaultScanOptions = {} +const NO_WSL: readonly string[] = [] + +async function rootDirsFor( + agent: 'codex' | 'copilot' | 'devin' | 'openclaw' | 'kimi' | 'grok', + env: Record +): Promise { + vi.resetModules() + for (const [key, value] of Object.entries(env)) { + vi.stubEnv(key, value) + } + const sources = await import('./session-scanner-agent-sources.js') + const source = sources.AI_VAULT_AGENT_SOURCES[agent] + if (!source) { + throw new Error(`no source table entry for ${agent}`) + } + return source.rootDirs(NO_OPTIONS, NO_WSL) +} + +describe('agent scan roots from environment overrides', () => { + afterEach(() => { + vi.unstubAllEnvs() + vi.resetModules() + }) + + it('finds Devin transcripts in a relocated platform data directory', async () => { + const dataDir = join(homedir(), 'relocated-agent-data') + const roots = await rootDirsFor('devin', { + DEVIN_HOME: '', + [process.platform === 'win32' ? 'APPDATA' : 'XDG_DATA_HOME']: dataDir + }) + expect(roots).toEqual( + ['transcripts', 'agent_logs'].map((dir) => join(dataDir, 'devin', 'cli', dir)) + ) + }) + + it('keeps an explicit transcript root isolated and discovers both WSL layouts', async () => { + const { AI_VAULT_AGENT_SOURCES } = await import('./session-scanner-agent-sources') + const custom = join(homedir(), 'custom-devin') + const wslHome = join(homedir(), 'wsl-home') + expect( + AI_VAULT_AGENT_SOURCES.devin?.rootDirs({ devinTranscriptsDir: custom }, [wslHome]) + ).toEqual([ + custom, + join(wslHome, '.local', 'share', 'devin', 'cli', 'transcripts'), + join(wslHome, '.local', 'share', 'devin', 'cli', 'agent_logs') + ]) + }) +}) diff --git a/src/main/ai-vault/session-scanner-agent-sources.ts b/src/main/ai-vault/discovery/session-scanner-agent-sources.ts similarity index 86% rename from src/main/ai-vault/session-scanner-agent-sources.ts rename to src/main/ai-vault/discovery/session-scanner-agent-sources.ts index 4db2ab7c288..ac3e1265ec2 100644 --- a/src/main/ai-vault/session-scanner-agent-sources.ts +++ b/src/main/ai-vault/discovery/session-scanner-agent-sources.ts @@ -1,25 +1,25 @@ import { homedir } from 'node:os' import { basename, dirname, join } from 'node:path' import { pathSegments } from './session-file-discovery' -import { resolveAbsoluteDirOverride } from '../../shared/absolute-dir-override' -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import type { AiVaultDeletableAgent } from '../../shared/ai-vault/contracts/ai-vault-session-deletion' -import { resolveGrokSessionsDir } from '../../shared/grok-session-paths' -import { resolveKiroHomeDir } from '../../shared/kiro-home' -import { uniqueCodexSessionsDirs } from './scanners/codex/session-scanner-codex-paths' +import { resolveAbsoluteDirOverride } from '../../../shared/absolute-dir-override' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultDeletableAgent } from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' +import { resolveGrokSessionsDir } from '../../../shared/grok-session-paths' +import { resolveKiroHomeDir } from '../../../shared/kiro-home' +import { uniqueCodexSessionsDirs } from '../scanners/codex/session-scanner-codex-paths' import { clineMessagesPathForMetadata, kiroTranscriptPathForMetadata -} from '../../shared/ai-vault/session-display/ai-vault-session-log-resource' -import { isClineSessionMetadataPath } from './scanners/cline/session-scanner-cline-parser' -import { cursorChatMetaPath } from './scanners/cursor/session-scanner-cursor-chat-meta' -import { devinSessionsDbDependencyPath } from './scanners/devin/session-scanner-devin-db' -import { resolveKimiSessionsDir } from './scanners/kimi/session-scanner-kimi-paths' -import { resolveMuseSessionsDir } from '../../shared/muse-session-log' -import { isKiroSessionMetadataPath } from './scanners/kiro/session-scanner-kiro-parser' +} from '../../../shared/ai-vault/session-display/ai-vault-session-log-resource' +import { isClineSessionMetadataPath } from '../scanners/cline/session-scanner-cline-parser' +import { cursorChatMetaPath } from '../scanners/cursor/session-scanner-cursor-chat-meta' +import { devinSessionsDbDependencyPath } from '../scanners/devin/session-scanner-devin-db' +import { resolveKimiSessionsDir } from '../scanners/kimi/session-scanner-kimi-paths' +import { resolveMuseSessionsDir } from '../../../shared/muse-session-log' +import { isKiroSessionMetadataPath } from '../scanners/kiro/session-scanner-kiro-parser' -import { OPENCLAW_AGENT_SOURCE } from './scanners/openclaw/openclaw-session-layout' -import { isOmpConversationDirectory } from './scanners/omp/session-scanner-omp-subagent-transcripts' +import { OPENCLAW_AGENT_SOURCE } from '../scanners/openclaw/openclaw-session-layout' +import { isOmpConversationDirectory } from '../scanners/omp/session-scanner-omp-subagent-transcripts' import { claudeProjectsRootDirs, codexHomeSessionsDir, @@ -27,11 +27,14 @@ import { sessionRootDirs, wslHomeSessionDirs } from './session-scanner-roots' -import { getHermesHome } from '../hermes/hermes-default-home' -import { isClaudeProjectBucketDirectory } from './scanners/claude/claude-project-dir-encoding' -import { SUBAGENT_DIR_NAME } from './scanners/claude/session-scanner-subagent-transcripts' -import type { AiVaultScanOptions } from './session-scanner-types' -import { normalizeAgentSessionsDir, primeAgentSessionsDirFromEnv } from './session-scanner-values' +import { getHermesHome } from '../../hermes/hermes-default-home' +import { isClaudeProjectBucketDirectory } from '../scanners/claude/claude-project-dir-encoding' +import { SUBAGENT_DIR_NAME } from '../scanners/claude/session-scanner-subagent-transcripts' +import type { AiVaultScanOptions } from '../session-scanner-types' +import { + normalizeAgentSessionsDir, + primeAgentSessionsDirFromEnv +} from './agent-session-directories' export const DEFAULT_CODEX_HOME_DIR = join(homedir(), '.codex') const GEMINI_SESSIONS_DIR = join(homedir(), '.gemini', 'tmp') @@ -317,5 +320,3 @@ export function sessionRowRootDirs( ? [...roots, ...AI_VAULT_AGENT_SOURCES.pi.rootDirs(options, wslHomeDirs)] : roots } - -export { isDiscoverableSessionFile } from './session-file-discovery' diff --git a/src/main/ai-vault/session-scanner-candidates.ts b/src/main/ai-vault/discovery/session-scanner-candidates.ts similarity index 82% rename from src/main/ai-vault/session-scanner-candidates.ts rename to src/main/ai-vault/discovery/session-scanner-candidates.ts index dc11c125b00..8da6beaff33 100644 --- a/src/main/ai-vault/session-scanner-candidates.ts +++ b/src/main/ai-vault/discovery/session-scanner-candidates.ts @@ -1,19 +1,19 @@ -import { prioritizeAntigravityTranscriptCandidates } from './scanners/antigravity/antigravity-transcript-candidates' -import { readCodexRolloutSessionMetaId } from '../codex/history/rollouts/codex-rollout-session-meta' +import { prioritizeAntigravityTranscriptCandidates } from '../scanners/antigravity/antigravity-transcript-candidates' +import { readCodexRolloutSessionMetaId } from '../../codex/history/rollouts/codex-rollout-session-meta' import { codexRolloutHardlinkIdentity, dedupeCodexRolloutAliases, dedupeCodexRolloutFileAliases -} from './scanners/codex/codex-session-root-dedup' -import { antigravityHistoryPathForBrainDir } from './scanners/antigravity/session-scanner-antigravity-paths' -import { codexHomeForSessionsDir } from './scanners/codex/session-scanner-codex-paths' -import { DEFAULT_CODEX_HOME_DIR } from './session-scanner-source-discovery' +} from '../scanners/codex/codex-session-root-dedup' +import { antigravityHistoryPathForBrainDir } from '../scanners/antigravity/session-scanner-antigravity-paths' +import { codexHomeForSessionsDir } from '../scanners/codex/session-scanner-codex-paths' +import { DEFAULT_CODEX_HOME_DIR } from './session-scanner-agent-sources' import type { AiVaultScanOptions, FileWithMtime, SessionFileCandidate, SessionFileDiscovery -} from './session-scanner-types' +} from '../session-scanner-types' export function discoveryFileCandidates( discovery: SessionFileDiscovery, diff --git a/src/main/ai-vault/session-scanner-directory-reader.test.ts b/src/main/ai-vault/discovery/session-scanner-directory-reader.test.ts similarity index 100% rename from src/main/ai-vault/session-scanner-directory-reader.test.ts rename to src/main/ai-vault/discovery/session-scanner-directory-reader.test.ts diff --git a/src/main/ai-vault/session-scanner-discovery-pipeline.test.ts b/src/main/ai-vault/discovery/session-scanner-discovery-pipeline.test.ts similarity index 83% rename from src/main/ai-vault/session-scanner-discovery-pipeline.test.ts rename to src/main/ai-vault/discovery/session-scanner-discovery-pipeline.test.ts index 084cd2e1892..b3e68af829e 100644 --- a/src/main/ai-vault/session-scanner-discovery-pipeline.test.ts +++ b/src/main/ai-vault/discovery/session-scanner-discovery-pipeline.test.ts @@ -5,7 +5,7 @@ import { tmpdir } from 'node:os' import { isAiVaultScanCancelledError, type AiVaultScanIssue -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' const fsMocks = vi.hoisted(() => ({ readdir: vi.fn(), stat: vi.fn() })) vi.mock('node:fs/promises', async (importOriginal) => ({ @@ -110,33 +110,6 @@ describe('fresh discovery pipeline', () => { expect(fsMocks.stat).toHaveBeenCalledTimes(paths.length) }) - it('bounds directory and metadata reads across simultaneous roots', async () => { - const roots = Array.from({ length: 8 }, (_, index) => join(root, `root-${index}`)) - await Promise.all(roots.map((directory) => createFiles(directory, 70))) - let active = 0 - let peak = 0 - async function tracked(read: () => Promise): Promise { - active++ - peak = Math.max(peak, active) - try { - await new Promise((resolve) => setImmediate(resolve)) - return await read() - } finally { - active-- - } - } - fsMocks.readdir.mockImplementation((path: string, options: { withFileTypes: true }) => - tracked(() => fs.readdir(path, options)) - ) - fsMocks.stat.mockImplementation((path: string) => tracked(() => fs.stat(path))) - - const results = await Promise.all(roots.map((directory) => scan(directory, [], 3))) - expect(results.every((result) => result.files.length === 3)).toBe(true) - expect(peak).toBeGreaterThan(1) - expect(peak).toBeLessThanOrEqual(8) - expect(active).toBe(0) - }) - it('sees file, sidecar, and nested membership changes on the next scan without notifications', async () => { const [file] = await createFiles(root, 1) if (!file) { diff --git a/src/main/ai-vault/session-scanner-discovery.ts b/src/main/ai-vault/discovery/session-scanner-discovery.ts similarity index 88% rename from src/main/ai-vault/session-scanner-discovery.ts rename to src/main/ai-vault/discovery/session-scanner-discovery.ts index e789b0903b9..4af6f505fe9 100644 --- a/src/main/ai-vault/session-scanner-discovery.ts +++ b/src/main/ai-vault/discovery/session-scanner-discovery.ts @@ -1,27 +1,31 @@ import type { Dirent } from 'node:fs' import { extname, join } from 'node:path' -import { mapWithConcurrency } from '../../shared/map-with-concurrency' -import { PrioritySemaphore } from '../../shared/priority-semaphore' -import { isWslUncPath } from '../../shared/wsl-paths' +import { mapWithConcurrency } from '../../../shared/map-with-concurrency' +import { PrioritySemaphore } from '../../../shared/priority-semaphore' +import { isWslUncPath } from '../../../shared/wsl-paths' import { SessionNewestFiles } from './session-newest-files' -import type { SessionSidecarObservation } from './parse-cache/session-sidecar-stat' -import type { AiVaultAgent, AiVaultScanIssue } from '../../shared/ai-vault/contracts/ai-vault-types' -import { wslGatedReaddir, wslGatedStat } from '../native-chat/wsl-transcript-fs-access' -import { WslTranscriptFsError } from '../native-chat/wsl-transcript-fs-gate' -import { recordSessionScanIssue, scanIssueTextFromError } from './session-scan-issues' -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import type { SessionSidecarObservation } from '../parse-cache/session-sidecar-stat' +import type { + AiVaultAgent, + AiVaultScanIssue +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { wslGatedReaddir, wslGatedStat } from '../../native-chat/wsl-transcript-fs-access' +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' +import { recordSessionScanIssue, scanIssueTextFromError } from '../parsing/session-scan-issues' +import { aiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' import type { FileWithMtime, SessionFileDiscovery, SessionFileWalkOptions -} from './session-scanner-types' -import { errorMessage } from './session-scanner-values' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' +} from '../session-scanner-types' +import { errorMessage } from '../../../shared/error-message' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' import { noteAiVaultScanFileFound, noteAiVaultScanWorkChanged, openAiVaultScanSource -} from './ai-vault-scan-progress' +} from '../scan-lifecycle/ai-vault-scan-progress' +import { isMissingTranscriptPathError } from './session-path-absence' const NATIVE_DISCOVERY_CONCURRENCY = 4 const NATIVE_DISCOVERY_BATCH_SIZE = 16 @@ -250,18 +254,6 @@ async function observeSessionSidecar( } } -/** A missing file or folder is absence, not a refusal; WSL gate errors are always refusals. */ -export function isMissingTranscriptPathError(error: unknown): boolean { - if (error instanceof WslTranscriptFsError) { - return false - } - const code = - error && typeof error === 'object' && 'code' in error && typeof error.code === 'string' - ? error.code - : null - return code === 'ENOENT' || code === 'ENOTDIR' -} - /** Collecting form for callers that want every match; bounded scans stream. */ export async function walkSessionFiles( dirPath: string, diff --git a/src/main/ai-vault/session-scanner-roots.test.ts b/src/main/ai-vault/discovery/session-scanner-roots.test.ts similarity index 100% rename from src/main/ai-vault/session-scanner-roots.test.ts rename to src/main/ai-vault/discovery/session-scanner-roots.test.ts diff --git a/src/main/ai-vault/session-scanner-roots.ts b/src/main/ai-vault/discovery/session-scanner-roots.ts similarity index 91% rename from src/main/ai-vault/session-scanner-roots.ts rename to src/main/ai-vault/discovery/session-scanner-roots.ts index 133cdee917b..929c953ff56 100644 --- a/src/main/ai-vault/session-scanner-roots.ts +++ b/src/main/ai-vault/discovery/session-scanner-roots.ts @@ -1,9 +1,9 @@ -import { claudeProfileHistoryDirs } from '../claude-accounts/profiles/routing/claude-profile-installed-router' +import { claudeProfileHistoryDirs } from '../../claude-accounts/profiles/routing/claude-profile-installed-router' import { homedir } from 'node:os' import { join } from 'node:path' -import { resolveAbsoluteDirOverride } from '../../shared/absolute-dir-override' -import { WSL_CODEX_RUNTIME_HOME_SEGMENTS } from '../pty/shell-startup/codex-home-wsl-env' -import { ompProfileSessionsDirs, resolveOmpSessionsDir } from './scanners/omp/omp-session-root' +import { resolveAbsoluteDirOverride } from '../../../shared/absolute-dir-override' +import { WSL_CODEX_RUNTIME_HOME_SEGMENTS } from '../../pty/shell-startup/codex-home-wsl-env' +import { ompProfileSessionsDirs, resolveOmpSessionsDir } from '../scanners/omp/omp-session-root' /** Where each transcript agent's session tree sits under a home dir (host or WSL guest). */ export const AGENT_SESSION_HOME_SEGMENTS = { diff --git a/src/main/ai-vault/session-scanner-source-discovery.ts b/src/main/ai-vault/discovery/session-scanner-source-discovery.ts similarity index 82% rename from src/main/ai-vault/session-scanner-source-discovery.ts rename to src/main/ai-vault/discovery/session-scanner-source-discovery.ts index dc844dcda35..1bde6bb21e2 100644 --- a/src/main/ai-vault/session-scanner-source-discovery.ts +++ b/src/main/ai-vault/discovery/session-scanner-source-discovery.ts @@ -1,16 +1,17 @@ import { delimiter } from 'node:path' -import type { AiVaultAgent, AiVaultScanIssue } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { + AiVaultAgent, + AiVaultScanIssue +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { discoverFiles } from './session-scanner-discovery' -import { opencodeDiscoveries } from './scanners/opencode/session-scanner-opencode-sources' -import { zcodeDiscoveries } from './scanners/zcode/session-scanner-zcode-sources' -import { antigravityDiscoveries } from './scanners/antigravity/session-scanner-antigravity-sources' +import { opencodeDiscoveries } from '../scanners/opencode/session-scanner-opencode-sources' +import { zcodeDiscoveries } from '../scanners/zcode/session-scanner-zcode-sources' +import { antigravityDiscoveries } from '../scanners/antigravity/session-scanner-antigravity-sources' import { AI_VAULT_AGENT_SOURCES, type AiVaultAgentSource } from './session-scanner-agent-sources' import { normalizedWslHomeDirs } from './session-scanner-roots' -import { configureOpenCodeWslReaders } from './scanners/opencode/reader-transport/session-scanner-opencode-wsl-client' -import { scopeOnlyScan, scopeWalksAgentFiles } from './session-scope-cwd' -import type { AiVaultScanOptions, SessionFileDiscovery } from './session-scanner-types' - -export { DEFAULT_CODEX_HOME_DIR } from './session-scanner-agent-sources' +import { configureOpenCodeWslReaders } from '../scanners/opencode/reader-transport/session-scanner-opencode-wsl-client' +import { scopeOnlyScan, scopeWalksAgentFiles } from '../scope/session-scope-cwd' +import type { AiVaultScanOptions, SessionFileDiscovery } from '../session-scanner-types' export async function discoverAiVaultSessionSources(args: { options: AiVaultScanOptions diff --git a/src/main/ai-vault/ai-vault-wsl-session-carryover.test.ts b/src/main/ai-vault/listing/ai-vault-wsl-session-carryover.test.ts similarity index 96% rename from src/main/ai-vault/ai-vault-wsl-session-carryover.test.ts rename to src/main/ai-vault/listing/ai-vault-wsl-session-carryover.test.ts index 0a2ba4c3636..b692406940e 100644 --- a/src/main/ai-vault/ai-vault-wsl-session-carryover.test.ts +++ b/src/main/ai-vault/listing/ai-vault-wsl-session-carryover.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it } from 'vitest' import type { AiVaultListResult, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { carryOverUnconfirmedWslSessions, resetAiVaultWslSessionCarryover diff --git a/src/main/ai-vault/ai-vault-wsl-session-carryover.ts b/src/main/ai-vault/listing/ai-vault-wsl-session-carryover.ts similarity index 91% rename from src/main/ai-vault/ai-vault-wsl-session-carryover.ts rename to src/main/ai-vault/listing/ai-vault-wsl-session-carryover.ts index 4a29f3cc9b5..a6c58844edb 100644 --- a/src/main/ai-vault/ai-vault-wsl-session-carryover.ts +++ b/src/main/ai-vault/listing/ai-vault-wsl-session-carryover.ts @@ -1,9 +1,9 @@ import type { AiVaultListResult, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { isWslUncPath } from '../../shared/wsl-paths' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { aiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import { isWslUncPath } from '../../../shared/wsl-paths' // The WSL rows of the last scan whose WSL roots a confirmed running list named, per scope key. // Map order is recency: the oldest scope is evicted past the cap, so retired scopes don't pile up. diff --git a/src/main/ai-vault/cached-session-list-wsl-probe.test.ts b/src/main/ai-vault/listing/cached-session-list-wsl-probe.test.ts similarity index 52% rename from src/main/ai-vault/cached-session-list-wsl-probe.test.ts rename to src/main/ai-vault/listing/cached-session-list-wsl-probe.test.ts index 738daf77fb7..23e786b12cc 100644 --- a/src/main/ai-vault/cached-session-list-wsl-probe.test.ts +++ b/src/main/ai-vault/listing/cached-session-list-wsl-probe.test.ts @@ -1,4 +1,3 @@ -import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { ProcessResult } from '@orca/process-host/process-spec' @@ -11,26 +10,20 @@ vi.mock('@orca/process-host', async (importOriginal) => ({ ...(await importOriginal()), runProcess: runProcessMock })) -vi.mock('./scan-service/session-scanner-service-spawn', async (importOriginal) => ({ +vi.mock('../scan-service/session-scanner-service-spawn', async (importOriginal) => ({ ...(await importOriginal()), scanAiVaultSessionsInService })) -vi.mock('./scanners/opencode/reader-transport/opencode-wsl-runtime-preparation', () => ({ +vi.mock('../scanners/opencode/reader-transport/opencode-wsl-runtime-preparation', () => ({ prepareOpenCodeWslReaders: vi.fn(async () => []) })) -import { - _resetWslCachesForTests, - _setWslCachesForTests, - listWslDistrosAsync -} from '../wsl/discovery/distro-catalog' -import { filterPathsToRunningWslDistrosAsync } from '../wsl/filesystem/wsl-running-path-filter' +import { _resetWslCachesForTests, listWslDistrosAsync } from '../../wsl/discovery/distro-catalog' import { configureAiVaultSessionSources, - getAiVaultWslHomeDirs, - listAiVaultSessions, - resetAiVaultSessionListCacheForTests -} from './cached-session-list' + getAiVaultWslHomeDirs +} from '../discovery/ai-vault-scan-roots' +import { resetAiVaultSessionListCacheForTests } from './cached-session-list' const NATIVE_CODEX_HOME = 'C:\\Users\\ada\\.codex' const WSL_HOME = '\\\\wsl.localhost\\Ubuntu\\home\\ada' @@ -62,57 +55,6 @@ describe('AI Vault listing wsl.exe probes', () => { vi.restoreAllMocks() }) - it('spawns no wsl.exe for native-only codex homes when no distro is installed', async () => { - _setWslCachesForTests({ distros: [] }) - - await listAiVaultSessions() - - expect(wslSpawns()).toEqual([]) - expect(scanAiVaultSessionsInService).toHaveBeenCalledWith( - expect.objectContaining({ - additionalCodexSessionsDirs: [join(NATIVE_CODEX_HOME, 'sessions')], - wslHomeDirs: [] - }), - expect.anything(), - expect.objectContaining({ - work: expect.any(Function), - finish: expect.any(Function), - fail: expect.any(Function) - }) - ) - }) - - it('still probes running distros when one is installed, so a later outage keeps the last-known-good list', async () => { - _setWslCachesForTests({ distros: ['Ubuntu'] }) - runProcessMock.mockImplementation( - ({ args }: { args: string[] }) => - new Promise((resolve) => { - resolve(exited(args.includes('--running') ? 'Ubuntu\n' : '/home/ada\n')) - }) - ) - - await listAiVaultSessions() - - expect(wslSpawns()).toEqual([ - ['--list', '--running', '--quiet'], - ['-d', 'Ubuntu', '--exec', 'bash', '-c', 'echo $HOME'] - ]) - expect(scanAiVaultSessionsInService).toHaveBeenCalledWith( - expect.objectContaining({ wslHomeDirs: [WSL_HOME] }), - expect.anything(), - expect.objectContaining({ - work: expect.any(Function), - finish: expect.any(Function), - fail: expect.any(Function) - }) - ) - - runProcessMock.mockResolvedValue(FAILED) - await expect(filterPathsToRunningWslDistrosAsync([`${WSL_HOME}\\.codex`])).resolves.toEqual([ - `${WSL_HOME}\\.codex` - ]) - }) - // A failed distro probe cannot narrow the roots trusted by deletion or subagent validation. it('still discovers WSL homes after the installed-distro probe was rejected', async () => { runProcessMock.mockImplementation( diff --git a/src/main/ai-vault/cached-session-list.ts b/src/main/ai-vault/listing/cached-session-list.ts similarity index 89% rename from src/main/ai-vault/cached-session-list.ts rename to src/main/ai-vault/listing/cached-session-list.ts index e4b7720a340..ed8bac2a214 100644 --- a/src/main/ai-vault/cached-session-list.ts +++ b/src/main/ai-vault/listing/cached-session-list.ts @@ -2,7 +2,7 @@ import { clearAiVaultBackgroundRestartCircuit, resetAiVaultScannerBackgroundForTests, scanAiVaultSessionsInBackground -} from './scan-service/session-scanner-background' +} from '../scan-service/session-scanner-background' import { carryOverUnconfirmedWslSessions, resetAiVaultWslSessionCarryover @@ -11,39 +11,30 @@ import { isAiVaultScanCancelledError, type AiVaultListArgs, type AiVaultListResult -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { aiVaultLocalScanKey, aiVaultLocalScanScopeKey -} from '../../shared/ai-vault/scanning/ai-vault-local-scan-key' -import { AiVaultScanCoordinator } from './ai-vault-scan-coordinator' +} from '../../../shared/ai-vault/scanning/ai-vault-local-scan-key' +import { AiVaultScanCoordinator } from '../scan-lifecycle/ai-vault-scan-coordinator' import { resetAiVaultSessionSourcesForTests, resolveLocalAiVaultScanRoots -} from './ai-vault-scan-roots' +} from '../discovery/ai-vault-scan-roots' import { attachAiVaultScopeCwdAliases, resolveAiVaultScopeRealPaths -} from './session-scope-real-paths' +} from '../scope/session-scope-real-paths' import { startLocalAiVaultScanProgress, type LocalAiVaultScanProgressHandle -} from './ai-vault-local-scan-progress' +} from '../scan-lifecycle/ai-vault-local-scan-progress' import { aiVaultCachedDepthServes, requestedAiVaultSessionDepth, truncateAiVaultListResult, type AiVaultSessionDepth -} from '../../shared/ai-vault/scanning/ai-vault-session-depth' - -export { - configureAiVaultSessionSources, - configuredAdditionalCodexHomePaths, - getAiVaultWslHomeDirs, - getAiVaultWslScanHomeDirs, - localAiVaultScanRoots, - type AiVaultSessionSources -} from './ai-vault-scan-roots' +} from '../../../shared/ai-vault/scanning/ai-vault-session-depth' // Desktop and runtime RPC share this cache to avoid duplicate scans when mobile and desktop open together. const AI_VAULT_CACHE_TTL_MS = 60_000 diff --git a/src/main/ai-vault/session-list-fingerprint.ts b/src/main/ai-vault/listing/session-list-fingerprint.ts similarity index 86% rename from src/main/ai-vault/session-list-fingerprint.ts rename to src/main/ai-vault/listing/session-list-fingerprint.ts index 6cc05890d74..51cae87327e 100644 --- a/src/main/ai-vault/session-list-fingerprint.ts +++ b/src/main/ai-vault/listing/session-list-fingerprint.ts @@ -1,5 +1,5 @@ import { createHash } from 'node:crypto' -import type { AiVaultListResult } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' export function conditionalAiVaultListResult( result: AiVaultListResult, diff --git a/src/main/ai-vault/session-list-result-validation.test.ts b/src/main/ai-vault/listing/session-list-result-validation.test.ts similarity index 83% rename from src/main/ai-vault/session-list-result-validation.test.ts rename to src/main/ai-vault/listing/session-list-result-validation.test.ts index bdf8ed58ae9..27353da561c 100644 --- a/src/main/ai-vault/session-list-result-validation.test.ts +++ b/src/main/ai-vault/listing/session-list-result-validation.test.ts @@ -58,22 +58,6 @@ describe('parseAiVaultListResult', () => { expect(parsed.issues).toEqual([validScanIssue()]) }) - it('reports malformed scan issues without counting unknown-agent issues as invalid', () => { - const parsed = parseAiVaultListResult({ - sessions: [], - issues: [validScanIssue(), { agent: 'future-agent' }, validScanIssue('newer-agent')], - scannedAt: '2026-07-27T00:00:00.000Z' - }) - - expect(parsed.issues).toEqual([ - validScanIssue(), - expect.objectContaining({ - path: 'aiVault.listSessions', - message: expect.stringContaining('Skipped 1 invalid') - }) - ]) - }) - it('does not throw when malformed rows are mixed with well-formed unknown sessions', () => { const parsed = parseAiVaultListResult({ sessions: [ @@ -129,20 +113,6 @@ describe('parseAiVaultListResult', () => { expect(parsed.issues).toEqual([coded, { agent: 'codex', path: coded.path, message: 'English' }]) }) - - it('rejects a malformed result envelope', () => { - expect(() => parseAiVaultListResult({ sessions: [] })).toThrow() - }) - - it('rejects a nonempty sessions array when every row is invalid', () => { - expect(() => - parseAiVaultListResult({ - sessions: [{ id: 42 }, null], - issues: [], - scannedAt: '2026-07-27T00:00:00.000Z' - }) - ).toThrow('all supplied Agent Session History sessions were invalid') - }) }) function validSession(sessionId = 'session-1'): Record { diff --git a/src/main/ai-vault/session-list-result-validation.ts b/src/main/ai-vault/listing/session-list-result-validation.ts similarity index 94% rename from src/main/ai-vault/session-list-result-validation.ts rename to src/main/ai-vault/listing/session-list-result-validation.ts index beaebd9ad79..6d2e832ce4b 100644 --- a/src/main/ai-vault/session-list-result-validation.ts +++ b/src/main/ai-vault/listing/session-list-result-validation.ts @@ -1,5 +1,5 @@ import { z } from 'zod' -import { AiVaultSessionAccountHomeSchema } from '../../shared/ai-vault/contracts/ai-vault-session-account-home' +import { AiVaultSessionAccountHomeSchema } from '../../../shared/ai-vault/contracts/ai-vault-session-account-home' import { AI_VAULT_AGENTS, AI_VAULT_SCOPE_PATHS_MAX_COUNT, @@ -7,9 +7,9 @@ import { type AiVaultListResult, type AiVaultScanIssue, type AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { normalizeExecutionHostId } from '../../shared/execution-host' -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { normalizeExecutionHostId } from '../../../shared/execution-host' +import { aiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' const aiVaultAgentSet = new Set(AI_VAULT_AGENTS) diff --git a/src/main/ai-vault/session-list-results.test.ts b/src/main/ai-vault/listing/session-list-results.test.ts similarity index 96% rename from src/main/ai-vault/session-list-results.test.ts rename to src/main/ai-vault/listing/session-list-results.test.ts index c9059411dbd..06ad84893f0 100644 --- a/src/main/ai-vault/session-list-results.test.ts +++ b/src/main/ai-vault/listing/session-list-results.test.ts @@ -3,8 +3,8 @@ import type { AiVaultListResult, AiVaultScanIssue, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { truncateAiVaultListResult } from '../../shared/ai-vault/scanning/ai-vault-session-depth' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { truncateAiVaultListResult } from '../../../shared/ai-vault/scanning/ai-vault-session-depth' import { mergeAiVaultListResults } from './session-list-results' function listResult(issues: AiVaultScanIssue[]): AiVaultListResult { diff --git a/src/main/ai-vault/session-list-results.ts b/src/main/ai-vault/listing/session-list-results.ts similarity index 88% rename from src/main/ai-vault/session-list-results.ts rename to src/main/ai-vault/listing/session-list-results.ts index b2cb8e2be40..ee792e6de0c 100644 --- a/src/main/ai-vault/session-list-results.ts +++ b/src/main/ai-vault/listing/session-list-results.ts @@ -2,14 +2,14 @@ import type { AiVaultListResult, AiVaultScanIssue, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import type { ExecutionHostId } from '../../shared/execution-host' -import type { AiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { sessionSortTime } from './session-scanner-accumulator' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { ExecutionHostId } from '../../../shared/execution-host' +import type { AiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import { sessionSortTime } from '../parsing/session-scanner-accumulator' import { requestedAiVaultSessionDepth, truncateAiVaultListResult -} from '../../shared/ai-vault/scanning/ai-vault-session-depth' +} from '../../../shared/ai-vault/scanning/ai-vault-session-depth' export function aiVaultScanIssueResult({ executionHostId, diff --git a/src/main/ai-vault/parse-cache/session-parse-cache-antigravity-upgrade.test.ts b/src/main/ai-vault/parse-cache/session-parse-cache-antigravity-upgrade.test.ts index f7632d7ef54..a312cb79fdb 100644 --- a/src/main/ai-vault/parse-cache/session-parse-cache-antigravity-upgrade.test.ts +++ b/src/main/ai-vault/parse-cache/session-parse-cache-antigravity-upgrade.test.ts @@ -10,7 +10,7 @@ import { import { createSessionParseStats, parseAgentSessionFileCached } from './session-scanner-parse-cache' import { resetSessionParseCacheForTests } from './session-parse-cache-store' -import { writeAntigravityTranscript } from '../session-scanner-test-fixtures' +import { writeAntigravityTranscript } from '../scanner-fixtures/session-scanner-test-fixtures' import type { SessionFileCandidate } from '../session-scanner-types' let root: string | undefined diff --git a/src/main/ai-vault/parse-cache/session-parse-cache-persistence.test.ts b/src/main/ai-vault/parse-cache/session-parse-cache-persistence.test.ts index da9460ecf18..611093b27cc 100644 --- a/src/main/ai-vault/parse-cache/session-parse-cache-persistence.test.ts +++ b/src/main/ai-vault/parse-cache/session-parse-cache-persistence.test.ts @@ -1,8 +1,8 @@ import { existsSync } from 'node:fs' -import { appendFile, mkdir, mkdtemp, readdir, rm, stat, utimes, writeFile } from 'node:fs/promises' +import { mkdtemp, readdir, rm, stat, writeFile } from 'node:fs/promises' import * as fsPromises from 'node:fs/promises' import { tmpdir } from 'node:os' -import { dirname, join } from 'node:path' +import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import SyncDatabase from '../../sqlite/sync-database' import { @@ -11,11 +11,7 @@ import { initSessionParseCachePersistence, resetSessionParseCachePersistenceForTests } from './session-parse-cache-persistence' -import { - SESSION_PARSE_CACHE_SCHEMA_VERSION, - SessionParseCacheDatabase -} from './session-parse-cache-database' -import { scanAiVaultSessions } from '../session-scanner' +import { SESSION_PARSE_CACHE_SCHEMA_VERSION } from './session-parse-cache-database' import { createSessionParseStats, parseAgentSessionFileCached, @@ -23,14 +19,10 @@ import { } from './session-scanner-parse-cache' import { invalidateSessionParseCacheEntry, - resetSessionParseCacheForTests, - storeSessionScopeCwd, - type SessionScopeCwdStamp + resetSessionParseCacheForTests } from './session-parse-cache-store' import type * as ParseCacheModule from './session-scanner-parse-cache' -import { isolatedScanRoots } from '../session-scanner-test-fixtures' -import { parseClaudeSessionFile } from '../scanners/claude/session-scanner-primary-parsers' -import { parseSessionCandidate } from '../session-scanner-candidate-parse' +import { parseSessionCandidate } from '../parsing/session-scanner-candidate-parse' import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from '../transcripts/session-transcript-record-budget' import type { FileWithMtime, SessionFileCandidate } from '../session-scanner-types' @@ -53,7 +45,6 @@ vi.mock('./session-scanner-parse-cache', async (importOriginal) => { }) const APP_VERSION = '1.2.3-test' -const DAY_MS = 24 * 60 * 60_000 let tempRoots: string[] = [] @@ -134,108 +125,7 @@ function simulateRestart(cacheFile: string): void { initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) } -function databaseRows(cacheFile: string): { path: string; seen_at: number }[] { - const db = new SyncDatabase(join(dirname(cacheFile), 'session-parse-cache.sqlite')) - try { - return db - .prepare('SELECT path, seen_at FROM rows ORDER BY path') - .all() - .map((row) => ({ path: String(row.path), seen_at: Number(row.seen_at) })) - } finally { - db.close() - } -} - -function setSeenAt(cacheFile: string, path: string, seenAt: number): void { - const db = new SyncDatabase(join(dirname(cacheFile), 'session-parse-cache.sqlite')) - db.prepare('UPDATE rows SET seen_at = ? WHERE path = ?').run(seenAt, path) - db.close() -} - describe('session parse cache persistence', () => { - it('persists scope rows across chunks and keeps replacements queued during a yield', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const paths = Array.from({ length: 1_001 }, (_, index) => join(root, `session-${index}`)) - const stamp: SessionScopeCwdStamp = { - mtimeMs: 1, - sizeBytes: 10, - platform: 'linux', - cwd: '/original' - } - for (const path of paths) { - storeSessionScopeCwd(path, stamp) - } - const flushing = flushSessionParseCachePersist() - const replacement = { ...stamp, mtimeMs: 2, cwd: '/updated' } - storeSessionScopeCwd(paths[0]!, replacement) - storeSessionScopeCwd(paths[750]!, replacement) - await flushing - resetSessionParseCachePersistenceForTests() - resetSessionParseCacheForTests() - - const database = new SessionParseCacheDatabase(join(root, 'session-parse-cache.sqlite')) - try { - const stored = database.readScopeCwds(paths).found - expect(stored.size).toBe(paths.length) - for (const [index, path] of paths.entries()) { - expect(stored.get(path)?.read).toEqual(index === 0 || index === 750 ? replacement : stamp) - } - } finally { - database.close() - } - }) - - it('round-trips: a persisted entry is a reused hit after a restart, without reading the transcript', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'vault-state', 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const transcript = await writeTranscript(root) - const candidate = await claudeCandidate(transcript) - const stats = createSessionParseStats() - const first = await parseAgentSessionFileCached(candidate, process.platform, stats) - expect(stats.fullParses).toBe(1) - await flushSessionParseCachePersist() - - simulateRestart(cacheFile) - // Removing the transcript proves the restored hit needs no transcript read. - await rm(transcript) - const reusedStats = createSessionParseStats() - const reused = await parseAgentSessionFileCached(candidate, process.platform, reusedStats) - expect(reusedStats).toMatchObject({ reused: 1, fullParses: 0, incremental: 0, bytesRead: 0 }) - expect(reused).toEqual(first) - }) - - it('scanAiVaultSessions reads the database and writes after parsing', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const roots = isolatedScanRoots(root) - const transcript = join(roots.claudeProjectsDir, 'project', 'scan-session.jsonl') - await mkdir(join(roots.claudeProjectsDir, 'project'), { recursive: true }) - await writeFile( - transcript, - `${userRecord(0, 'persisted-scan-marker-AAAA')}\n${assistantRecord(1, 'answer')}\n` - ) - const pinnedMtime = new Date(1740000000000) - await utimes(transcript, pinnedMtime, pinnedMtime) - - const first = await scanAiVaultSessions(roots) - expect(JSON.stringify(first.sessions[0])).toContain('persisted-scan-marker-AAAA') - await flushSessionParseCachePersist() - - simulateRestart(cacheFile) - // Same size and mtime but different content distinguishes a persisted hit from a cold parse. - await writeFile( - transcript, - `${userRecord(0, 'persisted-scan-marker-BBBB')}\n${assistantRecord(1, 'answer')}\n` - ) - await utimes(transcript, pinnedMtime, pinnedMtime) - const second = await scanAiVaultSessions(roots) - expect(second.sessions[0]).toEqual(first.sessions[0]) - }) - it('reconstructs unreadable diagnostics from a version 8 row before reusing it', async () => { const root = await makeTempDir() const cacheFile = join(root, 'session-parse-cache.json') @@ -287,27 +177,6 @@ describe('session parse cache persistence', () => { expect(reusedStats).toMatchObject({ reused: 1, fullParses: 0, bytesRead: 0 }) }) - it('falls through to a full parse when a file changed while the app was closed', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const transcript = await writeTranscript(root) - await parse(transcript) - await flushSessionParseCachePersist() - - simulateRestart(cacheFile) - // Restored rows lack incremental state; changed transcripts need a full parse. - await appendFile(transcript, `${userRecord(2, 'follow-up')}\n${assistantRecord(3, 'more')}\n`) - const stats = createSessionParseStats() - const reparsed = await parseAgentSessionFileCached( - await claudeCandidate(transcript), - process.platform, - stats - ) - expect(stats).toMatchObject({ fullParses: 1, incremental: 0, reused: 0 }) - expect(reparsed).toEqual(await parseClaudeSessionFile((await claudeCandidate(transcript)).file)) - }) - it('imports the old JSON file even when a title lookup reaches the database first', async () => { const root = await makeTempDir() const cacheFile = join(root, 'session-parse-cache.json') @@ -371,58 +240,6 @@ describe('session parse cache persistence', () => { expect(existsSync(cacheFile)).toBe(false) }) - it('rebuilds a corrupt database instead of failing the scan', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - await writeFile(join(root, 'session-parse-cache.sqlite'), 'not a database at all'.repeat(512)) - vi.spyOn(console, 'debug').mockImplementation(() => {}) - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const transcript = await writeTranscript(root) - expect((await parse(transcript)).fullParses).toBe(1) - await flushSessionParseCachePersist() - - simulateRestart(cacheFile) - expect((await parse(transcript)).reused).toBe(1) - }) - - it('drops rows whose transcript is gone and keeps old rows whose transcript is still there', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const kept = await writeTranscript(root, 'kaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee') - const deletedOutsideOrca = await writeTranscript(root, 'daaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee') - await parse(kept) - await parse(deletedOutsideOrca) - await flushSessionParseCachePersist() - resetSessionParseCachePersistenceForTests() - // ast-grep-ignore: test-no-wall-clock -- Real database expiry uses current time for persisted row ages. - setSeenAt(cacheFile, kept, Date.now() - 31 * DAY_MS) - // ast-grep-ignore: test-no-wall-clock -- Real database expiry uses current time for persisted row ages. - setSeenAt(cacheFile, deletedOutsideOrca, Date.now() - 31 * DAY_MS) - await rm(deletedOutsideOrca) - - simulateRestart(cacheFile) - expect((await parse(kept)).reused).toBe(1) - await vi.waitFor(() => expect(databaseRows(cacheFile).map((row) => row.path)).toEqual([kept])) - await vi.waitFor(() => - // ast-grep-ignore: test-no-wall-clock -- Real database expiry uses current time for persisted row ages. - expect(databaseRows(cacheFile)[0]!.seen_at).toBeGreaterThan(Date.now() - DAY_MS) - ) - }) - - it('invalidating before the first lookup does not bring the row back', async () => { - const root = await makeTempDir() - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: APP_VERSION }) - const transcript = await writeTranscript(root) - await parse(transcript) - await flushSessionParseCachePersist() - - simulateRestart(cacheFile) - invalidateSessionParseCacheEntry(transcript) - expect((await parse(transcript)).fullParses).toBe(1) - }) - it('performs zero disk IO when only configured, as Electron main is', async () => { const root = await makeTempDir() configureSessionParseCachePersistence({ @@ -436,21 +253,4 @@ describe('session parse cache persistence', () => { expect(fsPromises.readdir).not.toHaveBeenCalled() expect(await readdir(root)).toEqual([]) }) - - it('swallows database failures and leaves scan results unaffected', async () => { - const root = await makeTempDir() - // A file blocking the cache directory fails on Windows and as root, unlike chmod-based fixtures. - const blocker = join(root, 'blocker') - await writeFile(blocker, 'a file, not a directory') - initSessionParseCachePersistence({ - filePath: join(blocker, 'session-parse-cache.json'), - appVersion: APP_VERSION - }) - const debugSpy = vi.spyOn(console, 'debug').mockImplementation(() => {}) - const transcript = await writeTranscript(root) - expect((await parse(transcript)).fullParses).toBe(1) - await expect(flushSessionParseCachePersist()).resolves.toBeUndefined() - expect(debugSpy).toHaveBeenCalled() - expect((await parse(transcript)).reused).toBe(1) - }) }) diff --git a/src/main/ai-vault/parse-cache/session-parse-file-lane.ts b/src/main/ai-vault/parse-cache/session-parse-file-lane.ts index 1e1a519e661..aef0508f41c 100644 --- a/src/main/ai-vault/parse-cache/session-parse-file-lane.ts +++ b/src/main/ai-vault/parse-cache/session-parse-file-lane.ts @@ -1,7 +1,7 @@ import { abandonRemoteSessionScanOnCancel, throwIfAiVaultScanCancelled -} from '../ai-vault-scan-cancellation' +} from '../scan-lifecycle/ai-vault-scan-cancellation' const pending = new Map>() diff --git a/src/main/ai-vault/parse-cache/session-scanner-parse-cache-agents.test.ts b/src/main/ai-vault/parse-cache/session-scanner-parse-cache-agents.test.ts index 4da9eb988bd..2159fc30618 100644 --- a/src/main/ai-vault/parse-cache/session-scanner-parse-cache-agents.test.ts +++ b/src/main/ai-vault/parse-cache/session-scanner-parse-cache-agents.test.ts @@ -2,7 +2,7 @@ import { mkdir, mkdtemp, rm, stat, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { parseAgentSessionFile } from '../session-scanner-agent-parser' +import { parseAgentSessionFile } from '../parsing/session-scanner-agent-parser' import { CODEX_FIXTURE_SESSION_ID, codexFixture diff --git a/src/main/ai-vault/parse-cache/session-scanner-parse-cache.ts b/src/main/ai-vault/parse-cache/session-scanner-parse-cache.ts index b7d6e266e18..511e171d8e9 100644 --- a/src/main/ai-vault/parse-cache/session-scanner-parse-cache.ts +++ b/src/main/ai-vault/parse-cache/session-scanner-parse-cache.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' import { createQoderSessionResumeState } from '../scanners/qoder/session-scanner-qoder-parser' import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' import { inSessionParseFileLane } from './session-parse-file-lane' diff --git a/src/main/ai-vault/parse-cache/session-scanner-sidecar-enrichment.ts b/src/main/ai-vault/parse-cache/session-scanner-sidecar-enrichment.ts index fb7211c590a..b05039d27ba 100644 --- a/src/main/ai-vault/parse-cache/session-scanner-sidecar-enrichment.ts +++ b/src/main/ai-vault/parse-cache/session-scanner-sidecar-enrichment.ts @@ -1,6 +1,6 @@ import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' import { buildAiVaultResumeCommand } from '../../../shared/ai-vault/resume/ai-vault-resume-command' -import { generatedSessionTitle } from '../session-scanner-accumulator' +import { generatedSessionTitle } from '../parsing/session-scanner-accumulator' import { readCursorChatMeta, wasCursorChatMetaRefused diff --git a/src/main/ai-vault/conversation-name-request-sessions.ts b/src/main/ai-vault/parsing/conversation-name-request-sessions.ts similarity index 73% rename from src/main/ai-vault/conversation-name-request-sessions.ts rename to src/main/ai-vault/parsing/conversation-name-request-sessions.ts index dc617d0d24f..da85830e89f 100644 --- a/src/main/ai-vault/conversation-name-request-sessions.ts +++ b/src/main/ai-vault/parsing/conversation-name-request-sessions.ts @@ -1,5 +1,5 @@ -import type { AiVaultSession } from '../../shared/ai-vault/contracts/ai-vault-types' -import { CONVERSATION_NAME_PROMPT_OPENING } from '../../shared/source-control/ai/generation/conversation-name-generation' +import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { CONVERSATION_NAME_PROMPT_OPENING } from '../../../shared/source-control/ai/generation/conversation-name-generation' const MAX_NAME_REQUEST_MESSAGES = 6 diff --git a/src/main/ai-vault/parsing/session-json-object.ts b/src/main/ai-vault/parsing/session-json-object.ts new file mode 100644 index 00000000000..8a8ad5acb1f --- /dev/null +++ b/src/main/ai-vault/parsing/session-json-object.ts @@ -0,0 +1,13 @@ +import { asRecord } from './session-record-fields' + +export function parseJsonObject(line: string): Record | null { + if (!line.trim()) { + return null + } + try { + const parsed = JSON.parse(line) as unknown + return asRecord(parsed) + } catch { + return null + } +} diff --git a/src/main/ai-vault/parsing/session-record-fields.ts b/src/main/ai-vault/parsing/session-record-fields.ts new file mode 100644 index 00000000000..6f50e1dac89 --- /dev/null +++ b/src/main/ai-vault/parsing/session-record-fields.ts @@ -0,0 +1,42 @@ +import { extractString } from '../../../shared/trimmed-string' +export function asRecord(value: unknown): Record | null { + return value && typeof value === 'object' && !Array.isArray(value) + ? (value as Record) + : null +} + +export function extractModel(value: unknown): string | null { + const record = asRecord(value) + if (!record) { + return null + } + return ( + extractString(record.model) || + extractString(record.model_name) || + extractString(asRecord(record.metadata)?.model) || + extractString(asRecord(record.info)?.model) || + null + ) +} + +export function extractGitBranch(value: unknown): string | null { + const git = asRecord(value) + if (!git) { + return null + } + return extractString(git.branch) || extractString(git.current_branch) +} + +export function arrayValue(value: unknown): unknown[] { + return Array.isArray(value) ? value : [] +} + +export function firstString(record: Record, keys: string[]): string | null { + for (const key of keys) { + const value = extractString(record[key]) + if (value) { + return value + } + } + return null +} diff --git a/src/main/ai-vault/parsing/session-record-time.ts b/src/main/ai-vault/parsing/session-record-time.ts new file mode 100644 index 00000000000..009879caf7b --- /dev/null +++ b/src/main/ai-vault/parsing/session-record-time.ts @@ -0,0 +1,28 @@ +import { asRecord } from './session-record-fields' + +export function timestampMs(value: unknown): number { + if (typeof value === 'string') { + const parsed = Date.parse(value) + return Number.isFinite(parsed) ? parsed : Number.NaN + } + if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) { + return Number.NaN + } + return value > 1_000_000_000_000 ? value : value * 1000 +} + +export function timeObjectValue(value: unknown, key: string): string | null { + const record = asRecord(value) + if (!record) { + return null + } + const rawValue = record[key] + if (typeof rawValue === 'string') { + return rawValue + } + const parsed = timestampMs(rawValue) + if (!Number.isFinite(parsed)) { + return null + } + return new Date(parsed).toISOString() +} diff --git a/src/main/ai-vault/session-root-dedup.ts b/src/main/ai-vault/parsing/session-root-dedup.ts similarity index 95% rename from src/main/ai-vault/session-root-dedup.ts rename to src/main/ai-vault/parsing/session-root-dedup.ts index 3d5172001ae..b6578427214 100644 --- a/src/main/ai-vault/session-root-dedup.ts +++ b/src/main/ai-vault/parsing/session-root-dedup.ts @@ -1,9 +1,9 @@ -import { antigravitySessionOrigin } from '../../shared/antigravity-session-origin' -import type { AiVaultSession } from '../../shared/ai-vault/contracts/ai-vault-types' +import { antigravitySessionOrigin } from '../../../shared/antigravity-session-origin' +import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' import { codexSessionAliasKey, codexSessionAliasBeats -} from './scanners/codex/codex-session-root-dedup' +} from '../scanners/codex/codex-session-root-dedup' import { sessionSortTime } from './session-scanner-accumulator' function sessionAliasKey(session: AiVaultSession): string | null { diff --git a/src/main/ai-vault/session-scan-cutoff.test.ts b/src/main/ai-vault/parsing/session-scan-cutoff.test.ts similarity index 95% rename from src/main/ai-vault/session-scan-cutoff.test.ts rename to src/main/ai-vault/parsing/session-scan-cutoff.test.ts index 06053022bc5..79579a333d5 100644 --- a/src/main/ai-vault/session-scan-cutoff.test.ts +++ b/src/main/ai-vault/parsing/session-scan-cutoff.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import type { AiVaultSession } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' import { ScannedSessionCollection } from './session-root-dedup' import { canStopParsingSessions } from './session-scan-cutoff' import { createAccumulator, finalizeSession } from './session-scanner-accumulator' diff --git a/src/main/ai-vault/session-scan-cutoff.ts b/src/main/ai-vault/parsing/session-scan-cutoff.ts similarity index 100% rename from src/main/ai-vault/session-scan-cutoff.ts rename to src/main/ai-vault/parsing/session-scan-cutoff.ts diff --git a/src/main/ai-vault/session-scan-issues.ts b/src/main/ai-vault/parsing/session-scan-issues.ts similarity index 82% rename from src/main/ai-vault/session-scan-issues.ts rename to src/main/ai-vault/parsing/session-scan-issues.ts index 9b231a9c578..455580ca4ef 100644 --- a/src/main/ai-vault/session-scan-issues.ts +++ b/src/main/ai-vault/parsing/session-scan-issues.ts @@ -1,10 +1,10 @@ -import type { AiVaultScanIssue } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultScanIssue } from '../../../shared/ai-vault/contracts/ai-vault-types' import { aiVaultScanIssueText, type AiVaultScanIssueText -} from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { WslTranscriptFsError } from '../native-chat/wsl-transcript-fs-error' -import { errorMessage } from './session-scanner-values' +} from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' +import { errorMessage } from '../../../shared/error-message' // Bound IPC payloads when an unreachable host produces one issue per transcript. export const SCAN_ISSUE_LIMIT = 500 diff --git a/src/main/ai-vault/session-scanner-accumulator.ts b/src/main/ai-vault/parsing/session-scanner-accumulator.ts similarity index 94% rename from src/main/ai-vault/session-scanner-accumulator.ts rename to src/main/ai-vault/parsing/session-scanner-accumulator.ts index e02a4f9196b..e1c63cad224 100644 --- a/src/main/ai-vault/session-scanner-accumulator.ts +++ b/src/main/ai-vault/parsing/session-scanner-accumulator.ts @@ -4,20 +4,21 @@ import { type AiVaultAgent, type AiVaultSession, type AiVaultSessionTitleKind -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { buildAiVaultResumeCommand } from '../../shared/ai-vault/resume/ai-vault-resume-command' -import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../shared/execution-host' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { buildAiVaultResumeCommand } from '../../../shared/ai-vault/resume/ai-vault-resume-command' +import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host' import type { FileWithMtime, ResumableSessionParseState, SessionAccumulator -} from './session-scanner-types' -import { extractString, timestampMs } from './session-scanner-values' +} from '../session-scanner-types' +import { extractString } from '../../../shared/trimmed-string' +import { timestampMs } from './session-record-time' import { NO_TRANSCRIPT_MESSAGES, type TranscriptMessageSink, type TranscriptSessionIdentity -} from './transcripts/session-transcript-consumers' +} from '../transcripts/session-transcript-consumers' export function createAccumulator(args: { agent: AiVaultAgent diff --git a/src/main/ai-vault/session-scanner-agent-parser.ts b/src/main/ai-vault/parsing/session-scanner-agent-parser.ts similarity index 68% rename from src/main/ai-vault/session-scanner-agent-parser.ts rename to src/main/ai-vault/parsing/session-scanner-agent-parser.ts index 087723ea6fb..d53889f838c 100644 --- a/src/main/ai-vault/session-scanner-agent-parser.ts +++ b/src/main/ai-vault/parsing/session-scanner-agent-parser.ts @@ -1,21 +1,24 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from './ai-vault-scan-cancellation' -import { parseQoderSessionFile } from './scanners/qoder/session-scanner-qoder-parser' -import { parseCodebuddySessionFile } from './scanners/codebuddy/session-scanner-codebuddy-parser' -import type { AiVaultSession } from '../../shared/ai-vault/contracts/ai-vault-types' -import { parseDevinSessionFile } from './scanners/devin/session-scanner-devin-parser' -import { parseAntigravitySessionFile } from './scanners/antigravity/session-scanner-antigravity-parser' -import { parseDroidSessionFile } from './scanners/droid/session-scanner-droid-parser' -import { parseClineSessionFile } from './scanners/cline/session-scanner-cline-parser' -import { parseGrokSessionFile } from './scanners/grok/session-scanner-grok-parser' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' +import { parseQoderSessionFile } from '../scanners/qoder/session-scanner-qoder-parser' +import { parseCodebuddySessionFile } from '../scanners/codebuddy/session-scanner-codebuddy-parser' +import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { parseDevinSessionFile } from '../scanners/devin/session-scanner-devin-parser' +import { parseAntigravitySessionFile } from '../scanners/antigravity/session-scanner-antigravity-parser' +import { parseDroidSessionFile } from '../scanners/droid/session-scanner-droid-parser' +import { parseClineSessionFile } from '../scanners/cline/session-scanner-cline-parser' +import { parseGrokSessionFile } from '../scanners/grok/session-scanner-grok-parser' import { parseMessageGraphSessionFile, parseRovoSessionFile -} from './scanners/session-scanner-graph-parsers' -import { parseKimiSessionFile } from './scanners/kimi/session-scanner-kimi-parser' -import { parseMuseSessionFile } from './scanners/muse/session-scanner-muse-parser' -import { splitOpenCodeSqliteCandidate } from '../../shared/opencode-sqlite-session-path' -import { parseJcodeSessionFile } from './scanners/jcode/session-scanner-jcode-parser' -import { parseKiroSessionFile } from './scanners/kiro/session-scanner-kiro-parser' +} from '../scanners/session-scanner-graph-parsers' +import { parseKimiSessionFile } from '../scanners/kimi/session-scanner-kimi-parser' +import { parseMuseSessionFile } from '../scanners/muse/session-scanner-muse-parser' +import { splitOpenCodeSqliteCandidate } from '../../../shared/opencode-sqlite-session-path' +import { parseJcodeSessionFile } from '../scanners/jcode/session-scanner-jcode-parser' +import { parseKiroSessionFile } from '../scanners/kiro/session-scanner-kiro-parser' import { captureOpenCodeSqliteSessionViaWorker, captureOpenCode2SqliteSessionViaWorker, @@ -23,17 +26,17 @@ import { parseOpenCode2SqliteSessionViaWorker, parseOpenCodeSqliteSessionViaWorker, parseZcodeSqliteSessionViaWorker -} from './scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' -import { parseClaudeSessionFile } from './scanners/claude/session-scanner-primary-parsers' -import { parseGeminiSessionFile } from './scanners/gemini/session-scanner-gemini-parsers' -import { parseCodexSessionFile } from './scanners/codex/session-scanner-codex-parser' -import { parseCopilotSessionFile } from './scanners/copilot/session-scanner-copilot-parser' -import { parseCursorSessionFile } from './scanners/cursor/session-scanner-cursor-parser' -import { parseHermesSessionFile } from './scanners/hermes/session-scanner-hermes-parser' -import { parseOpenCodeSessionFile } from './scanners/opencode/session-scanner-opencode-parser' -import type { SessionFileCandidate } from './session-scanner-types' -import type { TranscriptMessageSink } from './transcripts/session-transcript-consumers' -import type { SkippedTranscriptRecord } from './transcripts/session-transcript-record-budget' +} from '../scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' +import { parseClaudeSessionFile } from '../scanners/claude/session-scanner-primary-parsers' +import { parseGeminiSessionFile } from '../scanners/gemini/session-scanner-gemini-parsers' +import { parseCodexSessionFile } from '../scanners/codex/session-scanner-codex-parser' +import { parseCopilotSessionFile } from '../scanners/copilot/session-scanner-copilot-parser' +import { parseCursorSessionFile } from '../scanners/cursor/session-scanner-cursor-parser' +import { parseHermesSessionFile } from '../scanners/hermes/session-scanner-hermes-parser' +import { parseOpenCodeSessionFile } from '../scanners/opencode/session-scanner-opencode-parser' +import type { SessionFileCandidate } from '../session-scanner-types' +import type { TranscriptMessageSink } from '../transcripts/session-transcript-consumers' +import type { SkippedTranscriptRecord } from '../transcripts/session-transcript-record-budget' /** Listing needs only a preview; active message sinks require the full transcript. */ async function readOpenCodeSqliteCandidate( diff --git a/src/main/ai-vault/session-scanner-candidate-parse.ts b/src/main/ai-vault/parsing/session-scanner-candidate-parse.ts similarity index 89% rename from src/main/ai-vault/session-scanner-candidate-parse.ts rename to src/main/ai-vault/parsing/session-scanner-candidate-parse.ts index b1cc184b20a..d377d13b964 100644 --- a/src/main/ai-vault/session-scanner-candidate-parse.ts +++ b/src/main/ai-vault/parsing/session-scanner-candidate-parse.ts @@ -1,32 +1,32 @@ -import { yieldToEventLoop } from '../../shared/event-loop-yield' +import { yieldToEventLoop } from '../../../shared/event-loop-yield' import { isConversationNameRequestSession } from './conversation-name-request-sessions' -import { candidateFileTime } from './scanners/antigravity/antigravity-transcript-candidates' +import { candidateFileTime } from '../scanners/antigravity/antigravity-transcript-candidates' import { aiVaultAgentLabel, isAiVaultSessionResumableContent, isAiVaultSessionRecoverableEmpty, type AiVaultScanIssue, type AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import type { ExecutionHostId } from '../../shared/execution-host' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { aiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import type { ExecutionHostId } from '../../../shared/execution-host' import { ScannedSessionCollection } from './session-root-dedup' -import type { AntigravityWorkspaceResolver } from './scanners/antigravity/session-scanner-antigravity-history' +import type { AntigravityWorkspaceResolver } from '../scanners/antigravity/session-scanner-antigravity-history' import { parseAgentSessionFileCached, parseListedSessionFile, type SessionParseStats -} from './parse-cache/session-scanner-parse-cache' +} from '../parse-cache/session-scanner-parse-cache' import { recordSessionScanIssue, scanIssueTextFromError } from './session-scan-issues' import { getSessionParseCacheEntry, noteSessionParseCacheListed, sessionParseCacheKey -} from './parse-cache/session-parse-cache-store' +} from '../parse-cache/session-parse-cache-store' import { canStopParsingSessions } from './session-scan-cutoff' -import type { SessionFileCandidate, SessionParseResult } from './session-scanner-types' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' -import { noteAiVaultScanWorkChanged } from './ai-vault-scan-progress' +import type { SessionFileCandidate, SessionParseResult } from '../session-scanner-types' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' +import { noteAiVaultScanWorkChanged } from '../scan-lifecycle/ai-vault-scan-progress' const SESSION_PARSE_CONCURRENCY = 8 diff --git a/src/main/ai-vault/session-scanner-conversation-name-requests.test.ts b/src/main/ai-vault/parsing/session-scanner-conversation-name-requests.test.ts similarity index 92% rename from src/main/ai-vault/session-scanner-conversation-name-requests.test.ts rename to src/main/ai-vault/parsing/session-scanner-conversation-name-requests.test.ts index f666a166800..825dc496fc4 100644 --- a/src/main/ai-vault/session-scanner-conversation-name-requests.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-conversation-name-requests.test.ts @@ -2,9 +2,12 @@ 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 { buildConversationNamePrompt } from '../../shared/source-control/ai/generation/conversation-name-generation' -import { scanAiVaultSessions } from './session-scanner' -import { isolatedScanRoots, writeJsonlFile } from './session-scanner-test-fixtures' +import { buildConversationNamePrompt } from '../../../shared/source-control/ai/generation/conversation-name-generation' +import { scanAiVaultSessions } from '../session-scanner' +import { + isolatedScanRoots, + writeJsonlFile +} from '../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/session-scanner-core-parser-wsl-stall.test.ts b/src/main/ai-vault/parsing/session-scanner-core-parser-wsl-stall.test.ts similarity index 94% rename from src/main/ai-vault/session-scanner-core-parser-wsl-stall.test.ts rename to src/main/ai-vault/parsing/session-scanner-core-parser-wsl-stall.test.ts index 5d55f79f8d2..eb3f121a4b6 100644 --- a/src/main/ai-vault/session-scanner-core-parser-wsl-stall.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-core-parser-wsl-stall.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type * as NodeFsPromisesModule from 'node:fs/promises' import type * as NodePathModule from 'node:path' -import type { SessionFileCandidate } from './session-scanner-types' +import type { SessionFileCandidate } from '../session-scanner-types' const mocks = vi.hoisted(() => ({ open: vi.fn(), @@ -24,14 +24,14 @@ vi.mock('node:path', async (importOriginal) => { return { ...actual.win32, default: actual.win32 } }) -import { parseAgentSessionFileCached } from './parse-cache/session-scanner-parse-cache' -import { resetSessionParseCacheForTests } from './parse-cache/session-parse-cache-store' +import { parseAgentSessionFileCached } from '../parse-cache/session-scanner-parse-cache' +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' import { resetWslTranscriptFsGateForTests, WSL_TRANSCRIPT_FS_ROUTE_QUARANTINE_BASE_MS, - WSL_TRANSCRIPT_FS_SCAN_TIMEOUT_MS, - WslTranscriptFsError -} from '../native-chat/wsl-transcript-fs-gate' + WSL_TRANSCRIPT_FS_SCAN_TIMEOUT_MS +} from '../../native-chat/wsl-transcript-fs-gate' +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' function uncPath(distro: string, ...segments: string[]): string { return `\\\\wsl.localhost\\${distro}\\home\\ada\\${segments.join('\\')}` diff --git a/src/main/ai-vault/session-scanner-injected-title.test.ts b/src/main/ai-vault/parsing/session-scanner-injected-title.test.ts similarity index 89% rename from src/main/ai-vault/session-scanner-injected-title.test.ts rename to src/main/ai-vault/parsing/session-scanner-injected-title.test.ts index d745884d755..62c509130e1 100644 --- a/src/main/ai-vault/session-scanner-injected-title.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-injected-title.test.ts @@ -2,9 +2,9 @@ import { mkdtemp, mkdir, 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 { scanAiVaultSessions } from './session-scanner' -import { withFullFirstUserPromptCapture } from './session-scanner-first-user-prompt-capture' -import { isolatedScanRoots, jsonLines } from './session-scanner-test-fixtures' +import { scanAiVaultSessions } from '../session-scanner' +import { withFullFirstUserPromptCapture } from '../prompts/session-scanner-first-user-prompt-capture' +import { isolatedScanRoots, jsonLines } from '../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/session-scanner-jsonl-reader.test.ts b/src/main/ai-vault/parsing/session-scanner-jsonl-reader.test.ts similarity index 96% rename from src/main/ai-vault/session-scanner-jsonl-reader.test.ts rename to src/main/ai-vault/parsing/session-scanner-jsonl-reader.test.ts index cf58745f4dd..6f7cd1fb845 100644 --- a/src/main/ai-vault/session-scanner-jsonl-reader.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-jsonl-reader.test.ts @@ -1,7 +1,7 @@ import { afterEach, expect, it, vi } from 'vitest' -import { isAiVaultScanCancelledError } from '../../shared/ai-vault/contracts/ai-vault-types' +import { isAiVaultScanCancelledError } from '../../../shared/ai-vault/contracts/ai-vault-types' import { consumeCompleteJsonlLines } from './session-scanner-jsonl-reader' -import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from './transcripts/session-transcript-record-budget' +import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from '../transcripts/session-transcript-record-budget' type ChunkSource = { chunks: Buffer[] @@ -11,7 +11,7 @@ type ChunkSource = { } const source = vi.hoisted((): ChunkSource => ({ chunks: [], closed: false, opens: 0 })) -vi.mock('../native-chat/wsl-transcript-fs-access', () => ({ +vi.mock('../../native-chat/wsl-transcript-fs-access', () => ({ openTranscriptReadStream: async function* () { source.opens += 1 source.closed = false diff --git a/src/main/ai-vault/session-scanner-jsonl-reader.ts b/src/main/ai-vault/parsing/session-scanner-jsonl-reader.ts similarity index 95% rename from src/main/ai-vault/session-scanner-jsonl-reader.ts rename to src/main/ai-vault/parsing/session-scanner-jsonl-reader.ts index cedcbe72037..c02e0dbae9f 100644 --- a/src/main/ai-vault/session-scanner-jsonl-reader.ts +++ b/src/main/ai-vault/parsing/session-scanner-jsonl-reader.ts @@ -1,14 +1,17 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from './ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' import type { Hash } from 'node:crypto' -import { openTranscriptReadStream } from '../native-chat/wsl-transcript-fs-access' +import { openTranscriptReadStream } from '../../native-chat/wsl-transcript-fs-access' import { isZstdTranscriptPath, zstdTranscriptStream -} from '../native-chat/transcript-zstd-decompression' +} from '../../native-chat/transcript-zstd-decompression' import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES, type SkippedTranscriptRecord -} from './transcripts/session-transcript-record-budget' +} from '../transcripts/session-transcript-record-budget' const NEWLINE_BYTE = 0x0a const CARRIAGE_RETURN_BYTE = 0x0d diff --git a/src/main/ai-vault/session-scanner-messages.test.ts b/src/main/ai-vault/parsing/session-scanner-messages.test.ts similarity index 93% rename from src/main/ai-vault/session-scanner-messages.test.ts rename to src/main/ai-vault/parsing/session-scanner-messages.test.ts index 28d02bf8bae..2bc2beecf34 100644 --- a/src/main/ai-vault/session-scanner-messages.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-messages.test.ts @@ -1,13 +1,13 @@ import { expect, it } from 'vitest' import { createAccumulator } from './session-scanner-accumulator' -import { decodeSessionMessage } from './transcripts/session-decoded-message' -import { withFullFirstUserPromptCapture } from './session-scanner-first-user-prompt-capture' +import { decodeSessionMessage } from '../transcripts/session-decoded-message' +import { withFullFirstUserPromptCapture } from '../prompts/session-scanner-first-user-prompt-capture' import { addDecodedSessionMessage, addPreviewMessage, addSessionContent } from './session-scanner-messages' -import type { TranscriptMessage } from './transcripts/session-transcript-consumers' +import type { TranscriptMessage } from '../transcripts/session-transcript-consumers' const AT = '2026-05-01T00:00:00.000Z' diff --git a/src/main/ai-vault/session-scanner-messages.ts b/src/main/ai-vault/parsing/session-scanner-messages.ts similarity index 86% rename from src/main/ai-vault/session-scanner-messages.ts rename to src/main/ai-vault/parsing/session-scanner-messages.ts index f00612298db..a56b526c47b 100644 --- a/src/main/ai-vault/session-scanner-messages.ts +++ b/src/main/ai-vault/parsing/session-scanner-messages.ts @@ -1,20 +1,20 @@ -import type { AiVaultSessionPreviewMessage } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultSessionPreviewMessage } from '../../../shared/ai-vault/contracts/ai-vault-types' import { timestampIso } from './session-scanner-accumulator' import { extractFullFirstUserPromptText, shouldCaptureFullFirstUserPrompt -} from './session-scanner-first-user-prompt' +} from '../prompts/session-scanner-first-user-prompt' import { extractPreviewContentText, - normalizePreviewText, - sliceAtCodeUnitLimit + normalizePreviewText } from './session-scanner-text-normalization' -import type { SessionAccumulator } from './session-scanner-types' -import { transcriptMessagesFromDecodedMessage } from './transcripts/session-transcript-message-content' +import { sliceAtCodeUnitLimit } from '../../../shared/surrogate-safe-text-slice' +import type { SessionAccumulator } from '../session-scanner-types' +import { transcriptMessagesFromDecodedMessage } from '../transcripts/session-transcript-message-content' import { decodeSessionMessage, type DecodedSessionMessage -} from './transcripts/session-decoded-message' +} from '../transcripts/session-decoded-message' const SESSION_PREVIEW_MESSAGE_LIMIT = 5 diff --git a/src/main/ai-vault/session-scanner-parse-wsl-stall.test.ts b/src/main/ai-vault/parsing/session-scanner-parse-wsl-stall.test.ts similarity index 91% rename from src/main/ai-vault/session-scanner-parse-wsl-stall.test.ts rename to src/main/ai-vault/parsing/session-scanner-parse-wsl-stall.test.ts index 8249a546c6f..08db7cd059d 100644 --- a/src/main/ai-vault/session-scanner-parse-wsl-stall.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-parse-wsl-stall.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type * as NodeFsPromisesModule from 'node:fs/promises' -import type { SessionFileCandidate } from './session-scanner-types' +import type { SessionFileCandidate } from '../session-scanner-types' const STALLED_PATH = '\\\\wsl.localhost\\Ubuntu\\home\\ada\\.claude\\projects\\p\\a.jsonl' @@ -13,19 +13,19 @@ vi.mock('node:fs/promises', async (importOriginal) => ({ readdir: mocks.readdir })) -import * as transcriptFs from '../native-chat/wsl-transcript-fs-access' -import { parseAgentSessionFileCached } from './parse-cache/session-scanner-parse-cache' +import * as transcriptFs from '../../native-chat/wsl-transcript-fs-access' +import { parseAgentSessionFileCached } from '../parse-cache/session-scanner-parse-cache' import { registerTranscriptConsumer, resetTranscriptConsumersForTests -} from './transcripts/session-transcript-consumers' -import { resetSessionParseCacheForTests } from './parse-cache/session-parse-cache-store' +} from '../transcripts/session-transcript-consumers' +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' import { resetWslTranscriptFsGateForTests, WSL_TRANSCRIPT_FS_ROUTE_QUARANTINE_BASE_MS, - WSL_TRANSCRIPT_FS_SCAN_TIMEOUT_MS, - WslTranscriptFsError -} from '../native-chat/wsl-transcript-fs-gate' + WSL_TRANSCRIPT_FS_SCAN_TIMEOUT_MS +} from '../../native-chat/wsl-transcript-fs-gate' +import { WslTranscriptFsError } from '../../native-chat/wsl-transcript-fs-error' type ReadResult = { bytesRead: number; buffer: Buffer } diff --git a/src/main/ai-vault/session-scanner-parser-stream-cleanup.test.ts b/src/main/ai-vault/parsing/session-scanner-parser-stream-cleanup.test.ts similarity index 83% rename from src/main/ai-vault/session-scanner-parser-stream-cleanup.test.ts rename to src/main/ai-vault/parsing/session-scanner-parser-stream-cleanup.test.ts index 218c7d530d3..c7eb8d9e6b4 100644 --- a/src/main/ai-vault/session-scanner-parser-stream-cleanup.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-parser-stream-cleanup.test.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { Readable } from 'node:stream' import type * as NodeReadlineModule from 'node:readline' -import type * as WslFsAccessModule from '../native-chat/wsl-transcript-fs-access' -import type { FileWithMtime } from './session-scanner-types' +import type * as WslFsAccessModule from '../../native-chat/wsl-transcript-fs-access' +import type { FileWithMtime } from '../session-scanner-types' // readline.close() leaves its input open; parser exits must destroy streams to release gated handles. const mocks = vi.hoisted(() => ({ @@ -12,7 +12,7 @@ const mocks = vi.hoisted(() => ({ createInterface: vi.fn() })) -vi.mock('../native-chat/wsl-transcript-fs-access', async (importOriginal) => ({ +vi.mock('../../native-chat/wsl-transcript-fs-access', async (importOriginal) => ({ ...(await importOriginal()), openTranscriptReadStream: mocks.openStream, wslGatedReadFile: mocks.readFile, @@ -24,12 +24,12 @@ vi.mock('node:readline', async (importOriginal) => ({ createInterface: mocks.createInterface })) -import { parseAntigravitySessionFile } from './scanners/antigravity/session-scanner-antigravity-parser' -import { parseDroidSessionFile } from './scanners/droid/session-scanner-droid-parser' -import { parseMessageGraphSessionFile } from './scanners/session-scanner-graph-parsers' -import { parseGrokSessionFile } from './scanners/grok/session-scanner-grok-parser' -import { parseKimiSessionFile } from './scanners/kimi/session-scanner-kimi-parser' -import { clearKimiSessionIndexCache } from './scanners/kimi/session-scanner-kimi-paths' +import { parseAntigravitySessionFile } from '../scanners/antigravity/session-scanner-antigravity-parser' +import { parseDroidSessionFile } from '../scanners/droid/session-scanner-droid-parser' +import { parseMessageGraphSessionFile } from '../scanners/session-scanner-graph-parsers' +import { parseGrokSessionFile } from '../scanners/grok/session-scanner-grok-parser' +import { parseKimiSessionFile } from '../scanners/kimi/session-scanner-kimi-parser' +import { clearKimiSessionIndexCache } from '../scanners/kimi/session-scanner-kimi-paths' const PARSE_FAILURE = 'parser failed mid-transcript' diff --git a/src/main/ai-vault/parsing/session-scanner-record-budget.test.ts b/src/main/ai-vault/parsing/session-scanner-record-budget.test.ts new file mode 100644 index 00000000000..62f4048b03a --- /dev/null +++ b/src/main/ai-vault/parsing/session-scanner-record-budget.test.ts @@ -0,0 +1,55 @@ +import { appendFile, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, expect, it } from 'vitest' +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' + +import { codexFixture } from '../scanners/codex/session-scanner-codex-fixtures' +import { scanAiVaultSessions } from '../session-scanner' +import { isolatedScanRoots } from '../scanner-fixtures/session-scanner-test-fixtures' +import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from '../transcripts/session-transcript-record-budget' +import { resetSessionParseCachePersistenceForTests } from '../parse-cache/session-parse-cache-persistence' + +// One record past the budget, terminated separately so tests control the newline. +const OVERSIZED = Buffer.alloc(MAX_SESSION_TRANSCRIPT_RECORD_BYTES + 1, 'x') + +let tempRoots: string[] = [] + +afterEach(async () => { + resetSessionParseCachePersistenceForTests() + resetSessionParseCacheForTests() + await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) + tempRoots = [] +}) + +async function tempRoot(prefix: string): Promise { + const root = await mkdtemp(join(tmpdir(), prefix)) + tempRoots.push(root) + return root +} + +it('lists a recovered session without an issue on fresh and cached scans', async () => { + const root = await tempRoot('orca-record-budget-scan-') + const roots = isolatedScanRoots(root) + const fixture = codexFixture() + const dir = roots.codexSessionsDir + const path = join(dir, fixture.fileName) + + await mkdir(dir, { recursive: true }) + await writeFile(path, `${fixture.seedLines.join('\n')}\n`) + await appendFile(path, '{"type":"compacted","payload":{"message":"') + await appendFile(path, OVERSIZED) + await appendFile(path, `"}}\n${fixture.appendLines.join('\n')}\n`) + + for (let scan = 0; scan < 2; scan++) { + const result = await scanAiVaultSessions(roots) + const session = result.sessions.find((entry) => entry.filePath === path) + expect(session?.previewMessages.map((message) => message.text)).toEqual([ + 'codex seed question', + 'codex seed answer', + 'codex follow-up', + 'codex incremental answer' + ]) + expect(result.issues).toEqual([]) + } +}) diff --git a/src/main/ai-vault/session-scanner-recoverable-empty.test.ts b/src/main/ai-vault/parsing/session-scanner-recoverable-empty.test.ts similarity index 93% rename from src/main/ai-vault/session-scanner-recoverable-empty.test.ts rename to src/main/ai-vault/parsing/session-scanner-recoverable-empty.test.ts index fd66614a3d5..5d692066350 100644 --- a/src/main/ai-vault/session-scanner-recoverable-empty.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-recoverable-empty.test.ts @@ -2,10 +2,13 @@ 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 { isAiVaultSessionRecoverableEmpty } from '../../shared/ai-vault/contracts/ai-vault-types' -import { scanAiVaultSessions } from './session-scanner' -import { parseClaudeSessionContent } from './scanners/claude/session-scanner-primary-parsers' -import { isolatedScanRoots, writeJsonlFile } from './session-scanner-test-fixtures' +import { isAiVaultSessionRecoverableEmpty } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { scanAiVaultSessions } from '../session-scanner' +import { parseClaudeSessionContent } from '../scanners/claude/session-scanner-primary-parsers' +import { + isolatedScanRoots, + writeJsonlFile +} from '../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/session-scanner-values.test.ts b/src/main/ai-vault/parsing/session-scanner-text-normalization.test.ts similarity index 86% rename from src/main/ai-vault/session-scanner-values.test.ts rename to src/main/ai-vault/parsing/session-scanner-text-normalization.test.ts index 7090c7e1ce5..3995690fd8d 100644 --- a/src/main/ai-vault/session-scanner-values.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-text-normalization.test.ts @@ -1,14 +1,13 @@ import { homedir } from 'node:os' import { join } from 'node:path' import { describe, expect, it } from 'vitest' +import { extractFullFirstUserPromptText } from '../prompts/session-scanner-first-user-prompt' import { - extractFullFirstUserPromptText, extractPreviewContentText, - normalizePrimeAgentSessionsDir, - primeAgentSessionsDirFromEnv, normalizePreviewText, normalizeTitleText -} from './session-scanner-values' +} from './session-scanner-text-normalization' +import { primeAgentSessionsDirFromEnv } from '../discovery/agent-session-directories' describe('AI Vault session scanner text values', () => { it('normalizes compact title text without surfacing hidden context blocks', () => { @@ -57,24 +56,6 @@ describe('AI Vault session scanner text values', () => { }) // Drive-relative paths are invalid on POSIX too; native Windows semantics need a Windows runner. - it('falls back to the default root for every non-absolute agent dir', () => { - const fallback = join(homedir(), '.prime', 'agent', 'sessions') - for (const value of [ - '/', - '//', - ' ', - '', - '.', - '..', - 'sessions', - 'rel/path', - 'C:\\', - 'C:/', - 'C:foo' - ]) { - expect(normalizePrimeAgentSessionsDir(value)).toBe(fallback) - } - }) describe('primeAgentSessionsDirFromEnv', () => { const defaultDir = join(homedir(), '.prime', 'agent', 'sessions') diff --git a/src/main/ai-vault/session-scanner-text-normalization.ts b/src/main/ai-vault/parsing/session-scanner-text-normalization.ts similarity index 97% rename from src/main/ai-vault/session-scanner-text-normalization.ts rename to src/main/ai-vault/parsing/session-scanner-text-normalization.ts index d8ee163ca30..15fb9c2b266 100644 --- a/src/main/ai-vault/session-scanner-text-normalization.ts +++ b/src/main/ai-vault/parsing/session-scanner-text-normalization.ts @@ -1,7 +1,5 @@ -import { sliceAtCodeUnitLimit } from '../../shared/surrogate-safe-text-slice' -import { withoutNativeChatVisualDirectiveLines } from '../../shared/native-chat/native-chat-visual-directive' - -export { sliceAtCodeUnitLimit } +import { sliceAtCodeUnitLimit } from '../../../shared/surrogate-safe-text-slice' +import { withoutNativeChatVisualDirectiveLines } from '../../../shared/native-chat/native-chat-visual-directive' const SESSION_TITLE_TEXT_LIMIT = 96 const SESSION_PREVIEW_TEXT_LIMIT = 220 diff --git a/src/main/ai-vault/session-scanner-timeline.test.ts b/src/main/ai-vault/parsing/session-scanner-timeline.test.ts similarity index 66% rename from src/main/ai-vault/session-scanner-timeline.test.ts rename to src/main/ai-vault/parsing/session-scanner-timeline.test.ts index e20c5ed55ae..53507e06d25 100644 --- a/src/main/ai-vault/session-scanner-timeline.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-timeline.test.ts @@ -27,16 +27,4 @@ describe('session timeline bounds', () => { }) expect(state.latestTimestampMs).toBe(Date.parse('2026-01-04T00:00:00Z')) }) - - it('compares fractional numeric timestamps against the rounded ISO bound', () => { - const state = accumulator() - const base = 1_700_000_000_000 - updateTimeline(state, base + 0.9) - updateTimeline(state, base + 0.1) - expect(state.latestTimestampMs).toBe(base + 0.1) - expect(state.createdAt).toBe(new Date(base).toISOString()) - updateTimeline(state, base - 0.1) - expect(state.createdAt).toBe(new Date(base - 1).toISOString()) - expect(state.latestTimestampMs).toBe(base + 0.1) - }) }) diff --git a/src/main/ai-vault/session-scanner-token-values.ts b/src/main/ai-vault/parsing/session-scanner-token-values.ts similarity index 96% rename from src/main/ai-vault/session-scanner-token-values.ts rename to src/main/ai-vault/parsing/session-scanner-token-values.ts index 0c30558ff75..02e8eaa1a90 100644 --- a/src/main/ai-vault/session-scanner-token-values.ts +++ b/src/main/ai-vault/parsing/session-scanner-token-values.ts @@ -1,5 +1,5 @@ -import type { CodexUsageSnapshot } from './session-scanner-types' -import { asRecord } from './session-scanner-record-value' +import type { CodexUsageSnapshot } from '../session-scanner-types' +import { asRecord } from './session-record-fields' export function tokenTotal(value: unknown): number { const usage = asRecord(value) diff --git a/src/main/ai-vault/session-scanner-unlimited-dedup.test.ts b/src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts similarity index 90% rename from src/main/ai-vault/session-scanner-unlimited-dedup.test.ts rename to src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts index 202babe8e82..604b0572dbe 100644 --- a/src/main/ai-vault/session-scanner-unlimited-dedup.test.ts +++ b/src/main/ai-vault/parsing/session-scanner-unlimited-dedup.test.ts @@ -1,17 +1,17 @@ import { beforeEach, expect, it, vi } from 'vitest' -import type { AiVaultSession } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' const fixture = vi.hoisted((): { sessions: AiVaultSession[] } => ({ sessions: [] })) -vi.mock('./session-scanner-source-discovery', () => ({ +vi.mock('../discovery/session-scanner-source-discovery', () => ({ discoverAiVaultSessionSources: async () => [], DEFAULT_CODEX_HOME_DIR: '/fixture' })) -vi.mock('./session-scanner-candidates', () => ({ +vi.mock('../discovery/session-scanner-candidates', () => ({ sessionCandidatesFromDiscoveries: async () => candidates() })) -vi.mock('./parse-cache/session-scanner-parse-cache', () => ({ +vi.mock('../parse-cache/session-scanner-parse-cache', () => ({ createSessionParseStats: () => ({ reused: 0, incremental: 0, @@ -22,7 +22,7 @@ vi.mock('./parse-cache/session-scanner-parse-cache', () => ({ parseListedSessionFile: async (candidate: { session: AiVaultSession }) => candidate.session })) -import { scanAiVaultSessions } from './session-scanner' +import { scanAiVaultSessions } from '../session-scanner' import { ScannedSessionCollection } from './session-root-dedup' function candidates() { diff --git a/src/main/ai-vault/session-first-user-prompt-handler.ts b/src/main/ai-vault/prompts/session-first-user-prompt-handler.ts similarity index 79% rename from src/main/ai-vault/session-first-user-prompt-handler.ts rename to src/main/ai-vault/prompts/session-first-user-prompt-handler.ts index 537c48e978e..e3315647e15 100644 --- a/src/main/ai-vault/session-first-user-prompt-handler.ts +++ b/src/main/ai-vault/prompts/session-first-user-prompt-handler.ts @@ -1,8 +1,8 @@ import type { AiVaultFirstUserPromptArgs, AiVaultFirstUserPromptResult -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { readAiVaultFirstUserPromptInBackground } from './scan-service/session-scanner-background' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { readAiVaultFirstUserPromptInBackground } from '../scan-service/session-scanner-background' export function handleAiVaultGetFirstUserPrompt( args?: AiVaultFirstUserPromptArgs diff --git a/src/main/ai-vault/session-first-user-prompt-read.test.ts b/src/main/ai-vault/prompts/session-first-user-prompt-read.test.ts similarity index 100% rename from src/main/ai-vault/session-first-user-prompt-read.test.ts rename to src/main/ai-vault/prompts/session-first-user-prompt-read.test.ts diff --git a/src/main/ai-vault/session-first-user-prompt-read.ts b/src/main/ai-vault/prompts/session-first-user-prompt-read.ts similarity index 84% rename from src/main/ai-vault/session-first-user-prompt-read.ts rename to src/main/ai-vault/prompts/session-first-user-prompt-read.ts index 8e11ba8fcc8..79c27092cde 100644 --- a/src/main/ai-vault/session-first-user-prompt-read.ts +++ b/src/main/ai-vault/prompts/session-first-user-prompt-read.ts @@ -2,20 +2,20 @@ import type { AiVaultAgent, AiVaultSession, AiVaultFirstUserPromptResult as ReadAiVaultFirstUserPromptResult -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../shared/execution-host' -import { wslGatedStat } from '../native-chat/wsl-transcript-fs-access' -import { parseAgentSessionFile } from './session-scanner-agent-parser' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host' +import { wslGatedStat } from '../../native-chat/wsl-transcript-fs-access' +import { parseAgentSessionFile } from '../parsing/session-scanner-agent-parser' import { withFullFirstUserPromptCapture } from './session-scanner-first-user-prompt-capture' import { parseOpenCodeSqliteSessionViaWorker, parseOpenCode2SqliteSessionViaWorker, parseZcodeSqliteSessionViaWorker -} from './scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' -import { splitOpenCodeSqliteCandidate } from '../../shared/opencode-sqlite-session-path' -import type { FileWithMtime } from './session-scanner-types' -import type { OpenCodeWslRuntime } from './scanners/opencode/reader-transport/session-scanner-opencode-wsl-runtime' -import { configureOpenCodeWslReaders } from './scanners/opencode/reader-transport/session-scanner-opencode-wsl-client' +} from '../scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' +import { splitOpenCodeSqliteCandidate } from '../../../shared/opencode-sqlite-session-path' +import type { FileWithMtime } from '../session-scanner-types' +import type { OpenCodeWslRuntime } from '../scanners/opencode/reader-transport/session-scanner-opencode-wsl-runtime' +import { configureOpenCodeWslReaders } from '../scanners/opencode/reader-transport/session-scanner-opencode-wsl-client' export type ReadAiVaultFirstUserPromptArgs = { agent: AiVaultAgent diff --git a/src/main/ai-vault/session-scanner-first-user-prompt-capture.ts b/src/main/ai-vault/prompts/session-scanner-first-user-prompt-capture.ts similarity index 100% rename from src/main/ai-vault/session-scanner-first-user-prompt-capture.ts rename to src/main/ai-vault/prompts/session-scanner-first-user-prompt-capture.ts diff --git a/src/main/ai-vault/session-scanner-first-user-prompt.test.ts b/src/main/ai-vault/prompts/session-scanner-first-user-prompt.test.ts similarity index 100% rename from src/main/ai-vault/session-scanner-first-user-prompt.test.ts rename to src/main/ai-vault/prompts/session-scanner-first-user-prompt.test.ts diff --git a/src/main/ai-vault/session-scanner-first-user-prompt.ts b/src/main/ai-vault/prompts/session-scanner-first-user-prompt.ts similarity index 92% rename from src/main/ai-vault/session-scanner-first-user-prompt.ts rename to src/main/ai-vault/prompts/session-scanner-first-user-prompt.ts index 7d709bfd7df..3d7ae24cf32 100644 --- a/src/main/ai-vault/session-scanner-first-user-prompt.ts +++ b/src/main/ai-vault/prompts/session-scanner-first-user-prompt.ts @@ -1,8 +1,8 @@ -import { isKnownHarnessInjectedUserTurnText } from '../../shared/harness-injected-user-turns' +import { isKnownHarnessInjectedUserTurnText } from '../../../shared/harness-injected-user-turns' import { getFirstUserPromptCaptureMode } from './session-scanner-first-user-prompt-capture' -import { stripGrokUserQueryEnvelope } from './scanners/grok/session-scanner-grok-user-text' +import { stripGrokUserQueryEnvelope } from '../scanners/grok/session-scanner-grok-user-text' // Import directly to avoid a cycle through the session-scanner-values re-export. -import { sliceAtCodeUnitLimit } from './session-scanner-text-normalization' +import { sliceAtCodeUnitLimit } from '../../../shared/surrogate-safe-text-slice' // Bound pathological pastes without applying the much smaller list-preview cap. const FULL_FIRST_USER_PROMPT_SAFETY_LIMIT = 256 * 1024 diff --git a/src/main/ai-vault/ai-vault-runtime-scan.ts b/src/main/ai-vault/runtime-hosts/ai-vault-runtime-scan.ts similarity index 94% rename from src/main/ai-vault/ai-vault-runtime-scan.ts rename to src/main/ai-vault/runtime-hosts/ai-vault-runtime-scan.ts index 23c48f085f5..c152bff5fa5 100644 --- a/src/main/ai-vault/ai-vault-runtime-scan.ts +++ b/src/main/ai-vault/runtime-hosts/ai-vault-runtime-scan.ts @@ -2,12 +2,12 @@ import { isAiVaultScanCancelledError, type AiVaultListArgs, type AiVaultListResult -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { abandonRemoteSessionScanOnCancel, throwIfAiVaultScanCancelled -} from './ai-vault-scan-cancellation' -import { aiVaultScanIssueResult } from './session-list-results' +} from '../scan-lifecycle/ai-vault-scan-cancellation' +import { aiVaultScanIssueResult } from '../listing/session-list-results' export type RuntimeAiVaultHostInfo = { environmentId: string diff --git a/src/main/ai-vault/runtime-session-scanner.ts b/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts similarity index 87% rename from src/main/ai-vault/runtime-session-scanner.ts rename to src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts index 85eeb7242db..dbd5f31dc38 100644 --- a/src/main/ai-vault/runtime-session-scanner.ts +++ b/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts @@ -1,5 +1,5 @@ -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { AiVaultChatForkSourceSchema } from '../../shared/ai-vault/contracts/ai-vault-chat-fork-contract' +import { aiVaultScanIssueText } from '../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' +import { AiVaultChatForkSourceSchema } from '../../../shared/ai-vault/contracts/ai-vault-chat-fork-contract' import { z } from 'zod' import { AI_VAULT_AGENTS, @@ -8,32 +8,32 @@ import { type AiVaultListArgs, type AiVaultListResult, type AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import { toRuntimeExecutionHostId } from '../../shared/execution-host' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { toRuntimeExecutionHostId } from '../../../shared/execution-host' import { listEnvironments, resolveEnvironment -} from '../../shared/remote-runtime/host-store/runtime-environment-store' -import { callRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-transport-routing' +} from '../../../shared/remote-runtime/host-store/runtime-environment-store' +import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing' import type { AiVaultPrepareSessionResumeRequest, AiVaultPrepareSessionResumeResult -} from '../../shared/ai-vault/resume/ai-vault-resume-preparation' +} from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' import type { AiVaultSessionTitlesArgs, AiVaultSessionTitlesResult -} from '../../shared/ai-vault/contracts/ai-vault-session-title' -import { parseAiVaultListResult } from './session-list-result-validation' -import { parseAiVaultSessionTitlesResult } from './session-titles/session-title-result-validation' -import { isGatedOffWslHost } from '../wsl/host-lifecycle/wsl-host-gate' +} from '../../../shared/ai-vault/contracts/ai-vault-session-title' +import { parseAiVaultListResult } from '../listing/session-list-result-validation' +import { parseAiVaultSessionTitlesResult } from '../session-titles/session-title-result-validation' +import { isGatedOffWslHost } from '../../wsl/host-lifecycle/wsl-host-gate' import type { AiVaultDeleteSessionArgs, AiVaultDeleteSessionResult -} from '../../shared/ai-vault/contracts/ai-vault-session-deletion' +} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' import { readRuntimeAiVaultDeleteSessionResponse, runtimeAiVaultDeleteSessionParams -} from '../../shared/ai-vault/contracts/ai-vault-runtime-session-delete' +} from '../../../shared/ai-vault/contracts/ai-vault-runtime-session-delete' import type { RuntimeAiVaultHostInfo } from './ai-vault-runtime-scan' export type RuntimeAiVaultScanOptions = { diff --git a/src/main/ai-vault/runtime-session-search-call.test.ts b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.test.ts similarity index 89% rename from src/main/ai-vault/runtime-session-search-call.test.ts rename to src/main/ai-vault/runtime-hosts/runtime-session-search-call.test.ts index 0475a56a956..bfb1ed34a4f 100644 --- a/src/main/ai-vault/runtime-session-search-call.test.ts +++ b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const callRuntimeEnvironment = vi.hoisted(() => vi.fn()) -vi.mock('../ipc/runtime-environments/runtime-environment-transport-routing', () => ({ +vi.mock('../../ipc/runtime-environments/runtime-environment-transport-routing', () => ({ callRuntimeEnvironment })) diff --git a/src/main/ai-vault/runtime-session-search-call.ts b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts similarity index 81% rename from src/main/ai-vault/runtime-session-search-call.ts rename to src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts index 4dfe7d66f31..89b5f42c2b9 100644 --- a/src/main/ai-vault/runtime-session-search-call.ts +++ b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts @@ -1,4 +1,4 @@ -import { callRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-transport-routing' +import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing' // Preserve RPC refusal codes so search recognizes older hosts that lack the method. export async function callRuntimeSessionSearch( diff --git a/src/main/ai-vault/ai-vault-local-scan-progress.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-local-scan-progress.ts similarity index 95% rename from src/main/ai-vault/ai-vault-local-scan-progress.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-local-scan-progress.ts index da6877898a5..28ae0baac4d 100644 --- a/src/main/ai-vault/ai-vault-local-scan-progress.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-local-scan-progress.ts @@ -2,8 +2,8 @@ import type { AiVaultScanProgress, AiVaultScanProgressUpdate, AiVaultScanWork -} from '../../shared/ai-vault/scanning/ai-vault-scan-progress' -import type { AiVaultServiceScanListener } from './scan-service/session-scanner-service-request-deadline' +} from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' +import type { AiVaultServiceScanListener } from '../scan-service/session-scanner-service-request-deadline' type Listener = (update: AiVaultScanProgressUpdate) => void diff --git a/src/main/ai-vault/ai-vault-scan-cancellation.test.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.test.ts similarity index 100% rename from src/main/ai-vault/ai-vault-scan-cancellation.test.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.test.ts diff --git a/src/main/ai-vault/ai-vault-scan-cancellation.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.ts similarity index 89% rename from src/main/ai-vault/ai-vault-scan-cancellation.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.ts index 98a77712109..19b650708f2 100644 --- a/src/main/ai-vault/ai-vault-scan-cancellation.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-cancellation.ts @@ -1,5 +1,5 @@ -import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import { AI_VAULT_SCAN_CANCELLED_MESSAGE } from '../../shared/ai-vault/contracts/ai-vault-types' +import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason' +import { AI_VAULT_SCAN_CANCELLED_MESSAGE } from '../../../shared/ai-vault/contracts/ai-vault-types' export function throwIfAiVaultScanCancelled(signal?: AbortSignal): void { if (!signal?.aborted) { diff --git a/src/main/ai-vault/ai-vault-scan-coordinator.test.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.test.ts similarity index 87% rename from src/main/ai-vault/ai-vault-scan-coordinator.test.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.test.ts index c292135ca0d..904dfe51214 100644 --- a/src/main/ai-vault/ai-vault-scan-coordinator.test.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.test.ts @@ -112,32 +112,6 @@ describe('AiVaultScanCoordinator', () => { ]) }) - it('keeps coalescing forced callers onto a forced scan that is still fresh', async () => { - vi.useFakeTimers() - try { - const coordinator = new AiVaultScanCoordinator() - let resolveScan: ((result: typeof EMPTY_RESULT) => void) | undefined - const start = vi.fn( - () => - new Promise((resolve) => { - resolveScan = resolve - }) - ) - const first = coordinator.run({ key: 'scope', force: true, start }) - await Promise.resolve() - - vi.advanceTimersByTime(4_999) - const second = coordinator.run({ key: 'scope', force: true, start }) - await Promise.resolve() - - expect(start).toHaveBeenCalledTimes(1) - resolveScan?.(EMPTY_RESULT) - await expect(Promise.all([first, second])).resolves.toEqual([EMPTY_RESULT, EMPTY_RESULT]) - } finally { - vi.useRealTimers() - } - }) - it('lets a forced refresh preempt a forced scan that hung past the coalescing window', async () => { vi.useFakeTimers() try { diff --git a/src/main/ai-vault/ai-vault-scan-coordinator.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.ts similarity index 98% rename from src/main/ai-vault/ai-vault-scan-coordinator.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.ts index 2c743aa8e09..f146acebce8 100644 --- a/src/main/ai-vault/ai-vault-scan-coordinator.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-coordinator.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto' import { AI_VAULT_SCAN_CANCELLED_MESSAGE, type AiVaultListResult -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' // Match the renderer throttle: forced requests share this window before they can preempt a hung scan. const FORCED_SCAN_PREEMPT_AFTER_MS = 5_000 diff --git a/src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress-flow.test.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress-flow.test.ts new file mode 100644 index 00000000000..e9986c5e4ca --- /dev/null +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress-flow.test.ts @@ -0,0 +1,70 @@ +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 { resetLocalAiVaultScanProgressForTests } from './ai-vault-local-scan-progress' +import * as parseCache from '../parse-cache/session-scanner-parse-cache' +import { aiVaultScanWork, trackAiVaultScanProgress } from './ai-vault-scan-progress' +import { scanAiVaultSessions } from '../session-scanner' +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' +import { + isolatedScanRoots, + writeJsonlFile +} from '../scanner-fixtures/session-scanner-test-fixtures' + +// Source fixtures exercise the real SQLite readers without a packaged worker bundle. +vi.mock( + '../scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn', + async () => { + const { listOpenCodeSqliteSessions } = + await import('../scanners/opencode/sqlite/session-scanner-opencode-sqlite-list') + const { listOpenCode2SqliteSessions } = + await import('../scanners/opencode2/session-scanner-opencode2-sqlite-list') + const { parseOpenCodeSqliteSession } = + await import('../scanners/opencode/sqlite/session-scanner-opencode-sqlite') + return { + listOpenCode2SqliteSessionsViaWorker: listOpenCode2SqliteSessions, + listOpenCodeSqliteSessionsViaWorker: listOpenCodeSqliteSessions, + listZcodeSqliteSessionsViaWorker: (args: Parameters[0]) => + listOpenCodeSqliteSessions({ ...args, agent: 'zcode' }), + parseOpenCodeSqliteSessionViaWorker: parseOpenCodeSqliteSession + } + } +) + +let tempRoot: string | null = null + +afterEach(async () => { + vi.useRealTimers() + vi.restoreAllMocks() + resetSessionParseCacheForTests() + resetLocalAiVaultScanProgressForTests() + if (tempRoot) { + await rm(tempRoot, { recursive: true, force: true }) + tempRoot = null + } +}) + +it('does not settle a batch interrupted during its real parser invocation', async () => { + tempRoot = await mkdtemp(join(tmpdir(), 'orca-scan-abort-')) + const roots = isolatedScanRoots(tempRoot) + await writeJsonlFile(join(roots.claudeProjectsDir, 'project', 'a.jsonl'), [ + { type: 'user', sessionId: 'a', message: { role: 'user', content: 'Generated' } } + ]) + const controller = new AbortController() + const original = parseCache.parseListedSessionFile + vi.spyOn(parseCache, 'parseListedSessionFile').mockImplementation(async (...args) => { + const result = await original(...args) + controller.abort() + return result + }) + const stop = trackAiVaultScanProgress(controller.signal, () => undefined) + try { + await expect( + scanAiVaultSessions({ ...roots, signal: controller.signal }) + ).rejects.toMatchObject({ name: 'AbortError' }) + expect(aiVaultScanWork(controller.signal)?.read).toEqual({ done: 0, total: 1, skipped: 0 }) + } finally { + stop() + } +}) diff --git a/src/main/ai-vault/ai-vault-scan-progress.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress.ts similarity index 94% rename from src/main/ai-vault/ai-vault-scan-progress.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress.ts index f0ffba9a7a4..7e1f51469cf 100644 --- a/src/main/ai-vault/ai-vault-scan-progress.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-progress.ts @@ -1,5 +1,5 @@ -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import type { AiVaultScanWork } from '../../shared/ai-vault/scanning/ai-vault-scan-progress' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultScanWork } from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' import { AiVaultScanTally } from './ai-vault-scan-tally' // Request signals distinguish scans from index-loop and interactive reads through the same readers. diff --git a/src/main/ai-vault/ai-vault-scan-tally.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-tally.ts similarity index 89% rename from src/main/ai-vault/ai-vault-scan-tally.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-tally.ts index e8b2581fde9..f76771f79c9 100644 --- a/src/main/ai-vault/ai-vault-scan-tally.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-tally.ts @@ -1,7 +1,10 @@ -import { AI_VAULT_AGENTS, type AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import type { AiVaultScanWork } from '../../shared/ai-vault/scanning/ai-vault-scan-progress' +import { + AI_VAULT_AGENTS, + type AiVaultAgent +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultScanWork } from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' import { AiVaultScanWorkload } from './ai-vault-scan-workload' -import { sessionFileExecutionNamespace } from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' +import { sessionFileExecutionNamespace } from '../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' type AgentTally = { files: Set diff --git a/src/main/ai-vault/ai-vault-scan-workload.ts b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-workload.ts similarity index 91% rename from src/main/ai-vault/ai-vault-scan-workload.ts rename to src/main/ai-vault/scan-lifecycle/ai-vault-scan-workload.ts index 7c93d6ae9c4..29cd237c3ee 100644 --- a/src/main/ai-vault/ai-vault-scan-workload.ts +++ b/src/main/ai-vault/scan-lifecycle/ai-vault-scan-workload.ts @@ -1,6 +1,6 @@ -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import type { AiVaultScanReadingProgress } from '../../shared/ai-vault/scanning/ai-vault-scan-progress' -import type { SessionFileCandidate } from './session-scanner-types' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultScanReadingProgress } from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' +import type { SessionFileCandidate } from '../session-scanner-types' type Ownership = { globalRemaining: number; owners: number; parsed: boolean } export type ScanReadPass = 'global' | 'walk' | 'bucket' diff --git a/src/main/ai-vault/scan-service/session-scanner-background.ts b/src/main/ai-vault/scan-service/session-scanner-background.ts index d15aad77f04..408b84d2982 100644 --- a/src/main/ai-vault/scan-service/session-scanner-background.ts +++ b/src/main/ai-vault/scan-service/session-scanner-background.ts @@ -7,7 +7,7 @@ import type { AiVaultSessionTitleRequest, AiVaultSessionTitlesResult } from '../../../shared/ai-vault/contracts/ai-vault-session-title' -import type { ReadAiVaultFirstUserPromptArgs } from '../session-first-user-prompt-read' +import type { ReadAiVaultFirstUserPromptArgs } from '../prompts/session-first-user-prompt-read' import { clearAiVaultServiceRestartCircuit, @@ -23,7 +23,7 @@ import type { AiVaultServiceSubagentRequest } from './session-scanner-service-protocol' import { isWslUncPath } from '../../../shared/wsl-paths' -import type { LocalAiVaultScanProgressHandle } from '../ai-vault-local-scan-progress' +import type { LocalAiVaultScanProgressHandle } from '../scan-lifecycle/ai-vault-local-scan-progress' // Let forced refreshes retry after a local service circuit opens. export function clearAiVaultBackgroundRestartCircuit(): void { @@ -55,7 +55,7 @@ export async function readAiVaultFirstUserPromptInBackground( request: ReadAiVaultFirstUserPromptArgs ): Promise { if (process.platform === 'win32' && isWslUncPath(request.filePath)) { - const { localAiVaultScanRoots } = await import('../cached-session-list') + const { localAiVaultScanRoots } = await import('../discovery/ai-vault-scan-roots') const roots = await localAiVaultScanRoots() request = { ...request, wslOpenCodeReaders: roots.wslOpenCodeReaders ?? [] } } diff --git a/src/main/ai-vault/scan-service/session-scanner-service-client-state.ts b/src/main/ai-vault/scan-service/session-scanner-service-client-state.ts index fc7d7a18403..875f2550b17 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-client-state.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-client-state.ts @@ -1,7 +1,7 @@ import { recordRelayedSpan } from '../../observability/tracer' import type { SessionSearchScanRoots } from '../../ai-vault-search/discovery/session-search-scan-roots' import type { ChildProcess } from 'node:child_process' -import { createAiVaultScanCancelledError } from '../ai-vault-scan-cancellation' +import { createAiVaultScanCancelledError } from '../scan-lifecycle/ai-vault-scan-cancellation' import type { AiVaultServiceScanListener } from './session-scanner-service-request-deadline' import { AI_VAULT_SERVICE_PROTOCOL_VERSION, diff --git a/src/main/ai-vault/scan-service/session-scanner-service-client.ts b/src/main/ai-vault/scan-service/session-scanner-service-client.ts index 4e08d0d65ba..393820e3dee 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-client.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-client.ts @@ -1,5 +1,5 @@ import type { ChildProcess } from 'node:child_process' -import { createAiVaultScanCancelledError } from '../ai-vault-scan-cancellation' +import { createAiVaultScanCancelledError } from '../scan-lifecycle/ai-vault-scan-cancellation' import { AI_VAULT_SERVICE_IDLE_TIMEOUT_MS, AI_VAULT_SERVICE_MAX_CALLS, diff --git a/src/main/ai-vault/scan-service/session-scanner-service-entry.test.ts b/src/main/ai-vault/scan-service/session-scanner-service-entry.test.ts index 0ab2312a470..2f9494b881e 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-entry.test.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-entry.test.ts @@ -1,6 +1,6 @@ import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import { listLocalAiVaultSubagentSessions } from '../session-subagent-reader' -import { noteAiVaultScanWorkChanged } from '../ai-vault-scan-progress' +import { listLocalAiVaultSubagentSessions } from './session-subagent-reader' +import { noteAiVaultScanWorkChanged } from '../scan-lifecycle/ai-vault-scan-progress' import { AI_VAULT_SERVICE_PROTOCOL_VERSION } from './session-scanner-service-protocol' const invalidateSessionParseCacheEntry = vi.hoisted(() => vi.fn()) @@ -15,7 +15,7 @@ vi.mock('../parse-cache/session-parse-cache-persistence', () => ({ flushSessionParseCachePersist: vi.fn(() => Promise.resolve()), initSessionParseCachePersistence: vi.fn() })) -vi.mock('../session-subagent-reader', () => ({ +vi.mock('./session-subagent-reader', () => ({ listLocalAiVaultSubagentSessions: vi.fn(() => Promise.resolve({ sessions: [], issues: [] })) })) diff --git a/src/main/ai-vault/scan-service/session-scanner-service-entry.ts b/src/main/ai-vault/scan-service/session-scanner-service-entry.ts index 728e1b15a2f..db382149e86 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-entry.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-entry.ts @@ -1,9 +1,9 @@ import { setActiveSink } from '../../observability/tracer' import { requestSessionSearchRoots } from './session-scanner-service-root-request' -import { aiVaultScanWork, trackAiVaultScanProgress } from '../ai-vault-scan-progress' +import { aiVaultScanWork, trackAiVaultScanProgress } from '../scan-lifecycle/ai-vault-scan-progress' import type { AiVaultScanWork } from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { readAiVaultFirstUserPrompt } from '../session-first-user-prompt-read' +import { readAiVaultFirstUserPrompt } from '../prompts/session-first-user-prompt-read' import { flushSessionParseCachePersist, initSessionParseCachePersistence @@ -26,7 +26,7 @@ import { type CachedAiVaultSessionTitle } from '../session-titles/session-title-file-reader' import { resolveHostReadableAiVaultTitleRequests } from '../session-titles/session-title-request-paths' -import { listLocalAiVaultSubagentSessions } from '../session-subagent-reader' +import { listLocalAiVaultSubagentSessions } from './session-subagent-reader' import { noteWslDistroMayHaveStopped, noteWslDistroWoken diff --git a/src/main/ai-vault/scan-service/session-scanner-service-protocol.ts b/src/main/ai-vault/scan-service/session-scanner-service-protocol.ts index ec7d5c7bdb5..7b26c2f139f 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-protocol.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-protocol.ts @@ -15,7 +15,7 @@ import type { import type { AiVaultSearchSettings } from '../../../shared/ai-vault/search/ai-vault-search-settings' import type { SessionSearchHostScope } from '../../ai-vault-search/session-search-service' import type { SessionSearchScanRoots } from '../../ai-vault-search/discovery/session-search-scan-roots' -import type { ReadAiVaultFirstUserPromptArgs } from '../session-first-user-prompt-read' +import type { ReadAiVaultFirstUserPromptArgs } from '../prompts/session-first-user-prompt-read' import type { SessionParseCachePersistenceOptions } from '../parse-cache/session-parse-cache-persistence' import type { AiVaultScanOptions } from '../session-scanner-types' import type { AiVaultScanWork } from '../../../shared/ai-vault/scanning/ai-vault-scan-progress' diff --git a/src/main/ai-vault/scan-service/session-scanner-service-spawn.ts b/src/main/ai-vault/scan-service/session-scanner-service-spawn.ts index ad2ecc097c8..b7ca6ab3e73 100644 --- a/src/main/ai-vault/scan-service/session-scanner-service-spawn.ts +++ b/src/main/ai-vault/scan-service/session-scanner-service-spawn.ts @@ -1,4 +1,4 @@ -import { localAiVaultScanRoots } from '../ai-vault-scan-roots' +import { localAiVaultScanRoots } from '../discovery/ai-vault-scan-roots' import type { SessionSearchHostScope } from '../../ai-vault-search/session-search-service' import { fork, type ChildProcess } from 'node:child_process' import { existsSync } from 'node:fs' @@ -17,7 +17,7 @@ import type { AiVaultSessionTitlesResult } from '../../../shared/ai-vault/contracts/ai-vault-session-title' import { withSpan } from '../../observability/tracer' -import type { ReadAiVaultFirstUserPromptArgs } from '../session-first-user-prompt-read' +import type { ReadAiVaultFirstUserPromptArgs } from '../prompts/session-first-user-prompt-read' import { sessionSearchServiceInit } from '../../ai-vault-search/session-search-service-init' import { getSessionParseCachePersistenceOptions } from '../parse-cache/session-parse-cache-persistence' @@ -34,7 +34,7 @@ import type { import { requestLocalAiVaultScan, type LocalAiVaultScanProgressHandle -} from '../ai-vault-local-scan-progress' +} from '../scan-lifecycle/ai-vault-local-scan-progress' export function spawnAiVaultServiceProcess(): ChildProcess { const entryPath = getAiVaultServiceEntryPath() diff --git a/src/main/ai-vault/scan-service/session-subagent-reader.ts b/src/main/ai-vault/scan-service/session-subagent-reader.ts new file mode 100644 index 00000000000..c7a5f206198 --- /dev/null +++ b/src/main/ai-vault/scan-service/session-subagent-reader.ts @@ -0,0 +1,12 @@ +import type { AiVaultSubagentListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { listClaudeSubagentSessions } from '../scanners/claude/session-scanner-claude-subagents' +import { listOmpSubagentSessions } from '../scanners/omp/session-scanner-omp-subagent-listing' +import type { AiVaultServiceSubagentRequest } from './session-scanner-service-protocol' + +export function listLocalAiVaultSubagentSessions( + request: AiVaultServiceSubagentRequest +): Promise { + return request.agent === 'claude' + ? listClaudeSubagentSessions({ parentFilePath: request.parentFilePath }) + : listOmpSubagentSessions({ parentFilePath: request.parentFilePath }) +} diff --git a/src/main/ai-vault/session-scanner-document-agent-fixtures.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-document-agent-fixtures.ts similarity index 100% rename from src/main/ai-vault/session-scanner-document-agent-fixtures.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-document-agent-fixtures.ts diff --git a/src/main/ai-vault/session-scanner-every-agent-fixture.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-every-agent-fixture.ts similarity index 87% rename from src/main/ai-vault/session-scanner-every-agent-fixture.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-every-agent-fixture.ts index 666b7291d39..f26af228916 100644 --- a/src/main/ai-vault/session-scanner-every-agent-fixture.ts +++ b/src/main/ai-vault/scanner-fixtures/session-scanner-every-agent-fixture.ts @@ -4,10 +4,10 @@ import { writeMuseScannerFixture, writeOpenCode2SqliteFixture } from './session-scanner-test-fixtures' -import { writeKiroSessionFixture } from './scanners/kiro/session-scanner-kiro-fixtures' +import { writeKiroSessionFixture } from '../scanners/kiro/session-scanner-kiro-fixtures' import { writeDocumentAgentFixtures } from './session-scanner-document-agent-fixtures' import { writeLogAgentFixtures } from './session-scanner-log-agent-fixtures' -import { writeOpenCodeSqliteDatabase } from './scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture' +import { writeOpenCodeSqliteDatabase } from '../scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture' export type EveryAgentVault = { roots: ReturnType diff --git a/src/main/ai-vault/session-scanner-incremental-fixtures.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-incremental-fixtures.ts similarity index 96% rename from src/main/ai-vault/session-scanner-incremental-fixtures.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-incremental-fixtures.ts index 8dcfda17577..fe401b2f829 100644 --- a/src/main/ai-vault/session-scanner-incremental-fixtures.ts +++ b/src/main/ai-vault/scanner-fixtures/session-scanner-incremental-fixtures.ts @@ -1,7 +1,7 @@ -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { antigravityFixture } from './scanners/antigravity/session-scanner-antigravity-fixtures' -import { codexFixture } from './scanners/codex/session-scanner-codex-fixtures' +import { antigravityFixture } from '../scanners/antigravity/session-scanner-antigravity-fixtures' +import { codexFixture } from '../scanners/codex/session-scanner-codex-fixtures' import { primeAgentFixture } from './session-scanner-prime-agent-fixtures' export type IncrementalAgentFixture = { diff --git a/src/main/ai-vault/session-scanner-log-agent-fixtures.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-log-agent-fixtures.ts similarity index 100% rename from src/main/ai-vault/session-scanner-log-agent-fixtures.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-log-agent-fixtures.ts diff --git a/src/main/ai-vault/session-scanner-prime-agent-fixtures.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-prime-agent-fixtures.ts similarity index 100% rename from src/main/ai-vault/session-scanner-prime-agent-fixtures.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-prime-agent-fixtures.ts diff --git a/src/main/ai-vault/session-scanner-test-fixtures.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts similarity index 99% rename from src/main/ai-vault/session-scanner-test-fixtures.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts index 3f7cbeaee88..0e979ccc226 100644 --- a/src/main/ai-vault/session-scanner-test-fixtures.ts +++ b/src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts @@ -1,6 +1,6 @@ import { mkdir, writeFile } from 'node:fs/promises' import { dirname, join } from 'node:path' -import Database from '../sqlite/sync-database' +import Database from '../../sqlite/sync-database' export async function writeOpenCode2SqliteFixture(root: string): Promise { const opencode2DbPath = join(root, 'opencode-next.db') diff --git a/src/main/ai-vault/session-scanner-vault-roots.ts b/src/main/ai-vault/scanner-fixtures/session-scanner-vault-roots.ts similarity index 100% rename from src/main/ai-vault/session-scanner-vault-roots.ts rename to src/main/ai-vault/scanner-fixtures/session-scanner-vault-roots.ts diff --git a/src/main/ai-vault/scanners/antigravity/antigravity-history-prompt.ts b/src/main/ai-vault/scanners/antigravity/antigravity-history-prompt.ts index b619bbbb315..a8e4d7e0b78 100644 --- a/src/main/ai-vault/scanners/antigravity/antigravity-history-prompt.ts +++ b/src/main/ai-vault/scanners/antigravity/antigravity-history-prompt.ts @@ -1,5 +1,5 @@ import { createHash } from 'node:crypto' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' export function antigravityHistoryPromptHash(value: unknown): string | null { if (typeof value !== 'string' || value.length > 4096) { diff --git a/src/main/ai-vault/scanners/antigravity/antigravity-ide-history.test.ts b/src/main/ai-vault/scanners/antigravity/antigravity-ide-history.test.ts index df7b5416f3a..b67a213e64b 100644 --- a/src/main/ai-vault/scanners/antigravity/antigravity-ide-history.test.ts +++ b/src/main/ai-vault/scanners/antigravity/antigravity-ide-history.test.ts @@ -4,7 +4,10 @@ import { tmpdir } from 'node:os' import { dirname, join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, writeAntigravityTranscript } from '../../session-scanner-test-fixtures' +import { + isolatedScanRoots, + writeAntigravityTranscript +} from '../../scanner-fixtures/session-scanner-test-fixtures' import { antigravitySessionOrigin } from '../../../../shared/antigravity-session-origin' import './session-scanner-antigravity-history' import './session-scanner-antigravity-metadata' diff --git a/src/main/ai-vault/scanners/antigravity/antigravity-opening-prompt-workspace.test.ts b/src/main/ai-vault/scanners/antigravity/antigravity-opening-prompt-workspace.test.ts index 3ebb60c392b..f570dffeaf9 100644 --- a/src/main/ai-vault/scanners/antigravity/antigravity-opening-prompt-workspace.test.ts +++ b/src/main/ai-vault/scanners/antigravity/antigravity-opening-prompt-workspace.test.ts @@ -4,7 +4,7 @@ import { createAntigravitySessionResumeState, parseAntigravitySessionContent } from './session-scanner-antigravity-parser' -import { jsonLines } from '../../session-scanner-test-fixtures' +import { jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' const openingTime = '2026-07-15T11:39:10.000Z' const historyPath = '/home/ada/.gemini/antigravity-cli/history.jsonl' diff --git a/src/main/ai-vault/scanners/antigravity/antigravity-transcript-candidates.ts b/src/main/ai-vault/scanners/antigravity/antigravity-transcript-candidates.ts index 8f04a64920d..c92866d0333 100644 --- a/src/main/ai-vault/scanners/antigravity/antigravity-transcript-candidates.ts +++ b/src/main/ai-vault/scanners/antigravity/antigravity-transcript-candidates.ts @@ -2,7 +2,7 @@ import { dirname, join } from 'node:path' import { wslGatedLstat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' import type { AiVaultScanIssue } from '../../../../shared/ai-vault/contracts/ai-vault-types' -import { recordSessionScanIssue, scanIssueTextFromError } from '../../session-scan-issues' +import { recordSessionScanIssue, scanIssueTextFromError } from '../../parsing/session-scan-issues' import type { FileWithMtime, SessionFileDiscovery } from '../../session-scanner-types' function transcriptDirectory(file: FileWithMtime): string { diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-fixtures.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-fixtures.ts index cf0f45ee971..1592515cd38 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-fixtures.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-fixtures.ts @@ -1,4 +1,4 @@ -import type { IncrementalAgentFixture } from '../../session-scanner-incremental-fixtures' +import type { IncrementalAgentFixture } from '../../scanner-fixtures/session-scanner-incremental-fixtures' export function antigravityFixture(): IncrementalAgentFixture { const record = (source: string, type: string, content: string, createdAt: string) => diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-history.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-history.ts index f1a1ea89f9b..c6bcebbfecc 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-history.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-history.ts @@ -11,9 +11,10 @@ import { } from '../../../native-chat/wsl-transcript-fs-access' import { readNodeFileWithinLimit } from '../../../../shared/file-content/node-bounded-file-reader' import { isWslUncPath } from '../../../../shared/wsl-paths' -import { throwIfAiVaultScanCancelled } from '../../ai-vault-scan-cancellation' +import { throwIfAiVaultScanCancelled } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { parseJsonObject, timestampMs } from '../../session-scanner-values' +import { parseJsonObject } from '../../parsing/session-json-object' +import { timestampMs } from '../../parsing/session-record-time' import { antigravityHistoryPromptHash } from './antigravity-history-prompt' import { antigravitySessionOrigin } from '../../../../shared/antigravity-session-origin' import { antigravityAcpSessionMetadataPath } from './session-scanner-antigravity-paths' diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-metadata.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-metadata.ts index 1ced4f014fa..a442634af47 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-metadata.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-metadata.ts @@ -1,4 +1,4 @@ -import { parseJsonObject } from '../../session-scanner-values' +import { parseJsonObject } from '../../parsing/session-json-object' export const ANTIGRAVITY_INDEX_MAX_BYTES = 4 * 1024 * 1024 const MAX_INDEX_ENTRIES = 10_000 diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-parser.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-parser.ts index e7805c4a36d..ed5d0b9b19a 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-parser.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-parser.ts @@ -2,7 +2,7 @@ import { remoteSessionContentLines, type RemoteSessionContent } from '../../transcripts/remote-session-content-lines' -import { consumeCompleteJsonlLines } from '../../session-scanner-jsonl-reader' +import { consumeCompleteJsonlLines } from '../../parsing/session-scanner-jsonl-reader' import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from '../../transcripts/session-transcript-record-budget' import type { AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-vault-types' import type { ExecutionHostId } from '../../../../shared/execution-host' @@ -11,8 +11,8 @@ import { createAccumulator, timestampIso, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionText } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionText } from '../../parsing/session-scanner-messages' import { antigravityConversationIdFromTranscriptPath } from './session-scanner-antigravity-paths' import { antigravityHistoryPromptHash } from './antigravity-history-prompt' import type { @@ -21,8 +21,9 @@ import type { SessionAccumulator } from '../../session-scanner-types' import type { TranscriptMessageSink } from '../../transcripts/session-transcript-consumers' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-source.test.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-source.test.ts index c6b3493a943..77122ef531a 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-source.test.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-source.test.ts @@ -11,7 +11,7 @@ import { isolatedScanRoots, writeAntigravityHistory, writeAntigravityTranscript -} from '../../session-scanner-test-fixtures' +} from '../../scanner-fixtures/session-scanner-test-fixtures' const tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-sources.ts b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-sources.ts index 106ade4d1ad..b544f96b21e 100644 --- a/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-sources.ts +++ b/src/main/ai-vault/scanners/antigravity/session-scanner-antigravity-sources.ts @@ -8,9 +8,9 @@ import { isAntigravityTranscriptPath, shouldDescendAntigravityBrainDirectory } from './session-scanner-antigravity-paths' -import { discoverFiles } from '../../session-scanner-discovery' +import { discoverFiles } from '../../discovery/session-scanner-discovery' import type { AiVaultScanOptions, SessionFileDiscovery } from '../../session-scanner-types' -import { scopeWalksAgentFiles } from '../../session-scope-cwd' +import { scopeWalksAgentFiles } from '../../scope/session-scope-cwd' export function antigravityDiscoveries( options: AiVaultScanOptions, diff --git a/src/main/ai-vault/scanners/claude/session-scanner-claude-cwd-drift.test.ts b/src/main/ai-vault/scanners/claude/session-scanner-claude-cwd-drift.test.ts index 2924f9a54ca..dd30a2c47d6 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-claude-cwd-drift.test.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-claude-cwd-drift.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/claude/session-scanner-claude-subagent-prune.test.ts b/src/main/ai-vault/scanners/claude/session-scanner-claude-subagent-prune.test.ts index d709b3383f2..119345b8d20 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-claude-subagent-prune.test.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-claude-subagent-prune.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/claude/session-scanner-claude-subagents.ts b/src/main/ai-vault/scanners/claude/session-scanner-claude-subagents.ts index 8c0e0cc7759..0104a423fa9 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-claude-subagents.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-claude-subagents.ts @@ -17,17 +17,18 @@ import { wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { recordSessionScanIssue, scanIssueTextFromError } from '../../session-scan-issues' -import { sessionIdFromFileName, sessionSortTime } from '../../session-scanner-accumulator' +import { recordSessionScanIssue, scanIssueTextFromError } from '../../parsing/session-scan-issues' +import { sessionIdFromFileName, sessionSortTime } from '../../parsing/session-scanner-accumulator' import { parseClaudeSessionFile } from './session-scanner-primary-parsers' import { isSubagentTranscriptFileName, subagentTranscriptsDirFor, SUBAGENT_TRANSCRIPT_PREFIX } from './session-scanner-subagent-transcripts' -import { asRecord } from '../../session-scanner-record-value' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' // Without a terminal report, old transcripts have unknown status rather than remaining running. const SUBAGENT_RUNNING_RECENCY_MS = 5 * 60_000 diff --git a/src/main/ai-vault/scanners/claude/session-scanner-claude-title.test.ts b/src/main/ai-vault/scanners/claude/session-scanner-claude-title.test.ts index 762718d57be..dbfe6e75df1 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-claude-title.test.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-claude-title.test.ts @@ -3,7 +3,10 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, writeJsonlFile } from '../../session-scanner-test-fixtures' +import { + isolatedScanRoots, + writeJsonlFile +} from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/claude/session-scanner-claude-unicode-scope.test.ts b/src/main/ai-vault/scanners/claude/session-scanner-claude-unicode-scope.test.ts index 9f95aa1b0bf..9ef7732ab2c 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-claude-unicode-scope.test.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-claude-unicode-scope.test.ts @@ -3,8 +3,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { resetProjectDirCwdCacheForTests } from '../../session-scanner-scope-discovery' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { resetProjectDirCwdCacheForTests } from '../../scope/session-scanner-scope-discovery' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/claude/session-scanner-primary-parsers.ts b/src/main/ai-vault/scanners/claude/session-scanner-primary-parsers.ts index 1039bee33e8..998bc9ca936 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-primary-parsers.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-primary-parsers.ts @@ -21,13 +21,17 @@ import { sessionIdFromFileName, updateLatestLocation, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' import { countSubagentTranscripts } from './session-scanner-subagent-transcripts' -import { asRecord } from '../../session-scanner-record-value' -import { claudeUsageTotal } from '../../session-scanner-token-values' -import { extractMessageText, normalizeTitleText } from '../../session-scanner-text-normalization' -import { extractString, parseJsonObject } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { claudeUsageTotal } from '../../parsing/session-scanner-token-values' +import { + extractMessageText, + normalizeTitleText +} from '../../parsing/session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' type ParserSessionOptions = { signal?: AbortSignal diff --git a/src/main/ai-vault/scanners/claude/session-scanner-subagent-transcripts.ts b/src/main/ai-vault/scanners/claude/session-scanner-subagent-transcripts.ts index 80743356828..a84488a8b41 100644 --- a/src/main/ai-vault/scanners/claude/session-scanner-subagent-transcripts.ts +++ b/src/main/ai-vault/scanners/claude/session-scanner-subagent-transcripts.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { wslGatedReaddir } from '../../../native-chat/wsl-transcript-fs-access' import { basename, dirname, extname, join } from 'node:path' diff --git a/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.test.ts b/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.test.ts index 564dc0f3bf1..6265b31c95a 100644 --- a/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.test.ts +++ b/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.ts b/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.ts index e140bcec951..3e612f46dc8 100644 --- a/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.ts +++ b/src/main/ai-vault/scanners/cline/session-scanner-cline-parser.ts @@ -10,13 +10,16 @@ import { createAccumulator, finalizeSession, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' import type { FileWithMtime, SessionAccumulator } from '../../session-scanner-types' import type { TranscriptMessageSink } from '../../transcripts/session-transcript-consumers' -import { arrayValue, extractString } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText, normalizeTitleText } from '../../session-scanner-text-normalization' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { + extractContentText, + normalizeTitleText +} from '../../parsing/session-scanner-text-normalization' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-parser.ts b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-parser.ts index 09f7425302d..6906c02590b 100644 --- a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-parser.ts +++ b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-parser.ts @@ -12,11 +12,12 @@ import { sessionIdFromFileName, updateLatestLocation, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionText } from '../../session-scanner-messages' -import { asRecord } from '../../session-scanner-record-value' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +} from '../../parsing/session-scanner-accumulator' +import { addSessionText } from '../../parsing/session-scanner-messages' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-scope.test.ts b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-scope.test.ts index dc3dadba44c..7cf01719363 100644 --- a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-scope.test.ts +++ b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-scope.test.ts @@ -3,8 +3,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { resetProjectDirCwdCacheForTests } from '../../session-scanner-scope-discovery' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { resetProjectDirCwdCacheForTests } from '../../scope/session-scanner-scope-discovery' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-source.test.ts b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-source.test.ts index 1237f1f83e3..e4ef4242cca 100644 --- a/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-source.test.ts +++ b/src/main/ai-vault/scanners/codebuddy/session-scanner-codebuddy-source.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/codex/codex-session-root-dedup.ts b/src/main/ai-vault/scanners/codex/codex-session-root-dedup.ts index 1003eacbe0b..84439dd20c4 100644 --- a/src/main/ai-vault/scanners/codex/codex-session-root-dedup.ts +++ b/src/main/ai-vault/scanners/codex/codex-session-root-dedup.ts @@ -2,8 +2,8 @@ import type { AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-va import { sessionFileExecutionNamespace } from '../../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' import { mapWithConcurrency } from '../../../../shared/map-with-concurrency' -import { throwIfAiVaultScanCancelled } from '../../ai-vault-scan-cancellation' -import { sessionSortTime } from '../../session-scanner-accumulator' +import { throwIfAiVaultScanCancelled } from '../../scan-lifecycle/ai-vault-scan-cancellation' +import { sessionSortTime } from '../../parsing/session-scanner-accumulator' // Bridging and backfill expose one rollout through multiple roots; list only its canonical alias (#7521). diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-dual-root.test.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-dual-root.test.ts index a9fad3be286..79f0c0f8a9b 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-dual-root.test.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-dual-root.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-fixtures.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-fixtures.ts index 2f5aa50ebf2..528f5f6148e 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-fixtures.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-fixtures.ts @@ -1,4 +1,4 @@ -import type { IncrementalAgentFixture } from '../../session-scanner-incremental-fixtures' +import type { IncrementalAgentFixture } from '../../scanner-fixtures/session-scanner-incremental-fixtures' const CODEX_SESSION_ID = '019f0000-1111-7222-8333-444444444444' diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-index-read.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-index-read.ts index 1136965ac4f..3564dd668e1 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-index-read.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-index-read.ts @@ -4,9 +4,10 @@ import { openTranscriptReadStream, readTranscriptSlice } from '../../../native-chat/wsl-transcript-fs-access' -import { consumeCompleteJsonlLines } from '../../session-scanner-jsonl-reader' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { consumeCompleteJsonlLines } from '../../parsing/session-scanner-jsonl-reader' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' export type CodexIndexRead = { titles: Map diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-message-records.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-message-records.ts index dbc37421e90..c14484b7af2 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-message-records.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-message-records.ts @@ -3,13 +3,13 @@ import { publishCodexCompletedTool } from './session-scanner-codex-tool-records' import { normalizePromptField } from '../../../../shared/agent-status/contracts/agent-status-field-normalization' -import { addSessionContent } from '../../session-scanner-messages' +import { addSessionContent } from '../../parsing/session-scanner-messages' import type { SessionAccumulator } from '../../session-scanner-types' -import { asRecord } from '../../session-scanner-record-value' +import { asRecord } from '../../parsing/session-record-fields' import { extractContentText, extractPreviewContentText -} from '../../session-scanner-text-normalization' +} from '../../parsing/session-scanner-text-normalization' export function consumeCodexResponseMessage( accumulator: SessionAccumulator, diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-non-user-origin.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-non-user-origin.ts index 75ed84d3417..107f2284599 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-non-user-origin.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-non-user-origin.ts @@ -1,5 +1,5 @@ -import { asRecord } from '../../session-scanner-record-value' -import { extractString } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' /** Join by parentThreadId; agentPath is a label, and fork lineage does not establish spawn parentage. */ export type CodexSubagentParentage = { diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-parser.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-parser.ts index 43778625ff7..23a03759b4a 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-parser.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-parser.ts @@ -1,4 +1,4 @@ -import { waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { openTranscriptReadStream } from '../../../native-chat/wsl-transcript-fs-access' import { isZstdTranscriptPath, @@ -18,7 +18,7 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' +} from '../../parsing/session-scanner-accumulator' import { consumeCodexCompletedMessage, consumeCodexLegacyEventMessage, @@ -36,14 +36,10 @@ import { addCodexUsage, normalizeCodexUsage, subtractCodexUsage -} from '../../session-scanner-token-values' -import { asRecord } from '../../session-scanner-record-value' -import { - extractGitBranch, - extractModel, - extractString, - parseJsonObject -} from '../../session-scanner-values' +} from '../../parsing/session-scanner-token-values' +import { asRecord, extractGitBranch, extractModel } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' import { readCodexTimelineOnlyRecord } from './session-scanner-codex-record-fast-path' import { extractCodexSessionMetadataTitle } from './session-scanner-codex-session-meta' import { diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-session-meta.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-session-meta.ts index 8b5fb208cb8..a02d5fc88f4 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-session-meta.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-session-meta.ts @@ -1,5 +1,5 @@ -import { extractString } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' export function extractCodexSessionMetadataTitle(payload: Record): string | null { return ( diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-tool-records.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-tool-records.ts index fa4dc7107cc..e4e36cba576 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-tool-records.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-tool-records.ts @@ -1,6 +1,6 @@ import { codexRolloutItem } from '../../../codex/history/rollouts/codex-rollout-item-projection' -import { timestampIso } from '../../session-scanner-accumulator' -import { asRecord } from '../../session-scanner-record-value' +import { timestampIso } from '../../parsing/session-scanner-accumulator' +import { asRecord } from '../../parsing/session-record-fields' import type { SessionAccumulator } from '../../session-scanner-types' import { transcriptMessagesFromContent } from '../../transcripts/session-transcript-message-content' diff --git a/src/main/ai-vault/scanners/codex/session-scanner-codex-workers.test.ts b/src/main/ai-vault/scanners/codex/session-scanner-codex-workers.test.ts index 2d9df02bafd..e09701089b1 100644 --- a/src/main/ai-vault/scanners/codex/session-scanner-codex-workers.test.ts +++ b/src/main/ai-vault/scanners/codex/session-scanner-codex-workers.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts b/src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts index de9afcff5a9..8d6c77494c5 100644 --- a/src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts +++ b/src/main/ai-vault/scanners/copilot/session-scanner-copilot-parser.ts @@ -13,12 +13,13 @@ import { createAccumulator, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionText } from '../../session-scanner-messages' -import { asRecord } from '../../session-scanner-record-value' -import { copilotModelMetricsTotal, numberValue } from '../../session-scanner-token-values' -import { extractString, extractTrustedFolder, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +} from '../../parsing/session-scanner-accumulator' +import { addSessionText } from '../../parsing/session-scanner-messages' +import { asRecord } from '../../parsing/session-record-fields' +import { copilotModelMetricsTotal, numberValue } from '../../parsing/session-scanner-token-values' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' type ParserSessionOptions = { executionHostId?: ExecutionHostId @@ -118,3 +119,11 @@ async function parseCopilotSessionLines(args: { } return state.finalize(args.platform, args.options) } + +function extractTrustedFolder(value: unknown): string | null { + const message = extractString(value) + if (!message) { + return null + } + return message.match(/^Folder (.+) has been added to trusted folders\.$/)?.[1] ?? null +} diff --git a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.test.ts b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.test.ts index 9bf702d2376..5a9f833c542 100644 --- a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.test.ts +++ b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.test.ts @@ -67,8 +67,8 @@ import { type AiVaultScanIssue, type AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-vault-types' -import { AI_VAULT_AGENT_SOURCES } from '../../session-scanner-agent-sources' -import { discoverFiles } from '../../session-scanner-discovery' +import { AI_VAULT_AGENT_SOURCES } from '../../discovery/session-scanner-agent-sources' +import { discoverFiles } from '../../discovery/session-scanner-discovery' import { scanAiVaultSessions } from '../../session-scanner' import { createSessionParseStats, @@ -82,7 +82,7 @@ import { resolveSessionScopeCwd } from '../../parse-cache/session-parse-cache-store' -import { isolatedScanRoots } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../scanner-fixtures/session-scanner-test-fixtures' import type { FileWithMtime } from '../../session-scanner-types' // Mirror Cursor meta.json keys (2026-09). diff --git a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.ts b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.ts index 4e930b1990b..6b85239146b 100644 --- a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.ts +++ b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-chat-meta.ts @@ -1,13 +1,14 @@ -import { waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { AsyncLocalStorage } from 'node:async_hooks' import { basename, dirname, join } from 'node:path' import { wslGatedReaddir, wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { timestampIso } from '../../session-scanner-accumulator' -import { scanIssueTextFromError } from '../../session-scan-issues' +import { timestampIso } from '../../parsing/session-scanner-accumulator' +import { scanIssueTextFromError } from '../../parsing/session-scan-issues' import type { AiVaultScanIssueText } from '../../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { extractString, readJsonObjectIfExists } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { readJsonObjectIfExists } from '../../discovery/session-json-file' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' // Transcript paths cannot derive hashed metadata buckets; index the separate chats tree by chat ID. diff --git a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-parser.ts b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-parser.ts index 1a3d5c6dfd7..96bfcf4c87d 100644 --- a/src/main/ai-vault/scanners/cursor/session-scanner-cursor-parser.ts +++ b/src/main/ai-vault/scanners/cursor/session-scanner-cursor-parser.ts @@ -17,11 +17,15 @@ import { createAccumulator, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText, extractMessageText } from '../../session-scanner-text-normalization' -import { extractString, parseJsonObject } from '../../session-scanner-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' +import { asRecord } from '../../parsing/session-record-fields' +import { + extractContentText, + extractMessageText +} from '../../parsing/session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-contention.test.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-contention.test.ts index 635e1b15807..18ebcabc20b 100644 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-contention.test.ts +++ b/src/main/ai-vault/scanners/devin/session-scanner-devin-contention.test.ts @@ -7,7 +7,7 @@ import { scanAiVaultSessions } from '../../session-scanner' import { resetDevinSessionsIndexCacheForTests } from './session-scanner-devin-db' import * as databaseReader from '../opencode/sqlite/session-scanner-opencode-sqlite-open' import { resetSessionParseCacheForTests } from '../../parse-cache/session-parse-cache-store' -import { isolatedScanRoots } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../scanner-fixtures/session-scanner-test-fixtures' let root: string | undefined diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts index f2da701236f..9b7858bbf63 100644 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts +++ b/src/main/ai-vault/scanners/devin/session-scanner-devin-db.test.ts @@ -8,7 +8,7 @@ import { devinSessionsIndexForSidecar, resetDevinSessionsIndexCacheForTests } from './session-scanner-devin-db' -import { isolatedScanRoots } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../scanner-fixtures/session-scanner-test-fixtures' import type { SessionSidecarStat } from '../../parse-cache/session-sidecar-stat' // Mirror the Devin CLI 3000.10.x schema so every probed column exists. diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-db.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-db.ts index 8c54fab529b..eb6efeb779b 100644 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-db.ts +++ b/src/main/ai-vault/scanners/devin/session-scanner-devin-db.ts @@ -7,9 +7,9 @@ import { wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { columnExists, tableExists } from '../../../opencode-usage/schema-helpers' import { readOpenCodeDatabase } from '../opencode/sqlite/session-scanner-opencode-sqlite-open' import type { SessionSidecarObservation } from '../../parse-cache/session-sidecar-stat' -import { asRecord } from '../../session-scanner-record-value' -import { numberValue } from '../../session-scanner-token-values' -import { extractString } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { numberValue } from '../../parsing/session-scanner-token-values' +import { extractString } from '../../../../shared/trimmed-string' // Devin stores workspace metadata absent from Windows transcripts in a sibling sessions.db. diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-dedup.test.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-dedup.test.ts index ae22350c772..b5593400ab5 100644 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-dedup.test.ts +++ b/src/main/ai-vault/scanners/devin/session-scanner-devin-dedup.test.ts @@ -2,9 +2,9 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' -import { isolatedScanRoots } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots } from '../../scanner-fixtures/session-scanner-test-fixtures' import { parseDevinSessionContent } from './session-scanner-devin-parser' -import { dedupeScannedSessions, ScannedSessionCollection } from '../../session-root-dedup' +import { dedupeScannedSessions, ScannedSessionCollection } from '../../parsing/session-root-dedup' const roots: string[] = [] afterEach(async () => { diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.test.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.test.ts deleted file mode 100644 index 75cd5cff925..00000000000 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.test.ts +++ /dev/null @@ -1,77 +0,0 @@ -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 { parseDevinSessionFile } from './session-scanner-devin-parser' -import { withFullFirstUserPromptCapture } from '../../session-scanner-first-user-prompt-capture' -import type { TranscriptMessage } from '../../transcripts/session-transcript-consumers' - -let tempDirs: string[] = [] - -afterEach(async () => { - await Promise.all(tempDirs.map((dir) => rm(dir, { recursive: true, force: true }))) - tempDirs = [] -}) - -describe('parseDevinSessionFile', () => { - it.each( - [ - { payloadKind: 'string', fields: (text: string) => ({ message: text }) }, - { payloadKind: 'wrapped string', fields: (text: string) => ({ message: { content: text } }) }, - { - payloadKind: 'wrapped blocks', - fields: (text: string) => ({ - message: { content: text.split('\n').map((text) => ({ type: 'text', text })) } - }) - }, - { - payloadKind: 'array', - fields: (text: string) => ({ - message: text.split('\n').map((text) => ({ type: 'text', text })) - }) - }, - { - payloadKind: 'content', - fields: (text: string) => ({ - content: text.split('\n').map((text) => ({ type: 'text', text })) - }) - }, - { payloadKind: 'text', fields: (text: string) => ({ text }) } - ].flatMap((payloadKind) => [5000, 256 * 1024 + 1].map((length) => ({ ...payloadKind, length }))) - )( - 'preserves $length-character $payloadKind messages before display limits', - async ({ fields, length }) => { - const dir = await mkdtemp(join(tmpdir(), 'orca-devin-content-')) - tempDirs.push(dir) - const path = join(dir, 'content.json') - const text = ` first line\n${'x'.repeat(length)}\nlast line ` - await writeFile( - path, - JSON.stringify({ - session_id: 'content', - steps: ['user', 'agent'].map((source) => ({ source, ...fields(text) })) - }) - ) - const messages: TranscriptMessage[] = [] - const session = await withFullFirstUserPromptCapture(() => - parseDevinSessionFile( - { path, mtimeMs: 1, modifiedAt: '2026-05-01T00:00:00.000Z' }, - 'linux', - { active: true, push: (message) => messages.push(message) } - ) - ) - - expect(messages).toEqual( - ['user', 'assistant'].map((role) => ({ - role, - text: text.slice(0, 256 * 1024), - timestamp: null, - ...(text.length > 256 * 1024 ? { textTruncated: true } : {}) - })) - ) - expect(session?.firstUserPrompt).toBe(text.trim().slice(0, 256 * 1024)) - expect(session?.title).toHaveLength(96) - expect(session?.previewMessages.map((message) => message.text.length)).toEqual([220, 220]) - } - ) -}) diff --git a/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.ts b/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.ts index 946347b6315..190ed724b1e 100644 --- a/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.ts +++ b/src/main/ai-vault/scanners/devin/session-scanner-devin-parser.ts @@ -9,16 +9,16 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addDecodedSessionMessage } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addDecodedSessionMessage } from '../../parsing/session-scanner-messages' import { decodeSessionMessage, type DecodedSessionMessage } from '../../transcripts/session-decoded-message' -import { arrayValue, extractString } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText } from '../../session-scanner-text-normalization' -import { numberValue } from '../../session-scanner-token-values' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { extractContentText } from '../../parsing/session-scanner-text-normalization' +import { numberValue } from '../../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/droid/session-scanner-droid-parser.ts b/src/main/ai-vault/scanners/droid/session-scanner-droid-parser.ts index 0727ca5c34a..4163f30dffb 100644 --- a/src/main/ai-vault/scanners/droid/session-scanner-droid-parser.ts +++ b/src/main/ai-vault/scanners/droid/session-scanner-droid-parser.ts @@ -13,12 +13,16 @@ import { createAccumulator, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent, addSessionText } from '../../session-scanner-messages' -import { asRecord } from '../../session-scanner-record-value' -import { extractMessageText, normalizeTitleText } from '../../session-scanner-text-normalization' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { tokenTotal } from '../../session-scanner-token-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent, addSessionText } from '../../parsing/session-scanner-messages' +import { asRecord } from '../../parsing/session-record-fields' +import { + extractMessageText, + normalizeTitleText +} from '../../parsing/session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { tokenTotal } from '../../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/gemini/session-scanner-gemini-parsers.ts b/src/main/ai-vault/scanners/gemini/session-scanner-gemini-parsers.ts index 0ab09bf5c6e..4a4d3c88b7f 100644 --- a/src/main/ai-vault/scanners/gemini/session-scanner-gemini-parsers.ts +++ b/src/main/ai-vault/scanners/gemini/session-scanner-gemini-parsers.ts @@ -16,12 +16,13 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' -import { arrayValue, extractString, parseJsonObject } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText } from '../../session-scanner-text-normalization' -import { tokenTotal } from '../../session-scanner-token-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { extractContentText } from '../../parsing/session-scanner-text-normalization' +import { tokenTotal } from '../../parsing/session-scanner-token-values' export async function parseGeminiSessionFile( file: FileWithMtime, diff --git a/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.test.ts b/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.test.ts index c519f70e2b9..c7b38cd7fc6 100644 --- a/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.test.ts +++ b/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.test.ts @@ -2,9 +2,8 @@ import { mkdir, 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 { withFullFirstUserPromptCapture } from '../../session-scanner-first-user-prompt-capture' +import { withFullFirstUserPromptCapture } from '../../prompts/session-scanner-first-user-prompt-capture' import { parseGrokSessionFile } from './session-scanner-grok-parser' -import type { TranscriptMessage } from '../../transcripts/session-transcript-consumers' let tempRoots: string[] = [] @@ -14,58 +13,6 @@ afterEach(async () => { }) describe('AI Vault Grok session parser', () => { - it.each([false, true])( - 'bounds preview scanning while preserving full turns with capture %s', - async (active) => { - const root = await mkdtemp(join(tmpdir(), 'orca-grok-preview-budget-')) - tempRoots.push(root) - const path = join(root, 'summary.json') - await writeFile(path, JSON.stringify({ info: { id: 'grok-preview-budget' } })) - const hidden = `${'x'.repeat(4057)}` - const text = `${hidden}ask😀tail` - const userText = `ask${' '.repeat(4093)}tail` - const turns = [ - { type: 'user', content: `${userText}` }, - { type: 'assistant', content: text }, - { - type: 'assistant', - content: [ - { type: 'text', text: ' '.repeat(2048) }, - { type: 'text', text: `${' '.repeat(2048)}outside preview budget` } - ] - } - ] - await writeFile( - join(root, 'chat_history.jsonl'), - turns.map((turn) => JSON.stringify(turn)).join('\n') - ) - const messages: TranscriptMessage[] = [] - const session = await withFullFirstUserPromptCapture(() => - parseGrokSessionFile( - { path, mtimeMs: 1, modifiedAt: '2026-05-01T00:00:00.000Z' }, - 'linux', - { active, push: (message) => messages.push(message) } - ) - ) - - expect(session?.previewMessages.map((message) => message.text)).toEqual(['ask', 'ask']) - expect(session?.firstUserPrompt).toBe(userText) - expect(messages).toEqual( - active - ? [ - { role: 'user', text: userText, timestamp: null }, - { role: 'assistant', text, timestamp: null }, - { - role: 'assistant', - text: `${' '.repeat(2048)}\n${' '.repeat(2048)}outside preview budget`, - timestamp: null - } - ] - : [] - ) - } - ) - it('stores the unwrapped user_query as firstUserPrompt under full capture', async () => { const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-grok-first-')) tempRoots.push(root) diff --git a/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.ts b/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.ts index e0d375a0ffc..f904cc2877d 100644 --- a/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.ts +++ b/src/main/ai-vault/scanners/grok/session-scanner-grok-parser.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { openTranscriptReadStream, wslGatedReadFile @@ -15,16 +18,17 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent, addSessionText } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent, addSessionText } from '../../parsing/session-scanner-messages' import { extractGrokFirstUserPromptText, stripGrokUserQueryEnvelope } from './session-scanner-grok-user-text' -import { asRecord } from '../../session-scanner-record-value' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' -import { numberValue } from '../../session-scanner-token-values' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' +import { numberValue } from '../../parsing/session-scanner-token-values' const GROK_PREVIEW_SCAN_LIMIT = 4096 diff --git a/src/main/ai-vault/scanners/hermes/session-scanner-hermes-parser.ts b/src/main/ai-vault/scanners/hermes/session-scanner-hermes-parser.ts index 05e437da29b..dbde0e4957e 100644 --- a/src/main/ai-vault/scanners/hermes/session-scanner-hermes-parser.ts +++ b/src/main/ai-vault/scanners/hermes/session-scanner-hermes-parser.ts @@ -9,12 +9,12 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' -import { arrayValue, extractString } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText } from '../../session-scanner-text-normalization' -import { numberValue } from '../../session-scanner-token-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { extractContentText } from '../../parsing/session-scanner-text-normalization' +import { numberValue } from '../../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/jcode/session-scanner-jcode-parser.ts b/src/main/ai-vault/scanners/jcode/session-scanner-jcode-parser.ts index b20e7cf988f..a1868042814 100644 --- a/src/main/ai-vault/scanners/jcode/session-scanner-jcode-parser.ts +++ b/src/main/ai-vault/scanners/jcode/session-scanner-jcode-parser.ts @@ -1,4 +1,4 @@ -import { waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { wslGatedReadFile } from '../../../native-chat/wsl-transcript-fs-access' import type { AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-vault-types' import type { ExecutionHostId } from '../../../../shared/execution-host' @@ -9,12 +9,15 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' -import { arrayValue, extractString } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText, normalizeTitleText } from '../../session-scanner-text-normalization' -import { numberValue } from '../../session-scanner-token-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { + extractContentText, + normalizeTitleText +} from '../../parsing/session-scanner-text-normalization' +import { numberValue } from '../../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.test.ts b/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.test.ts deleted file mode 100644 index 76e6a771463..00000000000 --- a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.test.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { mkdir, 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 { parseKimiSessionFile } from './session-scanner-kimi-parser' -import { clearKimiSessionIndexCache } from './session-scanner-kimi-paths' -import type { FileWithMtime } from '../../session-scanner-types' -import type { TranscriptMessage } from '../../transcripts/session-transcript-consumers' - -let tempDirs: string[] = [] - -afterEach(async () => { - await Promise.all(tempDirs.map((dir) => rm(dir, { recursive: true, force: true }))) - tempDirs = [] - clearKimiSessionIndexCache() -}) - -const SESSION_ID = 'session_4243babe-c33c-4ca3-8245-689c9e34ba3b' - -// Mirrors a real `agents/main/wire.jsonl` produced by Kimi Code 0.18.0. -const WIRE_LINES = [ - { type: 'metadata', protocol_version: '1.4', created_at: 1781853559132 }, - { type: 'config.update', profileName: 'agent', systemPrompt: 'You are Kimi Code CLI...' }, - { type: 'config.update', modelAlias: 'mock-model', thinkingLevel: 'high', time: 1781853559132 }, - { - type: 'turn.prompt', - input: [{ type: 'text', text: 'Please explain this project briefly' }], - origin: { kind: 'user' }, - time: 1781853559164 - }, - { - type: 'context.append_message', - message: { - role: 'user', - content: [{ type: 'text', text: 'Please explain this project briefly' }], - toolCalls: [], - origin: { kind: 'user' } - }, - time: 1781853559164 - }, - { - type: 'context.append_message', - message: { - role: 'user', - content: [ - { - type: 'text', - text: '\nAuto permission mode is active.\n' - } - ], - toolCalls: [], - origin: { kind: 'injection', variant: 'permission_mode' } - }, - time: 1781853559165 - }, - { - type: 'context.append_loop_event', - event: { type: 'step.begin', step: 1 }, - time: 1781853559165 - }, - { - type: 'context.append_loop_event', - event: { - type: 'content.part', - step: 1, - part: { type: 'text', text: 'Hello! This is a mock response. ' } - }, - time: 1781853559177 - }, - { - type: 'context.append_loop_event', - event: { type: 'step.end', step: 1, finishReason: 'end_turn' }, - time: 1781853559177 - }, - { - type: 'usage.record', - model: 'mock-model', - usage: { inputOther: 12, output: 18, inputCacheRead: 0, inputCacheCreation: 0 }, - usageScope: 'turn', - time: 1781853559177 - } -] - -async function writeKimiSession(args: { - sessionId?: string - state?: Record - workDir?: string | null - wireLines?: unknown[] | null -}): Promise<{ file: FileWithMtime }> { - const home = await mkdtemp(join(tmpdir(), 'orca-kimi-')) - tempDirs.push(home) - const sessionId = args.sessionId ?? SESSION_ID - const sessionDir = join(home, 'sessions', 'wd_kimi-test-proj_36fb0f9f4385', sessionId) - await mkdir(join(sessionDir, 'agents', 'main'), { recursive: true }) - - const statePath = join(sessionDir, 'state.json') - const state = args.state ?? { - createdAt: '2026-06-19T07:19:19.118Z', - updatedAt: '2026-06-19T07:19:19.161Z', - title: 'Please explain this project briefly', - isCustomTitle: false, - agents: { - main: { homedir: join(sessionDir, 'agents', 'main'), type: 'main', parentAgentId: null } - }, - custom: {}, - lastPrompt: 'Please explain this project briefly' - } - await writeFile(statePath, JSON.stringify(state)) - - if (args.workDir !== null) { - await writeFile( - join(home, 'session_index.jsonl'), - `${JSON.stringify({ sessionId, sessionDir, workDir: args.workDir ?? '/private/tmp/kimi-test-proj' })}\n` - ) - } - - if (args.wireLines !== null) { - await writeFile( - join(sessionDir, 'agents', 'main', 'wire.jsonl'), - (args.wireLines ?? WIRE_LINES).map((line) => JSON.stringify(line)).join('\n') - ) - } - - const mtimeMs = Date.now() - return { file: { path: statePath, mtimeMs, modifiedAt: new Date(mtimeMs).toISOString() } } -} - -describe('parseKimiSessionFile', () => { - it.each([300, 256 * 1024 + 1])( - 'publishes %i-character Kimi turns independently of the preview cap', - async (length) => { - const longReply = 'x'.repeat(length) - const messages: TranscriptMessage[] = [] - const { file } = await writeKimiSession({ - wireLines: [ - { - type: 'context.append_message', - message: { - role: 'user', - content: [{ type: 'text', text: 'y'.repeat(length) }], - origin: { kind: 'user' } - } - }, - { - type: 'context.append_loop_event', - event: { type: 'content.part', part: { type: 'text', text: longReply.slice(0, 150) } } - }, - { - type: 'context.append_loop_event', - event: { type: 'content.part', part: { type: 'text', text: longReply.slice(150) } } - }, - { type: 'context.append_loop_event', event: { type: 'step.end' } } - ] - }) - const session = await parseKimiSessionFile(file, 'darwin', { - active: true, - push: (message) => messages.push(message) - }) - const [userPreview, assistantPreview] = session!.previewMessages - // Preview length must use its own cap rather than the shorter title cap. - expect(userPreview.text.length).toBe(220) - expect(assistantPreview.text.length).toBe(220) - expect(assistantPreview.text.endsWith('...')).toBe(true) - expect(messages.map((message) => message.text)).toEqual([ - 'y'.repeat(Math.min(length, 256 * 1024)), - longReply.slice(0, 256 * 1024) - ]) - expect(messages.map((message) => message.textTruncated)).toEqual( - length > 256 * 1024 ? [true, true] : [undefined, undefined] - ) - } - ) -}) diff --git a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.ts b/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.ts index 3b9d3053664..bb2a2651929 100644 --- a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.ts +++ b/src/main/ai-vault/scanners/kimi/session-scanner-kimi-parser.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { openTranscriptReadStream, wslGatedReadFile @@ -10,8 +13,8 @@ import { createAccumulator, finalizeSession, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent, addSessionText } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent, addSessionText } from '../../parsing/session-scanner-messages' import { kimiPrimaryAgentWirePath, kimiSessionIdFromStatePath, @@ -20,10 +23,14 @@ import { } from './session-scanner-kimi-paths' import type { FileWithMtime, SessionAccumulator } from '../../session-scanner-types' import type { TranscriptMessageSink } from '../../transcripts/session-transcript-consumers' -import { asRecord } from '../../session-scanner-record-value' -import { extractContentText, normalizeTitleText } from '../../session-scanner-text-normalization' -import { extractString, parseJsonObject } from '../../session-scanner-values' -import { numberValue } from '../../session-scanner-token-values' +import { asRecord } from '../../parsing/session-record-fields' +import { + extractContentText, + normalizeTitleText +} from '../../parsing/session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { numberValue } from '../../parsing/session-scanner-token-values' // State supplies metadata, session_index supplies cwd, and the wire transcript supplies messages and usage. export async function parseKimiSessionFile( diff --git a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-paths.ts b/src/main/ai-vault/scanners/kimi/session-scanner-kimi-paths.ts index 44f8cabd5a7..224620d2d36 100644 --- a/src/main/ai-vault/scanners/kimi/session-scanner-kimi-paths.ts +++ b/src/main/ai-vault/scanners/kimi/session-scanner-kimi-paths.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { homedir } from 'node:os' import { basename, dirname, join } from 'node:path' import { createInterface } from 'node:readline' @@ -8,8 +11,8 @@ import { wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { asRecord } from '../../session-scanner-record-value' -import { extractString } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' import { KimiSessionIndexCache } from './session-scanner-kimi-index-cache' export function resolveKimiSessionsDir(override?: string): string { diff --git a/src/main/ai-vault/scanners/kiro/session-scanner-kiro-fixtures.ts b/src/main/ai-vault/scanners/kiro/session-scanner-kiro-fixtures.ts index 4cfb9992ad6..51969a10039 100644 --- a/src/main/ai-vault/scanners/kiro/session-scanner-kiro-fixtures.ts +++ b/src/main/ai-vault/scanners/kiro/session-scanner-kiro-fixtures.ts @@ -1,6 +1,9 @@ import { mkdir, writeFile } from 'node:fs/promises' import { join } from 'node:path' -import { type isolatedScanRoots, writeJsonlFile } from '../../session-scanner-test-fixtures' +import { + type isolatedScanRoots, + writeJsonlFile +} from '../../scanner-fixtures/session-scanner-test-fixtures' export const KIRO_FIXTURE_SESSION_ID = '0b5e1c2a-3d4f-4a5b-8c6d-7e8f9a0b1c2d' diff --git a/src/main/ai-vault/scanners/kiro/session-scanner-kiro-parser.ts b/src/main/ai-vault/scanners/kiro/session-scanner-kiro-parser.ts index 993ea6296ed..e5e13484052 100644 --- a/src/main/ai-vault/scanners/kiro/session-scanner-kiro-parser.ts +++ b/src/main/ai-vault/scanners/kiro/session-scanner-kiro-parser.ts @@ -1,4 +1,4 @@ -import { waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { basename } from 'node:path' import { wslGatedReadFile } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' @@ -9,15 +9,16 @@ import { createAccumulator, finalizeSession, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' -import { consumeCompleteJsonlLines } from '../../session-scanner-jsonl-reader' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' +import { consumeCompleteJsonlLines } from '../../parsing/session-scanner-jsonl-reader' import type { FileWithMtime, SessionAccumulator } from '../../session-scanner-types' import type { TranscriptMessageSink } from '../../transcripts/session-transcript-consumers' import type { SkippedTranscriptRecord } from '../../transcripts/session-transcript-record-budget' -import { arrayValue, extractString, parseJsonObject } from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/muse/session-scanner-muse-parser.ts b/src/main/ai-vault/scanners/muse/session-scanner-muse-parser.ts index 3ab7dfe9603..f5c09005016 100644 --- a/src/main/ai-vault/scanners/muse/session-scanner-muse-parser.ts +++ b/src/main/ai-vault/scanners/muse/session-scanner-muse-parser.ts @@ -1,4 +1,4 @@ -import { waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../../scan-lifecycle/ai-vault-scan-cancellation' import { wslGatedReadFile } from '../../../native-chat/wsl-transcript-fs-access' import type { AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-vault-types' import { unwrapMuseLogRecords } from '../../../../shared/muse-session-log' @@ -9,18 +9,15 @@ import { createAccumulator, finalizeSession, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent } from '../../parsing/session-scanner-messages' import { museSessionIdFromFilePath } from './session-scanner-muse-paths' -import { - arrayValue, - extractString, - parseJsonObject, - timestampMs -} from '../../session-scanner-values' -import { asRecord } from '../../session-scanner-record-value' -import { normalizeTitleText } from '../../session-scanner-text-normalization' -import { numberValue } from '../../session-scanner-token-values' +import { arrayValue, asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' +import { timestampMs } from '../../parsing/session-record-time' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' +import { numberValue } from '../../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/muse/session-scanner-muse.test.ts b/src/main/ai-vault/scanners/muse/session-scanner-muse.test.ts index b8dd6e8e739..b15df3b68aa 100644 --- a/src/main/ai-vault/scanners/muse/session-scanner-muse.test.ts +++ b/src/main/ai-vault/scanners/muse/session-scanner-muse.test.ts @@ -3,7 +3,10 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, writeMuseScannerFixture } from '../../session-scanner-test-fixtures' +import { + isolatedScanRoots, + writeMuseScannerFixture +} from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/omp/omp-session-root.ts b/src/main/ai-vault/scanners/omp/omp-session-root.ts index e5c5d7254d9..88e1d22d71f 100644 --- a/src/main/ai-vault/scanners/omp/omp-session-root.ts +++ b/src/main/ai-vault/scanners/omp/omp-session-root.ts @@ -1,7 +1,7 @@ import { existsSync, readdirSync } from 'node:fs' import { homedir } from 'node:os' import { join, normalize, parse, resolve, win32 } from 'node:path' -import { normalizeAgentSessionsDir } from '../../session-scanner-values' +import { normalizeAgentSessionsDir } from '../../discovery/agent-session-directories' import { normalizedOmpProfile } from '../../../../shared/omp-profile' function safeRoot(value: string): string { diff --git a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-listing.ts b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-listing.ts index 05e628c6001..8e6341d5d20 100644 --- a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-listing.ts +++ b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-listing.ts @@ -6,8 +6,8 @@ import type { } from '../../../../shared/ai-vault/contracts/ai-vault-types' import { wslGatedReaddir, wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { recordSessionScanIssue, scanIssueTextFromError } from '../../session-scan-issues' -import { sessionIdFromFileName, sessionSortTime } from '../../session-scanner-accumulator' +import { recordSessionScanIssue, scanIssueTextFromError } from '../../parsing/session-scan-issues' +import { sessionIdFromFileName, sessionSortTime } from '../../parsing/session-scanner-accumulator' import { parseMessageGraphSessionFile } from '../session-scanner-graph-parsers' import { isOmpSubagentTranscriptFileName, diff --git a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-prune.test.ts b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-prune.test.ts index d69dde9c35b..29acfebbc8c 100644 --- a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-prune.test.ts +++ b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-prune.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' const SESSION_STEM = '2026-05-01T10-00-00-000Z_cccccccc-dddd-4eee-8fff-000000000000' const SESSION_ID = 'cccccccc-dddd-4eee-8fff-000000000000' diff --git a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-transcripts.ts b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-transcripts.ts index 69a39a9dc7b..eb88e796fff 100644 --- a/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-transcripts.ts +++ b/src/main/ai-vault/scanners/omp/session-scanner-omp-subagent-transcripts.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { wslGatedReaddir } from '../../../native-chat/wsl-transcript-fs-access' import { basename, dirname, extname, join } from 'node:path' import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host' diff --git a/src/main/ai-vault/scanners/omp/session-scanner-omp-title.ts b/src/main/ai-vault/scanners/omp/session-scanner-omp-title.ts index 32e9506297a..9428db09669 100644 --- a/src/main/ai-vault/scanners/omp/session-scanner-omp-title.ts +++ b/src/main/ai-vault/scanners/omp/session-scanner-omp-title.ts @@ -1,5 +1,6 @@ -import { extractString, timestampMs } from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' +import { extractString } from '../../../../shared/trimmed-string' +import { timestampMs } from '../../parsing/session-record-time' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' export type OmpTranscriptTitle = { title: string diff --git a/src/main/ai-vault/scanners/omp/session-scanner-omp-written-record.ts b/src/main/ai-vault/scanners/omp/session-scanner-omp-written-record.ts index 79f5ab05ce7..4e5ff341839 100644 --- a/src/main/ai-vault/scanners/omp/session-scanner-omp-written-record.ts +++ b/src/main/ai-vault/scanners/omp/session-scanner-omp-written-record.ts @@ -1,5 +1,5 @@ -import { asRecord } from '../../session-scanner-record-value' -import { extractString } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' // OMP inherits PI_CODING_AGENT_DIR, so Pi's folder can hold OMP transcripts; Pi never writes these. export function isOmpWrittenRecord(record: Record): boolean { diff --git a/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.test.ts b/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.test.ts index 2a69251e397..037a458f577 100644 --- a/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.test.ts +++ b/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.test.ts @@ -2,8 +2,8 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join, relative } from 'node:path' import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import { AI_VAULT_AGENT_SOURCES } from '../../session-scanner-agent-sources' -import { walkSessionFiles } from '../../session-scanner-discovery' +import { AI_VAULT_AGENT_SOURCES } from '../../discovery/session-scanner-agent-sources' +import { walkSessionFiles } from '../../discovery/session-scanner-discovery' // The layout reported in #11394: canonical sessions beside an embedded Codex home. const CANONICAL = ['main', 'sessions', 'canonical.jsonl'] diff --git a/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.ts b/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.ts index 42a64e1541c..bdd515a85ae 100644 --- a/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.ts +++ b/src/main/ai-vault/scanners/openclaw/openclaw-session-layout.ts @@ -1,8 +1,8 @@ import { homedir } from 'node:os' import { basename, join } from 'node:path' import { resolveAbsoluteDirOverride } from '../../../../shared/absolute-dir-override' -import type { AiVaultAgentSource } from '../../session-scanner-agent-sources' -import { pathSegments } from '../../session-file-discovery' +import type { AiVaultAgentSource } from '../../discovery/session-scanner-agent-sources' +import { pathSegments } from '../../discovery/session-file-discovery' /** At depth 1, enter only agent sessions directories, excluding embedded tools' histories (#11394). */ export function openClawSessionDirectoryPredicate(name: string, depth: number): boolean { diff --git a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-dispatch.ts b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-dispatch.ts index b8a714719ad..717a9b1a2b2 100644 --- a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-dispatch.ts +++ b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-dispatch.ts @@ -18,7 +18,7 @@ import type { OpenCodeSqliteWorkerResponse } from './session-scanner-opencode-sqlite-worker-protocol' -import { withFullFirstUserPromptCapture } from '../../../session-scanner-first-user-prompt-capture' +import { withFullFirstUserPromptCapture } from '../../../prompts/session-scanner-first-user-prompt-capture' export async function handleOpenCodeSqliteRequest( request: OpenCodeSqliteWorkerRequest diff --git a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-client.ts b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-client.ts index 2846376f960..57a5f879fc5 100644 --- a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-client.ts +++ b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-client.ts @@ -16,7 +16,7 @@ import type { } from './session-scanner-opencode-sqlite-worker-protocol' import { parseOpenCodeSqliteCaptureValue } from './session-scanner-opencode-sqlite-worker-response' import type { SessionFileCandidate } from '../../../session-scanner-types' -import { errorMessage } from '../../../session-scanner-values' +import { errorMessage } from '../../../../../shared/error-message' import { runOpenCodeSqliteScanRequest } from '../sqlite/session-scanner-opencode-sqlite-scan-scope' // Adapt OpenCode reads to the shared worker queue and lazy host; spawning is wired in worker-spawn. diff --git a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-response.ts b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-response.ts index 0ed62af6016..f7f11c92470 100644 --- a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-response.ts +++ b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-response.ts @@ -1,5 +1,5 @@ import type { AiVaultSession } from '../../../../../shared/ai-vault/contracts/ai-vault-types' -import { asRecord } from '../../../session-scanner-record-value' +import { asRecord } from '../../../parsing/session-record-fields' import type { OpenCodeSqliteCaptureValue } from './session-scanner-opencode-sqlite-worker-protocol' import type { TranscriptMessage } from '../../../transcripts/session-transcript-consumers' diff --git a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn.ts b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn.ts index 5ecd1bd39b5..5a5a6a4e68f 100644 --- a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn.ts +++ b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn.ts @@ -1,5 +1,8 @@ import { aiVaultScopePathsForWslDistro } from '../../../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' -import { recordSessionScanIssue, scanIssueTextFromError } from '../../../session-scan-issues' +import { + recordSessionScanIssue, + scanIssueTextFromError +} from '../../../parsing/session-scan-issues' import { existsSync } from 'node:fs' import type { Worker } from 'node:worker_threads' import { spawnWorkerThread } from '../../../../worker-threads/worker-thread-spawn' @@ -20,7 +23,10 @@ import { } from './session-scanner-opencode-wsl-client' import { findForeignSqliteReaderEntry } from '../../../../foreign-sqlite-readers/foreign-sqlite-reader-entry-path' import { runOpenCodeSqliteScanRequest } from '../sqlite/session-scanner-opencode-sqlite-scan-scope' -import { noteAiVaultScanDatabases, openAiVaultScanSource } from '../../../ai-vault-scan-progress' +import { + noteAiVaultScanDatabases, + openAiVaultScanSource +} from '../../../scan-lifecycle/ai-vault-scan-progress' export function resolveOpenCodeSqliteWorkerEntryPath( runtimeDir = __dirname, diff --git a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-wsl-client.ts b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-wsl-client.ts index 3509c49ce59..0e9a68c1ef7 100644 --- a/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-wsl-client.ts +++ b/src/main/ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-wsl-client.ts @@ -13,7 +13,7 @@ import { createOpenCodeSqliteProcessClient } from './session-scanner-opencode-sq import type { OpenCodeSqliteWorkerClient } from './session-scanner-opencode-sqlite-worker-client' import type { OpenCodeWslRuntime } from './session-scanner-opencode-wsl-runtime' import { buildRelayAiVaultServiceEnv } from '../../../scan-service/session-scanner-service-env' -import { AiVaultScanIssueError } from '../../../session-scan-issues' +import { AiVaultScanIssueError } from '../../../parsing/session-scan-issues' import { AI_VAULT_SCAN_ISSUE_COPY, aiVaultScanIssueText diff --git a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-cancellation.test.ts b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-cancellation.test.ts index f05f3061074..6f2493da3c3 100644 --- a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-cancellation.test.ts +++ b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-cancellation.test.ts @@ -5,7 +5,7 @@ import { join } from 'node:path' import type * as workerSpawn from './reader-transport/session-scanner-opencode-sqlite-worker-spawn' import type { SessionFileDiscovery } from '../../session-scanner-types' import type { TranscriptReadOutcome } from '../../transcripts/session-transcript-consumers' -import { createAccumulator, finalizeSession } from '../../session-scanner-accumulator' +import { createAccumulator, finalizeSession } from '../../parsing/session-scanner-accumulator' const readers = vi.hoisted(() => ({ parse: vi.fn(), @@ -18,7 +18,7 @@ vi.mock('./reader-transport/session-scanner-opencode-sqlite-worker-spawn', () => captureOpenCodeSqliteSessionViaWorker: readers.capture, captureOpenCode2SqliteSessionViaWorker: readers.capture })) -vi.mock('../../session-scanner-source-discovery', () => ({ +vi.mock('../../discovery/session-scanner-source-discovery', () => ({ discoverAiVaultSessionSources: readers.discover })) import { scanAiVaultSessions } from '../../session-scanner' @@ -147,41 +147,6 @@ describe.each(['opencode', 'opencode2'] as const)('%s scan cancellation', (agent expect(outcomes.at(-1)?.incomplete).toBe(false) }) - it.each(['parse', 'capture'] as const)( - 'cancels an active %s and retries the uncached read', - async (mode) => { - const session = configure(agent) - const outcomes: TranscriptReadOutcome[] = [] - if (mode === 'capture') { - registerTranscriptConsumer({ - beginRead: () => ({ message() {}, finish: (outcome) => outcomes.push(outcome) }) - }) - readers.capture.mockImplementationOnce(({ signal }) => untilAborted(signal)) - } else { - readers.parse.mockImplementationOnce(({ signal }) => untilAborted(signal)) - } - const controller = new AbortController() - const pending = scanAiVaultSessions({ platform: 'linux', signal: controller.signal }) - const rejected = expect(pending).rejects.toMatchObject({ name: 'AbortError' }) - await vi.waitFor(() => expect(readers[mode]).toHaveBeenCalledOnce()) - controller.abort(new Error('Cancelled SQLite scan')) - await rejected - if (mode === 'capture') { - expect(outcomes).toEqual([ - { session: null, byteOffset: 0, incomplete: true, cancelled: true } - ]) - } - readers.parse.mockResolvedValue(session) - readers.capture.mockResolvedValue({ session, messages }) - const retried = await scanAiVaultSessions({ platform: 'linux' }) - expect(readers[mode]).toHaveBeenCalledTimes(2) - expect(retried.sessions).toHaveLength(1) - if (mode === 'capture') { - expect(outcomes.at(-1)?.incomplete).toBe(false) - } - } - ) - it('marks a partially delivered capture incomplete and never caches it', async () => { const session = configure(agent) const controller = new AbortController() diff --git a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.test.ts b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.test.ts index dece6746565..34d1f0a78a2 100644 --- a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.test.ts +++ b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.test.ts @@ -6,8 +6,8 @@ import { consumeOpenCodeMessages, parseOpenCodeSessionFile } from './session-scanner-opencode-parser' -import { createAccumulator } from '../../session-scanner-accumulator' -import { withFullFirstUserPromptCapture } from '../../session-scanner-first-user-prompt-capture' +import { createAccumulator } from '../../parsing/session-scanner-accumulator' +import { withFullFirstUserPromptCapture } from '../../prompts/session-scanner-first-user-prompt-capture' import type { TranscriptMessage } from '../../transcripts/session-transcript-consumers' let tempDirs: string[] = [] @@ -69,37 +69,6 @@ describe('parseOpenCodeSessionFile', () => { } ) - it.each([5000, 256 * 1024 + 1])( - 'publishes %i-character legacy OpenCode content before preview limits', - async (length) => { - const storageRoot = await mkdtemp(join(tmpdir(), 'orca-opencode-transcript-')) - tempDirs.push(storageRoot) - const sessionDir = join(storageRoot, 'session', 'project') - const messageDir = join(storageRoot, 'message', 'ses_transcript') - await mkdir(sessionDir, { recursive: true }) - await mkdir(messageDir, { recursive: true }) - const path = join(sessionDir, 'ses_transcript.json') - await writeFile(path, JSON.stringify({ id: 'ses_transcript' })) - const text = 'x'.repeat(length) - await writeFile(join(messageDir, 'msg_1.json'), userMessage(text, 1_777_634_000_000)) - const messages: TranscriptMessage[] = [] - const session = await parseOpenCodeSessionFile( - { path, mtimeMs: 1, modifiedAt: '2026-05-01T00:00:00.000Z' }, - 'linux', - { active: true, push: (message) => messages.push(message) } - ) - expect(messages).toEqual([ - { - role: 'user', - text: text.slice(0, 256 * 1024), - timestamp: '2026-05-01T11:13:20.000Z', - ...(length > 256 * 1024 ? { textTruncated: true } : {}) - } - ]) - expect(session?.previewMessages[0]?.text).toHaveLength(220) - } - ) - it('skips a corrupt message file instead of discarding the whole session', async () => { const storageRoot = await mkdtemp(join(tmpdir(), 'orca-opencode-parser-')) tempDirs.push(storageRoot) diff --git a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts index 30acc251a8c..9068302f9c6 100644 --- a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts +++ b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-parser.ts @@ -1,7 +1,10 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../../scan-lifecycle/ai-vault-scan-cancellation' import { wslGatedReaddir, wslGatedReadFile } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' -import { join } from 'node:path' +import { basename, dirname, join } from 'node:path' import type { AiVaultSession } from '../../../../shared/ai-vault/contracts/ai-vault-types' import type { FileWithMtime, SessionAccumulator } from '../../session-scanner-types' import type { TranscriptMessageSink } from '../../transcripts/session-transcript-consumers' @@ -10,17 +13,13 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../../session-scanner-accumulator' -import { addSessionContent, addPreviewMessage } from '../../session-scanner-messages' -import { asRecord } from '../../session-scanner-record-value' -import { - extractString, - findOpenCodeStorageRoot, - timeObjectValue, - timestampMs -} from '../../session-scanner-values' -import { normalizeTitleText } from '../../session-scanner-text-normalization' -import { tokenTotal } from '../../session-scanner-token-values' +} from '../../parsing/session-scanner-accumulator' +import { addSessionContent, addPreviewMessage } from '../../parsing/session-scanner-messages' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { timeObjectValue, timestampMs } from '../../parsing/session-record-time' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' +import { tokenTotal } from '../../parsing/session-scanner-token-values' /** Scope discovery reads cwd without opening message files. */ export function openCodeSessionCwd(record: Record): string | null { @@ -142,3 +141,12 @@ export async function consumeOpenCodeMessages( } } } + +function findOpenCodeStorageRoot(filePath: string): string | null { + const sessionDir = dirname(filePath) + const sessionRoot = dirname(sessionDir) + if (basename(sessionRoot) !== 'session') { + return null + } + return dirname(sessionRoot) +} diff --git a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-sources.ts b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-sources.ts index c606675088f..7a6401d4605 100644 --- a/src/main/ai-vault/scanners/opencode/session-scanner-opencode-sources.ts +++ b/src/main/ai-vault/scanners/opencode/session-scanner-opencode-sources.ts @@ -6,12 +6,12 @@ import { listOpenCodeDatabases, listOpenCodeDatabasesInDirectory } from '../../../opencode-usage/opencode-database-discovery' -import { recordSessionScanIssue, scanIssueTextFromError } from '../../session-scan-issues' +import { recordSessionScanIssue, scanIssueTextFromError } from '../../parsing/session-scan-issues' import { discoverOpenCodeSessions } from './sqlite/session-scanner-opencode-sqlite-discovery' import { listOpenCode2SqliteSessionsViaWorker } from './reader-transport/session-scanner-opencode-sqlite-worker-spawn' import { isOpenCodeV2DatabaseName } from '../../../../shared/opencode-database-name' import type { AiVaultScanOptions, SessionFileDiscovery } from '../../session-scanner-types' -import { scopeWalksAgentFiles } from '../../session-scope-cwd' +import { scopeWalksAgentFiles } from '../../scope/session-scope-cwd' type OpenCodeSource = { storageDir: string diff --git a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-capture.ts b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-capture.ts index 037bd8cfbe6..6c7da3cc21b 100644 --- a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-capture.ts +++ b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-capture.ts @@ -3,8 +3,8 @@ import { OPENCODE_CAPTURE_TEXT_LIMIT } from './opencode-transcript-capture-limits' import type { AiVaultSession } from '../../../../../shared/ai-vault/contracts/ai-vault-types' -import { timestampIso } from '../../../session-scanner-accumulator' -import { asRecord } from '../../../session-scanner-record-value' +import { timestampIso } from '../../../parsing/session-scanner-accumulator' +import { asRecord } from '../../../parsing/session-record-fields' import { extractPartText, readOpenCodeSqliteSession } from './session-scanner-opencode-sqlite' import { readOpenCodeDatabase } from './session-scanner-opencode-sqlite-open' import { canReadOpenCodeMessageParts } from './session-scanner-opencode-sqlite-schema' diff --git a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-discovery.ts b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-discovery.ts index 17315d3498c..b9c2bd073f0 100644 --- a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-discovery.ts +++ b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-discovery.ts @@ -1,10 +1,10 @@ import { basename, extname, join } from 'node:path' import type { AiVaultScanIssue } from '../../../../../shared/ai-vault/contracts/ai-vault-types' -import { discoverFiles } from '../../../session-scanner-discovery' +import { discoverFiles } from '../../../discovery/session-scanner-discovery' import { splitOpenCodeSqliteCandidate } from '../../../../../shared/opencode-sqlite-session-path' import { listOpenCodeSqliteSessionsViaWorker } from '../reader-transport/session-scanner-opencode-sqlite-worker-spawn' import type { FileWithMtime, SessionFileDiscovery } from '../../../session-scanner-types' -import { scopeWalksAgentFiles } from '../../../session-scope-cwd' +import { scopeWalksAgentFiles } from '../../../scope/session-scope-cwd' function sessionIdFromLegacyFilePath(filePath: string): string { return basename(filePath, extname(filePath)) diff --git a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-open.ts b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-open.ts index 31ede5f7731..d36965af3c4 100644 --- a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-open.ts +++ b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-open.ts @@ -7,7 +7,7 @@ import { } from '../../../../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' import SyncDatabase from '../../../../sqlite/sync-database' import { classifySqliteReadFailure } from '../../../../sqlite/sqlite-read-failure' -import { errorMessage } from '../../../session-scanner-values' +import { errorMessage } from '../../../../../shared/error-message' // Allow bounded contention waits for native reads without adding retries atop SQLite’s busy handler (#15036). const OPENCODE_SQLITE_BUSY_TIMEOUT_MS = 1_500 diff --git a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.test.ts b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.test.ts index b37e3708b86..6448aae957c 100644 --- a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.test.ts +++ b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.test.ts @@ -7,7 +7,7 @@ import { buildOpenCodeSqliteCandidatePath } from '../../../../../shared/opencode import { listOpenCodeSqliteSessions } from './session-scanner-opencode-sqlite-list' import { parseOpenCodeSqliteSession } from './session-scanner-opencode-sqlite' import { captureOpenCodeSqliteSession } from './session-scanner-opencode-sqlite-capture' -import { withFullFirstUserPromptCapture } from '../../../session-scanner-first-user-prompt-capture' +import { withFullFirstUserPromptCapture } from '../../../prompts/session-scanner-first-user-prompt-capture' import type { AiVaultScanIssue } from '../../../../../shared/ai-vault/contracts/ai-vault-types' let tempDirs: string[] = [] diff --git a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.ts b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.ts index 3df3139ec9e..1d6edd3dcd8 100644 --- a/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.ts +++ b/src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.ts @@ -6,19 +6,19 @@ import { createAccumulator, finalizeSession, updateTimeline -} from '../../../session-scanner-accumulator' -import { addPreviewMessage } from '../../../session-scanner-messages' +} from '../../../parsing/session-scanner-accumulator' +import { addPreviewMessage } from '../../../parsing/session-scanner-messages' import { normalizeFullFirstUserPromptText, shouldCaptureFullFirstUserPrompt -} from '../../../session-scanner-first-user-prompt' +} from '../../../prompts/session-scanner-first-user-prompt' import { readOpenCodeDatabase } from './session-scanner-opencode-sqlite-open' import { readPartDataRow, readSessionRow } from './session-scanner-opencode-sqlite-rows' import { canCountOpenCodeMessages, canReadOpenCodeMessageParts } from './session-scanner-opencode-sqlite-schema' -import { normalizeTitleText } from '../../../session-scanner-text-normalization' +import { normalizeTitleText } from '../../../parsing/session-scanner-text-normalization' import { zcodeVisibleMessageFilter } from '../../zcode/session-scanner-zcode-visibility' import { zcodeTranscriptOrder } from '../../zcode/session-scanner-zcode-order' import type SyncDatabase from '../../../../sqlite/sync-database' diff --git a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-message.ts b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-message.ts index 5f9eec27159..125ce6e8a0c 100644 --- a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-message.ts +++ b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-message.ts @@ -1,6 +1,6 @@ import type { AiVaultSessionPreviewMessage } from '../../../../shared/ai-vault/contracts/ai-vault-types' -import { asRecord } from '../../session-scanner-record-value' -import { parseJsonObject } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { parseJsonObject } from '../../parsing/session-json-object' import { decodeSessionMessage, type SessionMessageDecodeOptions diff --git a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts index c97bc696053..4219c2edb3c 100644 --- a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts +++ b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts @@ -4,7 +4,7 @@ import { splitOpenCodeSqliteCandidate } from '../../../../shared/opencode-sqlite-session-path' import type { SessionFileCandidate } from '../../session-scanner-types' -import { errorMessage } from '../../session-scanner-values' +import { errorMessage } from '../../../../shared/error-message' import SyncDatabase from '../../../sqlite/sync-database' import { columnExists, tableExists } from '../../../opencode-usage/schema-helpers' import { scopedSessionRows } from '../session-scanner-sqlite-scope-rows' diff --git a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts index d0033162ad9..0d30c54eeae 100644 --- a/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts +++ b/src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts @@ -11,14 +11,14 @@ import { finalizeSession, updateTimeline, timestampIso -} from '../../session-scanner-accumulator' -import { addDecodedSessionMessage } from '../../session-scanner-messages' +} from '../../parsing/session-scanner-accumulator' +import { addDecodedSessionMessage } from '../../parsing/session-scanner-messages' import { normalizeFullFirstUserPromptText, shouldCaptureFullFirstUserPrompt -} from '../../session-scanner-first-user-prompt' -import { normalizeTitleText } from '../../session-scanner-text-normalization' -import { asRecord } from '../../session-scanner-record-value' +} from '../../prompts/session-scanner-first-user-prompt' +import { normalizeTitleText } from '../../parsing/session-scanner-text-normalization' +import { asRecord } from '../../parsing/session-record-fields' import { extractOpenCode2MessageText, decodeOpenCode2Message, diff --git a/src/main/ai-vault/scanners/pi/session-scanner-pi-omp-shared-root.test.ts b/src/main/ai-vault/scanners/pi/session-scanner-pi-omp-shared-root.test.ts index 6ee20e13d50..9d3461aa849 100644 --- a/src/main/ai-vault/scanners/pi/session-scanner-pi-omp-shared-root.test.ts +++ b/src/main/ai-vault/scanners/pi/session-scanner-pi-omp-shared-root.test.ts @@ -3,7 +3,10 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { isolatedScanRoots, writeJsonlFile } from '../../session-scanner-test-fixtures' +import { + isolatedScanRoots, + writeJsonlFile +} from '../../scanner-fixtures/session-scanner-test-fixtures' const OMP_STEM = '2026-05-01T10-00-00-000Z_0199a000-0000-7000-8000-000000000002' const runtime = { version: '18.12.2' } diff --git a/src/main/ai-vault/scanners/pi/session-scanner-pi-scope.test.ts b/src/main/ai-vault/scanners/pi/session-scanner-pi-scope.test.ts index 5008ee09a6b..03d036af9de 100644 --- a/src/main/ai-vault/scanners/pi/session-scanner-pi-scope.test.ts +++ b/src/main/ai-vault/scanners/pi/session-scanner-pi-scope.test.ts @@ -3,8 +3,8 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' import { scanAiVaultSessions } from '../../session-scanner' -import { resetProjectDirCwdCacheForTests } from '../../session-scanner-scope-discovery' -import { isolatedScanRoots, jsonLines } from '../../session-scanner-test-fixtures' +import { resetProjectDirCwdCacheForTests } from '../../scope/session-scanner-scope-discovery' +import { isolatedScanRoots, jsonLines } from '../../scanner-fixtures/session-scanner-test-fixtures' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/scanners/qoder/session-scanner-qoder-parser.ts b/src/main/ai-vault/scanners/qoder/session-scanner-qoder-parser.ts index abc0105135c..a0245b3759a 100644 --- a/src/main/ai-vault/scanners/qoder/session-scanner-qoder-parser.ts +++ b/src/main/ai-vault/scanners/qoder/session-scanner-qoder-parser.ts @@ -1,7 +1,10 @@ import { createInterface } from 'node:readline' import type { ExecutionHostId } from '../../../../shared/execution-host' import { openTranscriptReadStream } from '../../../native-chat/wsl-transcript-fs-access' -import { accumulatorSessionIdentity, updateTimeline } from '../../session-scanner-accumulator' +import { + accumulatorSessionIdentity, + updateTimeline +} from '../../parsing/session-scanner-accumulator' import { cloneClaudeSessionParseState, consumeClaudeSessionRecord, @@ -9,8 +12,9 @@ import { finalizeClaudeSessionParseState, type ClaudeSessionParseState } from '../claude/session-scanner-primary-parsers' -import { asRecord } from '../../session-scanner-record-value' -import { extractString, parseJsonObject } from '../../session-scanner-values' +import { asRecord } from '../../parsing/session-record-fields' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../parsing/session-json-object' import { remoteSessionContentLines, type RemoteSessionContent diff --git a/src/main/ai-vault/scanners/session-scanner-graph-parsers.test.ts b/src/main/ai-vault/scanners/session-scanner-graph-parsers.test.ts deleted file mode 100644 index 0e74f1482cc..00000000000 --- a/src/main/ai-vault/scanners/session-scanner-graph-parsers.test.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { createAccumulator } from '../session-scanner-accumulator' -import { consumeRovoHistoryEntry } from './session-scanner-graph-parsers' -import type { TranscriptMessage } from '../transcripts/session-transcript-consumers' - -function rovoAccumulator(messages?: TranscriptMessage[]) { - return createAccumulator({ - agent: 'rovo', - sessionId: 'rovo-test', - file: { path: '/tmp/rovo/metadata.json', mtimeMs: 1, modifiedAt: '2026-05-01T00:00:00.000Z' }, - ...(messages - ? { messages: { active: true, push: (message: TranscriptMessage) => messages.push(message) } } - : {}) - }) -} - -describe('AI Vault graph session parsers', () => { - it.each([300, 256 * 1024 + 1])( - 'publishes %i-character Rovo history text while retaining its bounded preview', - (length) => { - const messages: TranscriptMessage[] = [] - const accumulator = rovoAccumulator(messages) - const text = 'x'.repeat(length) - consumeRovoHistoryEntry(accumulator, { - role: 'user', - parts: [ - { part_kind: 'tool-output', content: 'ignored' }, - { part_kind: 'user-prompt', content: text }, - { part_kind: 'text', text: 'tail' } - ] - }) - expect(messages).toEqual([ - { - role: 'user', - text: `${text}\ntail`.slice(0, 256 * 1024), - timestamp: null, - ...(length > 256 * 1024 ? { textTruncated: true } : {}) - } - ]) - expect(accumulator.previewMessages[0]?.text).toHaveLength(220) - } - ) -}) diff --git a/src/main/ai-vault/scanners/session-scanner-graph-parsers.ts b/src/main/ai-vault/scanners/session-scanner-graph-parsers.ts index f2d1d81bd5e..3a781b834ca 100644 --- a/src/main/ai-vault/scanners/session-scanner-graph-parsers.ts +++ b/src/main/ai-vault/scanners/session-scanner-graph-parsers.ts @@ -1,4 +1,4 @@ -import { waitForAiVaultScan } from '../ai-vault-scan-cancellation' +import { waitForAiVaultScan } from '../scan-lifecycle/ai-vault-scan-cancellation' import { rovoSessionCwd, rovoRoleFromKind } from './session-scanner-rovo-metadata' export { rovoSessionCwd, rovoRoleFromKind } from './session-scanner-rovo-metadata' import { foldOmpTranscriptTitle, type OmpTranscriptTitle } from './omp/session-scanner-omp-title' @@ -30,18 +30,17 @@ import { finalizeSession, sessionIdFromFileName, updateTimeline -} from '../session-scanner-accumulator' -import { addSessionContent } from '../session-scanner-messages' +} from '../parsing/session-scanner-accumulator' +import { addSessionContent } from '../parsing/session-scanner-messages' +import { arrayValue, firstString, asRecord } from '../parsing/session-record-fields' +import { extractString } from '../../../shared/trimmed-string' +import { parseJsonObject } from '../parsing/session-json-object' +import { readJsonObjectIfExists } from '../discovery/session-json-file' import { - arrayValue, - extractString, - firstString, - parseJsonObject, - readJsonObjectIfExists -} from '../session-scanner-values' -import { asRecord } from '../session-scanner-record-value' -import { extractContentText, extractMessageText } from '../session-scanner-text-normalization' -import { tokenTotal } from '../session-scanner-token-values' + extractContentText, + extractMessageText +} from '../parsing/session-scanner-text-normalization' +import { tokenTotal } from '../parsing/session-scanner-token-values' type ParserSessionOptions = { executionHostId?: ExecutionHostId diff --git a/src/main/ai-vault/scanners/session-scanner-rovo-metadata.ts b/src/main/ai-vault/scanners/session-scanner-rovo-metadata.ts index 679f69ea2ec..79055203104 100644 --- a/src/main/ai-vault/scanners/session-scanner-rovo-metadata.ts +++ b/src/main/ai-vault/scanners/session-scanner-rovo-metadata.ts @@ -1,4 +1,4 @@ -import { firstString } from '../session-scanner-values' +import { firstString } from '../parsing/session-record-fields' /** Scope discovery reads cwd from metadata without opening the context file. */ export function rovoSessionCwd(metadata: Record): string | null { diff --git a/src/main/ai-vault/scanners/zcode/session-scanner-zcode-sources.ts b/src/main/ai-vault/scanners/zcode/session-scanner-zcode-sources.ts index fed519c2513..ee7d615a4f7 100644 --- a/src/main/ai-vault/scanners/zcode/session-scanner-zcode-sources.ts +++ b/src/main/ai-vault/scanners/zcode/session-scanner-zcode-sources.ts @@ -4,9 +4,9 @@ import type { AiVaultScanIssue } from '../../../../shared/ai-vault/contracts/ai- import { throwIfSignalAborted } from '../../../../shared/abort-signal-reason' import { wslGatedAccess } from '../../../native-chat/wsl-transcript-fs-access' import { listZcodeSqliteSessionsViaWorker } from '../opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' -import { scanIssueTextFromError } from '../../session-scan-issues' +import { scanIssueTextFromError } from '../../parsing/session-scan-issues' import type { AiVaultScanOptions, SessionFileDiscovery } from '../../session-scanner-types' -import { scopeWalksAgentFiles } from '../../session-scope-cwd' +import { scopeWalksAgentFiles } from '../../scope/session-scope-cwd' // Keep ZCode discovery separate so OpenCode cannot absorb its database rows. export function zcodeDiscoveries( diff --git a/src/main/ai-vault/session-cwd-bucket-layouts.test.ts b/src/main/ai-vault/scope/session-cwd-bucket-layouts.test.ts similarity index 100% rename from src/main/ai-vault/session-cwd-bucket-layouts.test.ts rename to src/main/ai-vault/scope/session-cwd-bucket-layouts.test.ts diff --git a/src/main/ai-vault/session-cwd-bucket-layouts.ts b/src/main/ai-vault/scope/session-cwd-bucket-layouts.ts similarity index 94% rename from src/main/ai-vault/session-cwd-bucket-layouts.ts rename to src/main/ai-vault/scope/session-cwd-bucket-layouts.ts index 2579edf2175..62fb9cea304 100644 --- a/src/main/ai-vault/session-cwd-bucket-layouts.ts +++ b/src/main/ai-vault/scope/session-cwd-bucket-layouts.ts @@ -1,9 +1,9 @@ import { basename, join } from 'node:path' -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' import { claudeProjectBucketScopePrefixes, isClaudeProjectBucketInScope -} from './scanners/claude/claude-project-dir-encoding' +} from '../scanners/claude/claude-project-dir-encoding' export type CwdBucketLayout = { agent: Extract diff --git a/src/main/ai-vault/session-scanner-scope-discovery.ts b/src/main/ai-vault/scope/session-scanner-scope-discovery.ts similarity index 90% rename from src/main/ai-vault/session-scanner-scope-discovery.ts rename to src/main/ai-vault/scope/session-scanner-scope-discovery.ts index 719b9428ddb..b07dbab1aac 100644 --- a/src/main/ai-vault/session-scanner-scope-discovery.ts +++ b/src/main/ai-vault/scope/session-scanner-scope-discovery.ts @@ -4,18 +4,22 @@ import { openTranscriptReadStream, wslGatedReaddir, wslGatedStat -} from '../native-chat/wsl-transcript-fs-access' -import type { createAiVaultScopeCwdMatcher } from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' +} from '../../native-chat/wsl-transcript-fs-access' +import type { createAiVaultScopeCwdMatcher } from '../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' import type { CwdBucketLayout } from './session-cwd-bucket-layouts' -import type { AiVaultAgent, AiVaultScanIssue } from '../../shared/ai-vault/contracts/ai-vault-types' -import { parseWslUncPath, toWindowsWslUncPathSpellings } from '../../shared/wsl-paths' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' -import { yieldToEventLoop } from '../../shared/event-loop-yield' -import type { FileWithMtime } from './session-scanner-types' -import { extractString, parseJsonObject } from './session-scanner-values' -import { scanIssueTextFromError } from './session-scan-issues' -import { isMissingTranscriptPathError } from './session-scanner-discovery' -import { noteAiVaultScanFileFound } from './ai-vault-scan-progress' +import type { + AiVaultAgent, + AiVaultScanIssue +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import { parseWslUncPath, toWindowsWslUncPathSpellings } from '../../../shared/wsl-paths' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' +import { yieldToEventLoop } from '../../../shared/event-loop-yield' +import type { FileWithMtime } from '../session-scanner-types' +import { extractString } from '../../../shared/trimmed-string' +import { parseJsonObject } from '../parsing/session-json-object' +import { scanIssueTextFromError } from '../parsing/session-scan-issues' +import { isMissingTranscriptPathError } from '../discovery/session-path-absence' +import { noteAiVaultScanFileFound } from '../scan-lifecycle/ai-vault-scan-progress' // Limit representative probing when a bucket contains transcripts without cwd records. const REPRESENTATIVE_CWD_LINE_LIMIT = 200 diff --git a/src/main/ai-vault/session-scanner-scope-inventory.test.ts b/src/main/ai-vault/scope/session-scanner-scope-inventory.test.ts similarity index 85% rename from src/main/ai-vault/session-scanner-scope-inventory.test.ts rename to src/main/ai-vault/scope/session-scanner-scope-inventory.test.ts index cc53ef14dbd..4f0dbce92bf 100644 --- a/src/main/ai-vault/session-scanner-scope-inventory.test.ts +++ b/src/main/ai-vault/scope/session-scanner-scope-inventory.test.ts @@ -4,13 +4,13 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, expect, it, vi } from 'vitest' -import * as transcriptFs from '../native-chat/wsl-transcript-fs-access' +import * as transcriptFs from '../../native-chat/wsl-transcript-fs-access' -import { aiVaultScanWork, trackAiVaultScanProgress } from './ai-vault-scan-progress' +import { aiVaultScanWork, trackAiVaultScanProgress } from '../scan-lifecycle/ai-vault-scan-progress' import { CLAUDE_CWD_BUCKET_LAYOUT } from './session-cwd-bucket-layouts' import { inventoryCwdBucketFiles } from './session-scanner-scope-inventory' -import { writeJsonlFile } from './session-scanner-test-fixtures' +import { writeJsonlFile } from '../scanner-fixtures/session-scanner-test-fixtures' let root: string | null = null afterEach(async () => { vi.restoreAllMocks() diff --git a/src/main/ai-vault/session-scanner-scope-inventory.ts b/src/main/ai-vault/scope/session-scanner-scope-inventory.ts similarity index 89% rename from src/main/ai-vault/session-scanner-scope-inventory.ts rename to src/main/ai-vault/scope/session-scanner-scope-inventory.ts index 4a716638b6b..8eef850e6c8 100644 --- a/src/main/ai-vault/session-scanner-scope-inventory.ts +++ b/src/main/ai-vault/scope/session-scanner-scope-inventory.ts @@ -1,13 +1,13 @@ import { extname, join } from 'node:path' -import { yieldToEventLoop } from '../../shared/event-loop-yield' -import type { AiVaultScanIssue } from '../../shared/ai-vault/contracts/ai-vault-types' -import { wslGatedReaddir } from '../native-chat/wsl-transcript-fs-access' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' -import { openAiVaultScanSource } from './ai-vault-scan-progress' -import { SCAN_ISSUE_LIMIT, recordSessionScanIssue } from './session-scan-issues' -import { createAiVaultScopeCwdMatcher } from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' +import { yieldToEventLoop } from '../../../shared/event-loop-yield' +import type { AiVaultScanIssue } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { wslGatedReaddir } from '../../native-chat/wsl-transcript-fs-access' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' +import { openAiVaultScanSource } from '../scan-lifecycle/ai-vault-scan-progress' +import { SCAN_ISSUE_LIMIT, recordSessionScanIssue } from '../parsing/session-scan-issues' +import { createAiVaultScopeCwdMatcher } from '../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' import type { CwdBucketLayout } from './session-cwd-bucket-layouts' -import type { FileWithMtime } from './session-scanner-types' +import type { FileWithMtime } from '../session-scanner-types' import { cachedProjectDirCwd, cwdBucketScopePrefixes, diff --git a/src/main/ai-vault/scope/session-scanner-scope-only.test.ts b/src/main/ai-vault/scope/session-scanner-scope-only.test.ts new file mode 100644 index 00000000000..536687220e7 --- /dev/null +++ b/src/main/ai-vault/scope/session-scanner-scope-only.test.ts @@ -0,0 +1,102 @@ +import { mkdtemp, mkdir, rm, utimes, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' +import { scanAiVaultSessions } from '../session-scanner' +import { isolatedScanRoots } from '../scanner-fixtures/session-scanner-test-fixtures' + +let tempRoots: string[] = [] + +afterEach(async () => { + await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) + tempRoots = [] +}) + +async function writeClaudeSession(args: { + claudeRoot: string + dirName: string + sessionId: string + cwd: string + iso: string + // Records before the first cwd, like a long run of snapshot or summary lines. + cwdlessLines?: number + // File time when it differs from the transcript's own time. + mtime?: string +}): Promise { + const dir = join(args.claudeRoot, args.dirName) + await mkdir(dir, { recursive: true }) + const records: unknown[] = Array.from({ length: args.cwdlessLines ?? 0 }, () => ({ + type: 'file-history-snapshot', + sessionId: args.sessionId + })) + records.push({ + type: 'user', + sessionId: args.sessionId, + timestamp: args.iso, + cwd: args.cwd, + message: { role: 'user', content: `work in ${args.cwd}` } + }) + const filePath = join(dir, `${args.sessionId}.jsonl`) + await writeFile(filePath, records.map((record) => JSON.stringify(record)).join('\n')) + const time = new Date(args.mtime ?? args.iso) + await utimes(filePath, time, time) +} + +// What main's Workspace tab shows: the full scan, filtered to the scope as the renderer does. + +async function tempRoot(): Promise { + const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-scope-only-')) + tempRoots.push(root) + return root +} + +describe('scanAiVaultSessions scopeOnly', () => { + it('returns only in-scope rows', async () => { + const root = await tempRoot() + const claudeRoot = isolatedScanRoots(root).claudeProjectsDir + await writeClaudeSession({ + claudeRoot, + dirName: '-repo-app', + sessionId: 'in-scope', + cwd: '/repo/app', + iso: '2026-06-01T00:00:00.000Z' + }) + await writeClaudeSession({ + claudeRoot, + dirName: '-elsewhere', + sessionId: 'elsewhere', + cwd: '/elsewhere', + iso: '2026-06-02T00:00:00.000Z' + }) + // Codex has no cwd buckets, so it still goes through the recency pass. + const codexDir = join(isolatedScanRoots(root).codexSessionsDir, '2026', '06', '03') + await mkdir(codexDir, { recursive: true }) + const codexId = '019e9693-64fc-7370-9c18-7e625c595d0f' + await writeFile( + join(codexDir, `rollout-2026-06-03T00-00-00-${codexId}.jsonl`), + [ + { + timestamp: '2026-06-03T00:00:00.000Z', + type: 'session_meta', + payload: { id: codexId, cwd: '/elsewhere' } + }, + { + timestamp: '2026-06-03T00:00:01.000Z', + type: 'response_item', + payload: { type: 'message', role: 'user', content: [{ type: 'text', text: 'hi' }] } + } + ] + .map((record) => JSON.stringify(record)) + .join('\n') + ) + + const result = await scanAiVaultSessions({ + ...isolatedScanRoots(root), + platform: 'darwin', + scopePaths: ['/repo/app'], + scopeOnly: true + }) + + expect(result.sessions.map((session) => session.sessionId)).toEqual(['in-scope']) + }) +}) diff --git a/src/main/ai-vault/scope/session-scanner-scope-walk.test.ts b/src/main/ai-vault/scope/session-scanner-scope-walk.test.ts new file mode 100644 index 00000000000..0c4ec8dc3a5 --- /dev/null +++ b/src/main/ai-vault/scope/session-scanner-scope-walk.test.ts @@ -0,0 +1,111 @@ +import { link, mkdtemp, mkdir, rm, utimes, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join } from 'node:path' + +import { afterEach, describe, expect, it, vi } from 'vitest' +import { truncateAiVaultListResult } from '../../../shared/ai-vault/scanning/ai-vault-session-depth' + +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' +import { scanAiVaultSessions } from '../session-scanner' + +import { resetSessionParseCachePersistenceForTests } from '../parse-cache/session-parse-cache-persistence' +import { + isolatedScanRoots, + jsonLines, + writeAntigravityTranscript, + writeAntigravityHistory +} from '../scanner-fixtures/session-scanner-test-fixtures' + +let tempRoots: string[] = [] + +afterEach(async () => { + vi.restoreAllMocks() + resetSessionParseCachePersistenceForTests() + await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) + tempRoots = [] + resetSessionParseCacheForTests() +}) + +async function writeRollout(sessionsDir: string, id: string, cwd: string, day: string) { + const dir = join(sessionsDir, '2026', '10', day) + await mkdir(dir, { recursive: true }) + const path = join(dir, `rollout-2026-10-${day}T10-00-00-${id}.jsonl`) + const timestamp = `2026-10-${day}T10:00:00.000Z` + await writeFile( + path, + jsonLines([ + // Large Codex headers must still expose cwd beyond the initial read chunk. + { timestamp, type: 'session_meta', payload: { id, cwd, instructions: 'x'.repeat(20_000) } }, + { + timestamp, + type: 'response_item', + payload: { type: 'message', role: 'user', content: [{ type: 'text', text: id }] } + } + ]) + ) + await utimes(path, new Date(timestamp), new Date(timestamp)) + return path +} + +describe('scanAiVaultSessions — scope before the recency cap', () => { + it('lists an older in-scope Codex session once across hardlinked homes', async () => { + const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-scope-walk-')) + tempRoots.push(root) + const realHome = join(root, 'real-codex-home') + const managedSessionsDir = join(root, 'codex-accounts', 'a1', 'home', 'sessions') + const workspace = '/Users/ada/orca/workspaces/orca/taimen-2' + + const old = await writeRollout(managedSessionsDir, '01a14083-old', workspace, '11') + await mkdir(join(realHome, 'sessions', '2026', '10', '11'), { recursive: true }) + await link(old, old.replace(managedSessionsDir, join(realHome, 'sessions'))) + for (const [index, day] of ['13', '14', '15'].entries()) { + await writeRollout(managedSessionsDir, `02b-newer-${index}`, '/Users/ada/other', day) + } + + const scan = (scopePaths?: string[]) => + scanAiVaultSessions({ + ...isolatedScanRoots(root), + codexSessionsDir: join(realHome, 'sessions'), + defaultCodexHomeDir: realHome, + additionalCodexSessionsDirs: [managedSessionsDir], + platform: 'darwin', + limit: 2, + scopePaths + }) + + expect((await scan()).sessions.map((session) => session.sessionId)).not.toContain( + '01a14083-old' + ) + const scoped = await scan([workspace]) + const inScope = scoped.sessions.filter((session) => session.cwd === workspace) + expect(inScope.map((session) => session.sessionId)).toEqual(['01a14083-old']) + expect( + truncateAiVaultListResult(scoped, 2, [workspace]).sessions.map((s) => s.sessionId) + ).toContain('01a14083-old') + }) +}) + +it('keeps an older Antigravity session in scope across warm scans and changed history', async () => { + const root = await mkdtemp(join(tmpdir(), 'orca-scope-history-')) + tempRoots.push(root) + const roots = isolatedScanRoots(root) + await writeRollout(roots.codexSessionsDir, 'newer', '/other', '15') + const timestamp = '2026-10-11T10:00:00.000Z' + const path = await writeAntigravityTranscript(roots.antigravityBrainDir, 'older', [ + { source: 'USER_EXPLICIT', type: 'USER_INPUT', created_at: timestamp, content: 'Find me' } + ]) + await utimes(path, new Date(timestamp), new Date(timestamp)) + const history = (workspace: string) => + writeAntigravityHistory(roots.antigravityBrainDir, [ + { conversationId: 'older', display: 'Find me', timestamp, workspace } + ]) + const scan = () => + scanAiVaultSessions({ ...roots, platform: 'linux', limit: 1, scopePaths: ['/repo'] }) + await history('/repo') + expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') + expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') + await history('/elsewhere') + expect((await scan()).sessions.map((row) => row.sessionId)).not.toContain('older') + await history('/repo') + expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') +}) diff --git a/src/main/ai-vault/session-scanner-scope-walk.ts b/src/main/ai-vault/scope/session-scanner-scope-walk.ts similarity index 88% rename from src/main/ai-vault/session-scanner-scope-walk.ts rename to src/main/ai-vault/scope/session-scanner-scope-walk.ts index b082062866d..08ac35f5d68 100644 --- a/src/main/ai-vault/session-scanner-scope-walk.ts +++ b/src/main/ai-vault/scope/session-scanner-scope-walk.ts @@ -1,15 +1,15 @@ -import { SCAN_ISSUE_LIMIT } from './session-scan-issues' +import { SCAN_ISSUE_LIMIT } from '../parsing/session-scan-issues' import { aiVaultSessionInScope, createAiVaultScopeCwdMatcher -} from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' +} from '../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' import type { AiVaultScanIssue, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import type { ExecutionHostId } from '../../shared/execution-host' -import { yieldToEventLoop } from '../../shared/event-loop-yield' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { ExecutionHostId } from '../../../shared/execution-host' +import { yieldToEventLoop } from '../../../shared/event-loop-yield' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' import { lookupSessionScopeCwds, clearSessionScopeCwdKnowledge, @@ -17,32 +17,38 @@ import { resolveSessionScopeCwd, storeSessionScopeCwd, type SessionScopeCwdStamp -} from './parse-cache/session-parse-cache-store' -import type { AntigravityWorkspaceResolver } from './scanners/antigravity/session-scanner-antigravity-history' -import { parseSessionCandidates } from './session-scanner-candidate-parse' -import { sessionSortTime } from './session-scanner-accumulator' -import { discoveryFileCandidates, dropCodexHardlinkAliases } from './session-scanner-candidates' -import type { SessionParseStats } from './parse-cache/session-scanner-parse-cache' +} from '../parse-cache/session-parse-cache-store' +import type { AntigravityWorkspaceResolver } from '../scanners/antigravity/session-scanner-antigravity-history' +import { parseSessionCandidates } from '../parsing/session-scanner-candidate-parse' +import { sessionSortTime } from '../parsing/session-scanner-accumulator' +import { + discoveryFileCandidates, + dropCodexHardlinkAliases +} from '../discovery/session-scanner-candidates' +import type { SessionParseStats } from '../parse-cache/session-scanner-parse-cache' import { inventoryCwdBucketFiles, selectCwdBucketFiles, yieldScanInventory, type CwdBucketInventory } from './session-scanner-scope-inventory' -import { aiVaultScanWorkload, noteAiVaultScanWorkChanged } from './ai-vault-scan-progress' +import { + aiVaultScanWorkload, + noteAiVaultScanWorkChanged +} from '../scan-lifecycle/ai-vault-scan-progress' import type { AiVaultScanOptions, FileWithMtime, SessionFileCandidate, SessionFileDiscovery -} from './session-scanner-types' +} from '../session-scanner-types' import { AI_VAULT_SCOPE_CWD_SOURCES, scopeOnlyScan, scopeWalksAgentFiles } from './session-scope-cwd' -import { sidecarUnchanged } from './parse-cache/session-sidecar-stat' -import { prioritizeAntigravityTranscriptCandidates } from './scanners/antigravity/antigravity-transcript-candidates' +import { sidecarUnchanged } from '../parse-cache/session-sidecar-stat' +import { prioritizeAntigravityTranscriptCandidates } from '../scanners/antigravity/antigravity-transcript-candidates' type ScopeScanArgs = { inventory: CwdBucketInventory[] diff --git a/src/main/ai-vault/session-scanner-scope.test.ts b/src/main/ai-vault/scope/session-scanner-scope.test.ts similarity index 97% rename from src/main/ai-vault/session-scanner-scope.test.ts rename to src/main/ai-vault/scope/session-scanner-scope.test.ts index 13efa226630..e6a73a50cad 100644 --- a/src/main/ai-vault/session-scanner-scope.test.ts +++ b/src/main/ai-vault/scope/session-scanner-scope.test.ts @@ -2,9 +2,9 @@ import { chmod, mkdtemp, mkdir, rm, utimes, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' -import { scanAiVaultSessions } from './session-scanner' -import { isolatedScanRoots } from './session-scanner-test-fixtures' -import type { AiVaultScanOptions } from './session-scanner-types' +import { scanAiVaultSessions } from '../session-scanner' +import { isolatedScanRoots } from '../scanner-fixtures/session-scanner-test-fixtures' +import type { AiVaultScanOptions } from '../session-scanner-types' let tempRoots: string[] = [] diff --git a/src/main/ai-vault/session-scope-cwd.ts b/src/main/ai-vault/scope/session-scope-cwd.ts similarity index 88% rename from src/main/ai-vault/session-scope-cwd.ts rename to src/main/ai-vault/scope/session-scope-cwd.ts index 612362d380e..9a7639870b5 100644 --- a/src/main/ai-vault/session-scope-cwd.ts +++ b/src/main/ai-vault/scope/session-scope-cwd.ts @@ -1,14 +1,14 @@ -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' +import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' import { openTranscriptReadStream, readTranscriptSlice, wslGatedReadFile -} from '../native-chat/wsl-transcript-fs-access' +} from '../../native-chat/wsl-transcript-fs-access' import { isZstdTranscriptPath, readZstdTranscriptSlice, zstdTranscriptStream -} from '../native-chat/transcript-zstd-decompression' +} from '../../native-chat/transcript-zstd-decompression' import { CLAUDE_CWD_BUCKET_LAYOUT, CODEBUDDY_CWD_BUCKET_LAYOUT, @@ -19,18 +19,19 @@ import type { AiVaultScanOptions, FileWithMtime, SessionFileCandidate -} from './session-scanner-types' -import { asRecord } from './session-scanner-record-value' -import { extractString, parseJsonObject } from './session-scanner-values' -import { clineManifestCwd } from './scanners/cline/session-scanner-cline-parser' +} from '../session-scanner-types' +import { asRecord } from '../parsing/session-record-fields' +import { extractString } from '../../../shared/trimmed-string' +import { parseJsonObject } from '../parsing/session-json-object' +import { clineManifestCwd } from '../scanners/cline/session-scanner-cline-parser' import { cursorChatMetaUnavailable, readCursorChatMeta -} from './scanners/cursor/session-scanner-cursor-chat-meta' -import { rovoSessionCwd } from './scanners/session-scanner-graph-parsers' -import { grokSessionCwd } from './scanners/grok/session-scanner-grok-parser' -import { listedKiroMetadata } from './scanners/kiro/session-scanner-kiro-parser' -import { openCodeSessionCwd } from './scanners/opencode/session-scanner-opencode-parser' +} from '../scanners/cursor/session-scanner-cursor-chat-meta' +import { rovoSessionCwd } from '../scanners/session-scanner-rovo-metadata' +import { grokSessionCwd } from '../scanners/grok/session-scanner-grok-parser' +import { listedKiroMetadata } from '../scanners/kiro/session-scanner-kiro-parser' +import { openCodeSessionCwd } from '../scanners/opencode/session-scanner-opencode-parser' type HeadRecord = Record diff --git a/src/main/ai-vault/session-scope-real-paths.test.ts b/src/main/ai-vault/scope/session-scope-real-paths.test.ts similarity index 98% rename from src/main/ai-vault/session-scope-real-paths.test.ts rename to src/main/ai-vault/scope/session-scope-real-paths.test.ts index c83090e5c8e..c0bbb475ea6 100644 --- a/src/main/ai-vault/session-scope-real-paths.test.ts +++ b/src/main/ai-vault/scope/session-scope-real-paths.test.ts @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' import type { AiVaultListResult, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { attachAiVaultScopeCwdAliases, resolveAiVaultScopeRealPaths diff --git a/src/main/ai-vault/session-scope-real-paths.ts b/src/main/ai-vault/scope/session-scope-real-paths.ts similarity index 91% rename from src/main/ai-vault/session-scope-real-paths.ts rename to src/main/ai-vault/scope/session-scope-real-paths.ts index 7f8073aa53d..6bc3fa6ed0a 100644 --- a/src/main/ai-vault/session-scope-real-paths.ts +++ b/src/main/ai-vault/scope/session-scope-real-paths.ts @@ -3,13 +3,13 @@ import { isAbsolute, join } from 'node:path' import type { AiVaultListResult, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' +} from '../../../shared/ai-vault/contracts/ai-vault-types' import { normalizeRuntimePathForComparison, relativePathInsideRoot -} from '../../shared/cross-platform-path' -import { sessionFileExecutionNamespace } from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' -import { parseWslUncPath } from '../../shared/wsl-paths' +} from '../../../shared/cross-platform-path' +import { sessionFileExecutionNamespace } from '../../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' +import { parseWslUncPath } from '../../../shared/wsl-paths' type AiVaultScopeLink = { scopePath: string; realPath: string } diff --git a/src/main/ai-vault/session-handoff-snapshot.ts b/src/main/ai-vault/session-handoff-snapshot.ts index 2849ea58bac..7c574de15b1 100644 --- a/src/main/ai-vault/session-handoff-snapshot.ts +++ b/src/main/ai-vault/session-handoff-snapshot.ts @@ -15,7 +15,7 @@ import { writeAgentSessionContextSnapshot } from '../native-chat/agent-session-c import { wakeNativeChatTranscriptDistro } from '../native-chat/native-chat-open-wake' import { getProfileUserDataPath } from '../orca-profiles/profile-storage-paths' import { wslDistroForPath } from '../wsl/filesystem/wsl-unc-access-gate' -import { getAiVaultWslScanHomeDirs } from './ai-vault-scan-roots' +import { getAiVaultWslScanHomeDirs } from './discovery/ai-vault-scan-roots' import { openCodeWslPath } from './scanners/opencode/reader-transport/session-scanner-opencode-wsl-client' import { configureOpenCodeTranscriptWslReaders } from '../native-chat/transcript-opencode-database' diff --git a/src/main/ai-vault/session-newest-files.test.ts b/src/main/ai-vault/session-newest-files.test.ts deleted file mode 100644 index f878a3bc1b5..00000000000 --- a/src/main/ai-vault/session-newest-files.test.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { expect, it } from 'vitest' -import { SessionNewestFiles } from './session-newest-files' -import type { FileWithMtime } from './session-scanner-types' - -function file(i: number): FileWithMtime { - const mtimeMs = (i * 7919) % 997 - return { path: String(i), mtimeMs, modifiedAt: new Date(mtimeMs).toISOString() } -} - -it('retains at most 12 of 100,000 candidates with stable newest-first ties', () => { - const all = Array.from({ length: 100_000 }, (_, i) => file(i)) - const retained = new SessionNewestFiles(12) - let peak = 0 - for (const candidate of all) { - retained.add(candidate) - peak = Math.max(peak, retained.size) - } - expect(peak).toBe(12) - expect(retained.newest()).toEqual(all.sort((a, b) => b.mtimeMs - a.mtimeMs).slice(0, 12)) -}) diff --git a/src/main/ai-vault/session-scanner-agent-root-overrides.test.ts b/src/main/ai-vault/session-scanner-agent-root-overrides.test.ts deleted file mode 100644 index 73e4d771e04..00000000000 --- a/src/main/ai-vault/session-scanner-agent-root-overrides.test.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { homedir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AiVaultScanOptions } from './session-scanner-types' - -/** Exercise root consumers: module-time constants can bypass an otherwise correct override validator (#13082). */ - -const NO_OPTIONS: AiVaultScanOptions = {} -const NO_WSL: readonly string[] = [] - -async function rootDirsFor( - agent: 'codex' | 'copilot' | 'devin' | 'openclaw' | 'kimi' | 'grok', - env: Record -): Promise { - vi.resetModules() - for (const [key, value] of Object.entries(env)) { - vi.stubEnv(key, value) - } - const sources = await import('./session-scanner-agent-sources.js') - const source = sources.AI_VAULT_AGENT_SOURCES[agent] - if (!source) { - throw new Error(`no source table entry for ${agent}`) - } - return source.rootDirs(NO_OPTIONS, NO_WSL) -} - -const RELATIVE_VALUES = ['.', '..', 'rel/path', '~/sessions', 'C:foo', 'C:'] as const - -const CASES = [ - { - agent: 'codex', - envVar: 'CODEX_HOME', - absolute: '/srv/codex', - absoluteRoot: join('/srv/codex', 'sessions'), - defaultRoot: () => join(homedir(), '.codex', 'sessions') - }, - { - agent: 'copilot', - envVar: 'COPILOT_HOME', - absolute: '/srv/copilot', - absoluteRoot: join('/srv/copilot', 'session-state'), - defaultRoot: () => join(homedir(), '.copilot', 'session-state') - }, - { - agent: 'devin', - envVar: 'DEVIN_HOME', - absolute: '/srv/devin', - absoluteRoot: join('/srv/devin', 'transcripts'), - defaultRoot: () => - join( - process.platform === 'win32' - ? join( - process.env.APPDATA?.trim() || join(homedir(), 'AppData', 'Roaming'), - 'devin', - 'cli' - ) - : join( - process.env.XDG_DATA_HOME?.trim() || join(homedir(), '.local', 'share'), - 'devin', - 'cli' - ), - 'transcripts' - ) - }, - { - agent: 'openclaw', - envVar: 'OPENCLAW_STATE_DIR', - absolute: '/srv/openclaw', - absoluteRoot: join('/srv/openclaw', 'agents'), - defaultRoot: () => join(homedir(), '.openclaw', 'agents') - }, - { - agent: 'kimi', - envVar: 'KIMI_CODE_HOME', - absolute: '/srv/kimi', - absoluteRoot: join('/srv/kimi', 'sessions'), - defaultRoot: () => join(homedir(), '.kimi-code', 'sessions') - }, - { - agent: 'grok', - envVar: 'GROK_HOME', - absolute: '/srv/grok', - absoluteRoot: join('/srv/grok', 'sessions'), - defaultRoot: () => join(homedir(), '.grok', 'sessions') - } -] as const - -describe('agent scan roots from environment overrides', () => { - afterEach(() => { - vi.unstubAllEnvs() - vi.resetModules() - }) - - it('finds Devin transcripts in a relocated platform data directory', async () => { - const dataDir = join(homedir(), 'relocated-agent-data') - const roots = await rootDirsFor('devin', { - DEVIN_HOME: '', - [process.platform === 'win32' ? 'APPDATA' : 'XDG_DATA_HOME']: dataDir - }) - expect(roots).toEqual( - ['transcripts', 'agent_logs'].map((dir) => join(dataDir, 'devin', 'cli', dir)) - ) - }) - - it('keeps an explicit transcript root isolated and discovers both WSL layouts', async () => { - const { AI_VAULT_AGENT_SOURCES } = await import('./session-scanner-agent-sources') - const custom = join(homedir(), 'custom-devin') - const wslHome = join(homedir(), 'wsl-home') - expect( - AI_VAULT_AGENT_SOURCES.devin?.rootDirs({ devinTranscriptsDir: custom }, [wslHome]) - ).toEqual([ - custom, - join(wslHome, '.local', 'share', 'devin', 'cli', 'transcripts'), - join(wslHome, '.local', 'share', 'devin', 'cli', 'agent_logs') - ]) - }) - - for (const testCase of CASES) { - describe(testCase.envVar, () => { - it.each(RELATIVE_VALUES)('falls back to the default root for %j', async (value) => { - const roots = await rootDirsFor(testCase.agent, { - [testCase.envVar]: value - }) - expect(roots[0]).toBe(testCase.defaultRoot()) - }) - }) - } -}) diff --git a/src/main/ai-vault/session-scanner-json-document-memory.test.ts b/src/main/ai-vault/session-scanner-json-document-memory.test.ts deleted file mode 100644 index 5b18d93aeb8..00000000000 --- a/src/main/ai-vault/session-scanner-json-document-memory.test.ts +++ /dev/null @@ -1,132 +0,0 @@ -import { mkdtemp, open, rm, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { expect, it } from 'vitest' -import { parseHermesSessionFile } from './scanners/hermes/session-scanner-hermes-parser' -import { parseDevinSessionFile } from './scanners/devin/session-scanner-devin-parser' -import { parseGeminiSessionFile } from './scanners/gemini/session-scanner-gemini-parsers' -import { parseClineSessionFile } from './scanners/cline/session-scanner-cline-parser' - -const providers = [ - { agent: 'hermes', parse: parseHermesSessionFile, array: 'messages' }, - { agent: 'devin', parse: parseDevinSessionFile, array: 'steps' }, - { agent: 'gemini', parse: parseGeminiSessionFile, array: 'messages' }, - { agent: 'cline', parse: parseClineSessionFile, array: 'messages' } -] as const - -function collectHeap(): number { - if (!globalThis.gc) { - throw new Error('Run this regression with --expose-gc') - } - void /reset/.test('reset') - globalThis.gc() - globalThis.gc() - return process.memoryUsage().heapUsed -} - -async function writeLongDocument( - path: string, - messages: number, - agent: string, - array: string -): Promise { - const file = await open(path, 'wx') - try { - await file.writeFile(`{"session_id":"long-session","${array}":[`) - for (let start = 0; start < messages; start += 128) { - const batch = Array.from({ length: Math.min(128, messages - start) }, (_, offset) => { - const index = start + offset - return `${index === 0 ? '' : ','}${JSON.stringify({ - role: index === 0 ? 'user' : 'assistant', - type: index === 0 ? 'user' : 'gemini', - source: index === 0 ? 'user' : 'agent', - model: 'model-at-end', - message: agent === 'devin' ? `${index}:${'body'.repeat(1024)}` : undefined, - content: `${index}:${'body'.repeat(1024)}` - })}` - }).join('') - await file.writeFile(batch) - } - await file.writeFile( - '],"model":"model-at-end","agent":{"model_name":"model-at-end"},"cwd":"/workspace/project"}' - ) - } finally { - await file.close() - } -} - -it.each(providers)( - 'folds a large local $agent document without retaining all decoded messages', - async ({ agent, parse, array }) => { - const root = await mkdtemp(join(tmpdir(), 'orca-json-document-memory-')) - try { - const path = join(root, 'session.json') - const messageCount = 8192 - const contentPath = agent === 'cline' ? join(root, 'session.messages.json') : path - if (agent === 'cline') { - await writeFile(path, JSON.stringify({ session_id: 'long-session', model: 'model-at-end' })) - } - await writeLongDocument(contentPath, messageCount, agent, array) - const baseline = collectHeap() - let firstMessageRetainedBytes = 0 - let emitted = 0 - let lastText = '' - const session = await parse( - { path, mtimeMs: 1, modifiedAt: '2026-10-19T00:00:00.000Z' }, - 'linux', - { - active: true, - push(message) { - if (emitted === 0) { - firstMessageRetainedBytes = collectHeap() - baseline - } - emitted++ - lastText = message.text - } - } - ) - expect(emitted).toBe(messageCount) - expect(lastText).toBe(`${messageCount - 1}:${'body'.repeat(1024)}`) - expect(session?.messageCount).toBe(messageCount) - expect(session?.model).toBe('model-at-end') - expect(firstMessageRetainedBytes).toBeLessThan(8 * 1024 * 1024) - } finally { - await rm(root, { recursive: true, force: true }) - } - } -) - -it.each(providers)( - 'cancels a streamed local $agent document before consuming the whole file', - async ({ agent, parse, array }) => { - const root = await mkdtemp(join(tmpdir(), 'orca-json-document-cancel-')) - try { - const path = join(root, 'session.json') - const contentPath = agent === 'cline' ? join(root, 'session.messages.json') : path - if (agent === 'cline') { - await writeFile(path, '{"session_id":"session"}') - } - await writeLongDocument(contentPath, 1024, agent, array) - const controller = new AbortController() - let emitted = 0 - await expect( - parse( - { path, mtimeMs: 1, modifiedAt: new Date(1).toISOString() }, - 'linux', - { - active: true, - push: () => { - emitted++ - controller.abort() - } - }, - controller.signal - ) - ).rejects.toThrow(/cancel/i) - expect(emitted).toBeGreaterThan(0) - expect(emitted).toBeLessThan(1024) - } finally { - await rm(root, { recursive: true, force: true }) - } - } -) diff --git a/src/main/ai-vault/session-scanner-preview-window-truncation.test.ts b/src/main/ai-vault/session-scanner-preview-window-truncation.test.ts deleted file mode 100644 index 8a0895f47da..00000000000 --- a/src/main/ai-vault/session-scanner-preview-window-truncation.test.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { createAccumulator, finalizeSession } from './session-scanner-accumulator' -import { addPreviewMessage } from './session-scanner-messages' -import type { SessionAccumulator } from './session-scanner-types' - -// Mirrors SESSION_PREVIEW_MESSAGE_LIMIT in the module under test. -const PREVIEW_LIMIT = 5 - -function accumulatorWithUserTurns(count: number): SessionAccumulator { - const accumulator = createAccumulator({ - agent: 'claude', - file: { path: '/tmp/session-1.jsonl', mtimeMs: 0, modifiedAt: new Date(0).toISOString() }, - sessionId: 'session-1' - }) - for (let index = 0; index < count; index += 1) { - addPreviewMessage(accumulator, { role: 'user', text: `turn ${index}` }) - } - return accumulator -} - -describe('AI Vault preview-window truncation signal', () => { - it('flags the session once an older turn falls out of the window', () => { - const session = finalizeSession(accumulatorWithUserTurns(PREVIEW_LIMIT + 1), 'darwin') - - expect(session?.previewMessages[0]?.text).toBe('turn 1') - expect(session?.previewMessagesTruncated).toBe(true) - }) -}) diff --git a/src/main/ai-vault/session-scanner-record-budget.test.ts b/src/main/ai-vault/session-scanner-record-budget.test.ts deleted file mode 100644 index c428b82baa2..00000000000 --- a/src/main/ai-vault/session-scanner-record-budget.test.ts +++ /dev/null @@ -1,172 +0,0 @@ -import { appendFile, mkdir, mkdtemp, rm, stat, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, expect, it } from 'vitest' -import { - createSessionParseStats, - parseAgentSessionFileCached -} from './parse-cache/session-scanner-parse-cache' -import { - resetSessionParseCacheForTests, - getSessionParseCacheEntry -} from './parse-cache/session-parse-cache-store' - -import { aiVaultScanIssueText } from '../../shared/ai-vault/scanning/ai-vault-scan-issue-copy' -import { codexFixture } from './scanners/codex/session-scanner-codex-fixtures' -import { scanAiVaultSessions } from './session-scanner' -import { isolatedScanRoots } from './session-scanner-test-fixtures' -import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from './transcripts/session-transcript-record-budget' -import { - flushSessionParseCachePersist, - initSessionParseCachePersistence, - resetSessionParseCachePersistenceForTests -} from './parse-cache/session-parse-cache-persistence' -import { kiroTranscriptPathForMetadata } from '../../shared/ai-vault/session-display/ai-vault-session-log-resource' -import type { SessionFileCandidate } from './session-scanner-types' - -const SESSION_FILE = 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee.jsonl' -// One record past the budget, terminated separately so tests control the newline. -const OVERSIZED = Buffer.alloc(MAX_SESSION_TRANSCRIPT_RECORD_BYTES + 1, 'x') - -let tempRoots: string[] = [] - -afterEach(async () => { - resetSessionParseCachePersistenceForTests() - resetSessionParseCacheForTests() - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) - tempRoots = [] -}) - -async function tempRoot(prefix: string): Promise { - const root = await mkdtemp(join(tmpdir(), prefix)) - tempRoots.push(root) - return root -} - -function record(text: string): string { - return `${JSON.stringify({ type: 'user', sessionId: 's', message: { role: 'user', content: text } })}\n` -} - -async function candidate(path: string): Promise { - const info = await stat(path) - return { - agent: 'claude', - codexHome: null, - file: { - path, - mtimeMs: info.mtimeMs, - modifiedAt: info.mtime.toISOString(), - sizeBytes: info.size - } - } -} - -it('lists a recovered session without an issue on fresh and cached scans', async () => { - const root = await tempRoot('orca-record-budget-scan-') - const roots = isolatedScanRoots(root) - const fixture = codexFixture() - const dir = roots.codexSessionsDir - const path = join(dir, fixture.fileName) - - await mkdir(dir, { recursive: true }) - await writeFile(path, `${fixture.seedLines.join('\n')}\n`) - await appendFile(path, '{"type":"compacted","payload":{"message":"') - await appendFile(path, OVERSIZED) - await appendFile(path, `"}}\n${fixture.appendLines.join('\n')}\n`) - - for (let scan = 0; scan < 2; scan++) { - const result = await scanAiVaultSessions(roots) - const session = result.sessions.find((entry) => entry.filePath === path) - expect(session?.previewMessages.map((message) => message.text)).toEqual([ - 'codex seed question', - 'codex seed answer', - 'codex follow-up', - 'codex incremental answer' - ]) - expect(result.issues).toEqual([]) - } -}) - -it.each(['claude', 'kiro'] as const)( - 'retains %s unreadable errors across restart and clears them on recovery or replacement', - async (agent) => { - const root = await tempRoot('orca-record-budget-unreadable-') - const dir = join(root, agent) - const roots = { - ...isolatedScanRoots(root), - ...(agent === 'claude' ? { claudeProjectsDir: dir } : { kiroSessionsDir: dir }) - } - const cacheFile = join(root, 'session-parse-cache.json') - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: 'test' }) - const path = join( - dir, - agent === 'claude' ? SESSION_FILE : SESSION_FILE.replace('.jsonl', '.json') - ) - const transcript = agent === 'kiro' ? kiroTranscriptPathForMetadata(path) : path - const emptyPath = join( - dir, - `bbbbbbbb-cccc-4ddd-8eee-ffffffffffff.${agent === 'kiro' ? 'json' : 'jsonl'}` - ) - const conversationalRecord = (text: string) => - agent === 'claude' - ? record(text) - : `${JSON.stringify({ - version: 'v1', - kind: 'Prompt', - data: { content: [{ kind: 'text', data: text }] } - })}\n` - const restart = async () => { - await flushSessionParseCachePersist() - resetSessionParseCacheForTests() - resetSessionParseCachePersistenceForTests() - initSessionParseCachePersistence({ filePath: cacheFile, appVersion: 'test' }) - } - - await mkdir(dir, { recursive: true }) - if (agent === 'kiro') { - await writeFile(path, '{}') - } - await writeFile(transcript, conversationalRecord(OVERSIZED.toString())) - await writeFile(emptyPath, agent === 'kiro' ? '{}' : '') - - const result = await scanAiVaultSessions(roots) - expect(result.sessions.find((entry) => entry.filePath === path)?.messageCount).toBe(0) - expect(result.sessions.find((entry) => entry.filePath === emptyPath)?.messageCount).toBe(0) - expect(result.issues).toEqual([ - { - executionHostId: 'local', - agent, - path, - ...aiVaultScanIssueText('transcriptTooLarge', { - params: { label: agent === 'claude' ? 'Claude' : 'Kiro' } - }) - } - ]) - const unchanged = await candidate(path) - unchanged.agent = agent - unchanged.file.sidecar = getSessionParseCacheEntry(path)?.sidecar - await restart() - const stats = createSessionParseStats() - await parseAgentSessionFileCached(unchanged, process.platform, stats) - expect(stats).toMatchObject({ reused: 1, fullParses: 0, incremental: 0, bytesRead: 0 }) - expect((await scanAiVaultSessions(roots)).issues).toEqual(result.issues) - - await appendFile(transcript, conversationalRecord('recovered question')) - const recovered = await scanAiVaultSessions(roots) - expect( - recovered.sessions - .find((entry) => entry.filePath === path) - ?.previewMessages.map((message) => message.text) - ).toEqual(['recovered question']) - expect(recovered.issues).toEqual([]) - await restart() - expect((await scanAiVaultSessions(roots)).issues).toEqual([]) - - await writeFile(transcript, conversationalRecord(OVERSIZED.toString())) - expect((await scanAiVaultSessions(roots)).issues).toEqual(result.issues) - await writeFile(transcript, '') - expect((await scanAiVaultSessions(roots)).issues).toEqual([]) - await restart() - expect((await scanAiVaultSessions(roots)).issues).toEqual([]) - } -) diff --git a/src/main/ai-vault/session-scanner-record-value.ts b/src/main/ai-vault/session-scanner-record-value.ts deleted file mode 100644 index bd2c9b6326d..00000000000 --- a/src/main/ai-vault/session-scanner-record-value.ts +++ /dev/null @@ -1,5 +0,0 @@ -export function asRecord(value: unknown): Record | null { - return value && typeof value === 'object' && !Array.isArray(value) - ? (value as Record) - : null -} diff --git a/src/main/ai-vault/session-scanner-scope-cwd-facts.test.ts b/src/main/ai-vault/session-scanner-scope-cwd-facts.test.ts deleted file mode 100644 index 4f22a5f5c62..00000000000 --- a/src/main/ai-vault/session-scanner-scope-cwd-facts.test.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { appendFile, mkdir, mkdtemp, rm, stat, utimes, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, expect, it, vi } from 'vitest' -import { - flushSessionParseCachePersist, - initSessionParseCachePersistence, - resetSessionParseCachePersistenceForTests -} from './parse-cache/session-parse-cache-persistence' -import { resetSessionParseCacheForTests } from './parse-cache/session-parse-cache-store' -import { scanAiVaultSessions } from './session-scanner' -import SyncDatabase from '../sqlite/sync-database' -import { SessionParseCacheDatabase } from './parse-cache/session-parse-cache-database' -import { parseAgentSessionFileCached } from './parse-cache/session-scanner-parse-cache' -import { isolatedScanRoots, jsonLines } from './session-scanner-test-fixtures' - -let tempRoots: string[] = [] - -afterEach(async () => { - vi.restoreAllMocks() - resetSessionParseCachePersistenceForTests() - resetSessionParseCacheForTests() - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) - tempRoots = [] -}) - -it.each([false, true])('keeps cold authority with read failure=%s', async (failReads) => { - const root = await mkdtemp(join(tmpdir(), 'orca-scope-invalid-')) - tempRoots.push(root) - const roots = isolatedScanRoots(root) - const persistence = { filePath: join(root, 'parse-cache.json'), appVersion: 'test' } - initSessionParseCachePersistence(persistence) - const paths: string[] = [] - for (let index = 0; index < 8; index++) { - const path = await writeRollout( - roots.codexSessionsDir, - `old-${index}`, - index === 0 ? '/elsewhere' : '/repo', - index + 1 - ) - if (index === 0) { - const context = jsonLines([{ type: 'turn_context', payload: { cwd: '/repo' } }]) - const { atime, mtime } = await stat(path) - await appendFile(path, `\n${context}\n`) - await utimes(path, atime, mtime) - } - const { mtimeMs, size: sizeBytes, mtime } = await stat(path) - const parsed = await parseAgentSessionFileCached( - { - agent: 'codex', - file: { path, mtimeMs, sizeBytes, modifiedAt: mtime.toISOString() }, - codexHome: null - }, - 'linux' - ) - expect(parsed?.cwd).toBe('/repo') - paths.push(path) - } - await flushSessionParseCachePersist() - resetSessionParseCachePersistenceForTests() - resetSessionParseCacheForTests() - const db = new SyncDatabase(join(root, 'session-parse-cache.sqlite')) - for (const [index, session] of ['{', '1', '[]', 'true', '"scalar"', 'null', 'null'].entries()) { - db.prepare('UPDATE rows SET session = ?, sidecar = ? WHERE path = ?').run( - session, - index === 5 ? '{' : null, - paths[index + 1] - ) - } - db.prepare( - 'INSERT INTO scope_cwds SELECT path, mtime_ms, size_bytes, platform, ?, ?, seen_at FROM rows WHERE path = ?' - ).run('{', '/elsewhere', paths[0]) - db.close() - for (let index = 0; index < 9; index++) { - await writeRollout(roots.codexSessionsDir, `busy-${index}`, '/other', 20) - } - initSessionParseCachePersistence(persistence) - const metadata = vi.spyOn(SessionParseCacheDatabase.prototype, 'readScopeCwds') - const ordinary = vi.spyOn(SessionParseCacheDatabase.prototype, 'read') - const prepare = SyncDatabase.prototype.prepare - const queries = vi.spyOn(SyncDatabase.prototype, 'prepare').mockImplementation(function ( - this: SyncDatabase, - sql - ) { - if (failReads && sql.startsWith('SELECT') && sql.includes('FROM rows WHERE path')) { - throw new Error('unavailable parsed channel') - } - return prepare.call(this, sql) - }) - const result = await scanAiVaultSessions({ - ...roots, - platform: 'linux', - limit: 8, - scopePaths: ['/repo'] - }) - expect( - result.sessions - .filter((row) => row.cwd === '/repo') - .map((row) => row.filePath) - .sort() - ).toEqual(paths.slice(0, failReads ? 8 : 7).sort()) - expect( - metadata.mock.calls.filter(([batch]) => batch.some((path) => paths.includes(path))) - ).toHaveLength(1) - expect(queries.mock.calls.filter(([sql]) => sql.includes('WHERE path IN'))).toHaveLength(2) - if (failReads) { - expect(ordinary.mock.calls.filter(([path]) => paths.includes(path))).toEqual([]) - } -}) - -async function writeRollout(sessionsDir: string, id: string, cwd: string, day: number) { - const timestamp = new Date(Date.UTC(2026, 9, day, 10)) - const dir = join(sessionsDir, '2026', '10', String(day).padStart(2, '0')) - const path = join(dir, `rollout-2026-10-${String(day).padStart(2, '0')}T10-00-00-${id}.jsonl`) - await mkdir(dir, { recursive: true }) - await writeFile( - path, - jsonLines([ - { timestamp, type: 'session_meta', payload: { id, cwd } }, - { - timestamp, - type: 'response_item', - payload: { type: 'message', role: 'user', content: [{ type: 'text', text: id }] } - } - ]) - ) - await utimes(path, timestamp, timestamp) - return path -} diff --git a/src/main/ai-vault/session-scanner-scope-only.test.ts b/src/main/ai-vault/session-scanner-scope-only.test.ts deleted file mode 100644 index 79c23eb7ecb..00000000000 --- a/src/main/ai-vault/session-scanner-scope-only.test.ts +++ /dev/null @@ -1,328 +0,0 @@ -import { mkdtemp, mkdir, rm, utimes, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { afterEach, describe, expect, it } from 'vitest' -import { scanAiVaultSessions } from './session-scanner' -import { isolatedScanRoots } from './session-scanner-test-fixtures' -import { - aiVaultSessionInScope, - createAiVaultScopeCwdMatcher -} from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' - -let tempRoots: string[] = [] - -afterEach(async () => { - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) - tempRoots = [] -}) - -async function writeClaudeSession(args: { - claudeRoot: string - dirName: string - sessionId: string - cwd: string - iso: string - // Records before the first cwd, like a long run of snapshot or summary lines. - cwdlessLines?: number - // File time when it differs from the transcript's own time. - mtime?: string -}): Promise { - const dir = join(args.claudeRoot, args.dirName) - await mkdir(dir, { recursive: true }) - const records: unknown[] = Array.from({ length: args.cwdlessLines ?? 0 }, () => ({ - type: 'file-history-snapshot', - sessionId: args.sessionId - })) - records.push({ - type: 'user', - sessionId: args.sessionId, - timestamp: args.iso, - cwd: args.cwd, - message: { role: 'user', content: `work in ${args.cwd}` } - }) - const filePath = join(dir, `${args.sessionId}.jsonl`) - await writeFile(filePath, records.map((record) => JSON.stringify(record)).join('\n')) - const time = new Date(args.mtime ?? args.iso) - await utimes(filePath, time, time) -} - -async function writeCodexSession( - codexRoot: string, - args: { id: string; cwd: string; iso: string; mtime: string } -): Promise { - const dir = join(codexRoot, '2026', '06', '01') - await mkdir(dir, { recursive: true }) - const filePath = join(dir, `rollout-2026-06-01T00-00-00-${args.id}.jsonl`) - await writeFile( - filePath, - [ - { timestamp: args.iso, type: 'session_meta', payload: { id: args.id, cwd: args.cwd } }, - { - timestamp: args.iso, - type: 'response_item', - payload: { type: 'message', role: 'user', content: [{ type: 'text', text: 'hi' }] } - } - ] - .map((record) => JSON.stringify(record)) - .join('\n') - ) - const time = new Date(args.mtime) - await utimes(filePath, time, time) -} - -// What main's Workspace tab shows: the full scan, filtered to the scope as the renderer does. -async function workspaceSessionIds( - root: string, - scopePaths: string[], - options: { scopeOnly?: boolean; limit?: number } -): Promise { - const result = await scanAiVaultSessions({ - ...isolatedScanRoots(root), - platform: 'darwin', - scopePaths, - ...options - }) - const inScope = createAiVaultScopeCwdMatcher(scopePaths) - return result.sessions - .filter((session) => aiVaultSessionInScope(inScope, session)) - .map((session) => session.sessionId) - .sort() -} - -async function tempRoot(): Promise { - const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-scope-only-')) - tempRoots.push(root) - return root -} - -describe('scanAiVaultSessions scopeOnly', () => { - it('keeps recent sessions whose bucket or first lines name no in-scope cwd', async () => { - const root = await tempRoot() - const claudeRoot = isolatedScanRoots(root).claudeProjectsDir - // The bucket's only transcript records its cwd after the 200 lines the bucket probe reads. - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-app', - sessionId: 'late-cwd', - cwd: '/repo/app', - iso: '2026-06-01T00:00:00.000Z', - cwdlessLines: 250 - }) - // `/repo/my-app` and `/repo/my/app` share one bucket name; the newest transcript is the other folder's. - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-my-app', - sessionId: 'shared-bucket', - cwd: '/repo/my/app', - iso: '2026-06-02T00:00:00.000Z' - }) - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-my-app', - sessionId: 'other-folder', - cwd: '/repo/my-app', - iso: '2026-06-03T00:00:00.000Z' - }) - // CodeBuddy's transcripts are checked one by one; this one also records its cwd late. - const codebuddyDir = join(isolatedScanRoots(root).codebuddyProjectsDir, 'repo-app') - await mkdir(codebuddyDir, { recursive: true }) - await writeFile( - join(codebuddyDir, 'codebuddy-late-cwd.jsonl'), - [ - ...Array.from({ length: 250 }, () => ({ type: 'file-history-snapshot' })), - { - type: 'message', - timestamp: '2026-06-04T00:00:00.000Z', - sessionId: 'codebuddy-late-cwd', - cwd: '/repo/app', - role: 'user', - content: [{ type: 'input_text', text: 'work in /repo/app' }] - } - ] - .map((record) => JSON.stringify(record)) - .join('\n') - ) - const scopePaths = ['/repo/app', '/repo/my/app'] - - const main = await workspaceSessionIds(root, scopePaths, {}) - expect(main).toEqual(['codebuddy-late-cwd', 'late-cwd', 'shared-bucket']) - await expect(workspaceSessionIds(root, scopePaths, { scopeOnly: true })).resolves.toEqual(main) - }) - - it('matches buckets whose names use the other Unicode form', async () => { - const root = await tempRoot() - const cwd = '/repo/cafe\u0301' - const dir = join(isolatedScanRoots(root).codebuddyProjectsDir, 'repo-cafe\u0301') - await mkdir(dir, { recursive: true }) - await writeFile( - join(dir, 'nfd.jsonl'), - JSON.stringify({ - type: 'message', - timestamp: '2026-06-01T00:00:00.000Z', - sessionId: 'nfd', - cwd, - role: 'user', - content: [{ type: 'input_text', text: 'hi' }] - }) - ) - // Claude turns each non-alphanumeric code unit into a dash, so an NFD cwd names `-repo-cafe-`. - await writeClaudeSession({ - claudeRoot: isolatedScanRoots(root).claudeProjectsDir, - dirName: '-repo-cafe-', - sessionId: 'claude-nfd', - cwd, - iso: '2026-06-02T00:00:00.000Z' - }) - const scopePaths = [cwd.normalize('NFC')] - - const main = await workspaceSessionIds(root, scopePaths, {}) - expect(main).toEqual(['claude-nfd', 'nfd']) - await expect(workspaceSessionIds(root, scopePaths, { scopeOnly: true })).resolves.toEqual(main) - }) - - it('keeps every in-scope session main shows when the scope holds more than the limit', async () => { - const root = await tempRoot() - const claudeRoot = isolatedScanRoots(root).claudeProjectsDir - for (let index = 0; index < 4; index++) { - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-app', - sessionId: `in-scope-${index}`, - cwd: '/repo/app', - iso: `2026-06-0${index + 1}T00:00:00.000Z` - }) - } - - // Main shows the recency pass's 2 plus the scope pass's 2 more. - const main = await workspaceSessionIds(root, ['/repo/app'], { limit: 2 }) - expect(main).toHaveLength(4) - await expect( - workspaceSessionIds(root, ['/repo/app'], { limit: 2, scopeOnly: true }) - ).resolves.toEqual(main) - }) - - it('keeps in-scope rows when unverified files are newer than them', async () => { - const root = await tempRoot() - const claudeRoot = isolatedScanRoots(root).claudeProjectsDir - const inScope = (sessionId: string, day: string) => - writeClaudeSession({ - claudeRoot, - dirName: '-repo-app', - sessionId, - cwd: '/repo/app', - iso: `2026-06-${day}T00:00:00.000Z` - }) - await inScope('a1', '10') - await inScope('a2', '09') - // A sibling whose name also starts `-repo-app`, with cwds past the probe: its files must not take a3's or a4's slot. - for (const [sessionId, day] of [ - ['web-1', '08'], - ['web-2', '07'] - ]) { - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-app-web', - sessionId, - cwd: '/repo/app-web', - iso: `2026-06-${day}T00:00:00.000Z`, - cwdlessLines: 250 - }) - } - await inScope('a3', '05') - await inScope('a4', '04') - - const main = await workspaceSessionIds(root, ['/repo/app'], { limit: 2 }) - expect(main).toEqual(['a1', 'a2', 'a3', 'a4']) - await expect( - workspaceSessionIds(root, ['/repo/app'], { limit: 2, scopeOnly: true }) - ).resolves.toEqual(main) - }) - - it('keeps recency rows whose transcript time is older than their file time', async () => { - const root = await tempRoot() - const codexRoot = isolatedScanRoots(root).codexSessionsDir - // Newest file first: a group whose transcripts say they are old, ahead of newer-dated ones (imported logs). - const groups: { cwd: string; mtimeDay: string; isoDay: string }[] = [ - { cwd: '/repo/app', mtimeDay: '20', isoDay: '02' }, - { cwd: '/elsewhere', mtimeDay: '18', isoDay: '10' }, - { cwd: '/repo/app', mtimeDay: '16', isoDay: '12' } - ] - let index = 0 - for (const group of groups) { - for (let copy = 0; copy < 2; copy++) { - await writeCodexSession(codexRoot, { - id: `019e9693-64fc-7370-9c18-7e625c5950${index++}0`, - cwd: group.cwd, - iso: `2026-06-${group.isoDay}T0${copy}:00:00.000Z`, - mtime: `2026-06-${group.mtimeDay}T0${copy}:00:00.000Z` - }) - } - } - // Old Claude rows elsewhere with the newest files: main parses past them, scope-only never lists them. - for (let copy = 0; copy < 2; copy++) { - await writeClaudeSession({ - claudeRoot: isolatedScanRoots(root).claudeProjectsDir, - dirName: '-elsewhere', - sessionId: `claude-${copy}`, - cwd: '/elsewhere', - iso: `2026-01-0${copy + 1}T00:00:00.000Z`, - mtime: `2026-06-2${copy + 2}T00:00:00.000Z` - }) - } - - const main = await workspaceSessionIds(root, ['/repo/app'], { limit: 2 }) - expect(main).toHaveLength(4) - await expect( - workspaceSessionIds(root, ['/repo/app'], { limit: 2, scopeOnly: true }) - ).resolves.toEqual(main) - }) - - it('returns only in-scope rows', async () => { - const root = await tempRoot() - const claudeRoot = isolatedScanRoots(root).claudeProjectsDir - await writeClaudeSession({ - claudeRoot, - dirName: '-repo-app', - sessionId: 'in-scope', - cwd: '/repo/app', - iso: '2026-06-01T00:00:00.000Z' - }) - await writeClaudeSession({ - claudeRoot, - dirName: '-elsewhere', - sessionId: 'elsewhere', - cwd: '/elsewhere', - iso: '2026-06-02T00:00:00.000Z' - }) - // Codex has no cwd buckets, so it still goes through the recency pass. - const codexDir = join(isolatedScanRoots(root).codexSessionsDir, '2026', '06', '03') - await mkdir(codexDir, { recursive: true }) - const codexId = '019e9693-64fc-7370-9c18-7e625c595d0f' - await writeFile( - join(codexDir, `rollout-2026-06-03T00-00-00-${codexId}.jsonl`), - [ - { - timestamp: '2026-06-03T00:00:00.000Z', - type: 'session_meta', - payload: { id: codexId, cwd: '/elsewhere' } - }, - { - timestamp: '2026-06-03T00:00:01.000Z', - type: 'response_item', - payload: { type: 'message', role: 'user', content: [{ type: 'text', text: 'hi' }] } - } - ] - .map((record) => JSON.stringify(record)) - .join('\n') - ) - - const result = await scanAiVaultSessions({ - ...isolatedScanRoots(root), - platform: 'darwin', - scopePaths: ['/repo/app'], - scopeOnly: true - }) - - expect(result.sessions.map((session) => session.sessionId)).toEqual(['in-scope']) - }) -}) diff --git a/src/main/ai-vault/session-scanner-scope-walk.test.ts b/src/main/ai-vault/session-scanner-scope-walk.test.ts deleted file mode 100644 index 8c8d981dbab..00000000000 --- a/src/main/ai-vault/session-scanner-scope-walk.test.ts +++ /dev/null @@ -1,239 +0,0 @@ -import { link, mkdtemp, mkdir, rm, stat, utimes, writeFile } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' - -import { afterEach, describe, expect, it, vi } from 'vitest' -import { truncateAiVaultListResult } from '../../shared/ai-vault/scanning/ai-vault-session-depth' - -import { parseSessionCandidates } from './session-scanner-candidate-parse' -import { - MAX_UNLISTED_ENTRIES, - storeSessionParseCacheEntry, - storeSessionScopeCwd, - resetSessionParseCacheForTests -} from './parse-cache/session-parse-cache-store' -import { - createSessionParseStats, - parseAgentSessionFileCached -} from './parse-cache/session-scanner-parse-cache' -import { scanAiVaultSessions } from './session-scanner' - -import * as eventLoop from '../../shared/event-loop-yield' -import { AI_VAULT_SCOPE_CWD_SOURCES } from './session-scope-cwd' -import { SessionParseCacheDatabase } from './parse-cache/session-parse-cache-database' -import SyncDatabase from '../sqlite/sync-database' -import { - initSessionParseCachePersistence, - flushSessionParseCachePersist, - resetSessionParseCachePersistenceForTests -} from './parse-cache/session-parse-cache-persistence' -import { - isolatedScanRoots, - jsonLines, - writeJsonlFile, - writeAntigravityTranscript, - writeAntigravityHistory -} from './session-scanner-test-fixtures' - -let tempRoots: string[] = [] - -afterEach(async () => { - vi.restoreAllMocks() - resetSessionParseCachePersistenceForTests() - await Promise.all(tempRoots.map((root) => rm(root, { recursive: true, force: true }))) - tempRoots = [] - resetSessionParseCacheForTests() -}) - -it.each(['prefetch', 'read'] as const)('keeps an evicted parse from %s', async (boundary) => { - const root = await mkdtemp(join(tmpdir(), 'orca-scope-publication-')) - tempRoots.push(root) - const roots = isolatedScanRoots(root) - const path = join(roots.codexSessionsDir, 'rollout-published.jsonl') - await writeJsonlFile(path, [ - { type: 'session_meta', payload: { id: 'published', cwd: '/elsewhere' } }, - { type: 'turn_context', payload: { cwd: '/repo' } }, - { type: 'event_msg', payload: { type: 'user_message', message: 'Find me' } } - ]) - await utimes(path, 1, 1) - await writeRollout(roots.codexSessionsDir, 'newer', '/other', '15') - const { mtimeMs, size: sizeBytes, mtime } = await stat(path) - const file = { path, mtimeMs, sizeBytes, modifiedAt: mtime.toISOString() } - initSessionParseCachePersistence({ filePath: join(root, 'cache.json'), appVersion: 'test' }) - const metadata = vi.spyOn(SessionParseCacheDatabase.prototype, 'readScopeCwds') - const publish = async () => { - const parsed = await parseAgentSessionFileCached( - { agent: 'codex', file, codexHome: null }, - 'linux' - ) - expect(parsed?.cwd).toBe('/repo') - for (let index = 0; index <= MAX_UNLISTED_ENTRIES; index++) { - storeSessionParseCacheEntry(`index-${index}`, { - mtimeMs: mtimeMs + 1, - sizeBytes: null, - platform: 'linux', - session: null, - resume: null - }) - } - if (boundary === 'read') { - await flushSessionParseCachePersist() - } - const db = new SyncDatabase(join(root, 'session-parse-cache.sqlite')) - expect(db.prepare('SELECT path FROM rows WHERE path = ?').get(path) !== undefined).toBe( - boundary === 'read' - ) - db.close() - metadata.mockClear() - } - if (boundary === 'prefetch') { - storeSessionScopeCwd(path, { mtimeMs, sizeBytes, platform: 'linux', cwd: '/elsewhere' }) - vi.spyOn(eventLoop, 'yieldToEventLoop').mockImplementationOnce(publish) - } else { - const source = AI_VAULT_SCOPE_CWD_SOURCES.codex - if (source.kind !== 'read') { - throw new Error('Codex must have a cheap reader') - } - const original = source.readCwd - vi.spyOn(source, 'readCwd').mockImplementation(async (candidate, signal) => { - const read = await original(candidate, signal) - if (candidate.file.path === path) { - await publish() - } - return read - }) - } - const result = await scanAiVaultSessions({ - ...roots, - platform: 'linux', - limit: 1, - scopePaths: ['/repo'] - }) - const found = result.sessions.filter((row) => row.filePath === path) - expect(found.map((row) => row.cwd)).toEqual(['/repo']) - expect( - metadata.mock.calls.filter(([paths]) => paths.length === 1 && paths[0] === path) - ).toHaveLength(1) - expect(await stat(path)).toMatchObject({ mtimeMs, size: sizeBytes }) -}) - -async function writeRollout(sessionsDir: string, id: string, cwd: string, day: string) { - const dir = join(sessionsDir, '2026', '10', day) - await mkdir(dir, { recursive: true }) - const path = join(dir, `rollout-2026-10-${day}T10-00-00-${id}.jsonl`) - const timestamp = `2026-10-${day}T10:00:00.000Z` - await writeFile( - path, - jsonLines([ - // Large Codex headers must still expose cwd beyond the initial read chunk. - { timestamp, type: 'session_meta', payload: { id, cwd, instructions: 'x'.repeat(20_000) } }, - { - timestamp, - type: 'response_item', - payload: { type: 'message', role: 'user', content: [{ type: 'text', text: id }] } - } - ]) - ) - await utimes(path, new Date(timestamp), new Date(timestamp)) - return path -} - -describe('scanAiVaultSessions — scope before the recency cap', () => { - it('lists an older in-scope Codex session once across hardlinked homes', async () => { - const root = await mkdtemp(join(tmpdir(), 'orca-ai-vault-scope-walk-')) - tempRoots.push(root) - const realHome = join(root, 'real-codex-home') - const managedSessionsDir = join(root, 'codex-accounts', 'a1', 'home', 'sessions') - const workspace = '/Users/ada/orca/workspaces/orca/taimen-2' - - const old = await writeRollout(managedSessionsDir, '01a14083-old', workspace, '11') - await mkdir(join(realHome, 'sessions', '2026', '10', '11'), { recursive: true }) - await link(old, old.replace(managedSessionsDir, join(realHome, 'sessions'))) - for (const [index, day] of ['13', '14', '15'].entries()) { - await writeRollout(managedSessionsDir, `02b-newer-${index}`, '/Users/ada/other', day) - } - - const scan = (scopePaths?: string[]) => - scanAiVaultSessions({ - ...isolatedScanRoots(root), - codexSessionsDir: join(realHome, 'sessions'), - defaultCodexHomeDir: realHome, - additionalCodexSessionsDirs: [managedSessionsDir], - platform: 'darwin', - limit: 2, - scopePaths - }) - - expect((await scan()).sessions.map((session) => session.sessionId)).not.toContain( - '01a14083-old' - ) - const scoped = await scan([workspace]) - const inScope = scoped.sessions.filter((session) => session.cwd === workspace) - expect(inScope.map((session) => session.sessionId)).toEqual(['01a14083-old']) - expect( - truncateAiVaultListResult(scoped, 2, [workspace]).sessions.map((s) => s.sessionId) - ).toContain('01a14083-old') - }) -}) - -it('keeps an older Antigravity session in scope across warm scans and changed history', async () => { - const root = await mkdtemp(join(tmpdir(), 'orca-scope-history-')) - tempRoots.push(root) - const roots = isolatedScanRoots(root) - await writeRollout(roots.codexSessionsDir, 'newer', '/other', '15') - const timestamp = '2026-10-11T10:00:00.000Z' - const path = await writeAntigravityTranscript(roots.antigravityBrainDir, 'older', [ - { source: 'USER_EXPLICIT', type: 'USER_INPUT', created_at: timestamp, content: 'Find me' } - ]) - await utimes(path, new Date(timestamp), new Date(timestamp)) - const history = (workspace: string) => - writeAntigravityHistory(roots.antigravityBrainDir, [ - { conversationId: 'older', display: 'Find me', timestamp, workspace } - ]) - const scan = () => - scanAiVaultSessions({ ...roots, platform: 'linux', limit: 1, scopePaths: ['/repo'] }) - await history('/repo') - expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') - expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') - await history('/elsewhere') - expect((await scan()).sessions.map((row) => row.sessionId)).not.toContain('older') - await history('/repo') - expect((await scan()).sessions.map((row) => row.sessionId)).toContain('older') -}) - -it('delivers cancellation while traversing unchanged cached candidates', async () => { - const candidates = Array.from({ length: 512 }, (_, index) => { - const file = { - path: `/cached/${index}.json`, - mtimeMs: 1, - modifiedAt: new Date(1).toISOString() - } - storeSessionParseCacheEntry(file.path, { - mtimeMs: 1, - sizeBytes: null, - platform: 'linux', - session: null, - resume: null - }) - return { agent: 'hermes' as const, file, codexHome: null } - }) - const controller = new AbortController() - const timer = setTimeout(() => controller.abort(), 0) - try { - await expect( - parseSessionCandidates({ - candidates, - limit: 1, - platform: 'linux', - executionHostId: 'local', - issues: [], - parseStats: createSessionParseStats(), - signal: controller.signal, - listed: false, - selectCandidate: async () => true - }) - ).rejects.toMatchObject({ name: 'AbortError' }) - } finally { - clearTimeout(timer) - } -}) diff --git a/src/main/ai-vault/session-scanner-values.ts b/src/main/ai-vault/session-scanner-values.ts deleted file mode 100644 index bb98084db41..00000000000 --- a/src/main/ai-vault/session-scanner-values.ts +++ /dev/null @@ -1,210 +0,0 @@ -import { homedir } from 'node:os' -import { basename, dirname, join } from 'node:path' -import { resolveAbsoluteDirOverride } from '../../shared/absolute-dir-override' -import { wslGatedReadFile } from '../native-chat/wsl-transcript-fs-access' -import { WslTranscriptFsError } from '../native-chat/wsl-transcript-fs-gate' -import { asRecord } from './session-scanner-record-value' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' - -export { asRecord } - -export function timestampMs(value: unknown): number { - if (typeof value === 'string') { - const parsed = Date.parse(value) - return Number.isFinite(parsed) ? parsed : Number.NaN - } - if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) { - return Number.NaN - } - return value > 1_000_000_000_000 ? value : value * 1000 -} - -export function parseJsonObject(line: string): Record | null { - if (!line.trim()) { - return null - } - try { - const parsed = JSON.parse(line) as unknown - return asRecord(parsed) - } catch { - return null - } -} - -export function extractString(value: unknown): string | null { - if (typeof value !== 'string') { - return null - } - const trimmed = value.trim() - return trimmed.length > 0 ? trimmed : null -} - -export function extractModel(value: unknown): string | null { - const record = asRecord(value) - if (!record) { - return null - } - return ( - extractString(record.model) || - extractString(record.model_name) || - extractString(asRecord(record.metadata)?.model) || - extractString(asRecord(record.info)?.model) || - null - ) -} - -export { - extractContentText, - extractMessageText, - extractPreviewContentText, - normalizePreviewText, - normalizeTitleText, - sliceAtCodeUnitLimit -} from './session-scanner-text-normalization' -export { - extractFullFirstUserPromptText, - normalizeFullFirstUserPromptText, - shouldCaptureFullFirstUserPrompt -} from './session-scanner-first-user-prompt' - -export function extractGitBranch(value: unknown): string | null { - const git = asRecord(value) - if (!git) { - return null - } - return extractString(git.branch) || extractString(git.current_branch) -} - -export async function readJsonObjectIfExists( - filePath: string, - signal?: AbortSignal -): Promise | null> { - try { - const parsed: unknown = JSON.parse(await wslGatedReadFile(filePath, 'utf-8', 'scan', signal)) - return asRecord(parsed) - } catch (error) { - // Propagate cancellation so it cannot be cached as absent enrichment. - throwIfAiVaultScanCancelled(signal) - // Propagate WSL refusal as an issue; caching null can prevent retries for unchanged files. - if (error instanceof WslTranscriptFsError) { - throw error - } - return null - } -} - -export function arrayValue(value: unknown): unknown[] { - return Array.isArray(value) ? value : [] -} - -export function firstString(record: Record, keys: string[]): string | null { - for (const key of keys) { - const value = extractString(record[key]) - if (value) { - return value - } - } - return null -} - -export function extractTrustedFolder(value: unknown): string | null { - const message = extractString(value) - if (!message) { - return null - } - return message.match(/^Folder (.+) has been added to trusted folders\.$/)?.[1] ?? null -} - -export function timeObjectValue(value: unknown, key: string): string | null { - const record = asRecord(value) - if (!record) { - return null - } - const rawValue = record[key] - if (typeof rawValue === 'string') { - return rawValue - } - const parsed = timestampMs(rawValue) - if (!Number.isFinite(parsed)) { - return null - } - return new Date(parsed).toISOString() -} - -export function findOpenCodeStorageRoot(filePath: string): string | null { - const sessionDir = dirname(filePath) - const sessionRoot = dirname(sessionDir) - if (basename(sessionRoot) !== 'session') { - return null - } - return dirname(sessionRoot) -} - -// Accept Pi/OMP home, agent, or sessions paths. -export function normalizeAgentSessionsDir( - rawValue: string, - agentHomeDirName: '.pi' | '.omp' -): string { - const trimmed = rawValue.trim() - if (!trimmed) { - return join(homedir(), agentHomeDirName, 'agent', 'sessions') - } - const normalized = trimmed.replace(/[\\/]+$/, '') - const leaf = basename(normalized) - if (leaf === 'sessions') { - return normalized - } - if (leaf === 'agent') { - return join(normalized, 'sessions') - } - if (leaf === agentHomeDirName) { - return join(normalized, 'agent', 'sessions') - } - return normalized -} - -function defaultPrimeAgentSessionsDir(): string { - return join(homedir(), '.prime', 'agent', 'sessions') -} - -// Pi/Prime expand leading ~ themselves; other CLIs such as Grok treat it literally. -function absoluteConfiguredDir(rawValue: string): string | null { - const expanded = rawValue === '~' ? homedir() : rawValue.replace(/^~(?=[\\/])/, homedir()) - const normalized = expanded.replace(/[\\/]+$/, '') - return resolveAbsoluteDirOverride(normalized, '') || null -} - -// Prime always appends sessions, even when the configured agent directory is named sessions. -export function normalizePrimeAgentSessionsDir(rawAgentDir: string): string { - const agentDir = absoluteConfiguredDir(rawAgentDir.trim()) - return agentDir ? join(agentDir, 'sessions') : defaultPrimeAgentSessionsDir() -} - -// Explicit session-root overrides outrank the agent directory and are used verbatim. -export function primeAgentSessionsDirFromEnv(env: NodeJS.ProcessEnv = process.env): string { - const sessionDir = - env.PRIME_AGENT_SESSION_DIR?.trim() || env.PRIME_AGENT_CODING_AGENT_SESSION_DIR?.trim() - if (sessionDir) { - return absoluteConfiguredDir(sessionDir) ?? defaultPrimeAgentSessionsDir() - } - const agentDir = env.PRIME_AGENT_CODING_AGENT_DIR?.trim() - return agentDir ? normalizePrimeAgentSessionsDir(agentDir) : defaultPrimeAgentSessionsDir() -} - -export function clampPositiveInteger(value: number | undefined, fallback: number): number { - return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : fallback -} - -export function errorMessage(err: unknown): string { - return err instanceof Error ? err.message : String(err) -} - -export { - addCodexUsage, - claudeUsageTotal, - copilotModelMetricsTotal, - normalizeCodexUsage, - numberValue, - subtractCodexUsage, - tokenTotal -} from './session-scanner-token-values' diff --git a/src/main/ai-vault/session-scanner.test.ts b/src/main/ai-vault/session-scanner.test.ts index 32b95100f3a..07893f23fdf 100644 --- a/src/main/ai-vault/session-scanner.test.ts +++ b/src/main/ai-vault/session-scanner.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import { scanAiVaultSessions } from './session-scanner' -import { isolatedScanRoots, jsonLines } from './session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from './scanner-fixtures/session-scanner-test-fixtures' // Use synchronous SQLite implementations because worker bundles are absent in the test runtime. vi.mock( diff --git a/src/main/ai-vault/session-scanner.ts b/src/main/ai-vault/session-scanner.ts index dbe45b44195..550b7fcb346 100644 --- a/src/main/ai-vault/session-scanner.ts +++ b/src/main/ai-vault/session-scanner.ts @@ -5,33 +5,36 @@ import type { } from '../../shared/ai-vault/contracts/ai-vault-types' import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' import { withSpan } from '../observability/tracer' -import { sessionSortTime } from './session-scanner-accumulator' -import { dedupeScannedSessions } from './session-root-dedup' +import { sessionSortTime } from './parsing/session-scanner-accumulator' +import { dedupeScannedSessions } from './parsing/session-root-dedup' import { createAntigravityWorkspaceResolver, readLocalAntigravityHistory } from './scanners/antigravity/session-scanner-antigravity-history' -import { sessionCandidatesFromDiscoveries } from './session-scanner-candidates' -import { parseSessionCandidates } from './session-scanner-candidate-parse' +import { sessionCandidatesFromDiscoveries } from './discovery/session-scanner-candidates' +import { parseSessionCandidates } from './parsing/session-scanner-candidate-parse' import { createSessionParseStats } from './parse-cache/session-scanner-parse-cache' -import { recordSessionScanIssue } from './session-scan-issues' -import { aiVaultScanWorkload, noteAiVaultScanReading } from './ai-vault-scan-progress' -import { yieldScanInventory } from './session-scanner-scope-inventory' -import { prepareScopeScan, scanInScopeSessions } from './session-scanner-scope-walk' -import { discoverAiVaultSessionSources } from './session-scanner-source-discovery' +import { recordSessionScanIssue } from './parsing/session-scan-issues' +import { + aiVaultScanWorkload, + noteAiVaultScanReading +} from './scan-lifecycle/ai-vault-scan-progress' +import { yieldScanInventory } from './scope/session-scanner-scope-inventory' +import { prepareScopeScan, scanInScopeSessions } from './scope/session-scanner-scope-walk' +import { discoverAiVaultSessionSources } from './discovery/session-scanner-source-discovery' import { withAntigravityArtifactPaths } from './scanners/antigravity/antigravity-session-artifacts' import { cursorChatMetaRefusals, withCursorChatMetaScan } from './scanners/cursor/session-scanner-cursor-chat-meta' import type { AiVaultScanOptions } from './session-scanner-types' -import { clampPositiveInteger } from './session-scanner-values' -import { scopeOnlyScan } from './session-scope-cwd' + +import { scopeOnlyScan } from './scope/session-scope-cwd' import { aiVaultSessionInScope, createAiVaultScopeCwdMatcher } from '../../shared/ai-vault/scanning/ai-vault-scope-cwd-match' -import { throwIfAiVaultScanCancelled } from './ai-vault-scan-cancellation' +import { throwIfAiVaultScanCancelled } from './scan-lifecycle/ai-vault-scan-cancellation' import { DEFAULT_AI_VAULT_SCAN_LIMIT } from '../../shared/ai-vault/scanning/ai-vault-session-depth' import { withDevinSessionsDbScan } from './scanners/devin/session-scanner-devin-db' import { withOpenCodeSqliteScanScope } from './scanners/opencode/sqlite/session-scanner-opencode-sqlite-scan-scope' @@ -173,3 +176,7 @@ function mergeSessions( (left, right) => sessionSortTime(right) - sessionSortTime(left) ) } + +function clampPositiveInteger(value: number | undefined, fallback: number): number { + return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : fallback +} diff --git a/src/main/ai-vault/session-subagent-reader.ts b/src/main/ai-vault/session-subagent-reader.ts deleted file mode 100644 index 9383728ac17..00000000000 --- a/src/main/ai-vault/session-subagent-reader.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { AiVaultSubagentListResult } from '../../shared/ai-vault/contracts/ai-vault-types' -import { listClaudeSubagentSessions } from './scanners/claude/session-scanner-claude-subagents' -import { listOmpSubagentSessions } from './scanners/omp/session-scanner-omp-subagent-listing' -import type { AiVaultServiceSubagentRequest } from './scan-service/session-scanner-service-protocol' - -export function listLocalAiVaultSubagentSessions( - request: AiVaultServiceSubagentRequest -): Promise { - return request.agent === 'claude' - ? listClaudeSubagentSessions({ parentFilePath: request.parentFilePath }) - : listOmpSubagentSessions({ parentFilePath: request.parentFilePath }) -} diff --git a/src/main/ai-vault/structured-chat-cli-fork.test.ts b/src/main/ai-vault/structured-chat-cli-fork.test.ts deleted file mode 100644 index 8863a0cfd86..00000000000 --- a/src/main/ai-vault/structured-chat-cli-fork.test.ts +++ /dev/null @@ -1,203 +0,0 @@ -import { agentSessionConversationView } from '../../shared/agent-session/lifecycle/agent-session-conversation-view' -import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises' -import { join } from 'node:path' -import { tmpdir } from 'node:os' -import { afterEach, expect, it, vi } from 'vitest' -import { agentSessionRecordFixture } from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture' -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' -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/host/structured-agent-session-registry' -import { prepareStructuredChatCliFork } from './structured-chat-cli-fork' -import { structuredAgentRuntimeRegistration } from '../runtime/agent-session/installation/structured-agent-runtime-registrations' -import { prepareLegacySharedCodexSessionResume } from '../codex/history/resume/codex-legacy-session-resume' - -let root: string | undefined -const request = { - sourceChat: { sessionId: 'session-alpha-1', workspaceId: 'workspace-1' }, - fork: true -} as const -const prepare = vi.fn(async () => ({ useRealCodexHome: false })) -function savedJournal(): AgentJournalSnapshot { - return { - sessionId: 'session-alpha-1', - cursor: { epoch: 'e', sequence: 1 }, - submissions: [], - items: [ - { - itemId: 'legacy:pi:source:user-1', - revision: 0, - sequence: 1, - observedAt: 1, - body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Saved prompt' }] } - } - ] - } -} -function install(record: AgentSessionRecord, copy = vi.fn(), journal = savedJournal()) { - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: preparation reads only these host dependencies. - setStructuredAgentSessionHost({ - journalSnapshot: async () => journal, - deps: { - store: { - getRecord: () => record, - listRecords: () => [record], - listConversations: () => [agentSessionConversationView(record)], - selectWritableRecord: () => ({ kind: 'writable', record }), - requireWritableRecord: () => record - }, - adapter: { copyConversation: copy }, - resolveWorkspacePath: async () => root, - resolveLaunchEnv: () => ({}) - } - } as never) -} -afterEach(async () => { - setStructuredAgentSessionHost(null) - prepare.mockClear() - vi.unstubAllEnvs() - if (root) { - await rm(root, { recursive: true, force: true }) - } - root = undefined -}) - -it('locates the current Codex rollout in its recorded home and materializes the selected home', async () => { - root = await mkdtemp(join(tmpdir(), 'chat-cli-fork-')) - vi.stubEnv('ORCA_USER_DATA_PATH', root) - const home = join(root, 'codex-runtime-home', 'home') - const system = join(root, 'system') - const record = agentSessionRecordFixture() - record.provider = 'codex' - record.accountHome = { variable: 'CODEX_HOME', path: home } - record.providerHandleChain = [ - { - ...record.providerHandleChain[0]!, - handle: { transport: 'codex-app-server', agent: 'codex', nativeId: 'obsolete' } - }, - { - ...record.providerHandleChain[0]!, - linkId: 'latest', - handle: { transport: 'codex-app-server', agent: 'codex', nativeId: 'current-conversation' } - } - ] - const relative = join('2026', '10', '15', 'rollout-2026-10-15-current-conversation.jsonl') - const source = join(home, 'sessions', relative) - await mkdir(join(home, 'sessions', '2026', '10', '15'), { recursive: true }) - await writeFile(source, '{"saved":true}\n') - install(record) - const result = await prepareStructuredChatCliFork(request, async (args) => { - expect(args.sessionId).toBe('current-conversation') - expect(args.filePath).toBe(source) - const prepared = await prepareLegacySharedCodexSessionResume(args, { - isHostSystemDefaultRealHomeSelected: () => true, - legacyCodexHomePath: home, - systemCodexHomePath: system - }) - // Production uses its system home; this fixture selects the same materialized home explicitly. - return { ...prepared, useRealCodexHome: false, substituteCodexHome: system } - }) - expect(result.cliForkSource).toMatchObject({ - sessionId: 'current-conversation', - codexHome: system, - filePath: join(system, 'sessions', relative), - cwd: root - }) -}) - -it.runIf(process.platform === 'win32')( - 'maps an extended-length Windows rollout path into the prepared home (#27200)', - async () => { - root = await mkdtemp(join(tmpdir(), 'chat-cli-fork-')) - vi.stubEnv('ORCA_USER_DATA_PATH', root) - const home = join(root, 'codex-runtime-home', 'home') - const system = join(root, 'system') - const record = agentSessionRecordFixture() - record.provider = 'codex' - record.accountHome = { variable: 'CODEX_HOME', path: home } - record.providerHandleChain = [ - { - ...record.providerHandleChain[0]!, - handle: { transport: 'codex-app-server', agent: 'codex', nativeId: 'current-conversation' } - } - ] - const relative = join('2026', '10', '15', 'rollout-2026-10-15-current-conversation.jsonl') - await mkdir(join(home, 'sessions', '2026', '10', '15'), { recursive: true }) - await writeFile(join(home, 'sessions', relative), '{"saved":true}\n') - vi.spyOn( - structuredAgentRuntimeRegistration('codex')!.transcriptImport!, - 'findTranscript' - ).mockResolvedValueOnce(`\\\\?\\${join(home, 'sessions', relative)}`) - install(record) - const result = await prepareStructuredChatCliFork(request, async (args) => ({ - ...(await prepareLegacySharedCodexSessionResume(args, { - isHostSystemDefaultRealHomeSelected: () => true, - legacyCodexHomePath: home, - systemCodexHomePath: system - })), - useRealCodexHome: false, - substituteCodexHome: system - })) - expect(result.cliForkSource?.filePath).toBe(join(system, 'sessions', relative)) - } -) - -it('uses the Pi file handle and refuses a mismatched saved header or missing handle', async () => { - root = await mkdtemp(join(tmpdir(), 'chat-cli-fork-')) - const filePath = join(root, '2026-10-15_12345678-abcd-1234-abcd-123456789abc.jsonl') - const record = agentSessionRecordFixture() - record.provider = 'pi' - record.providerHandleChain = [ - { - ...record.providerHandleChain[0]!, - handle: { agent: 'pi', transport: 'jsonl-rpc', nativeId: filePath } - } - ] - await writeFile( - filePath, - `${JSON.stringify({ type: 'session', id: '12345678-abcd-1234-abcd-123456789abc', cwd: root })}\n` - ) - const journal = savedJournal() - const savedMessage = journal.items.splice(0) - install(record, vi.fn(), journal) - await expect(prepareStructuredChatCliFork(request, prepare)).rejects.toThrow( - 'no saved conversation' - ) - expect(prepare).not.toHaveBeenCalled() - await writeFile( - filePath, - `${JSON.stringify({ type: 'session', id: '12345678-abcd-1234-abcd-123456789abc', cwd: root })}\n${JSON.stringify({ type: 'message', id: 'user-1', parentId: null, message: { role: 'user', content: [{ type: 'text', text: 'Saved prompt' }], timestamp: 1 } })}\n` - ) - journal.items.push(...savedMessage) - await expect(prepareStructuredChatCliFork(request, prepare)).resolves.toMatchObject({ - cliForkSource: { filePath, sessionId: '12345678-abcd-1234-abcd-123456789abc' } - }) - journal.items[0]!.itemId = agentJournalSubmissionKey('send-1') - for (const dispatchState of ['pending', 'rejected', 'unknown', 'accepted'] as const) { - journal.submissions = [ - { - clientMessageId: 'send-1', - fence: 1, - payloadFingerprint: 'p', - dispatchState, - providerItemId: null, - reason: null, - submittedAt: 1, - resolvedAt: null, - handoverRecorded: true - } - ] - const preparation = prepareStructuredChatCliFork(request, prepare) - await (dispatchState === 'accepted' - ? expect(preparation).resolves.toHaveProperty('cliForkSource') - : expect(preparation).rejects.toThrow( - dispatchState === 'unknown' ? 'Could not confirm' : 'no saved conversation' - )) - } - await writeFile(filePath, `${JSON.stringify({ type: 'session', id: 'wrong', cwd: root })}\n`) - await expect(prepareStructuredChatCliFork(request, prepare)).rejects.toThrow('does not match') - record.providerHandleChain = [] - await expect(prepareStructuredChatCliFork(request, prepare)).rejects.toThrow( - 'no saved conversation' - ) -}) diff --git a/src/main/ai-vault/structured-session-ownership-client-audience.test.ts b/src/main/ai-vault/structured-session-ownership-client-audience.test.ts deleted file mode 100644 index dbf66da1c21..00000000000 --- a/src/main/ai-vault/structured-session-ownership-client-audience.test.ts +++ /dev/null @@ -1,153 +0,0 @@ -import { afterEach, describe, expect, it } from 'vitest' -import type { AgentSessionProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' -import { - buildAiVaultResumeCommand, - buildAiVaultResumeShellCommand -} from '../../shared/ai-vault/resume/ai-vault-resume-command' -import { buildAgentResumeStartupPlan } from '../../shared/agent-launch/startup/tui-agent-resume-startup' -import { isResumableTuiAgent } from '../../shared/agent-session/lifecycle/agent-session-resume' -import type { AgentStartupShell } from '../../shared/agent-launch/startup/tui-agent-startup-shell' -import { - claudeProviderHandle, - codexProviderHandle -} from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' -import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' -import { assertLegacyAiVaultResumeCommandAllowed } from './structured-session-ownership' -import { installOwnership } from './structured-session-ownership.test-support' - -const UUID = '019fd622-3c4d-7e5f-a061-7c8d9e0f1a2b' -const OPENCODE_ID = 'ses_2f9aB3cD4eF5gH6iJ7kL8mN9oP' -const SESSION_FILE = (root: string) => - `/Users/me/${root}/agent/sessions/--Users-me-repo--/2026-10-09T10-00-00-000Z_${UUID}.jsonl` - -type OwnedConversation = { - rowAgent: AiVaultAgent - sessionId: string - filePath: string - handle: AgentSessionProviderHandle -} - -const CONVERSATIONS: OwnedConversation[] = [ - { - rowAgent: 'opencode', - sessionId: OPENCODE_ID, - filePath: `/Users/me/.local/share/opencode/opencode.db#${OPENCODE_ID}`, - handle: { transport: 'acp', agent: 'opencode', nativeId: OPENCODE_ID } - }, - { - rowAgent: 'opencode2', - sessionId: OPENCODE_ID, - filePath: `/Users/me/.local/share/opencode/opencode.db#${OPENCODE_ID}`, - handle: { transport: 'acp', agent: 'opencode', nativeId: OPENCODE_ID } - }, - { - rowAgent: 'grok', - sessionId: UUID, - filePath: `/Users/me/.grok/sessions/%2FUsers%2Fme%2Frepo/${UUID}/summary.json`, - handle: { transport: 'acp', agent: 'grok', nativeId: UUID } - }, - { - rowAgent: 'omp', - sessionId: UUID, - filePath: SESSION_FILE('.omp'), - handle: { transport: 'acp', agent: 'omp', nativeId: UUID } - }, - { - rowAgent: 'pi', - sessionId: UUID, - filePath: SESSION_FILE('.pi'), - handle: { - transport: 'jsonl-rpc', - agent: 'pi', - nativeId: SESSION_FILE('.pi') - } - } -] - -afterEach(() => setStructuredAgentSessionHost(null)) - -// Shared desktop/mobile resume builders must produce commands the ownership guard recognizes. -describe('resume commands Orca builds for an owned row', () => { - const shells: { platform: NodeJS.Platform; shell: AgentStartupShell }[] = [ - { platform: 'darwin', shell: 'posix' }, - { platform: 'win32', shell: 'powershell' }, - { platform: 'win32', shell: 'cmd' } - ] - const overrides = (binary: string): Record => ({ - posix: [undefined, `FOO=1 /opt/bin/${binary}`, `env -i FOO=1 /opt/bin/${binary}`], - powershell: [undefined, `& 'C:\\Program Files\\${binary}\\${binary}.exe'`], - cmd: [undefined, `"C:\\Program Files\\${binary}\\${binary}.exe"`] - }) - - function builtCommands(conversation: OwnedConversation, fork = false): string[] { - const agent = conversation.rowAgent - if (!isResumableTuiAgent(agent)) { - return [] - } - return shells.flatMap(({ platform, shell }) => { - const vault = fork - ? null - : buildAiVaultResumeCommand({ - agent, - sessionId: conversation.sessionId, - cwd: '/Users/me/repo', - platform, - shell, - resumeFilePath: conversation.filePath - }) - const tabs = overrides(agent)[shell].map((override) => { - const plan = buildAgentResumeStartupPlan({ - agent, - providerSession: { - key: 'session_id', - id: conversation.sessionId, - transcriptPath: conversation.filePath - }, - cmdOverrides: override ? { [agent]: override } : {}, - platform, - shell, - ompResumeFilePath: conversation.filePath, - fork - }) - return plan - ? buildAiVaultResumeShellCommand({ - resumeCommand: plan.launchCommand, - cwd: '/Users/me/repo', - platform, - shell - }) - : null - }) - return [vault, ...tabs].filter((command): command is string => command !== null) - }) - } - - const everyAgent: OwnedConversation[] = [ - ...CONVERSATIONS, - { - rowAgent: 'claude', - sessionId: UUID, - filePath: `/Users/me/.claude/projects/-Users-me-repo/${UUID}.jsonl`, - handle: claudeProviderHandle(UUID, null) - }, - { - rowAgent: 'codex', - sessionId: UUID, - filePath: `/Users/me/.codex/sessions/2026/10/09/rollout-2026-10-09T10-00-00-${UUID}.jsonl`, - handle: codexProviderHandle(UUID) - } - ] - - it.each(everyAgent)('refuses each one for the $rowAgent row', async (conversation) => { - installOwnership({ handle: conversation.handle }) - const commands = builtCommands(conversation) - expect(commands.length).toBe(10) - for (const command of commands) { - await expect( - assertLegacyAiVaultResumeCommandAllowed(command, async () => undefined), - command - ).rejects.toThrow('agent_session_conflict') - } - }) -}) diff --git a/src/main/ai-vault/shell-command-words.test.ts b/src/main/ai-vault/structured-sessions/shell-command-words.test.ts similarity index 100% rename from src/main/ai-vault/shell-command-words.test.ts rename to src/main/ai-vault/structured-sessions/shell-command-words.test.ts diff --git a/src/main/ai-vault/shell-command-words.ts b/src/main/ai-vault/structured-sessions/shell-command-words.ts similarity index 100% rename from src/main/ai-vault/shell-command-words.ts rename to src/main/ai-vault/structured-sessions/shell-command-words.ts diff --git a/src/main/ai-vault/structured-chat-cli-fork.ts b/src/main/ai-vault/structured-sessions/structured-chat-cli-fork.ts similarity index 85% rename from src/main/ai-vault/structured-chat-cli-fork.ts rename to src/main/ai-vault/structured-sessions/structured-chat-cli-fork.ts index f44c0585500..945baa57588 100644 --- a/src/main/ai-vault/structured-chat-cli-fork.ts +++ b/src/main/ai-vault/structured-sessions/structured-chat-cli-fork.ts @@ -1,31 +1,31 @@ import { stat } from 'node:fs/promises' import { isAbsolute, join } from 'node:path' -import { getSystemCodexHomePath } from '../codex/configuration/homes/codex-home-paths' -import { codexDatedRolloutRelativePath } from '../codex/history/resume/codex-session-resume-home' +import { getSystemCodexHomePath } from '../../codex/configuration/homes/codex-home-paths' +import { codexDatedRolloutRelativePath } from '../../codex/history/resume/codex-session-resume-home' import { agentForksConversations, agentForksThroughChat -} from '../../shared/agent-launch/startup/agent-resume-argv' -import { isLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' -import { agentSessionProviderHandleChainHead } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import { pendingAgentSessionRewindFork } from '../../shared/agent-session/lifecycle/agent-session-rewind' +} from '../../../shared/agent-launch/startup/agent-resume-argv' +import { isLegacyAgentSessionAccountHome } from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' +import { pendingAgentSessionRewindFork } from '../../../shared/agent-session/lifecycle/agent-session-rewind' import type { AiVaultPrepareChatForkArgs, AiVaultPrepareSessionResumeResult, AiVaultSessionResumePreparation -} from '../../shared/ai-vault/resume/ai-vault-resume-preparation' -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' -import { isWslUncPath } from '../../shared/wsl-paths' -import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' -import { structuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-metadata' -import { readPiSessionHeader } from '../pi/rpc/launch/rpc-launch-resolution' +} from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' +import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' +import { isWslUncPath } from '../../../shared/wsl-paths' +import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' +import { structuredAgentRuntimeMetadata } from '../../runtime/agent-session/installation/structured-agent-runtime-metadata' +import { readPiSessionHeader } from '../../pi/rpc/launch/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/agent-session-journal-types' +import { isAiVaultAgent } from '../listing/session-list-result-validation' +import type { AgentJournalSnapshot } from '../../../shared/agent-session/journal/agent-session-journal-types' import { agentJournalSubmissionKey, parseAgentJournalItemKey -} from '../../shared/agent-session/journal/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/ai-vault/structured-chat-conversation-copy.test.ts b/src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.test.ts similarity index 78% rename from src/main/ai-vault/structured-chat-conversation-copy.test.ts rename to src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.test.ts index 0a6835221dd..9e82074255c 100644 --- a/src/main/ai-vault/structured-chat-conversation-copy.test.ts +++ b/src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.test.ts @@ -1,11 +1,11 @@ import { agentSessionRecordFixture, agentSessionLeaseFixture -} from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture' +} from '../../../shared/agent-session/lifecycle/agent-session-record.test-fixture' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { AgentSessionProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' -import type { AiVaultPrepareSessionResumeArgs } from '../../shared/ai-vault/resume/ai-vault-resume-preparation' -import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' +import type { AgentSessionProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' +import type { AiVaultPrepareSessionResumeArgs } from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' +import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' import { copyStructuredChatConversation } from './structured-chat-conversation-copy' import { installCopyingChat as installChat } from './structured-session-ownership.test-support' diff --git a/src/main/ai-vault/structured-chat-conversation-copy.ts b/src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.ts similarity index 81% rename from src/main/ai-vault/structured-chat-conversation-copy.ts rename to src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.ts index 4b2ecda85f6..71d7ac4eb6c 100644 --- a/src/main/ai-vault/structured-chat-conversation-copy.ts +++ b/src/main/ai-vault/structured-sessions/structured-chat-conversation-copy.ts @@ -1,12 +1,12 @@ -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' -import { agentForksThroughChat } from '../../shared/agent-launch/startup/agent-resume-argv' -import { agentSessionProviderHandleChainHead } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' +import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' +import { agentForksThroughChat } from '../../../shared/agent-launch/startup/agent-resume-argv' +import { agentSessionProviderHandleChainHead } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' import type { AiVaultPrepareSessionResumeArgs, AiVaultPrepareSessionResumeResult -} from '../../shared/ai-vault/resume/ai-vault-resume-preparation' -import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' -import { isAiVaultAgent } from './session-list-result-validation' +} from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' +import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' +import { isAiVaultAgent } from '../listing/session-list-result-validation' import { findResumeOwnership } from './structured-session-ownership' /** On the chat’s execution host, create an unowned copy for agents whose adapters handle forks. */ diff --git a/src/main/ai-vault/structured-session-ownership.test-support.ts b/src/main/ai-vault/structured-sessions/structured-session-ownership.test-support.ts similarity index 85% rename from src/main/ai-vault/structured-session-ownership.test-support.ts rename to src/main/ai-vault/structured-sessions/structured-session-ownership.test-support.ts index 742d4a9a9ce..82ca06fc7a9 100644 --- a/src/main/ai-vault/structured-session-ownership.test-support.ts +++ b/src/main/ai-vault/structured-sessions/structured-session-ownership.test-support.ts @@ -1,22 +1,22 @@ import { vi } from 'vitest' -import { agentSessionConversationView } from '../../shared/agent-session/lifecycle/agent-session-conversation-view' -import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' +import { agentSessionConversationView } from '../../../shared/agent-session/lifecycle/agent-session-conversation-view' +import type { AgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-record' import { agentSessionLeaseFixture, agentSessionRecordFixture -} from '../../shared/agent-session/lifecycle/agent-session-record.test-fixture' -import type { AgentSessionProviderHandle } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' +} from '../../../shared/agent-session/lifecycle/agent-session-record.test-fixture' +import type { AgentSessionProviderHandle } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' import type { AiVaultListResult, AiVaultSession -} from '../../shared/ai-vault/contracts/ai-vault-types' -import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' -import type { StructuredProviderSessionOwnership } from '../native-chat/agent-session-wire/host/structured-provider-session-ownership' -import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' +} from '../../../shared/ai-vault/contracts/ai-vault-types' +import type { StructuredAgentSessionAdapter } from '../../native-chat/agent-session-wire/providers/structured-agent-session-adapter' +import type { StructuredProviderSessionOwnership } from '../../native-chat/agent-session-wire/host/structured-provider-session-ownership' +import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' import { claudeProviderHandle, codexProviderHandle -} from '../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' +} from '../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding' export const PROVIDER_SESSION = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60' diff --git a/src/main/ai-vault/structured-session-ownership.test.ts b/src/main/ai-vault/structured-sessions/structured-session-ownership.test.ts similarity index 85% rename from src/main/ai-vault/structured-session-ownership.test.ts rename to src/main/ai-vault/structured-sessions/structured-session-ownership.test.ts index 605bd3562e9..f64fb92a0be 100644 --- a/src/main/ai-vault/structured-session-ownership.test.ts +++ b/src/main/ai-vault/structured-sessions/structured-session-ownership.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it } from 'vitest' -import { resolveOrcaManagedCodexHomePath } from '../codex/configuration/homes/codex-home-paths' -import { redactForTransport } from '../../shared/ai-vault/search/ai-vault-search-transport' -import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' +import { resolveOrcaManagedCodexHomePath } from '../../codex/configuration/homes/codex-home-paths' +import { redactForTransport } from '../../../shared/ai-vault/search/ai-vault-search-transport' +import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' import { assertLegacyAiVaultResumeCommandAllowed, OPENS_EVERY_STRUCTURED_CHAT, @@ -11,7 +11,7 @@ import { import type { AiVaultSearchHit, AiVaultSearchResponse -} from '../../shared/ai-vault/search/ai-vault-search-types' +} from '../../../shared/ai-vault/search/ai-vault-search-types' import { installOwnership, listResult, @@ -74,23 +74,6 @@ describe('structured AI Vault ownership', () => { } ) - it.each([ - `codex resume --last`, - `claude --resume`, - `claude -r`, - `claude --continue`, - `claude -c`, - // --continue takes no id; trailing prompt text must not be mistaken for a different target. - `claude --continue "keep going"`, - `claude -c 019fd532-7c11-7a90-b6de-4e1a2c3d5f61` - ])('refuses resume commands without a provably different target: %s', async (command) => { - installOwnership(command.startsWith('claude') ? { provider: 'claude' } : {}) - - await expect( - assertLegacyAiVaultResumeCommandAllowed(command, async () => undefined) - ).rejects.toThrow('agent_session_conflict') - }) - it.each([ // After `--` the flag is prompt text, so Claude resumes the owned session as a writer. `claude --resume ${PROVIDER_SESSION} -- --fork-session`, diff --git a/src/main/ai-vault/structured-session-ownership.ts b/src/main/ai-vault/structured-sessions/structured-session-ownership.ts similarity index 84% rename from src/main/ai-vault/structured-session-ownership.ts rename to src/main/ai-vault/structured-sessions/structured-session-ownership.ts index 67e0d78f50e..e2252c72393 100644 --- a/src/main/ai-vault/structured-session-ownership.ts +++ b/src/main/ai-vault/structured-sessions/structured-session-ownership.ts @@ -1,40 +1,40 @@ -import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host' +import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import { homedir } from 'node:os' import { join } from 'node:path' import { agentSessionAccountHome, isLegacyAgentSessionAccountHome, type AgentSessionAccountHome -} from '../../shared/agent-session/lifecycle/agent-session-account-home' -import { acquiredAgentSessionAccount } from '../../shared/agent-session/lifecycle/agent-session-acquired-account' -import { CLAUDE_STRUCTURED_AGENT } from '../claude/structured/claude-structured-agent-definition' -import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path' -import { resolveOrcaManagedCodexHomePath } from '../codex/configuration/homes/codex-home-paths' -import { agentSessionOwnerObservationIsLive } from '../../shared/agent-session/lifecycle/agent-session-lease-adjudication' -import { defaultAgentChatLabel } from '../../shared/agent-session/agent-session-chat-label' -import type { AiVaultListResult } from '../../shared/ai-vault/contracts/ai-vault-types' -import { historyRowFallsBackToChatLabel } from '../../shared/structured-chat-row-name' -import type { AiVaultSearchResponse } from '../../shared/ai-vault/search/ai-vault-search-types' +} from '../../../shared/agent-session/lifecycle/agent-session-account-home' +import { acquiredAgentSessionAccount } from '../../../shared/agent-session/lifecycle/agent-session-acquired-account' +import { CLAUDE_STRUCTURED_AGENT } from '../../claude/structured/claude-structured-agent-definition' +import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path' +import { resolveOrcaManagedCodexHomePath } from '../../codex/configuration/homes/codex-home-paths' +import { agentSessionOwnerObservationIsLive } from '../../../shared/agent-session/lifecycle/agent-session-lease-adjudication' +import { defaultAgentChatLabel } from '../../../shared/agent-session/agent-session-chat-label' +import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { historyRowFallsBackToChatLabel } from '../../../shared/structured-chat-row-name' +import type { AiVaultSearchResponse } from '../../../shared/ai-vault/search/ai-vault-search-types' import { redactForTransport, type SessionSearchTransport -} from '../../shared/ai-vault/search/ai-vault-search-transport' -import type { AiVaultPrepareSessionResumeArgs } from '../../shared/ai-vault/resume/ai-vault-resume-preparation' -import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/host/structured-agent-session-registry' -import { ensureStructuredAgentSessionHostUnlessRefused } from '../runtime/agent-session/structured-agent-session-host-refusal' +} from '../../../shared/ai-vault/search/ai-vault-search-transport' +import type { AiVaultPrepareSessionResumeArgs } from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' +import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry' +import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/structured-agent-session-host-refusal' import { listStructuredProviderSessionOwnership, terminalResumeBlocked, type StructuredProviderSessionOwnership -} from '../native-chat/agent-session-wire/host/structured-provider-session-ownership' -import type { StructuredAgentId } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' +} from '../../native-chat/agent-session-wire/host/structured-provider-session-ownership' +import type { StructuredAgentId } from '../../../shared/agent-session/lifecycle/agent-session-provider-handle' import { sessionHistoryBinaryNames, type StructuredAgentResumeInvocation, type StructuredAgentSessionHistory -} from '../native-chat/structured-agent-cli-conversations' -import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../runtime/agent-session/installation/structured-agent-runtime-metadata' -import type { StructuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-registration-types' +} from '../../native-chat/structured-agent-cli-conversations' +import { STRUCTURED_AGENT_RUNTIME_METADATA } from '../../runtime/agent-session/installation/structured-agent-runtime-metadata' +import type { StructuredAgentRuntimeMetadata } from '../../runtime/agent-session/installation/structured-agent-runtime-registration-types' import { commandName, commandProgramIndex, shellCommands } from './shell-command-words' /** Hide chat-owned rows from clients unable to open that agent’s chat. */ diff --git a/src/main/ai-vault/transcripts/remote-session-content-lines.ts b/src/main/ai-vault/transcripts/remote-session-content-lines.ts index cb48d9009ab..84ec6cbf2fa 100644 --- a/src/main/ai-vault/transcripts/remote-session-content-lines.ts +++ b/src/main/ai-vault/transcripts/remote-session-content-lines.ts @@ -1,6 +1,6 @@ import { splitTranscriptStreamLines } from '../../native-chat/transcript-stream-lines' import { setImmediate as yieldToEventLoop } from 'node:timers/promises' -import { throwIfAiVaultScanCancelled } from '../ai-vault-scan-cancellation' +import { throwIfAiVaultScanCancelled } from '../scan-lifecycle/ai-vault-scan-cancellation' import { MAX_SESSION_TRANSCRIPT_RECORD_BYTES } from './session-transcript-record-budget' export type RemoteSessionContent = string | AsyncIterable diff --git a/src/main/ai-vault/transcripts/remote-session-file-stat.ts b/src/main/ai-vault/transcripts/remote-session-file-stat.ts index 2f8aeb7a2b6..4be6146a7d5 100644 --- a/src/main/ai-vault/transcripts/remote-session-file-stat.ts +++ b/src/main/ai-vault/transcripts/remote-session-file-stat.ts @@ -1,4 +1,4 @@ -import { errorMessage } from '../session-scanner-values' +import { errorMessage } from '../../../shared/error-message' export function isMissingRemoteSessionPathError(error: unknown): boolean { const code = diff --git a/src/main/ai-vault/transcripts/session-decoded-message.ts b/src/main/ai-vault/transcripts/session-decoded-message.ts index 1fd634c83f4..b2a87db55d2 100644 --- a/src/main/ai-vault/transcripts/session-decoded-message.ts +++ b/src/main/ai-vault/transcripts/session-decoded-message.ts @@ -1,5 +1,5 @@ import type { AiVaultSessionPreviewMessage } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { asRecord } from '../session-scanner-record-value' +import { asRecord } from '../parsing/session-record-fields' import { isClaudeToolUseContent, isClaudeToolResultContent, diff --git a/src/main/ai-vault/transcripts/session-document-stream.ts b/src/main/ai-vault/transcripts/session-document-stream.ts index b6a186082e9..d917472158a 100644 --- a/src/main/ai-vault/transcripts/session-document-stream.ts +++ b/src/main/ai-vault/transcripts/session-document-stream.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' import { StringDecoder } from 'node:string_decoder' import { FlexAssembler, arrayRule, objectRule } from 'stream-json/core/utils/flex-assembler.js' import { setImmediate as yieldToEventLoop } from 'node:timers/promises' diff --git a/src/main/ai-vault/transcripts/session-transcript-channel.ts b/src/main/ai-vault/transcripts/session-transcript-channel.ts index ccf17eecd1a..baff84fa403 100644 --- a/src/main/ai-vault/transcripts/session-transcript-channel.ts +++ b/src/main/ai-vault/transcripts/session-transcript-channel.ts @@ -1,4 +1,7 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' import { hasTranscriptConsumers, transcriptConsumers, diff --git a/src/main/ai-vault/transcripts/session-transcript-consumers.test.ts b/src/main/ai-vault/transcripts/session-transcript-consumers.test.ts index 41f148a4a0e..bed7c848c37 100644 --- a/src/main/ai-vault/transcripts/session-transcript-consumers.test.ts +++ b/src/main/ai-vault/transcripts/session-transcript-consumers.test.ts @@ -1,4 +1,4 @@ -import { appendFile, mkdir, mkdtemp, rm, stat, truncate, utimes, writeFile } from 'node:fs/promises' +import { appendFile, mkdir, mkdtemp, rm, stat, utimes, writeFile } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' @@ -7,7 +7,7 @@ import { afterEach, expect, it } from 'vitest' import { scanAiVaultSessions } from '../session-scanner' import { parseAgentSessionFileCached } from '../parse-cache/session-scanner-parse-cache' import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' -import { isolatedScanRoots, jsonLines } from '../session-scanner-test-fixtures' +import { isolatedScanRoots, jsonLines } from '../scanner-fixtures/session-scanner-test-fixtures' import type { FileWithMtime, SessionFileCandidate } from '../session-scanner-types' import { @@ -121,38 +121,6 @@ it('replays only the appended lines on a resumed read', async () => { ]) }) -it.each(['rewrite', 'truncate then regrow'])( - 're-reads a same-size %s from zero', - async (operation) => { - const { transcript } = await writeClaudeFixture() - const before = await claudeCandidate(transcript) - await parseAgentSessionFileCached(before, 'darwin') - const consumer = recordingConsumer() - const rewritten = `${jsonLines(claudeTurns(1, 4))}\n`.replace('reply 4', 'fresh 4') - expect(Buffer.byteLength(rewritten)).toBe(before.file.sizeBytes) - - if (operation === 'truncate then regrow') { - await truncate(transcript, 0) - await appendFile(transcript, rewritten) - } else { - await writeFile(transcript, rewritten) - } - const changedAt = new Date(before.file.mtimeMs + 2000) - await utimes(transcript, changedAt, changedAt) - const session = await parseAgentSessionFileCached(await claudeCandidate(transcript), 'darwin') - - expect(consumer.reads).toHaveLength(1) - expect(consumer.reads[0].start.mode).toBe('replace') - expect(consumer.reads[0].start.previousByteOffset).toBe(0) - expect(textsFor(consumer.reads, 'claude')).toContain('assistant:fresh 4') - expect(textsFor(consumer.reads, 'claude')).not.toContain('assistant:reply 4') - resetSessionParseCacheForTests() - expect(session).toEqual( - await parseAgentSessionFileCached(await claudeCandidate(transcript), 'darwin') - ) - } -) - it('publishes a trailing unterminated line once, when it is complete', async () => { const { roots, transcript } = await writeClaudeFixture() const consumer = recordingConsumer() diff --git a/src/main/ai-vault/transcripts/session-transcript-every-agent-capture.test.ts b/src/main/ai-vault/transcripts/session-transcript-every-agent-capture.test.ts index 57fe7408dcc..8e575358246 100644 --- a/src/main/ai-vault/transcripts/session-transcript-every-agent-capture.test.ts +++ b/src/main/ai-vault/transcripts/session-transcript-every-agent-capture.test.ts @@ -2,6 +2,17 @@ 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 type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types' +import { scanAiVaultSessions } from '../session-scanner' +import { writeEveryAgentVault } from '../scanner-fixtures/session-scanner-every-agent-fixture' +import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' +import { writeOpenCodeSqliteDatabase } from '../scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture' +import { splitOpenCodeSqliteCandidate } from '../../../shared/opencode-sqlite-session-path' +import { + registerTranscriptConsumer, + resetTranscriptConsumersForTests, + type TranscriptMessage +} from './session-transcript-consumers' // Replace the worker transport with its real in-process readers. vi.mock( @@ -46,20 +57,6 @@ vi.mock( } } ) -import { - AI_VAULT_AGENTS, - type AiVaultAgent -} from '../../../shared/ai-vault/contracts/ai-vault-types' -import { scanAiVaultSessions } from '../session-scanner' -import { writeEveryAgentVault } from '../session-scanner-every-agent-fixture' -import { resetSessionParseCacheForTests } from '../parse-cache/session-parse-cache-store' -import { writeOpenCodeSqliteDatabase } from '../scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture' -import { splitOpenCodeSqliteCandidate } from '../../../shared/opencode-sqlite-session-path' -import { - registerTranscriptConsumer, - resetTranscriptConsumersForTests, - type TranscriptMessage -} from './session-transcript-consumers' const OPENCODE_SQLITE_SESSION = 'ses_capture_guard' @@ -123,18 +120,6 @@ async function readEveryAgentVault(): Promise { return reads } -function spokeIn(read: CapturedRead): boolean { - return read.messages.some((message) => message.role === 'user' || message.role === 'assistant') -} - -it('publishes at least one user or assistant message for every source it reads', async () => { - const reads = await readEveryAgentVault() - - // Check every storage source: one working OpenCode format must not mask another’s missing messages. - expect(reads.filter((read) => !spokeIn(read)).map((read) => read.path)).toEqual([]) - expect(new Set(reads.map((read) => read.agent))).toEqual(new Set(AI_VAULT_AGENTS)) -}) - it('publishes an OpenCode SQLite session through the same channel as every file source', async () => { const reads = await readEveryAgentVault() diff --git a/src/main/ai-vault/transcripts/session-transcript-reader.ts b/src/main/ai-vault/transcripts/session-transcript-reader.ts index 6f3b8e77936..07689a706d3 100644 --- a/src/main/ai-vault/transcripts/session-transcript-reader.ts +++ b/src/main/ai-vault/transcripts/session-transcript-reader.ts @@ -1,9 +1,12 @@ -import { throwIfAiVaultScanCancelled, waitForAiVaultScan } from '../ai-vault-scan-cancellation' +import { + throwIfAiVaultScanCancelled, + waitForAiVaultScan +} from '../scan-lifecycle/ai-vault-scan-cancellation' import { createHash } from 'node:crypto' import { readTranscriptSlice } from '../../native-chat/wsl-transcript-fs-access' import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { parseAgentSessionFile } from '../session-scanner-agent-parser' -import { consumeCompleteJsonlLines } from '../session-scanner-jsonl-reader' +import { parseAgentSessionFile } from '../parsing/session-scanner-agent-parser' +import { consumeCompleteJsonlLines } from '../parsing/session-scanner-jsonl-reader' import { isZstdTranscriptPath } from '../../native-chat/transcript-zstd-decompression' import type { ResumableSessionParseState, SessionFileCandidate } from '../session-scanner-types' import { diff --git a/src/main/claude/structured/journal/claude-internal-message-content.ts b/src/main/claude/structured/journal/claude-internal-message-content.ts index be9b0fa448a..9a834efd669 100644 --- a/src/main/claude/structured/journal/claude-internal-message-content.ts +++ b/src/main/claude/structured/journal/claude-internal-message-content.ts @@ -1,4 +1,4 @@ -import { asRecord } from '../../../ai-vault/session-scanner-record-value' +import { asRecord } from '../../../ai-vault/parsing/session-record-fields' import type { ClaudeJournalTranslator } from './claude-journal-translator-contract' export function withClaudeConversationContent( diff --git a/src/main/codex-usage/codex-usage-record-parser.ts b/src/main/codex-usage/codex-usage-record-parser.ts index e09c7fd21f7..9594162c767 100644 --- a/src/main/codex-usage/codex-usage-record-parser.ts +++ b/src/main/codex-usage/codex-usage-record-parser.ts @@ -1,4 +1,4 @@ -import { extractString } from '../usage/source-input/usage-record-coercion' +import { extractString } from '../../shared/trimmed-string' import { buildCodexUsageEventKey, normalizeRawUsage, diff --git a/src/main/codex/codex-conversation-copy.ts b/src/main/codex/codex-conversation-copy.ts index cb3b3a9adee..56210bad650 100644 --- a/src/main/codex/codex-conversation-copy.ts +++ b/src/main/codex/codex-conversation-copy.ts @@ -9,7 +9,7 @@ import { isAgentSessionRefusalError } from '../../shared/agent-session/failures/ import { join } from 'node:path' import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session/lifecycle/agent-session-account-home' import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { asRecord } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' import type { StructuredAgentSessionAdapter } from '../native-chat/agent-session-wire/providers/structured-agent-session-adapter' import { resolveSessionFilePath } from '../native-chat/session-file-resolver' import { diff --git a/src/main/codex/codex-fork-history.ts b/src/main/codex/codex-fork-history.ts index 26d345e2693..e985e3658b8 100644 --- a/src/main/codex/codex-fork-history.ts +++ b/src/main/codex/codex-fork-history.ts @@ -1,6 +1,7 @@ import { AgentConversationCopyError } from '../native-chat/agent-conversation-copy-error' import { parseAgentJournalItemKey } from '../../shared/agent-session/journal/agent-session-journal-item-key' -import { asRecord, parseJsonObject } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' import { createLegacyIdentityTracker } from '../native-chat/agent-session-journal/history-import/journal-legacy-identity' import { readCodexLocalHistory } from '../native-chat/codex-local-history' import { decodeCodexTranscriptLine } from '../native-chat/transcript-line-decoders-codex' diff --git a/src/main/codex/history/journal-views/codex-cli-conversations.ts b/src/main/codex/history/journal-views/codex-cli-conversations.ts index 06e8d8de46e..6a958b853dd 100644 --- a/src/main/codex/history/journal-views/codex-cli-conversations.ts +++ b/src/main/codex/history/journal-views/codex-cli-conversations.ts @@ -1,5 +1,5 @@ import { join } from 'node:path' -import { configuredAdditionalCodexHomePaths } from '../../../ai-vault/cached-session-list' +import { configuredAdditionalCodexHomePaths } from '../../../ai-vault/discovery/ai-vault-scan-roots' import { resolveSessionFilePath } from '../../../native-chat/session-file-resolver' import { directoryTranscriptImport, diff --git a/src/main/ipc/ai-vault/ai-vault-all-host-timeouts.ts b/src/main/ipc/ai-vault/ai-vault-all-host-timeouts.ts index baddbe84fa9..b7f30d65f62 100644 --- a/src/main/ipc/ai-vault/ai-vault-all-host-timeouts.ts +++ b/src/main/ipc/ai-vault/ai-vault-all-host-timeouts.ts @@ -1,4 +1,4 @@ -import type { RuntimeAiVaultHostInfo } from '../../ai-vault/ai-vault-runtime-scan' +import type { RuntimeAiVaultHostInfo } from '../../ai-vault/runtime-hosts/ai-vault-runtime-scan' // Per-leg bounds for the all-hosts fan-outs, so one slow host cannot hold a merge open. export const AI_VAULT_ALL_HOST_TIMEOUT_MS = { diff --git a/src/main/ipc/ai-vault/ai-vault-delete.ts b/src/main/ipc/ai-vault/ai-vault-delete.ts index 36ea782e146..67cb10409ae 100644 --- a/src/main/ipc/ai-vault/ai-vault-delete.ts +++ b/src/main/ipc/ai-vault/ai-vault-delete.ts @@ -2,7 +2,7 @@ import { ipcMain, shell } from 'electron' import { configureRemoteAiVaultSessionDelete, deleteHostAiVaultSession -} from '../../ai-vault/host-session-delete' +} from '../../ai-vault/deletion/host-session-delete' import { parseRoutableExecutionHostId } from '../../../shared/execution-host' import type { AiVaultDeleteSessionArgs, diff --git a/src/main/ipc/ai-vault/ai-vault-host-discovery.ts b/src/main/ipc/ai-vault/ai-vault-host-discovery.ts index bd318f88d22..f8c0395ebe1 100644 --- a/src/main/ipc/ai-vault/ai-vault-host-discovery.ts +++ b/src/main/ipc/ai-vault/ai-vault-host-discovery.ts @@ -1,5 +1,5 @@ import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { aiVaultScanIssueResult } from '../../ai-vault/session-list-results' +import { aiVaultScanIssueResult } from '../../ai-vault/listing/session-list-results' export type AiVaultHostDiscoveryResult = { hostInfos: readonly T[] diff --git a/src/main/ipc/ai-vault/ai-vault-host-leg-cache.ts b/src/main/ipc/ai-vault/ai-vault-host-leg-cache.ts index ad298f4fea9..8abc67db1e6 100644 --- a/src/main/ipc/ai-vault/ai-vault-host-leg-cache.ts +++ b/src/main/ipc/ai-vault/ai-vault-host-leg-cache.ts @@ -1,7 +1,7 @@ import type { AiVaultProjectionDependency } from './ai-vault-projection-dependency' import { MAX_TIMER_DELAY_MS } from '../../../shared/timer-delay' -import { AiVaultScanCoordinator } from '../../ai-vault/ai-vault-scan-coordinator' -import { aiVaultSessionListCacheGeneration } from '../../ai-vault/cached-session-list' +import { AiVaultScanCoordinator } from '../../ai-vault/scan-lifecycle/ai-vault-scan-coordinator' +import { aiVaultSessionListCacheGeneration } from '../../ai-vault/listing/cached-session-list' import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' import { aiVaultCachedDepthServes, diff --git a/src/main/ipc/ai-vault/ai-vault-resume.test.ts b/src/main/ipc/ai-vault/ai-vault-resume.test.ts index 5822bf7c52d..71b39a1c419 100644 --- a/src/main/ipc/ai-vault/ai-vault-resume.test.ts +++ b/src/main/ipc/ai-vault/ai-vault-resume.test.ts @@ -3,7 +3,7 @@ import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-w import { installCopyingChat, PROVIDER_SESSION -} from '../../ai-vault/structured-session-ownership.test-support' +} from '../../ai-vault/structured-sessions/structured-session-ownership.test-support' import { prepareAiVaultSessionResume } from './ai-vault-resume' vi.mock('electron', () => ({ ipcMain: { handle: vi.fn() } })) @@ -52,28 +52,3 @@ it('refuses the native owner while preserving forks and other execution hosts', }) // Resuming is a user act: its stopped distro must start before the transcript's gated reads. -it('starts the session file distro before preparing a WSL resume', async () => { - const platform = Object.getOwnPropertyDescriptor(process, 'platform') - Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' }) - try { - const prepareSessionResume = vi.fn(async () => { - expect(wakeMock).toHaveBeenCalledWith('Ubuntu') - return { useRealCodexHome: false } - }) - await prepareAiVaultSessionResume( - { - agent: 'claude', - sessionId: 'sess-1', - filePath: String.raw`\\wsl.localhost\Ubuntu\home\qa\session.jsonl`, - codexHome: null, - executionHostId: 'local' - }, - { prepareSessionResume } - ) - expect(prepareSessionResume).toHaveBeenCalledOnce() - } finally { - if (platform) { - Object.defineProperty(process, 'platform', platform) - } - } -}) diff --git a/src/main/ipc/ai-vault/ai-vault-resume.ts b/src/main/ipc/ai-vault/ai-vault-resume.ts index 3d556fbe14a..d598526e895 100644 --- a/src/main/ipc/ai-vault/ai-vault-resume.ts +++ b/src/main/ipc/ai-vault/ai-vault-resume.ts @@ -1,5 +1,5 @@ import { AiVaultPrepareSessionResumeParams } from '../../../shared/rpc-contract/ai-vault-params' -import { prepareStructuredChatCliFork } from '../../ai-vault/structured-chat-cli-fork' +import { prepareStructuredChatCliFork } from '../../ai-vault/structured-sessions/structured-chat-cli-fork' import { ipcMain } from 'electron' import type { AiVaultPrepareSessionResumeRequest, @@ -8,9 +8,9 @@ import type { } from '../../../shared/ai-vault/resume/ai-vault-resume-preparation' import { isUnresolvedOwnerHostId, parseExecutionHostId } from '../../../shared/execution-host' import { isWslUncPath } from '../../../shared/wsl-paths' -import { assertLegacyAiVaultResumeAllowed } from '../../ai-vault/structured-session-ownership' +import { assertLegacyAiVaultResumeAllowed } from '../../ai-vault/structured-sessions/structured-session-ownership' import { tryEnsureStructuredAgentSessionHostForResume } from '../../runtime/agent-session/structured-agent-session-host-refusal' -import { copyStructuredChatConversation } from '../../ai-vault/structured-chat-conversation-copy' +import { copyStructuredChatConversation } from '../../ai-vault/structured-sessions/structured-chat-conversation-copy' import { wakeNativeChatTranscriptDistro } from '../../native-chat/native-chat-open-wake' import { wslDistroForPath } from '../../wsl/filesystem/wsl-unc-access-gate' import { prepareAiVaultSessionHandoff } from './ai-vault-handoff' diff --git a/src/main/ipc/ai-vault/ai-vault-scan-coalescing.test.ts b/src/main/ipc/ai-vault/ai-vault-scan-coalescing.test.ts deleted file mode 100644 index caaaecc59ec..00000000000 --- a/src/main/ipc/ai-vault/ai-vault-scan-coalescing.test.ts +++ /dev/null @@ -1,354 +0,0 @@ -import { EventEmitter } from 'node:events' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { AiVaultListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' - -const mocks = vi.hoisted(() => ({ - scanAiVaultSessionsInService: vi.fn(), - resolveAiVaultSessionTitlesInService: vi.fn(), - scanRuntimeAiVaultSessions: vi.fn(), - ipcHandle: vi.fn(), - subscribe: vi.fn() -})) - -vi.mock('electron', () => ({ - app: { on: vi.fn() }, - ipcMain: { handle: mocks.ipcHandle, on: vi.fn() }, - BrowserWindow: { getAllWindows: () => [] } -})) -vi.mock('../../ai-vault/scan-service/session-scanner-service-spawn', async (importOriginal) => ({ - ...(await importOriginal()), - scanAiVaultSessionsInService: mocks.scanAiVaultSessionsInService, - resolveAiVaultSessionTitlesInService: mocks.resolveAiVaultSessionTitlesInService -})) -vi.mock('../runtime-environments/runtime-environment-transport-routing', () => ({ - subscribeRuntimeEnvironment: mocks.subscribe -})) -vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({ - resolveEnvironment: (_path: string, id: string) => ({ - id, - runtimeId: id, - pairingRevision: 1, - createdAt: 1 - }) -})) -import { createAiVaultAssociationObserver } from './ai-vault-projection-dependency' -import { invalidateAiVaultHostLegCache } from './ai-vault-host-leg-cache' -import { invalidateAiVaultSessionListCache } from '../../ai-vault/cached-session-list' -import { registerRuntimeEnvironmentSubscriptionHandlers } from '../runtime-environments/runtime-environment-subscription-handlers' -import { advanceRuntimeEnvironmentTransportGeneration } from '../runtime-environments/runtime-environment-transport-generation' -import type { subscribeRuntimeEnvironment } from '../runtime-environments/runtime-environment-transport-routing' -vi.mock('../../wsl/discovery/distro-catalog', () => ({ - listRunningWslHomeDirsAsync: vi.fn().mockResolvedValue([]), - hasCachedWslDistros: vi.fn(() => false) -})) -vi.mock('../../wsl/filesystem/wsl-running-path-filter', () => ({ - filterPathsToRunningWslDistrosAsync: vi.fn(async (paths: readonly string[]) => [...paths]) -})) -const { _internals, registerAiVaultHandlers } = await import('./ai-vault') -const EMPTY_RESULT: AiVaultListResult = { - sessions: [], - issues: [], - scannedAt: '2026-07-27T00:00:00.000Z' -} - -beforeEach(() => { - vi.clearAllMocks() - _internals.resetAiVaultCacheForTests() - mocks.scanAiVaultSessionsInService.mockResolvedValue(EMPTY_RESULT) - mocks.resolveAiVaultSessionTitlesInService.mockResolvedValue({ titles: [] }) - mocks.scanRuntimeAiVaultSessions.mockResolvedValue(EMPTY_RESULT) -}) - -describe('Agent Session History scan coalescing', () => { - it('never shares a compact reply with a caller missing its exact baseline', async () => { - registerRuntimeHost() - const fingerprint = 'a'.repeat(64) - mocks.scanRuntimeAiVaultSessions.mockImplementation(async (_host, args) => { - await Promise.resolve() - return args.afterFingerprint === fingerprint - ? { ...EMPTY_RESULT, fingerprint, unchanged: true } - : { ...EMPTY_RESULT, scannedAt: 'full' } - }) - const [conditional, legacy] = await Promise.all([ - _internals.listAiVaultSessions({ - executionHostScope: 'runtime:remote-server', - afterFingerprint: fingerprint - }), - _internals.listAiVaultSessions({ executionHostScope: 'runtime:remote-server' }) - ]) - expect(conditional.unchanged).toBe(true) - expect(legacy.unchanged).toBeUndefined() - expect(legacy.scannedAt).toBe('full') - expect(mocks.scanRuntimeAiVaultSessions).toHaveBeenCalledTimes(2) - }) - - it.each([ - ['local', mocks.scanAiVaultSessionsInService], - ['runtime:remote-server', mocks.scanRuntimeAiVaultSessions] - ] as const)('coalesces %s scans while isolating caller cancellation', async (scope, scan) => { - let resolveScan: ((result: AiVaultListResult) => void) | undefined - scan.mockImplementation( - () => - new Promise((resolve) => { - resolveScan = resolve - }) - ) - registerRuntimeHost() - const firstController = new AbortController() - const first = _internals.listAiVaultSessions( - { executionHostScope: scope }, - { signal: firstController.signal } - ) - const second = _internals.listAiVaultSessions({ executionHostScope: scope }) - await vi.waitFor(() => expect(resolveScan).toBeDefined()) - - firstController.abort() - - await expect(first).rejects.toMatchObject({ name: 'AbortError' }) - expect(scan).toHaveBeenCalledTimes(1) - resolveScan?.(EMPTY_RESULT) - await expect(second).resolves.toMatchObject(EMPTY_RESULT) - }) - - it.each([ - ['local', 'desktop', mocks.scanAiVaultSessionsInService], - ['local', 'remote-client', mocks.scanAiVaultSessionsInService], - ['runtime:remote-server', 'desktop', mocks.scanRuntimeAiVaultSessions] - ] as const)( - 'does not let a %s read after a %s delete join a scan that began before it', - async (scope, deleter, scan) => { - registerRuntimeHost() - let finishBeforeDelete = (_result: AiVaultListResult): void => {} - scan - .mockReturnValueOnce(new Promise((resolve) => (finishBeforeDelete = resolve))) - .mockResolvedValueOnce({ ...EMPTY_RESULT, scannedAt: '2026-07-28T00:00:00.000Z' }) - const beforeDelete = _internals.listAiVaultSessions({ executionHostScope: scope }) - await vi.waitFor(() => expect(scan).toHaveBeenCalledTimes(1)) - - // Remote-client deletes skip the desktop host-leg cache. - if (deleter === 'desktop') { - invalidateAiVaultHostLegCache() - } - invalidateAiVaultSessionListCache() - const afterDelete = _internals.listAiVaultSessions({ executionHostScope: scope }) - finishBeforeDelete(EMPTY_RESULT) - - await expect(afterDelete).resolves.toMatchObject({ scannedAt: '2026-07-28T00:00:00.000Z' }) - await expect(beforeDelete).resolves.toMatchObject({ scannedAt: EMPTY_RESULT.scannedAt }) - } - ) -}) - -function registerRuntimeHost(): void { - registerAiVaultHandlers({ - getActiveRuntimeAiVaultHostInfos: () => [ - { environmentId: 'remote-server', executionHostId: 'runtime:remote-server' } - ], - scanRuntimeAiVaultSessions: mocks.scanRuntimeAiVaultSessions - }) -} - -function ipcHandler(channel: string): (...args: unknown[]) => unknown { - const registration = mocks.ipcHandle.mock.calls.find(([registered]) => registered === channel) - if (!registration) { - throw new Error(`${channel} was not registered`) - } - return registration[1] -} - -afterEach(() => { - _internals.resetAiVaultCacheForTests() - vi.useRealTimers() -}) - -it('orders forwarded association edges before new remote/All admissions and fences other-window work', async () => { - vi.useFakeTimers() - const retained = new Map() - const pending = new Map() - const forwarding: (() => Promise)[] = [] - const sender = Object.assign(new EventEmitter(), { - id: 91, - isDestroyed: () => false, - send: vi.fn(() => { - forwarding.push(() => list('runtime:a')) - }) - }) - let callbacks: Parameters[5] | undefined - mocks.subscribe.mockImplementation( - async (...args: Parameters) => { - callbacks = args[5] - return { requestId: 'status', sendBinary: () => true, close: () => {} } - } - ) - let observerThrows = false - const recordLayoutFrame = vi.fn() - registerRuntimeEnvironmentSubscriptionHandlers({ - getUserDataPath: () => '/profile', - remoteRuntimeSubscriptions: retained, - pendingSubscriptions: pending, - createAssociationObserver: (host, identity) => { - const observer = createAiVaultAssociationObserver( - host, - identity, - invalidateAiVaultHostLegCache - ) - return { - ...observer, - observe: (frame) => { - if (observerThrows) { - throw new Error('observer') - } - observer.observe(frame) - } - } - }, - recordLayoutFrame - }) - registerAiVaultHandlers({ - getUserDataPath: () => '/profile', - getActiveRuntimeAiVaultHostInfos: () => [ - { environmentId: 'a', executionHostId: 'runtime:a' }, - { environmentId: 'b', executionHostId: 'runtime:b' } - ], - scanRuntimeAiVaultSessions: mocks.scanRuntimeAiVaultSessions - }) - const list = (executionHostScope: 'runtime:a' | 'runtime:b' | 'all', scopePaths: string[] = []) => - _internals.listAiVaultSessions({ executionHostScope, scopePaths, limit: 250 }) - await ipcHandler('runtimeEnvironments:subscribe')( - { sender }, - { selector: 'a', method: 'agentSession.subscribeStatus', subscriptionId: 'association' } - ) - const summary = { - sessionId: 'native', - workspaceId: 'workspace', - agent: 'pi', - providerSession: { key: 'session_id', id: '/old-provider' } - } - const frame = (result: unknown) => - callbacks?.onEvent({ - type: 'response', - response: { id: 'status', ok: true, result, _meta: { runtimeId: 'a' } } - }) - frame({ type: 'snapshot', sessions: [summary] }) - forwarding.length = 0 - let detached = false - const answer = (host: string): AiVaultListResult => ({ - ...EMPTY_RESULT, - fingerprint: detached ? 'detached' : 'owned', - sessions: [ - { - id: `runtime:${host}:codex:host-session:/host/transcript.jsonl`, - executionHostId: `runtime:${host}`, - agent: 'codex', - sessionId: 'host-session', - cwd: '/host/folder', - branch: null, - model: null, - filePath: '/host/transcript.jsonl', - codexHome: '/host/codex', - createdAt: null, - updatedAt: null, - modifiedAt: '', - messageCount: 2, - totalTokens: 0, - previewMessages: [], - queuedMessageCount: 0, - subagentTranscriptCount: 0, - resumeCommand: 'host-resume-command', - subagent: null, - title: detached ? 'Provider title' : 'Manual name', - ...(detached - ? {} - : { structuredSession: { sessionId: 'native', workspaceId: 'workspace' } }) - } - ] - }) - mocks.scanRuntimeAiVaultSessions.mockImplementation(async (host) => answer(host)) - await list('runtime:a') - await list('runtime:b') - await list('all') - const baseline = mocks.scanRuntimeAiVaultSessions.mock.calls.length - for (const n of [10, 100]) { - for (let i = 0; i < n; i++) { - frame({ type: 'status', session: { ...summary, updatedAt: i, conversationName: `${i}` } }) - frame({ type: 'snapshot', sessions: [], namingActiveSessionIds: [], conversationNames: [] }) - frame({ type: 'snapshot', sessions: [] }) - } - await list('runtime:a') - await list('runtime:b') - await list('all') - expect(mocks.scanRuntimeAiVaultSessions).toHaveBeenCalledTimes(baseline) - } - const held: (() => void)[] = [] - mocks.scanRuntimeAiVaultSessions.mockImplementation((host, args) => { - const result = answer(host) - return args.scopePaths?.includes('/race') && !detached - ? new Promise((resolve) => held.push(() => resolve(result))) - : Promise.resolve(result) - }) - const oldA = list('runtime:a', ['/race']) - const oldAll = list('all', ['/race']) - const oldB = list('runtime:b', ['/race']) - await vi.waitFor(() => expect(held).toHaveLength(4)) - const warmRaceScannerStarts = mocks.scanAiVaultSessionsInService.mock.calls.length - forwarding.length = 0 - detached = true - frame({ type: 'status', session: { ...summary, providerSession: undefined } }) - // invoke admits these after the forwarding callback has returned, as Electron does. - expect((await forwarding[0]!()).sessions[0]?.structuredSession).toBeUndefined() - const currentA = await list('runtime:a', ['/race']) - const currentAll = await list('all', ['/race']) - expect(currentA.sessions[0]?.title).toBe('Provider title') - expect(currentAll.sessions.every((row) => row.structuredSession === undefined)).toBe(true) - const bCalls = mocks.scanRuntimeAiVaultSessions.mock.calls.filter(([host]) => host === 'b').length - const bWaiter = list('runtime:b', ['/race']) - held.forEach((finish) => finish()) - await Promise.all([oldA, oldAll, oldB, bWaiter]) - expect(mocks.scanRuntimeAiVaultSessions.mock.calls.filter(([host]) => host === 'b')).toHaveLength( - bCalls - ) - expect((await list('runtime:b', ['/race'])).sessions[0]?.title).toBe('Manual name') - expect((await list('runtime:a', ['/race'])).sessions[0]?.title).toBe('Provider title') - expect((await list('all', ['/race'])).sessions).toEqual(currentAll.sessions) - // Expired projected caches must not resurrect the pre-edge last-full answer. - await vi.advanceTimersByTimeAsync(15_000) - mocks.scanRuntimeAiVaultSessions.mockResolvedValueOnce({ - ...EMPTY_RESULT, - fingerprint: 'owned', - unchanged: true - }) - expect((await list('runtime:a')).sessions).toEqual([]) - expect(mocks.scanAiVaultSessionsInService).toHaveBeenCalledTimes(warmRaceScannerStarts) - expect(mocks.scanRuntimeAiVaultSessions.mock.calls.every(([, args]) => args.force !== true)).toBe( - true - ) - const warning = vi.spyOn(console, 'warn').mockImplementation(() => {}) - observerThrows = true - frame({ type: 'snapshot', sessions: [] }) - expect(warning).toHaveBeenCalled() - await forwarding.at(-1)!() - warning.mockRestore() - const sends = sender.send.mock.calls.length - advanceRuntimeEnvironmentTransportGeneration('a') - frame({ type: 'snapshot', sessions: [] }) - expect(sender.send).toHaveBeenCalledTimes(sends) - await ipcHandler('runtimeEnvironments:unsubscribe')({ sender }, { subscriptionId: 'association' }) - expect(retained.size).toBe(0) - await ipcHandler('runtimeEnvironments:subscribe')( - { sender }, - { selector: 'a', method: 'agentSession.subscribeStatus', subscriptionId: 'renewed' } - ) - observerThrows = false - await list('runtime:a') - frame({ type: 'status', session: { ...summary, providerSession: undefined } }) - await list('runtime:a') - const beforeRenewal = mocks.scanRuntimeAiVaultSessions.mock.calls.length - frame({ type: 'snapshot', sessions: [] }) - await list('runtime:a') - expect(mocks.scanRuntimeAiVaultSessions).toHaveBeenCalledTimes(beforeRenewal + 1) - await ipcHandler('runtimeEnvironments:unsubscribe')({ sender }, { subscriptionId: 'renewed' }) - const disposedSends = sender.send.mock.calls.length - frame({ type: 'status', session: summary }) - expect(sender.send).toHaveBeenCalledTimes(disposedSends) - expect(retained.size).toBe(0) -}) diff --git a/src/main/ipc/ai-vault/ai-vault-scan-progress-broadcast.ts b/src/main/ipc/ai-vault/ai-vault-scan-progress-broadcast.ts index 9d97401fc1f..bdf14b3ceec 100644 --- a/src/main/ipc/ai-vault/ai-vault-scan-progress-broadcast.ts +++ b/src/main/ipc/ai-vault/ai-vault-scan-progress-broadcast.ts @@ -3,7 +3,7 @@ import { AI_VAULT_SCAN_PROGRESS_CHANNEL } from '../../../shared/ai-vault/scannin import { localAiVaultScanProgress, onLocalAiVaultScanProgress -} from '../../ai-vault/ai-vault-local-scan-progress' +} from '../../ai-vault/scan-lifecycle/ai-vault-local-scan-progress' let unsubscribe: (() => void) | null = null diff --git a/src/main/ipc/ai-vault/ai-vault-search.ts b/src/main/ipc/ai-vault/ai-vault-search.ts index dde935592a5..f314894e9f7 100644 --- a/src/main/ipc/ai-vault/ai-vault-search.ts +++ b/src/main/ipc/ai-vault/ai-vault-search.ts @@ -32,7 +32,7 @@ import { AI_VAULT_ALL_HOST_TIMEOUT_MS } from './ai-vault-all-host-timeouts' import { OPENS_EVERY_STRUCTURED_CHAT, searchWithStructuredOwners -} from '../../ai-vault/structured-session-ownership' +} from '../../ai-vault/structured-sessions/structured-session-ownership' export type RuntimeSessionSearchCall = ( environmentId: string, diff --git a/src/main/ipc/ai-vault/ai-vault-subagent-list.ts b/src/main/ipc/ai-vault/ai-vault-subagent-list.ts index f6240190457..6e9f43493c2 100644 --- a/src/main/ipc/ai-vault/ai-vault-subagent-list.ts +++ b/src/main/ipc/ai-vault/ai-vault-subagent-list.ts @@ -1,8 +1,8 @@ import { resolve } from 'node:path' -import { getAiVaultWslHomeDirs } from '../../ai-vault/cached-session-list' +import { getAiVaultWslHomeDirs } from '../../ai-vault/discovery/ai-vault-scan-roots' import { listAiVaultSubagentSessionsInBackground } from '../../ai-vault/scan-service/session-scanner-background' -import { claudeProjectsRootDirs } from '../../ai-vault/session-scanner-roots' -import { sessionRowRootDirs } from '../../ai-vault/session-scanner-agent-sources' +import { claudeProjectsRootDirs } from '../../ai-vault/discovery/session-scanner-roots' +import { sessionRowRootDirs } from '../../ai-vault/discovery/session-scanner-agent-sources' import { isPathInsideOrEqual } from '../../../shared/cross-platform-path' import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host' import type { diff --git a/src/main/ipc/ai-vault/ai-vault.ts b/src/main/ipc/ai-vault/ai-vault.ts index 303166c2cf8..63685c661f1 100644 --- a/src/main/ipc/ai-vault/ai-vault.ts +++ b/src/main/ipc/ai-vault/ai-vault.ts @@ -3,20 +3,20 @@ import { type AiVaultProjectionDependency } from './ai-vault-projection-dependency' import { app, ipcMain } from 'electron' +import { configureAiVaultSessionSources } from '../../ai-vault/discovery/ai-vault-scan-roots' import { - configureAiVaultSessionSources, listAiVaultSessions as listCachedLocalAiVaultSessions, AiVaultLocalScanError, - resetAiVaultSessionListCacheForTests, - type AiVaultSessionSources -} from '../../ai-vault/cached-session-list' + resetAiVaultSessionListCacheForTests +} from '../../ai-vault/listing/cached-session-list' +import type { AiVaultSessionSources } from '../../ai-vault/discovery/ai-vault-scan-roots' import { deleteAiVaultSession, registerAiVaultDeleteHandler } from './ai-vault-delete' import { listAiVaultSubagentSessions } from './ai-vault-subagent-list' import { aiVaultScanIssueResult, cancelledAiVaultListResult, mergeAiVaultListResults -} from '../../ai-vault/session-list-results' +} from '../../ai-vault/listing/session-list-results' import type { AiVaultDeleteSessionArgs } from '../../../shared/ai-vault/contracts/ai-vault-session-deletion' import { classifyAiVaultScanError } from '../../../shared/ai-vault/scanning/ai-vault-scan-error-message' import { @@ -28,7 +28,7 @@ import { type AiVaultSubagentListArgs, type AiVaultSubagentListResult } from '../../../shared/ai-vault/contracts/ai-vault-types' -import { handleAiVaultGetFirstUserPrompt } from '../../ai-vault/session-first-user-prompt-handler' +import { handleAiVaultGetFirstUserPrompt } from '../../ai-vault/prompts/session-first-user-prompt-handler' import { registerAiVaultResumeHandler, type AiVaultResumeHandlerOptions } from './ai-vault-resume' import { LOCAL_EXECUTION_HOST_ID, @@ -43,7 +43,7 @@ import { scanRuntimeAiVaultSessions, type RuntimeAiVaultHostInfo, type RuntimeAiVaultScanner -} from '../../ai-vault/ai-vault-runtime-scan' +} from '../../ai-vault/runtime-hosts/ai-vault-runtime-scan' import { createAiVaultListScanCoordinator, invalidateAiVaultHostLegCache, @@ -62,7 +62,7 @@ import { import { OPENS_EVERY_STRUCTURED_CHAT, projectStructuredAiVaultSessions -} from '../../ai-vault/structured-session-ownership' +} from '../../ai-vault/structured-sessions/structured-session-ownership' import { allHostsRuntimeScanTimeoutMs } from './ai-vault-all-host-timeouts' import { registerAiVaultScanProgressBroadcast } from './ai-vault-scan-progress-broadcast' diff --git a/src/main/ipc/pty/spawn-agent-launch-plugin-hook.ts b/src/main/ipc/pty/spawn-agent-launch-plugin-hook.ts index 26177eee322..b8850dbc3f8 100644 --- a/src/main/ipc/pty/spawn-agent-launch-plugin-hook.ts +++ b/src/main/ipc/pty/spawn-agent-launch-plugin-hook.ts @@ -3,7 +3,7 @@ import { isRestoreSpawnIntent } from '../../../shared/terminal/pty/admission/spa import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent' import { workspaceKindForWorktreeId } from '../../../shared/agent-launch/contracts/workspace-launch-kind' import { pluginHookWanted, runPluginHook } from '../../plugins/hooks/plugin-hook-dispatch' -import { assertLegacyAiVaultResumeCommandAllowed } from '../../ai-vault/structured-session-ownership' +import { assertLegacyAiVaultResumeCommandAllowed } from '../../ai-vault/structured-sessions/structured-session-ownership' import { addWslEnvKeys } from '../../../shared/wsl-env' type AgentSpawnArgs = { diff --git a/src/main/ipc/register-core-handlers/register-core-handlers.ts b/src/main/ipc/register-core-handlers/register-core-handlers.ts index 7bf4a77b0e8..f100d92b59f 100644 --- a/src/main/ipc/register-core-handlers/register-core-handlers.ts +++ b/src/main/ipc/register-core-handlers/register-core-handlers.ts @@ -101,8 +101,8 @@ import { prepareRuntimeAiVaultSessionResume, resolveRuntimeAiVaultSessionTitles, scanRuntimeAiVaultSessions -} from '../../ai-vault/runtime-session-scanner' -import { callRuntimeSessionSearch } from '../../ai-vault/runtime-session-search-call' +} from '../../ai-vault/runtime-hosts/runtime-session-scanner' +import { callRuntimeSessionSearch } from '../../ai-vault/runtime-hosts/runtime-session-search-call' import { configureRuntimeAiVaultSessionDelete } from '../ai-vault/ai-vault-delete' import { ensureStructuredAgentSessionHostUnlessRefused } from '../../runtime/agent-session/structured-agent-session-host-refusal' import { getAgentSessionAttachmentStore } from '../../native-chat/agent-session-attachments/agent-session-attachment-store-registry' diff --git a/src/main/muse-usage/muse-usage-record-parser.ts b/src/main/muse-usage/muse-usage-record-parser.ts index 15d3bcb80a3..2e37b044df5 100644 --- a/src/main/muse-usage/muse-usage-record-parser.ts +++ b/src/main/muse-usage/muse-usage-record-parser.ts @@ -1,6 +1,7 @@ import { record, type JsonRecord } from '../../shared/codex-rollout-jsonl-cursor' import { unwrapMuseLogRecords } from '../../shared/muse-session-log' -import { ensureNumber, extractString } from '../usage/source-input/usage-record-coercion' +import { ensureNumber } from '../usage/source-input/usage-record-coercion' +import { extractString } from '../../shared/trimmed-string' import type { MuseUsageParsedEvent } from './types' export type MuseUsageParseContext = { diff --git a/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts b/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts index 36fff34b4b6..6c16bc0ad54 100644 --- a/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts +++ b/src/main/native-chat/agent-session-journal/history-import/adopted-transcript-source.ts @@ -1,10 +1,11 @@ import { dirname, join } from 'node:path' -import { sessionIdFromFileName } from '../../../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../../../ai-vault/parsing/session-scanner-accumulator' import type { AgentType } from '../../../../shared/agent-status/contracts/agent-status-types' import { normalizeRuntimePathForComparison } from '../../../../shared/cross-platform-path' import { readNodeFileWithinLimit } from '../../../../shared/file-content/node-bounded-file-reader' -import { extractString, parseJsonObject } from '../../../ai-vault/session-scanner-values' -import { asRecord } from '../../../ai-vault/session-scanner-record-value' +import { extractString } from '../../../../shared/trimmed-string' +import { parseJsonObject } from '../../../ai-vault/parsing/session-json-object' +import { asRecord } from '../../../ai-vault/parsing/session-record-fields' import { readOpenCodeTranscriptSignalViaWorker } from '../../../ai-vault/scanners/opencode/reader-transport/session-scanner-opencode-sqlite-worker-spawn' import { samePiDirectory } from '../../../pi/rpc/launch/rpc-launch-resolution' diff --git a/src/main/native-chat/agent-session-journal/history-import/imported-fork-tip.ts b/src/main/native-chat/agent-session-journal/history-import/imported-fork-tip.ts index 530a9214892..324e79ebacd 100644 --- a/src/main/native-chat/agent-session-journal/history-import/imported-fork-tip.ts +++ b/src/main/native-chat/agent-session-journal/history-import/imported-fork-tip.ts @@ -1,5 +1,5 @@ -import { parseJsonObject } from '../../../ai-vault/session-scanner-values' -import { asRecord } from '../../../ai-vault/session-scanner-record-value' +import { parseJsonObject } from '../../../ai-vault/parsing/session-json-object' +import { asRecord } from '../../../ai-vault/parsing/session-record-fields' import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' import { agentJournalItemKey } from '../../../../shared/agent-session/journal/agent-session-journal-item-key' diff --git a/src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts b/src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts index bdaf032dec4..35749eb0da1 100644 --- a/src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts +++ b/src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts @@ -1,8 +1,9 @@ import { performance } from 'node:perf_hooks' import type { AgentJournalItemIdentity } from '../../../../shared/agent-session/journal/agent-session-journal-identity' import type { NativeChatMessage } from '../../../../shared/native-chat/native-chat-types' -import { parseJsonObject, timestampMs } from '../../../ai-vault/session-scanner-values' -import { asRecord } from '../../../ai-vault/session-scanner-record-value' +import { parseJsonObject } from '../../../ai-vault/parsing/session-json-object' +import { timestampMs } from '../../../ai-vault/parsing/session-record-time' +import { asRecord } from '../../../ai-vault/parsing/session-record-fields' import Database from '../../../sqlite/sync-database' import { decodeOmpTranscriptLine } from '../../transcript-line-decoders-omp' diff --git a/src/main/native-chat/codex-local-history.ts b/src/main/native-chat/codex-local-history.ts index 71ce7089e49..10b95015145 100644 --- a/src/main/native-chat/codex-local-history.ts +++ b/src/main/native-chat/codex-local-history.ts @@ -1,6 +1,8 @@ import { createHash } from 'node:crypto' -import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values' -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { sessionIdFromFileName } from '../ai-vault/parsing/session-scanner-accumulator' import { codexHistorySources, codexPhysicalRolloutId } from './codex-rollout-history-source' import { readCodexRolloutBytes } from './codex-rollout-history-stream' import { splitTranscriptStreamLines } from './transcript-stream-lines' diff --git a/src/main/native-chat/codex-rollout-history-source.ts b/src/main/native-chat/codex-rollout-history-source.ts index 3932efc5c6b..6beb4da8d66 100644 --- a/src/main/native-chat/codex-rollout-history-source.ts +++ b/src/main/native-chat/codex-rollout-history-source.ts @@ -1,5 +1,5 @@ import { basename, dirname, join } from 'node:path' -import { forEachSessionFile } from '../ai-vault/session-scanner-discovery' +import { forEachSessionFile } from '../ai-vault/discovery/session-scanner-discovery' import { admitTranscriptPath } from './transcript-path-admission' export function codexPhysicalRolloutId(path: string): string | null { diff --git a/src/main/native-chat/host-readable-transcript-path.ts b/src/main/native-chat/host-readable-transcript-path.ts index 72f7835b253..93711287b7f 100644 --- a/src/main/native-chat/host-readable-transcript-path.ts +++ b/src/main/native-chat/host-readable-transcript-path.ts @@ -5,7 +5,7 @@ import { uniqueDirs, wslHomeSessionDirs, type SessionHomeAgent -} from '../ai-vault/session-scanner-roots' +} from '../ai-vault/discovery/session-scanner-roots' import { resolveWslGuestRealDirAsync } from '../wsl/filesystem/unc-path-access' import { listRunningWslHomeDirsUnlessStopped, @@ -17,7 +17,8 @@ import { filterPathsToWslDistros } from '../wsl/filesystem/wsl-running-path-filter' import { wslGatedAccess } from './wsl-transcript-fs-access' -import { WslTranscriptFsError, wslTranscriptFsRefusal } from './wsl-transcript-fs-gate' +import { WslTranscriptFsError } from './wsl-transcript-fs-error' +import { wslTranscriptFsRefusal } from './wsl-transcript-fs-gate' export function isGuestAbsoluteLinuxPath(path: string): boolean { if (!path.startsWith('/') || path.startsWith('//')) { diff --git a/src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts b/src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts index dc8f9949c61..bbfda1b0eaf 100644 --- a/src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts +++ b/src/main/native-chat/session-file-resolver-wsl-scan-gate.test.ts @@ -26,7 +26,7 @@ vi.mock('./wsl-transcript-fs-gate', async (importOriginal) => ({ ...(await importOriginal()), runWslTranscriptFsTask: mocks.gate })) -vi.mock('../ai-vault/session-scanner-discovery', () => ({ +vi.mock('../ai-vault/discovery/session-scanner-discovery', () => ({ walkSessionFiles: mocks.walk, forEachSessionFile: async ( dir: string, @@ -60,7 +60,7 @@ vi.mock('../wsl/filesystem/wsl-running-path-filter', async (importOriginal) => ( })) import { resolveSessionFilePath } from './session-file-resolver' -import { WslTranscriptFsError } from './wsl-transcript-fs-gate' +import { WslTranscriptFsError } from './wsl-transcript-fs-error' const realPlatform = process.platform diff --git a/src/main/native-chat/session-file-resolver.ts b/src/main/native-chat/session-file-resolver.ts index 5c45188e22c..02568647602 100644 --- a/src/main/native-chat/session-file-resolver.ts +++ b/src/main/native-chat/session-file-resolver.ts @@ -7,13 +7,13 @@ import { type NativeChatTranscriptAgent } from '../../shared/native-chat/native-chat-agent-support' import { isWslUncPath } from '../../shared/wsl-paths' -import { forEachSessionFile } from '../ai-vault/session-scanner-discovery' +import { forEachSessionFile } from '../ai-vault/discovery/session-scanner-discovery' import { claudeProjectsHostDirs, codexHomeSessionsDir, ompSessionsRootDirs, uniqueDirs -} from '../ai-vault/session-scanner-roots' +} from '../ai-vault/discovery/session-scanner-roots' import { resolveOrcaManagedCodexHomePath } from '../codex/configuration/homes/codex-home-paths' import { findGrokChatHistoryBySessionId, @@ -29,7 +29,8 @@ import { SESSION_FILE_ID_LAYOUTS, type SessionIdLookupAgent } from './session-fi import { findWslSessionPath } from './wsl-session-path-scan' import { findClaudeSessionFile } from './session-file-resolver-claude-probe' import { parseSshTranscriptPath } from './ssh-transcript-path' -import { wslTranscriptFsRefusal, type WslTranscriptFsError } from './wsl-transcript-fs-gate' +import { wslTranscriptFsRefusal } from './wsl-transcript-fs-gate' +import type { WslTranscriptFsError } from './wsl-transcript-fs-error' // Read shared discovery roots per call; preference order prevents cross-account matches. function claudeProjectsDirs(): string[] { diff --git a/src/main/native-chat/structured-agent-cli-conversations.ts b/src/main/native-chat/structured-agent-cli-conversations.ts index 467de8bf9ad..dafa0f747c0 100644 --- a/src/main/native-chat/structured-agent-cli-conversations.ts +++ b/src/main/native-chat/structured-agent-cli-conversations.ts @@ -7,7 +7,7 @@ import { import type { AgentSessionProviderHandleLink } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' import type { AiVaultAgent } from '../../shared/ai-vault/contracts/ai-vault-types' import { TUI_AGENT_CONFIG } from '../../shared/agent-launch/catalog/tui-agent-config' -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../ai-vault/parsing/session-scanner-accumulator' export type StructuredAgentTranscriptImportSettings = { codexManagedAccounts?: readonly { managedHomePath: string }[] diff --git a/src/main/native-chat/structured-conversation-key.ts b/src/main/native-chat/structured-conversation-key.ts index c6271aa1c3f..48f39815538 100644 --- a/src/main/native-chat/structured-conversation-key.ts +++ b/src/main/native-chat/structured-conversation-key.ts @@ -9,7 +9,7 @@ import { import type { AgentSessionProviderHandleLink } from '../../shared/agent-session/lifecycle/agent-session-provider-handle' import type { AgentSessionRecord } from '../../shared/agent-session/lifecycle/agent-session-record' import { structuredAgentRuntimeMetadata } from '../runtime/agent-session/installation/structured-agent-runtime-metadata' -import { sessionIdFromFileName } from '../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../ai-vault/parsing/session-scanner-accumulator' /** One conversation wherever it is named: the agents sharing its ids, its id (null: a targetless * resume that may pick any of the family's), and its account home (null: the namer can't tell). */ diff --git a/src/main/native-chat/transcript-line-decoders-claude.ts b/src/main/native-chat/transcript-line-decoders-claude.ts index 8a37756b51e..41e127f05ef 100644 --- a/src/main/native-chat/transcript-line-decoders-claude.ts +++ b/src/main/native-chat/transcript-line-decoders-claude.ts @@ -5,12 +5,10 @@ import { type NativeChatEditPatchHunk, type NativeChatMessage } from '../../shared/native-chat/native-chat-types' -import { - asRecord, - extractString, - parseJsonObject, - timestampMs -} from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { timestampMs } from '../ai-vault/parsing/session-record-time' import { imageSourcePathFromText } from '../../shared/native-chat/transcript/native-chat-image-transcript-markers' import { claudeContentBlocks } from './transcript-record-blocks' import { isKnownRasterImageMimeType } from '../../shared/file-preview/raster-image-preview-limits' diff --git a/src/main/native-chat/transcript-line-decoders-codex.ts b/src/main/native-chat/transcript-line-decoders-codex.ts index 09c975ce385..25a356f851b 100644 --- a/src/main/native-chat/transcript-line-decoders-codex.ts +++ b/src/main/native-chat/transcript-line-decoders-codex.ts @@ -4,12 +4,10 @@ import { type NativeChatMessage } from '../../shared/native-chat/native-chat-types' import { NATIVE_CHAT_NOTICE_COPY } from '../../shared/native-chat/native-chat-notice' -import { - asRecord, - extractString, - parseJsonObject, - timestampMs -} from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { timestampMs } from '../ai-vault/parsing/session-record-time' import { claudeContentBlocks, toolResultOutput } from './transcript-record-blocks' import { CODEX_EVENT_TURN_ABORTED } from './transcript-turn-markers' diff --git a/src/main/native-chat/transcript-line-decoders-grok.ts b/src/main/native-chat/transcript-line-decoders-grok.ts index aaaa87bcb50..447168e005b 100644 --- a/src/main/native-chat/transcript-line-decoders-grok.ts +++ b/src/main/native-chat/transcript-line-decoders-grok.ts @@ -1,10 +1,8 @@ import type { NativeChatBlock, NativeChatMessage } from '../../shared/native-chat/native-chat-types' -import { - asRecord, - extractString, - parseJsonObject, - timestampMs -} from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { timestampMs } from '../ai-vault/parsing/session-record-time' import { claudeContentBlocks, toolResultOutput } from './transcript-record-blocks' import { AGENT_SESSION_PASTED_IMAGE_SUFFIX_SOURCE } from '../../shared/agent-session/agent-session-attachments' diff --git a/src/main/native-chat/transcript-line-decoders-omp.ts b/src/main/native-chat/transcript-line-decoders-omp.ts index dcd3a555bb6..f90c20cf8a2 100644 --- a/src/main/native-chat/transcript-line-decoders-omp.ts +++ b/src/main/native-chat/transcript-line-decoders-omp.ts @@ -8,12 +8,10 @@ import { } from '../../shared/native-chat/native-chat-types' import type { AgentSessionTokenUsage } from '../../shared/agent-session/agent-session-context-usage' import { buildImageDataUri } from '../../shared/file-preview/image-data-uri' -import { - asRecord, - extractString, - parseJsonObject, - timestampMs -} from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { timestampMs } from '../ai-vault/parsing/session-record-time' import { toolResultOutput } from './transcript-record-blocks' export function decodeOmpTranscriptLine( diff --git a/src/main/native-chat/transcript-opencode-database.ts b/src/main/native-chat/transcript-opencode-database.ts index c063ad325f2..608d9c01442 100644 --- a/src/main/native-chat/transcript-opencode-database.ts +++ b/src/main/native-chat/transcript-opencode-database.ts @@ -2,7 +2,7 @@ import { homedir } from 'node:os' import { wslGatedAccess } from './wsl-transcript-fs-access' import { join } from 'node:path' import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason' -import { getAiVaultWslScanHomeDirs } from '../ai-vault/cached-session-list' +import { getAiVaultWslScanHomeDirs } from '../ai-vault/discovery/ai-vault-scan-roots' import { prepareOpenCodeWslReaders } from '../ai-vault/scanners/opencode/reader-transport/opencode-wsl-runtime-preparation' import { configureOpenCodeWslReaders, diff --git a/src/main/native-chat/transcript-opencode-part-blocks.ts b/src/main/native-chat/transcript-opencode-part-blocks.ts index 22118011b63..2bec558bfb9 100644 --- a/src/main/native-chat/transcript-opencode-part-blocks.ts +++ b/src/main/native-chat/transcript-opencode-part-blocks.ts @@ -6,7 +6,9 @@ import type { NativeChatTextBlock } from '../../shared/native-chat/native-chat-types' import { agentSessionHostStatusBody } from '../../shared/agent-session/view/agent-session-host-status-rows' -import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' // Electron-free: imported by the OpenCode SQLite worker. export type OpenCodePartRow = { diff --git a/src/main/native-chat/transcript-opencode-sqlite-query.ts b/src/main/native-chat/transcript-opencode-sqlite-query.ts index f1973c83970..de884754cd3 100644 --- a/src/main/native-chat/transcript-opencode-sqlite-query.ts +++ b/src/main/native-chat/transcript-opencode-sqlite-query.ts @@ -8,7 +8,9 @@ import { import type { NativeChatMessage } from '../../shared/native-chat/native-chat-types' import { openCodeTranscriptPageLimit } from '../../shared/opencode-transcript-page-limit' import { columnExists, tableExists } from '../opencode-usage/schema-helpers' -import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' import type SyncDatabase from '../sqlite/sync-database' import { rowsOf, rowsWithinBudget } from './transcript-opencode-row-budget' import { diff --git a/src/main/native-chat/transcript-opencode-subscribe.ts b/src/main/native-chat/transcript-opencode-subscribe.ts index 4f694ff5834..3f7fddbdb2f 100644 --- a/src/main/native-chat/transcript-opencode-subscribe.ts +++ b/src/main/native-chat/transcript-opencode-subscribe.ts @@ -1,6 +1,6 @@ import { pruneOpenCodeFingerprintCache } from './transcript-opencode-fingerprint-window' export { pruneOpenCodeFingerprintCache as pruneOpenCodeFingerprintCacheForTest } from './transcript-opencode-fingerprint-window' -import { errorMessage } from '../ai-vault/session-scanner-values' +import { errorMessage } from '../../shared/error-message' import { DESKTOP_READ_WINDOW, UNFLUSHED_SETTLE_MS, diff --git a/src/main/native-chat/transcript-opencode.ts b/src/main/native-chat/transcript-opencode.ts index 7bcb66b6e97..f0de1e707a5 100644 --- a/src/main/native-chat/transcript-opencode.ts +++ b/src/main/native-chat/transcript-opencode.ts @@ -10,7 +10,7 @@ import { OPENCODE_CAPTURE_TEXT_LIMIT } from '../ai-vault/scanners/opencode/sqlite/opencode-transcript-capture-limits' import type { NativeChatMessage } from '../../shared/native-chat/native-chat-types' -import { errorMessage } from '../ai-vault/session-scanner-values' +import { errorMessage } from '../../shared/error-message' import type { ReadTranscriptResult } from './transcript-reader' import { readOpenCodeTranscriptPageViaWorker, diff --git a/src/main/native-chat/transcript-opencode2-fork-coverage.ts b/src/main/native-chat/transcript-opencode2-fork-coverage.ts index 04e470dd0ff..f401a762068 100644 --- a/src/main/native-chat/transcript-opencode2-fork-coverage.ts +++ b/src/main/native-chat/transcript-opencode2-fork-coverage.ts @@ -1,6 +1,7 @@ import type SyncDatabase from '../sqlite/sync-database' import { tableExists } from '../opencode-usage/schema-helpers' -import { asRecord, parseJsonObject } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' import { hasOpenCode2Session } from './transcript-opencode2-sqlite' export function readOpenCode2ForkCoverage( diff --git a/src/main/native-chat/transcript-opencode2-sqlite.ts b/src/main/native-chat/transcript-opencode2-sqlite.ts index 53fc07115e9..4b5998f43e0 100644 --- a/src/main/native-chat/transcript-opencode2-sqlite.ts +++ b/src/main/native-chat/transcript-opencode2-sqlite.ts @@ -2,7 +2,9 @@ import { createHash } from 'node:crypto' import type SyncDatabase from '../sqlite/sync-database' import { openCodeTranscriptPageLimit } from '../../shared/opencode-transcript-page-limit' import { columnExists, tableExists } from '../opencode-usage/schema-helpers' -import { asRecord, extractString, parseJsonObject } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' import { opencodeMessages, OPENCODE_TRANSCRIPT_MAX_ROW_BYTES diff --git a/src/main/native-chat/transcript-reader.ts b/src/main/native-chat/transcript-reader.ts index 97dad1b6080..7baa9ce98e3 100644 --- a/src/main/native-chat/transcript-reader.ts +++ b/src/main/native-chat/transcript-reader.ts @@ -6,7 +6,7 @@ import type { NativeChatTurnLifecycle } from '../../shared/native-chat/native-chat-types' import { resolveNativeChatTranscriptAgent } from '../../shared/native-chat/native-chat-agent-support' -import { errorMessage } from '../ai-vault/session-scanner-values' +import { errorMessage } from '../../shared/error-message' import { resolveSessionFilePath, type ResolveSessionFileOptions } from './session-file-resolver' import { openTranscriptReadStream } from './wsl-transcript-fs-access' import { wslTranscriptFsRefusal } from './wsl-transcript-fs-gate' diff --git a/src/main/native-chat/transcript-record-blocks.ts b/src/main/native-chat/transcript-record-blocks.ts index c9fba58d705..19a8cb0a282 100644 --- a/src/main/native-chat/transcript-record-blocks.ts +++ b/src/main/native-chat/transcript-record-blocks.ts @@ -3,7 +3,8 @@ import type { NativeChatImageRefBlock, NativeChatToolResultBlock } from '../../shared/native-chat/native-chat-types' -import { asRecord, extractString } from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' import { isClaudeToolUseContent, isClaudeToolResultContent, diff --git a/src/main/native-chat/transcript-turn-lifecycle.ts b/src/main/native-chat/transcript-turn-lifecycle.ts index 68bff178ecb..342c71e941d 100644 --- a/src/main/native-chat/transcript-turn-lifecycle.ts +++ b/src/main/native-chat/transcript-turn-lifecycle.ts @@ -3,12 +3,10 @@ import type { NativeChatTurnLifecycle } from '../../shared/native-chat/native-ch import { resolveNativeChatTranscriptAgent } from '../../shared/native-chat/native-chat-agent-support' import { isNoiseMessage } from '../../shared/native-chat/native-chat-noise' import { claudeBashInputAsTypedCommand } from '../../shared/claude-bash-input' -import { - asRecord, - extractString, - parseJsonObject, - timestampMs -} from '../ai-vault/session-scanner-values' +import { asRecord } from '../ai-vault/parsing/session-record-fields' +import { extractString } from '../../shared/trimmed-string' +import { parseJsonObject } from '../ai-vault/parsing/session-json-object' +import { timestampMs } from '../ai-vault/parsing/session-record-time' import { decodeClaudeTranscriptLine } from './transcript-line-decoders-claude' import { claudeInterruptedMessageId, diff --git a/src/main/native-chat/transcript-turn-markers.ts b/src/main/native-chat/transcript-turn-markers.ts index 96d43748b6b..4ce336eb918 100644 --- a/src/main/native-chat/transcript-turn-markers.ts +++ b/src/main/native-chat/transcript-turn-markers.ts @@ -1,6 +1,6 @@ // Share provider boundary predicates so visible interruption rows and lifecycle settlement agree. -import { extractString } from '../ai-vault/session-scanner-values' +import { extractString } from '../../shared/trimmed-string' export function claudeInterruptedMessageId(record: Record): string | undefined { if (record.type !== 'user') { diff --git a/src/main/native-chat/wsl-session-path-scan.ts b/src/main/native-chat/wsl-session-path-scan.ts index 19398d01f54..e69de189501 100644 --- a/src/main/native-chat/wsl-session-path-scan.ts +++ b/src/main/native-chat/wsl-session-path-scan.ts @@ -1,5 +1,5 @@ import type { Dirent } from 'node:fs' -import { walkSessionFiles } from '../ai-vault/session-scanner-discovery' +import { walkSessionFiles } from '../ai-vault/discovery/session-scanner-discovery' import { SESSION_FILE_ID_LAYOUTS, type SessionIdLookupAgent } from './session-file-id-layouts' import { wslGatedReaddir } from './wsl-transcript-fs-access' diff --git a/src/main/omp/omp-session-cwd-lookup.ts b/src/main/omp/omp-session-cwd-lookup.ts index 262a46d2f8e..3d18bdc59ff 100644 --- a/src/main/omp/omp-session-cwd-lookup.ts +++ b/src/main/omp/omp-session-cwd-lookup.ts @@ -1,7 +1,7 @@ import { createHash } from 'node:crypto' import { lstat, opendir, realpath } from 'node:fs/promises' import { basename, extname, isAbsolute, join, relative, resolve } from 'node:path' -import { PI_CWD_BUCKET_LAYOUT } from '../ai-vault/session-cwd-bucket-layouts' +import { PI_CWD_BUCKET_LAYOUT } from '../ai-vault/scope/session-cwd-bucket-layouts' import { SESSION_FILE_ID_LAYOUTS } from '../native-chat/session-file-id-layouts' async function canonicalPath(path: string): Promise { diff --git a/src/main/opencode-usage/opencode-usage-row-parsing.ts b/src/main/opencode-usage/opencode-usage-row-parsing.ts index b254787f582..18414a701c2 100644 --- a/src/main/opencode-usage/opencode-usage-row-parsing.ts +++ b/src/main/opencode-usage/opencode-usage-row-parsing.ts @@ -1,4 +1,5 @@ -import { ensureNumber, extractString } from '../usage/source-input/usage-record-coercion' +import { ensureNumber } from '../usage/source-input/usage-record-coercion' +import { extractString } from '../../shared/trimmed-string' import type { OpenCodeUsageRow } from './opencode-usage-row-queries' import type { OpenCodeUsageParsedEvent } from './types' diff --git a/src/main/orcad/orcad-session-search.ts b/src/main/orcad/orcad-session-search.ts index f154aff15b2..78ae307b122 100644 --- a/src/main/orcad/orcad-session-search.ts +++ b/src/main/orcad/orcad-session-search.ts @@ -5,7 +5,7 @@ import { resolveAiVaultSearchSettings } from '../../shared/ai-vault/search/ai-vault-search-settings' import type { GlobalSettings } from '../../shared/global-settings-types' -import { localAiVaultScanRoots } from '../ai-vault/cached-session-list' +import { localAiVaultScanRoots } from '../ai-vault/discovery/ai-vault-scan-roots' import { installInProcessSessionSearchService } from '../ai-vault-search/session-search-in-process-service' /** Index in-process as sole writer; the scanner child has no installed search data root. */ diff --git a/src/main/pi/rpc/launch/rpc-launch-resolution.ts b/src/main/pi/rpc/launch/rpc-launch-resolution.ts index 41f99302e1f..f9337e805ef 100644 --- a/src/main/pi/rpc/launch/rpc-launch-resolution.ts +++ b/src/main/pi/rpc/launch/rpc-launch-resolution.ts @@ -27,7 +27,7 @@ import { } from '../../../native-chat/structured-agent-command-resolution' import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-session/launch/structured-agent-launch-composition' import { isWindowsProcessStartTimeAvailable } from '../../../windows/windows-process-table' -import { sessionIdFromFileName } from '../../../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../../../ai-vault/parsing/session-scanner-accumulator' import { PI_RPC_SESSION_ENV_TO_DELETE, withoutPiCallerEnv, diff --git a/src/main/pi/transcripts/pi-session-history.ts b/src/main/pi/transcripts/pi-session-history.ts index 9e86873a799..ab4e8fc8acb 100644 --- a/src/main/pi/transcripts/pi-session-history.ts +++ b/src/main/pi/transcripts/pi-session-history.ts @@ -1,4 +1,4 @@ -import { sessionIdFromFileName } from '../../ai-vault/session-scanner-accumulator' +import { sessionIdFromFileName } from '../../ai-vault/parsing/session-scanner-accumulator' import { resumeInvocationFromOptions, sessionFileResumeTargetMatches, diff --git a/src/main/pi/transcripts/pi-transcript-import.ts b/src/main/pi/transcripts/pi-transcript-import.ts index ace25d9dc76..d289094be9e 100644 --- a/src/main/pi/transcripts/pi-transcript-import.ts +++ b/src/main/pi/transcripts/pi-transcript-import.ts @@ -1,8 +1,8 @@ import { homedir } from 'node:os' import { join } from 'node:path' -import { sessionIdFromFileName } from '../../ai-vault/session-scanner-accumulator' -import { walkSessionFiles } from '../../ai-vault/session-scanner-discovery' -import { piSessionHistorySessionsDir } from '../../ai-vault/session-scanner-agent-sources' +import { sessionIdFromFileName } from '../../ai-vault/parsing/session-scanner-accumulator' +import { walkSessionFiles } from '../../ai-vault/discovery/session-scanner-discovery' +import { piSessionHistorySessionsDir } from '../../ai-vault/discovery/session-scanner-agent-sources' import { directoryTranscriptImport } from '../../native-chat/structured-agent-cli-conversations' import { readPiSessionHeader } from '../rpc/launch/rpc-launch-resolution' diff --git a/src/main/plugins/hooks/plugin-agent-hook-sites.test.ts b/src/main/plugins/hooks/plugin-agent-hook-sites.test.ts index c22eb8f301a..33aa5a09bc7 100644 --- a/src/main/plugins/hooks/plugin-agent-hook-sites.test.ts +++ b/src/main/plugins/hooks/plugin-agent-hook-sites.test.ts @@ -12,7 +12,7 @@ import { setPluginHookRunner } from './plugin-hook-dispatch' const { resumeCheck } = vi.hoisted(() => ({ resumeCheck: vi.fn<(command: string, ensureHost: () => Promise) => Promise>() })) -vi.mock('../../ai-vault/structured-session-ownership', () => ({ +vi.mock('../../ai-vault/structured-sessions/structured-session-ownership', () => ({ assertLegacyAiVaultResumeCommandAllowed: resumeCheck })) diff --git a/src/main/runtime/agent-session/records/agent-session-inventory-scale.test.ts b/src/main/runtime/agent-session/records/agent-session-inventory-scale.test.ts index c3c92b863d7..d59c508115d 100644 --- a/src/main/runtime/agent-session/records/agent-session-inventory-scale.test.ts +++ b/src/main/runtime/agent-session/records/agent-session-inventory-scale.test.ts @@ -1,22 +1,20 @@ -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it } from 'vitest' import '../../../../shared/worktree/host-qualified-identity' import '../../../../shared/ai-vault/search/ai-vault-search-test-fixture' -import '../../../ai-vault/structured-session-ownership.test-support' -import '../../../ai-vault/structured-session-ownership' +import '../../../ai-vault/structured-sessions/structured-session-ownership.test-support' +import '../../../ai-vault/structured-sessions/structured-session-ownership' import { hostTestState } from '../../../native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-harness' import { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/host/structured-agent-session-host' import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/host/structured-agent-session-registry' import '../../../native-chat/agent-session-journal/journal-store-factory' import { openTestJournalHostDatabase } from '../../../native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -import { countStoreWork, scaleDirectory, scaleRecord } from './agent-session-scale.test-fixture' +import { scaleDirectory, scaleRecord } from './agent-session-scale.test-fixture' import '../../workspaces/references/runtime-reference-find' import '../../../../shared/workspace-attachments/workspace-reference-identity' import { createReferenceAgentIndex } from '../../workspaces/references/runtime-reference-agents' import { seedTestAgentSessionRecordStore, - openTestAgentSessionRecordStore, - editPersistedTestAgentSessionStore, - readPersistedTestAgentSessionStore + openTestAgentSessionRecordStore } from './agent-session-record-store-test-harness' import { OrchestrationDb } from '../../orchestration/db/orchestration-db' import '../../orchestration/db/contract-constants' @@ -61,101 +59,6 @@ function clearedRecord(sessionId: string, successor: string): AgentSessionRecord } describe('real conversation inventory work', () => { - it.each([10, 100])('visits %i unreadable rows once per audience inventory', async (u) => { - const root = await scaleDirectory() - const healthy = Array.from({ length: 10 }, (_, i) => scaleRecord(`healthy-u-${i}`)) - const unreadable = Array.from({ length: u }, (_, i) => scaleRecord(`unreadable-u-${i}`)) - const retained = unreadable.filter((_, i) => i % 2 === 0) - await seedTestAgentSessionRecordStore(root, { - records: [...healthy, ...unreadable], - sessionTabs: [...healthy, ...unreadable].map(({ sessionId }) => ({ - sessionId, - tabId: `tab-${sessionId}` - })) - }) - await editPersistedTestAgentSessionStore(root, (state) => { - unreadable.forEach(({ sessionId }, i) => { - if (i % 2 === 0) { - Object.assign(state.records[sessionId].lease, { minimumNextFence: 'bad' }) - } else { - Object.assign(state.records[sessionId], { providerHandleChain: 'bad' }) - } - }) - }) - const raw = await readPersistedTestAgentSessionStore(root) - const store = await openTestAgentSessionRecordStore(root) - const host = new StructuredAgentSessionHost({ - ...hostTestState().host.deps, - store, - journalDatabase: openTestJournalHostDatabase(root) - }) - const ids = new Set(unreadable.map(({ sessionId }) => sessionId)) - const work = countStoreWork(store) - const inventories = vi.mocked(store.listConversations) - // Default spy executes native flatMap and its production callback on every dense input row. - const flatten = vi.spyOn(Array.prototype, 'flatMap') - try { - for (let repeat = 1; repeat <= 3; repeat++) { - expect(host.knownAgentIds()).toContain('claude') - expect(work.counts).toMatchObject({ - inventories: repeat, - views: 10 * repeat, - clones: 0, - decodes: 0 - }) - } - const scans = flatten.mock.contexts - .map((rows, i) => - Array.isArray(rows) && - rows.length === u && - rows.every( - (row: unknown) => - typeof row === 'object' && - row !== null && - 'raw' in row && - typeof row.raw === 'object' && - row.raw !== null && - 'sessionId' in row.raw && - typeof row.raw.sessionId === 'string' && - ids.has(row.raw.sessionId) - ) - ? i - : -1 - ) - .filter((i) => i >= 0) - expect(scans).toHaveLength(3) - for (const i of scans) { - expect(flatten.mock.contexts[i]).toMatchObject( - unreadable.map(({ sessionId }) => ({ raw: { sessionId } })) - ) - expect(flatten.mock.results[i]).toEqual({ - type: 'return', - value: retained.map(({ sessionId }) => store.getConversation(sessionId)) - }) - } - expect(inventories.mock.results.map((result) => result.value)).toEqual( - Array.from({ length: 3 }, () => - [...healthy, ...retained].map(({ sessionId }) => store.getConversation(sessionId)) - ) - ) - } finally { - flatten.mockRestore() - } - expect(store.getVisibleSessionTabIndex().sessionIds).toEqual( - [...healthy, ...retained].map(({ sessionId }) => sessionId) - ) - for (const [i, { sessionId }] of unreadable.entries()) { - expect(store.getConversation(sessionId)?.sessionId ?? null).toBe(i % 2 ? null : sessionId) - expect(store.getRecord(sessionId)).toBeNull() - expect(() => store.requireWritableRecord(sessionId)).toThrow() - } - await store.setConversationName(healthy[0]!.sessionId, 'unrelated update') - const after = await readPersistedTestAgentSessionStore(root) - for (const { sessionId } of unreadable) { - expect(after.records[sessionId]).toEqual(raw.records[sessionId]) - } - }) - it('keeps global worker identity separate from candidate inventory and retains closure/loop outcomes', async () => { const rootId = testOrcaSessionId('global-root') const successor = testOrcaSessionId('visible-successor') diff --git a/src/main/runtime/agent-session/structured-agent-session-create-adoption.ts b/src/main/runtime/agent-session/structured-agent-session-create-adoption.ts index 6629e907f6c..b18a7810aab 100644 --- a/src/main/runtime/agent-session/structured-agent-session-create-adoption.ts +++ b/src/main/runtime/agent-session/structured-agent-session-create-adoption.ts @@ -5,7 +5,7 @@ import { } from '../../../shared/agent-session/failures/agent-session-wire-refusals' import { prepareCodexAdoption } from '../../native-chat/codex-adoption-preparation' import { isAiVaultTitleAgent } from '../../../shared/ai-vault/contracts/ai-vault-session-title' -import { generatedSessionTitle } from '../../ai-vault/session-scanner-accumulator' +import { generatedSessionTitle } from '../../ai-vault/parsing/session-scanner-accumulator' import { resolveLocalAiVaultSessionTitles } from '../../ai-vault/session-titles/session-title-resolver' import type { NativeCodexResumePreparation } from '../../codex/history/resume/codex-ai-vault-session-resume' import type { StructuredAgentSessionResumeSource } from '../../../shared/agent-session/structured-agent-session-create' diff --git a/src/main/runtime/construction/runtime-construction.ts b/src/main/runtime/construction/runtime-construction.ts index 797bbb1e977..ccedc1d4b2a 100644 --- a/src/main/runtime/construction/runtime-construction.ts +++ b/src/main/runtime/construction/runtime-construction.ts @@ -50,7 +50,7 @@ import { RuntimeClientSettingsController } from '../client/settings/runtime-clie import { RuntimeSessionSearchSettingsController } from '../integrations/ai-vault/runtime-session-search-settings' import { RuntimeAutomationController } from '../integrations/automations/runtime-automation-controller' import { RuntimeOrchestrationFederation } from '../orchestration/federation/runtime-orchestration-federation' -import { configureAiVaultSessionSources } from '../../ai-vault/cached-session-list' +import { configureAiVaultSessionSources } from '../../ai-vault/discovery/ai-vault-scan-roots' import { configureHostReadableTranscriptPathSources } from '../../native-chat/host-readable-transcript-path' import { createEphemeralAgentSessionClaimSigner } from '../agent-session/ownership/agent-session-claim-identity' import { registerConptyDa1OverrideInstaller } from '../terminal/output/terminal-model-query-authority' diff --git a/src/main/runtime/integrations/ai-vault/runtime-ai-vault-commands.ts b/src/main/runtime/integrations/ai-vault/runtime-ai-vault-commands.ts index 2ac12d2e69d..513158d547a 100644 --- a/src/main/runtime/integrations/ai-vault/runtime-ai-vault-commands.ts +++ b/src/main/runtime/integrations/ai-vault/runtime-ai-vault-commands.ts @@ -10,8 +10,8 @@ import type { AiVaultListArgs, AiVaultListResult } from '../../../../shared/ai-vault/contracts/ai-vault-types' -import { listAiVaultSessions } from '../../../ai-vault/cached-session-list' -import { deleteAiVaultSessionForRemoteClient } from '../../../ai-vault/host-session-delete' +import { listAiVaultSessions } from '../../../ai-vault/listing/cached-session-list' +import { deleteAiVaultSessionForRemoteClient } from '../../../ai-vault/deletion/host-session-delete' import type { AiVaultDeleteSessionArgs, AiVaultDeleteSessionResult diff --git a/src/main/runtime/rpc/methods/history/ai-vault.test.ts b/src/main/runtime/rpc/methods/history/ai-vault.test.ts index 245be54fe3b..c7c5c73c136 100644 --- a/src/main/runtime/rpc/methods/history/ai-vault.test.ts +++ b/src/main/runtime/rpc/methods/history/ai-vault.test.ts @@ -44,11 +44,11 @@ import { agentSessionRefusalError } from '../../../../../shared/agent-session/fa import { recordStructuredAgentSessionHostInstallRefusal } from '../../../agent-session/structured-agent-session-host-refusal' import '../../../../native-chat/agent-session-wire/host/structured-agent-session-registry' -import '../../../../ai-vault/structured-session-ownership.test-support' +import '../../../../ai-vault/structured-sessions/structured-session-ownership.test-support' import { listAiVaultSessions, resetAiVaultSessionListCacheForTests -} from '../../../../ai-vault/cached-session-list' +} from '../../../../ai-vault/listing/cached-session-list' function makeRequest(method: string, params?: unknown): RpcRequest { return { id: 'req-1', authToken: 'tok', method, params } diff --git a/src/main/runtime/rpc/methods/history/ai-vault.ts b/src/main/runtime/rpc/methods/history/ai-vault.ts index 0354adef06d..5790be63329 100644 --- a/src/main/runtime/rpc/methods/history/ai-vault.ts +++ b/src/main/runtime/rpc/methods/history/ai-vault.ts @@ -1,4 +1,4 @@ -import { prepareStructuredChatCliFork } from '../../../../ai-vault/structured-chat-cli-fork' +import { prepareStructuredChatCliFork } from '../../../../ai-vault/structured-sessions/structured-chat-cli-fork' import { writeAiVaultSessionHandoffSnapshot } from '../../../../ai-vault/session-handoff-snapshot' import { AiVaultSearchRequestSchema, @@ -11,9 +11,9 @@ import { sessionSearchServiceStatus } from '../../../../ai-vault-search/session-search-service-registry' import { defineMethod } from '../../core' -import { conditionalAiVaultListResult } from '../../../../ai-vault/session-list-fingerprint' -import { restampAiVaultListResult } from '../../../../ai-vault/session-list-results' -import { copyStructuredChatConversation } from '../../../../ai-vault/structured-chat-conversation-copy' +import { conditionalAiVaultListResult } from '../../../../ai-vault/listing/session-list-fingerprint' +import { restampAiVaultListResult } from '../../../../ai-vault/listing/session-list-results' +import { copyStructuredChatConversation } from '../../../../ai-vault/structured-sessions/structured-chat-conversation-copy' import type { AiVaultPrepareSessionResumeArgs } from '../../../../../shared/ai-vault/resume/ai-vault-resume-preparation' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' import { isWslUncPath } from '../../../../../shared/wsl-paths' @@ -22,7 +22,7 @@ import { assertLegacyAiVaultResumeAllowed, projectStructuredAiVaultSessions, searchWithStructuredOwners -} from '../../../../ai-vault/structured-session-ownership' +} from '../../../../ai-vault/structured-sessions/structured-session-ownership' import { ensureStructuredAgentSessionHostUnlessRefused, tryEnsureStructuredAgentSessionHostForResume diff --git a/src/main/runtime/rpc/methods/native-chat/native-chat-opencode-semantic-pages.test.ts b/src/main/runtime/rpc/methods/native-chat/native-chat-opencode-semantic-pages.test.ts deleted file mode 100644 index b382b4922e7..00000000000 --- a/src/main/runtime/rpc/methods/native-chat/native-chat-opencode-semantic-pages.test.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { mkdtempSync, rmSync } from 'node:fs' -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 '../../../../ai-vault/session-scanner-values' -import { asRecord } from '../../../../ai-vault/session-scanner-record-value' -import { readOpenCodeTranscriptPage } from '../../../../native-chat/transcript-opencode-sqlite-query' -import { readOpenCodeNativeChatTranscriptTail } from '../../../../native-chat/transcript-opencode' -import type { SubscribeNativeChatTranscriptArgs } from '../../../../native-chat/transcript-watch-contract' -import { buildRegistry, isStreamingMethod, type RpcContext } from '../../core' - -const state: { path: string; watcher: SubscribeNativeChatTranscriptArgs | null } = vi.hoisted( - () => ({ - path: '', - watcher: null - }) -) -vi.mock('../../../../managed-data-accounts/service', () => ({ - getManagedDataAccountService: vi.fn() -})) -vi.mock('../../../../native-chat/transcript-watch', () => ({ - subscribeNativeChatTranscript: async (args: SubscribeNativeChatTranscriptArgs) => { - state.watcher = args - return { watching: true, unsubscribe: vi.fn() } - } -})) -vi.mock('../../../../native-chat/transcript-tail-reader', () => ({ - readNativeChatTranscriptTail: (args: { - sessionId: string - limit: number - beforeOffset?: number - }) => - readOpenCodeNativeChatTranscriptTail(args, { - resolveDbPath: async () => state.path, - readPage: async (page) => readOpenCodeTranscriptPage(page) - }) -})) -import { NATIVE_CHAT_METHODS } from './native-chat' - -const roots: string[] = [] -afterEach(() => { - state.watcher = null - for (const root of roots.splice(0)) { - rmSync(root, { recursive: true, force: true }) - } -}) - -function fixture() { - const root = mkdtempSync(join(tmpdir(), 'orca-opencode-paired-pages-')) - roots.push(root) - state.path = join(root, 'opencode.db') - const db = new Database(state.path) - db.exec(`CREATE TABLE session_v2 (id TEXT PRIMARY KEY); - CREATE TABLE session_message (id TEXT, session_id TEXT, type TEXT, seq INTEGER, - data TEXT, time_created INTEGER, time_updated INTEGER); - INSERT INTO session_v2 VALUES ('session');`) - for (let index = 1; index <= 3; index++) { - db.prepare('INSERT INTO session_message VALUES (?, ?, ?, ?, ?, ?, ?)').run( - String(index), - 'session', - 'assistant', - index * 7, - JSON.stringify({ - content: [ - { type: 'reasoning', text: `thinking ${index}` }, - { type: 'text', text: `answer ${index}` } - ] - }), - 1, - 1 - ) - } - db.close() -} - -function context(): RpcContext { - const runtime = { - getAgentProviderSessionRows: () => [], - registerSubscriptionCleanup: vi.fn(), - cleanupSubscription: vi.fn() - } - // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: These handlers only read hook rows and register or invoke subscription cleanup on the runtime. - return { runtime: runtime as unknown as RpcContext['runtime'], clientKind: 'mobile' } -} - -describe.each(['opencode', 'opencode2'])('%s paired semantic pages', (agent) => { - it('reconstructs reasoning and answers across raw-row cursors at limit 1', async () => { - fixture() - const method = buildRegistry(NATIVE_CHAT_METHODS).get('nativeChat.readSession')! - if (isStreamingMethod(method)) { - throw new Error('Expected a page read') - } - const pages: string[][] = [] - let beforeOffset: number | undefined - for (let index = 0; index < 4; index++) { - const params = method.params?.parse({ agent, sessionId: 'session', limit: 1, beforeOffset }) - const result = asRecord(await method.handler(params, context())) - expect(result?.hasMore).toBe(index < 2) - const messages = Array.isArray(result?.messages) ? result.messages : [] - expect(messages.map((message) => asRecord(message)?.role)).toEqual(['reasoning', 'assistant']) - pages.push(messages.map((message) => String(asRecord(message)?.id))) - if (result?.hasMore !== true) { - break - } - expect(typeof result.beforeOffset).toBe('number') - beforeOffset = typeof result.beforeOffset === 'number' ? result.beforeOffset : undefined - } - expect(pages.toReversed().flat()).toEqual([ - 'opencode:1:reasoning', - 'opencode:1', - 'opencode:2:reasoning', - 'opencode:2', - 'opencode:3:reasoning', - 'opencode:3' - ]) - }) -}) diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts index 50a9b884f4d..4143840057c 100644 --- a/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts +++ b/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts @@ -19,7 +19,7 @@ import { SESSION_TAB_MARKDOWN_METHODS } from './session-tab-markdown-methods' import { SESSION_TAB_MUTATION_METHODS } from './session-tab-mutation-methods' import { createSessionTabsStreamDelta } from './session-tabs-sender-delta' import { prepareStructuredTabsIfSupported } from './structured-session-tab-restore' -import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership' +import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-sessions/structured-session-ownership' import '../../../../../shared/protocol-version' import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../../shared/session-tabs-runtime-capabilities' import { createSessionTabsTabDeltaEncoder } from '../../../../../shared/session-tabs-tab-delta' diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts index 83cbb3ee1ee..0880b953e70 100644 --- a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts +++ b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts @@ -2,7 +2,7 @@ import { isTerminalInputPaused, TerminalInputPausedError } from '../../../terminal/input/terminal-input-admission' -import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-session-ownership' +import { assertLegacyAiVaultResumeCommandAllowed } from '../../../../ai-vault/structured-sessions/structured-session-ownership' import { InvalidArgumentError, defineMethod } from '../../core' import { isTerminalQueryReply } from '../../../../../shared/terminal/protocol/queries/terminal-query-reply' import { isUntypedTerminalInput } from '../../../../../shared/terminal/input/terminal-untyped-input' diff --git a/src/main/runtime/terminal/input/terminal-plugin-hooked-input.ts b/src/main/runtime/terminal/input/terminal-plugin-hooked-input.ts index 57590e3da0e..f24506fa874 100644 --- a/src/main/runtime/terminal/input/terminal-plugin-hooked-input.ts +++ b/src/main/runtime/terminal/input/terminal-plugin-hooked-input.ts @@ -1,5 +1,5 @@ import type { RuntimeTerminalSend } from '../../../../shared/runtime-terminal-send-contract' -import { assertLegacyAiVaultResumeCommandAllowed } from '../../../ai-vault/structured-session-ownership' +import { assertLegacyAiVaultResumeCommandAllowed } from '../../../ai-vault/structured-sessions/structured-session-ownership' import type { RuntimeTerminalWriteOptions } from './runtime-terminal-writer' import { OrcaRuntimeWithControllerKnowsPtyIsLive } from './terminal-input-dispatch' import type { RuntimeAgentPromptWriteOptions } from './agent-prompt-write-options' diff --git a/src/main/runtime/terminal/launch/mobile-terminal-chat-fork-create.ts b/src/main/runtime/terminal/launch/mobile-terminal-chat-fork-create.ts index 7c744b51f4b..f51e4090d00 100644 --- a/src/main/runtime/terminal/launch/mobile-terminal-chat-fork-create.ts +++ b/src/main/runtime/terminal/launch/mobile-terminal-chat-fork-create.ts @@ -8,7 +8,7 @@ import type { RuntimeMobileSessionCreateTerminalResult } from '../../../../share import { prepareStructuredChatCliFork, isStructuredChatCliForkSourceCurrent -} from '../../../ai-vault/structured-chat-cli-fork' +} from '../../../ai-vault/structured-sessions/structured-chat-cli-fork' import { buildMobileTerminalChatFork } from './mobile-terminal-chat-fork' import { isWslUncPath } from '../../../../shared/wsl-paths' import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-config' diff --git a/src/main/runtime/terminal/launch/mobile-terminal-chat-fork.test.ts b/src/main/runtime/terminal/launch/mobile-terminal-chat-fork.test.ts deleted file mode 100644 index db104413939..00000000000 --- a/src/main/runtime/terminal/launch/mobile-terminal-chat-fork.test.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { expect, it, vi } from 'vitest' -import type { RuntimeNotifier } from '../../client/events/runtime-notifier-contract' -import './mobile-terminal-chat-fork' -import { prepareStructuredChatCliFork } from '../../../ai-vault/structured-chat-cli-fork' -import '../../orchestration/orchestration-error' -import '../../../../shared/project-runtime-repair-message' -import '../../orca-runtime-tests/orca-runtime-test-lifecycle.spec' -import { committingSpawn } from '../../orca-runtime-tests/bind-first-pane.test-fixture' -import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch' -import { structuredAgentSessionTabId } from '../../../../shared/agent-session/view/structured-agent-session-projection' -vi.mock('../../../ai-vault/structured-chat-cli-fork', () => ({ - prepareStructuredChatCliFork: vi.fn(), - isStructuredChatCliForkSourceCurrent: vi.fn(() => true) -})) -const cwd = process.platform === 'win32' ? 'C:\\repo' : '/tmp/repo' -const filePath = process.platform === 'win32' ? 'C:\\sessions\\chat.jsonl' : '/tmp/chat.jsonl' - -it.each([true, false])( - 'forks a source-selected chat with saved placement available: %s', - async (saved) => { - await import('../../orca-runtime-tests/runtime-test-module-registration.spec') - const { OrcaRuntimeService } = await import('../../orca-runtime') - const { electronMocks } = await import('../../orca-runtime-test-mocks/setup.spec') - const { - TEST_WORKTREE_ID: wt, - makeRuntimeStoreWithWorkspaceSession, - makeWorkspaceSessionWithHeadlessTerminal - } = await import('../../orca-runtime-tests/orca-runtime-test-fixtures.spec') - const { withChatTabChanges } = await import('../../agent-session/agent-session-tab-layout') - const source = 'source-chat', - row = `agent-session:${source}`, - canonical = 'custom-chat-tab' - const initial = makeWorkspaceSessionWithHeadlessTerminal() - const session = - withChatTabChanges('local', initial, wt, [ - { open: { sessionId: source, agent: 'claude', tabId: canonical } } - ]) ?? initial - const group = session.tabGroups?.[wt]?.[0] - if (!group) { - throw new Error('Missing saved group') - } - group.tabOrder = [canonical, 'host-tab'] - const fixture = makeRuntimeStoreWithWorkspaceSession(saved ? session : initial) - const admit = vi.spyOn(fixture.runtimeStore, 'admitTerminalPane') - const service = new OrcaRuntimeService(fixture.runtimeStore) - const spawn = vi.fn( - async (_options: { worktreeId?: string; tabId?: string; leafId?: string }) => ({ - id: 'pty-fork', - incarnationId: '45454545-4545-4545-8545-454545454545' - }) - ) - service.setPtyController({ - spawn: committingSpawn(service, spawn), - write: () => true, - kill: () => true, - getForegroundProcess: async () => null, - listProcesses: async () => [] - }) - electronMocks.BrowserWindow.fromId.mockReturnValue({ - isDestroyed: () => false, - webContents: { - isDestroyed: () => false, - setBackgroundThrottling: vi.fn(), - capturePage: async () => undefined - } - }) - service.attachWindow(1) - service.syncWindowGraph(1, { tabs: [], leaves: [] }) - const { createMobileCreateTestNotifier } = - await import('../../orca-runtime-tests/orca-runtime-test-scenario-builders.spec') - const reveal = vi.fn>( - (_worktree, opts) => { - if (!opts.tabId || !opts.leafId) { - throw new Error('Missing revealed pane') - } - return { - tabId: opts.tabId, - identity: { - worktreeId: wt, - tabId: opts.tabId, - leafId: opts.leafId, - ptyId: opts.ptyId - } - } - } - ) - service.setNotifier({ - ...createMobileCreateTestNotifier(vi.fn()), - revealTerminalSession: reveal - }) - vi.spyOn(service, 'ensureStructuredAgentSessionHost').mockResolvedValue(undefined) - await service.publishStructuredAgentSessionTab({ - workspaceId: wt, - sessionId: source, - agent: 'claude', - activate: true - }) - vi.mocked(prepareStructuredChatCliFork).mockResolvedValue({ - useRealCodexHome: false, - cliForkSource: { - agent: 'claude', - sourceAgent: 'claude', - sessionId: source, - filePath, - cwd, - codexHome: null, - executionHostPlatform: process.platform - } - }) - const created = await service.createMobileSessionTerminal(`id:${wt}`, { - sourceChatFork: { sessionId: source }, - afterTabId: row, - clientMutationId: 'fork', - navigation: 'caller', - clientNavigationId: 'phone', - supportsSplitGroupPlacement: true - }) - expect(spawn).toHaveBeenCalledOnce() - expect(spawn.mock.calls[0]?.[0]).toEqual( - expect.objectContaining({ - command: expect.stringContaining(source) - }) - ) - expect(admit).toHaveBeenCalledOnce() - expect(admit.mock.calls[0]?.[0]).toMatchObject({ - type: 'createTerminalTab', - tabId: created.tab.parentTabId, - ...(saved ? { afterTabId: canonical, groupId: group.id } : {}) - }) - expect(admit.mock.calls[0]?.[0]).not.toMatchObject({ afterTabId: row }) - expect(reveal).toHaveBeenCalledWith( - wt, - expect.objectContaining({ - tabId: created.tab.parentTabId, - leafId: created.tab.leafId, - ptyId: created.tab.ptyId, - activate: false, - focus: false, - presentation: 'background', - surfaceOwner: false, - ...(saved ? { afterTabId: canonical, targetGroupId: group.id } : {}) - }) - ) - if (saved) { - expect( - fixture.getSession().tabGroups?.[wt]?.find((entry) => entry.id === group.id)?.tabOrder - ).toEqual([canonical, created.tab.parentTabId, 'host-tab']) - expect(fixture.getSession().unifiedTabs?.[wt]).toEqual( - expect.arrayContaining([expect.objectContaining({ id: canonical, entityId: source })]) - ) - } else if (ORCA_LAYOUT_OWNER_IS_MAIN) { - expect(admit.mock.calls[0]?.[0]).toMatchObject({ - afterTabId: structuredAgentSessionTabId(source) - }) - } else { - expect(admit.mock.calls[0]?.[0]).not.toHaveProperty('afterTabId') - expect(reveal.mock.calls[0]?.[1]).not.toHaveProperty('afterTabId') - expect(reveal.mock.calls[0]?.[1]).not.toHaveProperty('targetGroupId') - } - expect((await service.listMobileSessionTabs(`id:${wt}`)).tabs).toEqual( - expect.arrayContaining([ - expect.objectContaining({ type: 'agent-session', id: row, sessionId: source }) - ]) - ) - } -) diff --git a/src/main/usage/source-input/usage-record-coercion.ts b/src/main/usage/source-input/usage-record-coercion.ts index fe0700418d5..a409c7da406 100644 --- a/src/main/usage/source-input/usage-record-coercion.ts +++ b/src/main/usage/source-input/usage-record-coercion.ts @@ -1,11 +1,3 @@ export function ensureNumber(value: unknown): number { return typeof value === 'number' && Number.isFinite(value) ? value : 0 } - -export function extractString(value: unknown): string | null { - if (typeof value !== 'string') { - return null - } - const trimmed = value.trim() - return trimmed.length > 0 ? trimmed : null -} diff --git a/src/main/workspaces/removal/retirement/worktree-retirement-discovery.ts b/src/main/workspaces/removal/retirement/worktree-retirement-discovery.ts index 5acb7526aec..4f225990cc4 100644 --- a/src/main/workspaces/removal/retirement/worktree-retirement-discovery.ts +++ b/src/main/workspaces/removal/retirement/worktree-retirement-discovery.ts @@ -7,11 +7,11 @@ import { claudeProjectBucketNameBelowScope, mayBeHashedClaudeProjectBucketName } from '../../../ai-vault/scanners/claude/claude-project-dir-encoding' -import { CLAUDE_CWD_BUCKET_LAYOUT } from '../../../ai-vault/session-cwd-bucket-layouts' +import { CLAUDE_CWD_BUCKET_LAYOUT } from '../../../ai-vault/scope/session-cwd-bucket-layouts' import { cachedProjectDirCwd, cwdBucketScopePrefixes -} from '../../../ai-vault/session-scanner-scope-discovery' +} from '../../../ai-vault/scope/session-scanner-scope-discovery' import { wslGatedReaddir, wslGatedStat } from '../../../native-chat/wsl-transcript-fs-access' import { WslTranscriptFsError } from '../../../native-chat/wsl-transcript-fs-error' import { mapWithConcurrency } from '../../../../shared/map-with-concurrency' diff --git a/src/shared/trimmed-string.ts b/src/shared/trimmed-string.ts new file mode 100644 index 00000000000..5d568aacaa9 --- /dev/null +++ b/src/shared/trimmed-string.ts @@ -0,0 +1,7 @@ +export function extractString(value: unknown): string | null { + if (typeof value !== 'string') { + return null + } + const trimmed = value.trim() + return trimmed.length > 0 ? trimmed : null +} diff --git a/src/shared/wsl-move/wsl-move-storage-dispositions.ts b/src/shared/wsl-move/wsl-move-storage-dispositions.ts index 2fc777c59f6..56f2de6e067 100644 --- a/src/shared/wsl-move/wsl-move-storage-dispositions.ts +++ b/src/shared/wsl-move/wsl-move-storage-dispositions.ts @@ -139,7 +139,7 @@ export const SQLITE_SCHEMA_FILE_DATABASES: Record = { // Test fixtures that mirror third-party agent and browser databases. 'src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-fixture.ts': 'test-fixture', - 'src/main/ai-vault/session-scanner-test-fixtures.ts': 'test-fixture', + 'src/main/ai-vault/scanner-fixtures/session-scanner-test-fixtures.ts': 'test-fixture', 'src/main/browser/cookies/browser-cookie-import-test-database.ts': 'test-fixture', 'src/main/codex/history/index/codex-state-db-test-fixture.ts': 'test-fixture', 'src/main/opencode-usage/opencode-usage-sqlite-fixture.ts': 'test-fixture' diff --git a/tests/e2e/ai-vault-manual-name-clear.unit.test.ts b/tests/e2e/ai-vault-manual-name-clear.unit.test.ts deleted file mode 100644 index 58c8db09227..00000000000 --- a/tests/e2e/ai-vault-manual-name-clear.unit.test.ts +++ /dev/null @@ -1,352 +0,0 @@ -// @vitest-environment happy-dom - -import type * as StructuredAgentSessionSubscriptions from '@/runtime/native-chat/requests/structured-agent-session-subscriptions' -import { mkdtemp, rm } from 'node:fs/promises' -import { tmpdir } from 'node:os' -import { join } from 'node:path' -import { act, cleanup, render, screen, waitFor } from '@testing-library/react' -import { afterEach, expect, it, vi } from 'vitest' -import { createElement, Fragment } from 'react' -import { - agentSessionLeaseFixture, - agentSessionRecordFixture -} from '../../src/shared/agent-session/lifecycle/agent-session-record.test-fixture' -import { AGENT_JOURNAL_THREAD_SCOPE } from '../../src/shared/agent-session/journal/agent-session-journal-types' -import { computeAgentSessionPayloadFingerprint } from '../../src/shared/agent-session/lifecycle/agent-session-mutation-envelope' -import type { - AiVaultListResult, - AiVaultSession -} from '../../src/shared/ai-vault/contracts/ai-vault-types' -import { - projectStructuredAiVaultSessions, - OPENS_EVERY_STRUCTURED_CHAT -} from '../../src/main/ai-vault/structured-session-ownership' -import { - openTestAgentSessionRecordStore, - seedTestAgentSessionRecordStore, - readPersistedTestAgentSessionStore -} from '../../src/main/runtime/agent-session/records/agent-session-record-store-test-harness' -import { AgentSessionJournal } from '../../src/main/native-chat/agent-session-journal/journal-store' -import { - openTestJournalHostDatabase, - closeTestJournalHostDatabases -} from '../../src/main/native-chat/agent-session-journal/store-lifecycle/journal-host-database-test-support' -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 { 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' -import { useAppStore } from '@/store' -import { - getStructuredAgentSessionStatusFeed, - resetStructuredAgentSessionStatusFeedsForTests -} from '@/runtime/native-chat/status/structured-agent-session-status-feed' -import { - resetAiVaultForcedRescanThrottleForTest, - useAiVaultSessionRefresh -} from '../../src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-session-refresh' -import { aiVaultSessionRowResumeGating } from '../../src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume' -import { useAiVaultSessionDisplayTitle } from '../../src/renderer/src/components/right-sidebar/ai-vault/session-list/use-ai-vault-session-display-title' - -const mocks = vi.hoisted(() => ({ subscribe: vi.fn() })) -vi.mock('@/store', async () => { - const { createTestStore } = await import('@/store/testing/app-store-test-fixture') - return { useAppStore: createTestStore() } -}) -vi.mock( - '../../src/renderer/src/runtime/native-chat/requests/structured-agent-session-subscriptions', - async (importOriginal) => ({ - ...(await importOriginal()), - subscribeStructuredAgentSessionStatus: mocks.subscribe - }) -) - -const SESSION = 'native-pi-history-clear' -const PROVIDER = '019fd622-3c4d-7e5f-a061-7c8d9e0f1a2b' -const FILE = `/sessions/2026-10-23T10-00-00-000Z_${PROVIDER}.jsonl` -const NAME = 'Budget plan' -const PATHS = ['/repo'] -const initialState = useAppStore.getInitialState() -let directory: string | null = null -let host: StructuredAgentSessionHost | null = null - -function HistoryRow({ session }: { session: AiVaultSession }) { - const title = useAiVaultSessionDisplayTitle(session) - return createElement( - 'div', - { - 'data-testid': 'history-row', - 'data-owner': session.structuredSession?.sessionId, - 'data-copy-resume': aiVaultSessionRowResumeGating(session, { blocked: false }) - .canCopyResumeCommand, - 'data-resume': session.resumeCommand - }, - title - ) -} -function History() { - const { sessions } = useAiVaultSessionRefresh(PATHS, 'local', 250) - return createElement( - Fragment, - null, - sessions.map((session) => createElement(HistoryRow, { key: session.id, session })) - ) -} - -async function disposeHistory() { - cleanup() - resetStructuredAgentSessionStatusFeedsForTests() - setStructuredAgentSessionHost(null) - await host?.flushAllStreamedEvents() - host = null - await closeTestJournalHostDatabases() - if (directory) { - await rm(directory, { recursive: true, force: true }) - } - directory = null - useAppStore.setState(initialState, true) -} -afterEach(disposeHistory) - -it('detaches a mounted provider History row after clear without losing the native manual name', async () => { - for (const remount of [false, true]) { - resetAiVaultForcedRescanThrottleForTest() - resetStructuredAgentSessionStatusFeedsForTests() - directory = await mkdtemp(join(tmpdir(), 'orca-history-manual-clear-')) - const lease = agentSessionLeaseFixture({ - sessionId: SESSION, - ownerProcess: null, - reservedSpawnToken: null, - claimStatus: 'released' - }) - const record = { - ...agentSessionRecordFixture(lease), - provider: 'pi' as const, - accountHome: { variable: 'PI_CODING_AGENT_DIR' as const, path: directory }, - providerHandleChain: [ - { - linkId: 'pi-link', - origin: 'created' as const, - mintedAtFence: lease.runtimeFence, - observedAt: 1000, - handle: { transport: 'jsonl-rpc' as const, agent: 'pi' as const, nativeId: FILE } - } - ] - } - await seedTestAgentSessionRecordStore(directory, { records: [record] }) - const store = await openTestAgentSessionRecordStore(directory) - const database = openTestJournalHostDatabase(directory) - const journal = new AgentSessionJournal({ - database, - identity: { - sessionId: SESSION, - workspaceId: 'workspace-1', - hostId: 'local', - agent: 'pi', - providerHandle: null - } - }) - await journal.open() - await journal.appendItem( - { provider: 'legacy', agent: 'pi', sessionId: FILE, recordId: 'completed-reply' }, - { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Inventory checked' }] }, - { fence: lease.runtimeFence, turnScope: AGENT_JOURNAL_THREAD_SCOPE } - ) - await journal.close() - const { logger } = recordingStructuredAgentSessionLogger() - const unexpectedLaunch = (): never => { - throw new Error('Clear must not launch a provider') - } - host = new StructuredAgentSessionHost({ - store, - journalDatabase: database, - logger, - agents: structuredAgentsDeclaringNothing([PI_RPC_AGENT]), - adapter: { - acquire: unexpectedLaunch, - open: unexpectedLaunch, - dispatch: unexpectedLaunch, - cancelTurn: async () => ({ cancelled: true }), - answerPrompt: async () => {}, - setOption: async () => {}, - closeSession: async () => true - }, - claimKeyId: 'key-1', - mintSpawnToken: () => 'unused', - probeOwner: async () => ({ outcome: 'pid-absent' }), - conversationNaming: createStructuredChatNamingHandler({ - getStore: () => store, - getSettings: () => ({}), - workerTaskTitle: () => null, - readFirstPrompt: async () => '', - readJournalFirstPrompt: async () => '', - generate: async () => null, - onNamed: () => host?.publishConversationName(SESSION), - logger - }) - }) - setStructuredAgentSessionHost(host) - await host.revealSession(SESSION) - expect(await host.setUserConversationName(SESSION, NAME, 'rename')).toEqual({ - name: NAME, - applied: true - }) - let emitFrame = (_event: AgentSessionStatusEvent): void => {} - const unsubscribe = vi.fn() - mocks.subscribe.mockImplementation(async (_target, emit) => { - emitFrame = emit - const stop = host?.subscribeStatus({ id: 'history-clear-test', emit }) - return { - unsubscribe: () => { - unsubscribe() - stop?.() - } - } - }) - const scanned: AiVaultListResult = { - scannedAt: 'unchanged-provider-scan', - issues: [], - sessions: [ - { - id: `local:pi:${PROVIDER}`, - executionHostId: 'local', - agent: 'pi', - sessionId: PROVIDER, - filePath: FILE, - title: 'Check inventory', - cwd: '/repo', - branch: null, - model: null, - codexHome: null, - createdAt: null, - updatedAt: null, - modifiedAt: '2026-10-23T10:00:00Z', - messageCount: 2, - totalTokens: 0, - previewMessages: [], - queuedMessageCount: 0, - subagentTranscriptCount: 0, - resumeCommand: `pi --session ${FILE}`, - subagent: null - } - ] - } - const project = () => projectStructuredAiVaultSessions(scanned, OPENS_EVERY_STRUCTURED_CHAT) - Object.defineProperty(window, 'api', { - configurable: true, - value: { - aiVault: { - listSessions: vi.fn(async () => project()), - cancelListSessions: vi.fn(async () => {}), - onWindowFocused: () => () => {} - } - } - }) - // History owns its feed even when no chat tab or pane projector exists. - let view = render(createElement(History)) - await waitFor(() => expect(screen.getByTestId('history-row').textContent).toBe(NAME)) - expect(screen.getByTestId('history-row').getAttribute('data-owner')).toBe(SESSION) - expect(screen.getByTestId('history-row').getAttribute('data-copy-resume')).toBe('false') - - const feed = getStructuredAgentSessionStatusFeed({ kind: 'local' }) - const confirmed = feed.getSnapshot().get(SESSION)! - const revision = feed.getAssociationRevision() - const queries = window.api.aiVault.listSessions - const beforeChurn = vi.mocked(queries).mock.calls.length - for (const n of [10, 100]) { - await act(async () => { - for (let i = 0; i < n; i++) { - emitFrame({ - type: 'status', - session: { ...confirmed, updatedAt: i, latestPrompt: `${i}` } - }) - emitFrame({ - type: 'snapshot', - sessions: [], - namingActiveSessionIds: [], - conversationNames: [{ sessionId: SESSION, conversationName: NAME }] - }) - } - }) - expect(vi.mocked(queries).mock.calls).toHaveLength(beforeChurn) - expect(feed.getAssociationRevision()).toBe(revision) - } - const oldProjection = project() - if (remount) { - view.unmount() - expect(unsubscribe).toHaveBeenCalledOnce() - } - let settleOld = (_result: AiVaultListResult): void => {} - if (remount) { - vi.mocked(queries).mockImplementationOnce( - () => - new Promise((resolve) => { - settleOld = resolve - }) - ) - } - await act(async () => { - const command = 'clear' - const clearing = host?.conversationCommand( - { callerKey: 'desktop' }, - { - command, - envelope: { - sessionId: SESSION, - clientOperationId: `${Date.now()}-${'1'.repeat(32)}`, - expectedRuntimeFence: store.getRecord(SESSION)?.lease.runtimeFence ?? null, - payloadFingerprint: computeAgentSessionPayloadFingerprint({ - method: 'agentSession.conversationCommand', - sessionId: SESSION, - fields: { command } - }) - } - } - ) - if (remount) { - view = render(createElement(History)) - } - expect(await clearing).toMatchObject({ - ok: true, - value: { command: 'clear', state: 'completed' } - }) - }) - const beforeSettlement = vi.mocked(queries).mock.calls.length - if (remount) { - expect(screen.getByTestId('history-row').textContent).toBe(NAME) - await act(async () => settleOld(oldProjection)) - } - const saved = (await readPersistedTestAgentSessionStore(directory)).records[SESSION] - expect(saved).toMatchObject({ - conversationName: NAME, - conversationNameSource: 'user', - providerHandleChain: [] - }) - expect(project().sessions[0]).toMatchObject({ title: 'Check inventory' }) - expect(project().sessions[0]?.structuredSession).toBeUndefined() - const published = getStructuredAgentSessionStatusFeed({ kind: 'local' }) - .getSnapshot() - .get(SESSION) - expect(published).toMatchObject({ sessionId: SESSION, conversationName: NAME }) - expect(published?.providerSession).toBeUndefined() - await waitFor(() => { - expect(screen.getByTestId('history-row').textContent).toBe('Check inventory') - expect(screen.getByTestId('history-row').getAttribute('data-owner')).toBeNull() - expect(screen.getByTestId('history-row').getAttribute('data-copy-resume')).toBe('true') - expect(screen.getByTestId('history-row').getAttribute('data-resume')).toBe( - `pi --session ${FILE}` - ) - }) - expect(vi.mocked(queries).mock.calls).toHaveLength(beforeSettlement + (remount ? 1 : 0)) - expect(vi.mocked(queries).mock.calls.every(([args]) => args?.force !== true)).toBe(true) - view.unmount() - expect(unsubscribe).toHaveBeenCalledTimes(remount ? 2 : 1) - expect((await readPersistedTestAgentSessionStore(directory)).records[SESSION]).toMatchObject({ - conversationName: NAME, - conversationNameSource: 'user' - }) - await disposeHistory() - } -}) 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 deleted file mode 100644 index 4b5d4e9b43a..00000000000 --- a/tests/e2e/cross-version-wire/agent-session-saved-name-old-client.unit.test.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { expect, it, vi } from 'vitest' -import { materializeReleaseCheckout, importReleaseCheckoutModule } from './release-checkout' -import { RpcDispatcher } from '../../../src/main/runtime/rpc/dispatcher' -import { AI_VAULT_METHODS } from '../../../src/main/runtime/rpc/methods/history/ai-vault' -import { SESSION_TAB_METHODS } from '../../../src/main/runtime/rpc/methods/session-tabs/session-tabs' -import { listResult } from '../../../src/main/ai-vault/structured-session-ownership.test-support' -import { - HOST_TEST_SESSION, - HOST_TEST_LOCATION -} from '../../../src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-host-test-data' -import { - WORKTREE, - createChat, - send, - runtime, - host, - store -} from '../../../src/main/runtime/rpc/methods/session-tabs/structured-chat-tab-table.test-fixture' - -// Cold CI may materialize the pinned release checkout before importing its client modules. -it('a released client reads the current saved name from tabs and each fresh History query', async () => { - const checkout = await materializeReleaseCheckout('v1.4.222') - const [tabs, history, protocol] = await Promise.all( - [ - 'mobile/src/session/mobile-session-read-operations.ts', - 'mobile/src/agent-history/mobile-agent-history-operations.ts', - 'mobile/src/transport/mobile-runtime-client-capabilities.ts' - ].map((path) => importReleaseCheckoutModule(checkout, path)) - ) - const capabilities = protocol.MOBILE_RUNTIME_CLIENT_CAPABILITIES - if ( - !Array.isArray(capabilities) || - !capabilities.every((value: unknown): value is string => typeof value === 'string') - ) { - throw new Error('Pinned released client capabilities missing') - } - expect(checkout.commit).toBe('4bb6f2072b07c1f0664b809551f77754700570e4') - // The fixture already installed the real host on its throwaway SQLite store. - vi.spyOn(runtime, 'ensureStructuredAgentSessionHost').mockResolvedValue() - expect(await createChat(HOST_TEST_SESSION)).toMatchObject({ ok: true }) - expect(await send(HOST_TEST_SESSION, 'Begin the compatibility conversation')).toMatchObject({ - ok: true - }) - const providerId = store.getRecord(HOST_TEST_SESSION)?.providerHandleChain.at(-1)?.handle.nativeId - if (!providerId) { - throw new Error('Real host did not acquire provider identity') - } - const raw = listResult() - raw.sessions = [ - { - ...raw.sessions[0]!, - id: `local:codex:${providerId}`, - sessionId: providerId, - filePath: `/sessions/rollout-${providerId}.jsonl`, - resumeCommand: `codex resume '${providerId}'`, - title: 'Provider title' - } - ] - const scan = vi.spyOn(runtime, 'listAiVaultSessions').mockResolvedValue(raw) - const dispatcher = new RpcDispatcher({ - runtime, - methods: [...SESSION_TAB_METHODS, ...AI_VAULT_METHODS] - }) - const client = { - sendRequest: async (method: string, params: unknown) => - JSON.parse( - JSON.stringify( - await dispatcher.dispatch( - { id: method, authToken: 'token', method, params }, - { - clientKind: 'mobile', - clientCapabilities: capabilities - } - ) - ) - ) - } - const read = async (operation: unknown, params: unknown): Promise => { - if ( - !operation || - typeof operation !== 'object' || - !('request' in operation) || - typeof operation.request !== 'function' || - !('interpret' in operation) || - typeof operation.interpret !== 'function' - ) { - throw new Error('Released reader missing') - } - return operation.interpret(await operation.request(client, params)) - } - for (const name of ['Cold saved name', 'Renamed on serving host']) { - expect(await store.setUserConversationName(HOST_TEST_SESSION, name, 'rename')).toMatchObject({ - applied: true - }) - host.publishConversationName(HOST_TEST_SESSION) - expect(await read(tabs.sessionTabsListRead, { worktree: WORKTREE })).toMatchObject({ - tabs: [ - expect.objectContaining({ - type: 'agent-session', - sessionId: HOST_TEST_SESSION, - title: name - }) - ] - }) - expect(await read(history.agentHistorySessionScan, { scopePaths: ['/repo'] })).toMatchObject({ - sessions: [ - expect.objectContaining({ - title: name, - sessionId: providerId, - structuredSession: { - sessionId: HOST_TEST_SESSION, - workspaceId: HOST_TEST_LOCATION.workspaceId - } - }) - ] - }) - } - expect(scan).toHaveBeenCalledTimes(2) - expect(raw.sessions[0]?.title).toBe('Provider title') - expect(store.getRecord(HOST_TEST_SESSION)).toMatchObject({ - conversationName: 'Renamed on serving host', - conversationNameSource: 'user' - }) -}, 180_000)