@adhdev/daemon-core 0.9.76-rc.21 → 0.9.76-rc.22

package/package.json

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

package/src/git/git-commands.ts

@@ -152,6 +152,7 @@ const FAILURE_REASONS = new Set<GitFailureReason>([
   'dirty_index_required',
   'conflict',
   'invalid_args',
+  'nothing_to_commit',
   'git_command_failed',
 ]);
 
@@ -454,7 +455,10 @@ async function gitCheckpoint(
   } catch (err: any) {
     const output = (err?.stdout || '') + (err?.stderr || '');
     if (/nothing to commit/i.test(output)) {
-      throw new GitCommandError('git_command_failed', 'Nothing to commit');
+      throw new GitCommandError('nothing_to_commit', 'Nothing to commit — working tree is clean.', {
+        stdout: err?.stdout,
+        stderr: err?.stderr,
+      });
     }
     throw err;
   }

package/src/git/git-types.ts

@@ -14,6 +14,7 @@ export type GitFailureReason =
   | 'dirty_index_required'
   | 'conflict'
   | 'invalid_args'
+  | 'nothing_to_commit'
   | 'git_command_failed';
 
 export interface GitRepoIdentity {

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

@@ -985,12 +985,33 @@ export class CliProviderInstance implements ProviderInstance {
     private mergeConversationMessages(parsedMessages: any[]): ChatMessage[] {
         if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
 
-        return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)]
-            .map((message, index) => ({ message, index }))
+        type MergeEntry = { message: ChatMessage; index: number; source: 'parsed' | 'runtime' };
+        const parsedEntries: MergeEntry[] = parsedMessages.map((message, index) => ({
+            message,
+            index,
+            source: 'parsed',
+        }));
+        const runtimeEntries: MergeEntry[] = this.runtimeMessages.map((entry, index) => ({
+            message: entry.message,
+            index: parsedMessages.length + index,
+            source: 'runtime',
+        }));
+        const getTime = (message: ChatMessage): number => {
+            const value = typeof message.receivedAt === 'number'
+                ? message.receivedAt
+                : typeof message.timestamp === 'number'
+                    ? message.timestamp
+                    : 0;
+            return Number.isFinite(value) && value > 0 ? value : 0;
+        };
+
+        return normalizeChatMessages([...parsedEntries, ...runtimeEntries]
             .sort((a, b) => {
-                const aTime = a.message.receivedAt || a.message.timestamp || 0;
-                const bTime = b.message.receivedAt || b.message.timestamp || 0;
-                if (aTime !== bTime) return aTime - bTime;
+                const aTime = getTime(a.message);
+                const bTime = getTime(b.message);
+                if (aTime && bTime && aTime !== bTime) return aTime - bTime;
+                if (aTime && !bTime && a.source === 'runtime' && b.source === 'parsed') return -1;
+                if (!aTime && bTime && a.source === 'parsed' && b.source === 'runtime') return 1;
                 return a.index - b.index;
             })
             .map((entry) => entry.message));