@adhdev/daemon-core 0.9.82-rc.118 → 0.9.82-rc.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.118",
+  "version": "0.9.82-rc.119",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/chat-commands.ts

@@ -26,6 +26,11 @@ const RECENT_SEND_WINDOW_MS = 1200;
 export const READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25_000;
 const HERMES_CLI_STARTING_SEND_SETTLE_MS = 2_000;
 const CLI_NATIVE_HISTORY_FRESH_MS = 5 * 60_000;
+// Fallback list for supportsCliNativeTranscript() when the ProviderModule is
+// unavailable (e.g. provider config not yet loaded). The authoritative check is
+// provider.canonicalHistory via isNativeSourceCanonicalHistory(). New providers
+// with native transcripts should set canonicalHistory in their provider.json
+// rather than adding entries here.
 const CLI_NATIVE_TRANSCRIPT_PROVIDERS = new Set(['codex-cli', 'claude-cli', 'hermes-cli', 'antigravity-cli']);
 const recentSendByTarget = new Map<string, number>();
 
@@ -471,15 +476,20 @@ function hasSafeNativeHistoryMapping(args: {
             return messageSessionIds.some((id) => id === explicitSessionId);
         }
 
+        // Messages carry no historySessionId — cannot confirm they belong to the requested session.
+        // Only allow a coordinator transcript that is also confirmed by the PTY side; otherwise
+        // fail closed so a same-workspace session's history is never silently accepted.
         if (isCoordinatorTranscript && args.ptyMessages && args.ptyMessages.length > 0) {
             const ptyHasCoordinator = args.ptyMessages.some((m: any) => {
                 const text = typeof m?.content === 'string' ? m.content : JSON.stringify(m?.content || '');
                 return text.includes('mesh_send_task') || text.includes('mesh_status') || text.includes('mesh_read_chat');
             });
-            if (!ptyHasCoordinator) {
-                return false;
-            }
+            return ptyHasCoordinator;
         }
+
+        // No historySessionId in messages and no coordinator cross-check: fail closed.
+        // Workspace-only matching must not override an explicit session identity.
+        return false;
     }
     const workspace = String(args.workspace || '').trim();
     if (!workspace) return false;
@@ -500,6 +510,11 @@ function hasSafeNativeHistoryMapping(args: {
     return hasOverlappingVisibleConversationText(args.nativeMessages, args.ptyMessages || []);
 }
 
+// Provenance boundary: workspace-only native history lookup is never safe
+// because multiple concurrent sessions sharing the same cwd would alias each
+// other. historySessionId (the provider-native session key) is required to
+// establish ownership. hasSafeNativeHistoryMapping() enforces the same
+// invariant after the read; both guards must hold for native history to be used.
 function readCliProviderNativeHistory(agentStr: string, args: {
     canonicalHistory?: ProviderModule['canonicalHistory'];
     historySessionId?: string;
@@ -509,7 +524,6 @@ function readCliProviderNativeHistory(agentStr: string, args: {
     excludeRecentCount: number;
     historyBehavior?: ProviderModule['historyBehavior'];
     scripts?: ProviderScripts;
-    exactSessionScoped?: boolean;
 }): ReturnType<typeof readProviderChatHistory> & { lookup: 'session' | 'workspace' } {
     if (!args.historySessionId) {
         return {
@@ -1220,7 +1234,6 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
                 excludeRecentCount,
                 historyBehavior: provider?.historyBehavior,
                 scripts: provider?.scripts as any,
-                exactSessionScoped: exactNativeHistoryScope,
             })
             : readProviderChatHistory(agentStr, {
                 canonicalHistory: provider?.canonicalHistory,
@@ -1360,7 +1373,6 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         excludeRecentCount: 0,
                         historyBehavior: provider?.historyBehavior,
                         scripts: provider?.scripts as any,
-                        exactSessionScoped: exactNativeHistoryScope,
                     });
                 } catch (error: any) {
                     const fallbackReason = `native_history_error:${error?.message || String(error)}`;
@@ -1526,7 +1538,6 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     excludeRecentCount: 0,
                     historyBehavior: provider?.historyBehavior,
                     scripts: provider?.scripts as any,
-                    exactSessionScoped: exactNativeHistoryScope,
                 })
                 : readProviderChatHistory(agentStr, {
                 canonicalHistory: provider?.canonicalHistory,