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

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;
   }
@@ -14660,7 +14664,7 @@ init_provider_cli_adapter();
 import * as os13 from "os";
 import * as path17 from "path";
 import * as crypto4 from "crypto";
-import { existsSync as existsSync12 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, writeFileSync as writeFileSync7 } from "fs";
 import { execFileSync } from "child_process";
 import chalk from "chalk";
 init_config();
@@ -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));
   }
@@ -16828,6 +16848,35 @@ function colorize(color, text) {
   const fn = chalkApi?.[color];
   return typeof fn === "function" ? fn(text) : text;
 }
+var COORDINATOR_DELEGATED_ENV_UNSETS = {
+  ADHDEV_INLINE_MESH: "",
+  ADHDEV_MCP_TRANSPORT: "",
+  ADHDEV_MESH_ID: "",
+  HERMES_EPHEMERAL_SYSTEM_PROMPT: ""
+};
+function hasCliArg(args, flag) {
+  return args.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
+}
+function ensureEmptyDelegatedMcpConfig(workspace) {
+  const baseDir = path17.join(os13.tmpdir(), "adhdev-delegated-agent-empty-mcp");
+  mkdirSync7(baseDir, { recursive: true });
+  const workspaceHash = crypto4.createHash("sha256").update(path17.resolve(workspace || os13.tmpdir())).digest("hex").slice(0, 16);
+  const filePath = path17.join(baseDir, `${workspaceHash}.json`);
+  writeFileSync7(filePath, JSON.stringify({ mcpServers: {} }, null, 2), "utf-8");
+  return filePath;
+}
+function buildCoordinatorDelegatedCliLaunchOptions(input) {
+  const cliType = String(input.cliType || "").trim();
+  const cliArgs = Array.isArray(input.cliArgs) ? [...input.cliArgs] : [];
+  const env = { ...input.env || {}, ...COORDINATOR_DELEGATED_ENV_UNSETS };
+  if (cliType === "hermes-cli" && !hasCliArg(cliArgs, "--ignore-user-config")) {
+    cliArgs.unshift("--ignore-user-config");
+  }
+  if (cliType === "claude-cli" && !hasCliArg(cliArgs, "--mcp-config")) {
+    cliArgs.unshift("--mcp-config", ensureEmptyDelegatedMcpConfig(input.workspace));
+  }
+  return { cliArgs, env };
+}
 function isUuid(value) {
   return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
 }
@@ -17461,12 +17510,23 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const dir = resolved.path;
         const launchSource = resolved.source;
         if (!cliType) throw new Error("cliType required");
+        const settingsOverride = args?.settings && typeof args.settings === "object" ? args.settings : void 0;
+        const delegatedLaunch = settingsOverride?.launchedByCoordinator === true ? buildCoordinatorDelegatedCliLaunchOptions({
+          cliType,
+          workspace: dir,
+          cliArgs: args?.cliArgs,
+          env: args?.env
+        }) : null;
         const started = await this.startSession(
           cliType,
           dir,
-          args?.cliArgs,
+          delegatedLaunch ? delegatedLaunch.cliArgs : args?.cliArgs,
           args?.initialModel,
-          { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings, extraEnv: args?.env }
+          {
+            resumeSessionId: args?.resumeSessionId,
+            settingsOverride,
+            extraEnv: delegatedLaunch ? delegatedLaunch.env : args?.env
+          }
         );
         return {
           success: true,
@@ -21947,7 +22007,7 @@ var DaemonCommandRouter = class {
               workspace
             };
           }
-          const { existsSync: existsSync23, readFileSync: readFileSync15, writeFileSync: writeFileSync12, copyFileSync: copyFileSync3, mkdirSync: mkdirSync14 } = await import("fs");
+          const { existsSync: existsSync23, readFileSync: readFileSync15, writeFileSync: writeFileSync13, copyFileSync: copyFileSync3, mkdirSync: mkdirSync15 } = await import("fs");
           const { dirname: dirname9 } = await import("path");
           const mcpConfigPath = coordinatorSetup.configPath;
           const hermesManualFallback = cliType === "hermes-cli" && configFormat === "hermes_config_yaml" ? createHermesManualMeshCoordinatorSetup(meshId, workspace) : null;
@@ -21971,7 +22031,7 @@ var DaemonCommandRouter = class {
             };
           }
           try {
-            mkdirSync14(dirname9(mcpConfigPath), { recursive: true });
+            mkdirSync15(dirname9(mcpConfigPath), { recursive: true });
           } catch (error) {
             const message = `Could not prepare MCP config path for automatic setup: ${error?.message || error}`;
             LOG.error("MeshCoordinator", message);
@@ -22003,7 +22063,7 @@ var DaemonCommandRouter = class {
             }
           };
           try {
-            writeFileSync12(mcpConfigPath, serializeMeshCoordinatorMcpConfig(mcpConfig, configFormat), "utf-8");
+            writeFileSync13(mcpConfigPath, serializeMeshCoordinatorMcpConfig(mcpConfig, configFormat), "utf-8");
           } catch (error) {
             const message = `Could not write MCP config for automatic setup: ${error?.message || error}`;
             LOG.error("MeshCoordinator", message);