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

package/dist/index.d.ts

@@ -4,7 +4,7 @@
  * Core logic for daemon: CDP, Provider, IDE detection, CLI/ACP adapters and more.
  */
 export type { ChatBubbleState, ChatMessage, ExtensionInfo, CommandResult as CoreCommandResult, ProviderConfig, DaemonEvent, StatusResponse, SystemInfo, DetectedIde, ProviderInfo, AgentEntry, } from './types.js';
-export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, CloudDaemonSummaryEntry, DashboardBootstrapDaemonEntry, VersionUpdateReason, CloudStatusReportPayload, DaemonStatusEventPayload, DashboardStatusEventPayload, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, SessionRuntimeOutputSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, WorkspaceGitSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, SessionActiveChatData, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, } from './shared-types.js';
+export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, CloudDaemonSummaryEntry, DashboardBootstrapDaemonEntry, VersionUpdateReason, CloudStatusReportPayload, DaemonStatusEventPayload, DashboardStatusEventPayload, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, SessionRuntimeOutputSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, WorkspaceGitSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, SessionActiveChatData, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, MessageInputSupport, InputMediaStrategyDescriptor, InputAttachmentStrategy, InputMediaType, } from './shared-types.js';
 export type { RepoMesh, RepoMeshNode, RepoMeshNodeHealth, RepoMeshPolicy, RepoMeshNodePolicy, RepoMeshRelatedRepo, RepoMeshNodeCapabilities, DetectedCommand, ProjectContextSnapshot, ProjectContextSource, RepoMeshCoordinatorConfig, LocalMeshConfig, LocalMeshEntry, LocalMeshNodeEntry, RepoMeshStatus, RepoMeshNodeStatus, } from './repo-mesh-types.js';
 export { DEFAULT_MESH_POLICY } from './repo-mesh-types.js';
 export * from './git/index.js';

package/dist/index.js

@@ -15356,8 +15356,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 = [];
@@ -15384,7 +15408,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,
@@ -21240,7 +21267,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;
@@ -21909,6 +21939,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 +22007,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 +23254,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 +23296,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 {
@@ -23688,7 +23760,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";
@@ -24965,7 +25037,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 +25063,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 +25103,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 +25151,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 +25159,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,