@adhdev/daemon-core 0.9.76-rc.63 → 0.9.76-rc.65

package/dist/index.mjs

@@ -15146,8 +15146,32 @@ function materializeImageDataPart(part, index, dir) {
   fs6.mkdirSync(dir, { recursive: true });
   const filePath = path16.join(dir, safeInputImageBasename(index, part.mimeType));
   fs6.writeFileSync(filePath, Buffer.from(rawData, "base64"));
+  cleanupStaleMaterializedImages(dir);
   return filePath;
 }
+var MATERIALIZED_IMAGE_MAX_AGE_MS = 60 * 60 * 1e3;
+var MATERIALIZED_IMAGE_CLEANUP_INTERVAL_MS = 5 * 60 * 1e3;
+var lastMaterializedImageCleanupAt = 0;
+function cleanupStaleMaterializedImages(dir) {
+  const now = Date.now();
+  if (now - lastMaterializedImageCleanupAt < MATERIALIZED_IMAGE_CLEANUP_INTERVAL_MS) return;
+  lastMaterializedImageCleanupAt = now;
+  try {
+    const entries = fs6.readdirSync(dir);
+    for (const entry of entries) {
+      if (!entry.startsWith("adhdev-input-image-")) continue;
+      const fullPath = path16.join(dir, entry);
+      try {
+        const stat2 = fs6.statSync(fullPath);
+        if (now - stat2.mtimeMs > MATERIALIZED_IMAGE_MAX_AGE_MS) {
+          fs6.unlinkSync(fullPath);
+        }
+      } catch {
+      }
+    }
+  } catch {
+  }
+}
 function buildCliStructuredInputPrompt(input, options = {}) {
   const promptParts = [];
   const imageRefs = [];
@@ -15174,7 +15198,10 @@ function buildCliStructuredInputPrompt(input, options = {}) {
       resourceRefs.push([part.name, part.text, part.uri].filter(Boolean).join("\n"));
     }
   });
