From c4b9b2137ccdc9da7eea51cdcb5076048dfc8459 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Sun, 8 Nov 2026 21:17:06 +0000 Subject: [PATCH] refactor(session-history): build the scope matcher only for scope-only scans and tighten comments --- src/main/ai-vault/session-scanner-scope-inventory.ts | 3 +-- src/main/ai-vault/session-scanner-scope-walk.ts | 9 ++++----- src/main/ai-vault/session-scanner-source-discovery.ts | 3 +-- src/main/ai-vault/session-scanner.ts | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/ai-vault/session-scanner-scope-inventory.ts b/src/main/ai-vault/session-scanner-scope-inventory.ts index e38ab4aa3fd..4a716638b6b 100644 --- a/src/main/ai-vault/session-scanner-scope-inventory.ts +++ b/src/main/ai-vault/session-scanner-scope-inventory.ts @@ -94,8 +94,7 @@ export async function inventoryCwdBucketFiles( let unverified = false if (layout.agent === 'claude') { const cwd = await cachedProjectDirCwd(directory, record, layout.agent, args.signal) - // Main's recency pass still shows recent sessions in a name-matched bucket whose newest transcripts - // name no cwd, or another folder sharing the lossy name; scope-only lets their parse decide. + // No cwd found, or a folder sharing the lossy name: without a recency pass, the parse decides. if (!inScope(cwd, directory)) { if (!args.scopeOnly) { continue diff --git a/src/main/ai-vault/session-scanner-scope-walk.ts b/src/main/ai-vault/session-scanner-scope-walk.ts index 3440371a1ee..b082062866d 100644 --- a/src/main/ai-vault/session-scanner-scope-walk.ts +++ b/src/main/ai-vault/session-scanner-scope-walk.ts @@ -64,13 +64,14 @@ export async function scanInScopeSessions(args: ScopeScanArgs): Promise workload?.settle(candidate, 'bucket', parsed), // Unverified bucket files are placed by their parsed cwd. - admitSession: scopeOnlyScan(args.options) - ? (session) => aiVaultSessionInScope(inScope, session) - : undefined + admitSession: inScope ? (session) => aiVaultSessionInScope(inScope, session) : undefined }) return [...bucketed, ...walked] } diff --git a/src/main/ai-vault/session-scanner-source-discovery.ts b/src/main/ai-vault/session-scanner-source-discovery.ts index c7347433c6a..dc844dcda35 100644 --- a/src/main/ai-vault/session-scanner-source-discovery.ts +++ b/src/main/ai-vault/session-scanner-source-discovery.ts @@ -51,8 +51,7 @@ function agentDiscoveries( issues: AiVaultScanIssue[] ): Promise[] { const rootDirs = source.rootDirs(options, wslHomeDirs) - // Scope-only scans read cwd-bucket agents through their bucket inventory and can't place cwd-less ones. - // Pi stays listed: OMP shares its folder under PI_CODING_AGENT_DIR, and Pi's listing decides who parses a file. + // Scope-only reads cwd buckets through the scope pass; Pi stays listed because OMP's dedupe needs its listing. if ( scopeOnlyScan(options) && !scopeWalksAgentFiles(agent, options.scopePaths) && diff --git a/src/main/ai-vault/session-scanner.ts b/src/main/ai-vault/session-scanner.ts index 3b9481a4b44..dbe45b44195 100644 --- a/src/main/ai-vault/session-scanner.ts +++ b/src/main/ai-vault/session-scanner.ts @@ -103,8 +103,8 @@ async function scanAiVaultSessionStores(options: AiVaultScanOptions): Promise sessionSortTime(right) - sessionSortTime(left) ) // Scope-only keeps the recency pass for agents without cwd buckets, but returns only its in-scope rows. - const inScope = createAiVaultScopeCwdMatcher(options.scopePaths ?? []) - const cappedSessions = scopeOnly + const inScope = scopeOnly ? createAiVaultScopeCwdMatcher(options.scopePaths ?? []) : null + const cappedSessions = inScope ? recentSessions.filter((session) => aiVaultSessionInScope(inScope, session)) : recentSessions.slice(0, limit)