@adhdev/daemon-core 0.9.82-rc.103 → 0.9.82-rc.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.103",
+  "version": "0.9.82-rc.105",
   "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

@@ -1310,8 +1310,14 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         ? (nativeHistory as any).unavailableReason
                         : undefined;
                     const lookup = (nativeHistory as any).lookup === 'workspace' ? 'workspace' : 'session';
+                    const nativeHistorySessionForMapping = adapter.cliType === 'antigravity-cli'
+                        && historyProviderSessionId
+                        && nativeHistorySessionId
+                        && historyProviderSessionId !== nativeHistorySessionId
+                        ? undefined
+                        : nativeHistorySessionId;
                     const safeMapping = hasSafeNativeHistoryMapping({
-                        historySessionId: lookup === 'workspace' ? undefined : nativeHistorySessionId,
+                        historySessionId: lookup === 'workspace' ? undefined : nativeHistorySessionForMapping,
                         providerSessionId: lookup === 'workspace' ? undefined : historyProviderSessionId || providerSessionId,
                         workspace,
                         nativeMessages,

package/src/providers/cli-provider-instance.ts

@@ -541,6 +541,15 @@ export class CliProviderInstance implements ProviderInstance {
         }
         const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
+        const statusMessages = canonicalBackedHistory && this.lastPersistedHistoryMessages.length > 0
+            ? this.lastPersistedHistoryMessages.map((message) => ({
+                role: message.role,
+                content: message.content,
+                kind: message.kind,
+                senderName: message.senderName,
+                receivedAt: message.receivedAt,
+            }))
+            : mergedMessages;
 
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
         const parsedChatStatus = typeof parsedStatus?.status === 'string' && parsedStatus.status.trim()
@@ -607,7 +616,7 @@ export class CliProviderInstance implements ProviderInstance {
                 id: activeChatId,
                 title: parsedStatus?.title || dirName,
                 status: activeChatStatus,
-                messages: mergedMessages,
+                messages: statusMessages,
                 activeModal: autoApproveActive ? null : (parsedStatus?.activeModal ?? adapterStatus.activeModal),
                 inputContent: '',
             },