-  if (input.textFallback.trim()) promptParts.push(input.textFallback.trim());
+  const hasExplicitTextParts = input.parts.some((part) => part.type === "text" && part.text.trim());
+  if (!hasExplicitTextParts && input.textFallback.trim()) {
+    promptParts.push(input.textFallback.trim());
+  }
   const ordered = [
     ...imageRefs,
     ...promptParts,
@@ -20703,7 +20730,7 @@ import * as yaml from "js-yaml";
 // src/commands/mesh-coordinator.ts
 import { execFileSync as execFileSync2 } from "child_process";
 import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync15, readdirSync as readdirSync6, realpathSync as realpathSync2 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync7, realpathSync as realpathSync2 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import * as os17 from "os";
 import { dirname as dirname4, isAbsolute as isAbsolute11, join as join18, resolve as resolve13 } from "path";
@@ -20888,7 +20915,7 @@ function addNodeCandidatesFromPath(pathValue, addCandidate) {
 function addNodeCandidatesFromNvm(homeDir, addCandidate) {
   const versionsDir = join18(homeDir, ".nvm", "versions", "node");
   try {
-    const versionDirs = readdirSync6(versionsDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort(compareNodeVersionNamesDescending);
+    const versionDirs = readdirSync7(versionsDir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort(compareNodeVersionNamesDescending);
     for (const versionDir of versionDirs) {
       addCandidate(join18(versionsDir, versionDir, "bin", "node"));
     }
@@ -21035,7 +21062,10 @@ function setupMeshEventForwarding(components) {
     const workspace = readNonEmptyString(state.workspace);
     if (!workspace) return;
     const settings = state.settings && typeof state.settings === "object" ? state.settings : {};
+    if (readNonEmptyString(settings.meshCoordinatorFor)) return;
     const meshIdFromRuntime = readNonEmptyString(settings.meshNodeFor);
+    const isMeshDelegate = Boolean(meshIdFromRuntime || settings.launchedByCoordinator);
+    if (!isMeshDelegate) return;
     const mesh = meshIdFromRuntime ? getMesh(meshIdFromRuntime) : getMeshByRepo(workspace);
     const meshId = meshIdFromRuntime || readNonEmptyString(mesh?.id);
     if (!meshId) return;
@@ -21704,6 +21734,8 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
 }
 
 // src/commands/router.ts
+import { homedir as homedir19 } from "os";
+import { join as pathJoin, resolve as pathResolve } from "path";
 import * as fs10 from "fs";
 var CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
 var CHANNEL_SERVER_URL = {
@@ -21770,6 +21802,32 @@ function serializeMeshCoordinatorMcpConfig(config, format) {
   if (format === "claude_mcp_json") return JSON.stringify(config, null, 2);
   return loadYamlModule().dump(config, { noRefs: true, lineWidth: 120 });
 }
+function resolveHermesUserHome() {
+  const explicitHome = process.env.HERMES_HOME?.trim();
+  return explicitHome || pathJoin(homedir19(), ".hermes");
+}
+function loadHermesCoordinatorBaseConfig(targetConfigPath) {
+  const sourceHome = resolveHermesUserHome();
+  const sourceConfigPath = pathJoin(sourceHome, "config.yaml");
+  if (!fs10.existsSync(sourceConfigPath)) return { config: {}, sourceHome, sourceConfigPath };
+  if (pathResolve(sourceConfigPath) === pathResolve(targetConfigPath)) return { config: {}, sourceHome, sourceConfigPath };
+  const parsed = parseMeshCoordinatorMcpConfig(fs10.readFileSync(sourceConfigPath, "utf-8"), "hermes_config_yaml");
+  const { mcp_servers: _mcpServers, ...baseConfig } = parsed;
+  return { config: baseConfig, sourceHome, sourceConfigPath };
+}
+function copyHermesCoordinatorCredentialFiles(sourceHome, targetHome) {
+  if (pathResolve(sourceHome) === pathResolve(targetHome)) return;
+  for (const fileName of [".env", "auth.json"]) {
+    const sourcePath = pathJoin(sourceHome, fileName);
+    const targetPath = pathJoin(targetHome, fileName);
+    if (!fs10.existsSync(sourcePath)) continue;
+    try {
+      fs10.copyFileSync(sourcePath, targetPath);
+    } catch (error) {
+      LOG.warn("MeshCoordinator", `Could not copy Hermes ${fileName} into isolated coordinator home: ${error?.message || error}`);
+    }
+  }
+}
 var CHAT_COMMANDS = [
   "send_chat",
   "new_chat",
@@ -22991,10 +23049,20 @@ var DaemonCommandRouter = class {
               workspace
             };
           }
-          const { existsSync: existsSync23, readFileSync: readFileSync15, writeFileSync: writeFileSync14, copyFileSync: copyFileSync3, mkdirSync: mkdirSync16 } = await import("fs");
+          const { existsSync: existsSync23, readFileSync: readFileSync15, writeFileSync: writeFileSync14, copyFileSync: copyFileSync4, mkdirSync: mkdirSync16 } = 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;
+          let hermesBaseConfig = null;
+          if (hermesManualFallback) {
+            try {
+              hermesBaseConfig = loadHermesCoordinatorBaseConfig(mcpConfigPath);
+            } catch (error) {
+              const message = `Failed to parse Hermes base config for automatic coordinator setup: ${error?.message || error}`;
+              LOG.error("MeshCoordinator", message);
+              return { success: false, code: "mesh_coordinator_config_parse_failed", error: message, meshId, cliType, workspace };
+            }
+          }
           const returnManualFallback = (message) => ({
             success: false,
             code: "mesh_coordinator_manual_mcp_setup_required",
@@ -23023,11 +23091,15 @@ var DaemonCommandRouter = class {
             return { success: false, code: "mesh_coordinator_config_write_failed", error: message, meshId, cliType, workspace };
           }
           const hadExistingMcpConfig = existsSync23(mcpConfigPath);
-          let existingMcpConfig = {};
+          let existingMcpConfig = hermesBaseConfig?.config || {};
+          if (hermesBaseConfig) {
+            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname9(mcpConfigPath));
+          }
           if (hadExistingMcpConfig) {
             try {
-              existingMcpConfig = parseMeshCoordinatorMcpConfig(readFileSync15(mcpConfigPath, "utf-8"), configFormat);
-              copyFileSync3(mcpConfigPath, mcpConfigPath + ".backup");
+              const parsedExistingMcpConfig = parseMeshCoordinatorMcpConfig(readFileSync15(mcpConfigPath, "utf-8"), configFormat);
+              existingMcpConfig = { ...existingMcpConfig, ...parsedExistingMcpConfig };
+              copyFileSync4(mcpConfigPath, mcpConfigPath + ".backup");
             } catch (error) {
               LOG.error("MeshCoordinator", `Failed to parse existing MCP config ${mcpConfigPath}: ${error?.message || error}`);
               return {
@@ -23483,7 +23555,7 @@ function prepareSessionChatTailUpdate(input) {
     };
   }
   const fullMessages = normalizeChatMessages(Array.isArray(result.messages) ? result.messages : []);
-  const messages = filterUserFacingChatMessages(fullMessages);
+  const messages = fullMessages;
   const title = typeof result.title === "string" ? result.title : void 0;
   const activeModal = normalizeChatTailActiveModal(result.activeModal);
   const status = typeof result.status === "string" ? result.status : "idle";