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

package/dist/index.mjs

@@ -4693,6 +4693,7 @@ var FAILURE_REASONS = /* @__PURE__ */ new Set([
   "dirty_index_required",
   "conflict",
   "invalid_args",
+  "nothing_to_commit",
   "git_command_failed"
 ]);
 function failure(reason, error) {
@@ -4937,7 +4938,10 @@ async function gitCheckpoint(workspace, message, includeUntracked) {
   } catch (err) {
     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 \u2014 working tree is clean.", {
+        stdout: err?.stdout,
+        stderr: err?.stderr
+      });
     }
     throw err;
   }
@@ -15468,10 +15472,26 @@ ${effect.notification.body || ""}`.trim();
   }
   mergeConversationMessages(parsedMessages) {
     if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
-    return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).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 parsedEntries = parsedMessages.map((message, index) => ({
+      message,
+      index,
+      source: "parsed"
+    }));
+    const runtimeEntries = this.runtimeMessages.map((entry, index) => ({
+      message: entry.message,
+      index: parsedMessages.length + index,
+      source: "runtime"
+    }));
+    const getTime = (message) => {
+      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 = 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));
   }