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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-standalone",
-  "version": "0.9.76-rc.21",
+  "version": "0.9.76-rc.22",
   "description": "ADHDev standalone daemon — embedded HTTP/WS server for local dashboard",
   "main": "dist/index.js",
   "bin": {

package/vendor/mcp-server/index.js

@@ -27329,7 +27329,10 @@ async function gitCheckpoint2(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;
   }
@@ -42532,6 +42535,7 @@ ${lastSnapshot}`;
       "dirty_index_required",
       "conflict",
       "invalid_args",
+      "nothing_to_commit",
       "git_command_failed"
     ]);
     defaultSnapshotStore = createGitSnapshotStore({
@@ -46981,10 +46985,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));
       }
@@ -56699,7 +56719,8 @@ async function meshCheckpoint(ctx, args) {
   if (isLocalTransport(ctx.transport)) {
     const result = await commandForNode(ctx, node, "git_checkpoint", {
       workspace: node.workspace,
-      message: args.message
+      message: args.message,
+      includeUntracked: true
     });
     return JSON.stringify(result, null, 2);
   } else {