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

package/dist/index.js

@@ -21909,6 +21909,8 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
 }
 
 // src/commands/router.ts
+var import_os3 = require("os");
+var import_path4 = require("path");
 var fs10 = __toESM(require("fs"));
 var CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
 var CHANNEL_SERVER_URL = {
@@ -21975,6 +21977,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 || (0, import_path4.join)((0, import_os3.homedir)(), ".hermes");
+}
+function loadHermesCoordinatorBaseConfig(targetConfigPath) {
+  const sourceHome = resolveHermesUserHome();
+  const sourceConfigPath = (0, import_path4.join)(sourceHome, "config.yaml");
+  if (!fs10.existsSync(sourceConfigPath)) return { config: {}, sourceHome, sourceConfigPath };
+  if ((0, import_path4.resolve)(sourceConfigPath) === (0, import_path4.resolve)(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 ((0, import_path4.resolve)(sourceHome) === (0, import_path4.resolve)(targetHome)) return;
+  for (const fileName of [".env", "auth.json"]) {
+    const sourcePath = (0, import_path4.join)(sourceHome, fileName);
+    const targetPath = (0, import_path4.join)(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",
@@ -23196,10 +23224,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",
@@ -23228,11 +23266,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 {
@@ -24965,7 +25007,7 @@ var fs11 = __toESM(require("fs"));
 var path23 = __toESM(require("path"));
 var os20 = __toESM(require("os"));
 var import_child_process10 = require("child_process");
-var import_os3 = require("os");
+var import_os4 = require("os");
 var ARCHIVE_PATH = path23.join(os20.homedir(), ".adhdev", "version-history.json");
 var MAX_ENTRIES_PER_PROVIDER = 20;
 var VersionArchive = class {
@@ -24991,7 +25033,7 @@ var VersionArchive = class {
     entries.push({
       version,
       detectedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      os: (0, import_os3.platform)()
+      os: (0, import_os4.platform)()
     });
     if (entries.length > MAX_ENTRIES_PER_PROVIDER) {
       this.history[type] = entries.slice(-MAX_ENTRIES_PER_PROVIDER);
@@ -25031,7 +25073,7 @@ function runCommand(cmd, timeout = 1e4) {
   }
 }
 function findBinary2(name) {
-  const cmd = (0, import_os3.platform)() === "win32" ? `where ${name}` : `which ${name}`;
+  const cmd = (0, import_os4.platform)() === "win32" ? `where ${name}` : `which ${name}`;
   const result = runCommand(cmd, 5e3);
   return result ? result.split("\n")[0] : null;
 }
@@ -25079,7 +25121,7 @@ function checkPathExists2(paths) {
   return null;
 }
 function getMacAppVersion(appPath) {
-  if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
+  if ((0, import_os4.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
   const plistPath = path23.join(appPath, "Contents", "Info.plist");
   if (!fs11.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
@@ -25087,7 +25129,7 @@ function getMacAppVersion(appPath) {
 }
 async function detectAllVersions(loader, archive) {
   const results = [];
-  const currentOs = (0, import_os3.platform)();
+  const currentOs = (0, import_os4.platform)();
   for (const provider of loader.getAll()) {
     const info = {
       type: provider.type,