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

package/dist/index.mjs

@@ -21704,6 +21704,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 +21772,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 +23019,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 +23061,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 {