@adhdev/daemon-core 0.9.76-rc.11 → 0.9.76-rc.12

package/dist/providers/cli-provider-instance.d.ts

@@ -67,6 +67,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     constructor(provider: ProviderModule, workingDir: string, cliArgs?: string[], instanceId?: string, transportFactory?: PtyTransportFactory, options?: {
         providerSessionId?: string;
         launchMode?: 'new' | 'resume' | 'manual';
+        extraEnv?: Record<string, string>;
         onProviderSessionResolved?: (info: {
             instanceId: string;
             providerType: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.11",
+  "version": "0.9.76-rc.12",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,6 +52,7 @@
     "chalk": "^5.3.0",
     "chokidar": "^5.0.0",
     "conf": "^13.0.0",
+    "js-yaml": "^4.1.1",
     "node-pty": "^1.2.0-beta.12",
     "ws": "^8.19.0"
   },
@@ -62,6 +63,7 @@
     "@adhdev/ghostty-vt-node": "*"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
     "tsup": "^8.2.0",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -422,6 +422,7 @@ export class ProviderCliAdapter implements CliAdapter {
         provider: CliProviderModule,
         workingDir: string,
         private extraArgs: string[] = [],
+        private extraEnv: Record<string, string> = {},
         transportFactory: PtyTransportFactory = new NodePtyTransportFactory(),
     ) {
         this.provider = provider;
@@ -523,6 +524,7 @@ export class ProviderCliAdapter implements CliAdapter {
             runtimeSettings: this.runtimeSettings,
             workingDir: this.workingDir,
             extraArgs: this.extraArgs,
+            extraEnv: this.extraEnv,
         });
 
         LOG.info('CLI', `[${this.cliType}] Spawning in ${this.workingDir}`);

package/src/cli-adapters/provider-cli-runtime.ts

@@ -27,8 +27,9 @@ export function resolveCliSpawnPlan(options: {
     runtimeSettings: Record<string, any>;
     workingDir: string;
     extraArgs: string[];
+    extraEnv?: Record<string, string>;
 }): CliSpawnPlan {
-    const { provider, runtimeSettings, workingDir, extraArgs } = options;
+    const { provider, runtimeSettings, workingDir, extraArgs, extraEnv } = options;
     const { spawn: spawnConfig } = provider;
     const configuredCommand = typeof runtimeSettings.executablePath === 'string' && runtimeSettings.executablePath.trim()
         ? runtimeSettings.executablePath.trim()
@@ -65,7 +66,7 @@ export function resolveCliSpawnPlan(options: {
         shellArgs = allArgs;
     }
 
-    const env = buildCliSpawnEnv(process.env, spawnConfig.env);
+    const env = buildCliSpawnEnv(process.env, { ...(spawnConfig.env || {}), ...(extraEnv || {}) });
     // Some CLI agents, notably Hermes, route their tools through TERMINAL_CWD
     // rather than process.cwd(). Keep the generic ADHDev launch workspace as
     // the single source of truth so PTY cwd and tool cwd cannot diverge.

package/src/commands/cli-manager.ts

@@ -132,6 +132,12 @@ type CliAdapterWithExtraArgs = CliAdapter & {
     extraArgs?: string[];
 };
 
+type CliStartOptions = {
+    resumeSessionId?: string;
+    settingsOverride?: Record<string, any>;
+    extraEnv?: Record<string, string>;
+};
+
 function isUuid(value: string): boolean {
     return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
 }
@@ -365,6 +371,7 @@ export class DaemonCliManager {
         runtimeId: string,
         providerSessionId?: string,
         attachExisting = false,
+        extraEnv?: Record<string, string>,
     ): CliAdapter {
  // cliType normalize (Resolve alias)
         const normalizedType = this.providerLoader.resolveAlias(cliType);
@@ -382,7 +389,7 @@ export class DaemonCliManager {
                 providerSessionId,
                 attachExisting,
             );
-            return new ProviderCliAdapter(resolvedProvider as CliProviderModule, workingDir, cliArgs, transportFactory);
+            return new ProviderCliAdapter(resolvedProvider as CliProviderModule, workingDir, cliArgs, extraEnv || {}, transportFactory);
         }
 
         throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);
@@ -425,6 +432,7 @@ export class DaemonCliManager {
         options?: {
             providerSessionId?: string;
             launchMode?: CliLaunchMode;
+            extraEnv?: Record<string, string>;
             onProviderSessionResolved?: (info: {
                 instanceId: string;
                 providerType: string;
@@ -480,7 +488,7 @@ export class DaemonCliManager {
         workingDir: string,
         cliArgs?: string[],
         initialModel?: string,
-        options?: { resumeSessionId?: string, settingsOverride?: Record<string, any> },
+        options?: CliStartOptions,
     ): Promise<{ runtimeSessionId: string; providerSessionId?: string }> {
         const trimmed = (workingDir || '').trim();
         if (!trimmed) throw new Error('working directory required');
@@ -629,6 +637,7 @@ export class DaemonCliManager {
                 {
                     providerSessionId: sessionBinding.providerSessionId,
                     launchMode: sessionBinding.launchMode,
+                    extraEnv: options?.extraEnv,
                     onProviderSessionResolved: ({ providerSessionId, providerName, providerType, workspace }) => {
                         this.persistRecentActivity({
                             kind: 'cli',
@@ -651,6 +660,7 @@ export class DaemonCliManager {
                 key,
                 sessionBinding.providerSessionId,
                 false,
+                options?.extraEnv,
             );
             try {
                 await adapter.spawn();
@@ -904,7 +914,7 @@ export class DaemonCliManager {
                     dir,
                     args?.cliArgs,
                     args?.initialModel,
-                    { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings },
+                    { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings, extraEnv: args?.env },
                 );
 
                 return {

package/src/commands/mesh-coordinator.ts

@@ -1,6 +1,7 @@
 import { existsSync, realpathSync } from 'node:fs'
 import { createRequire } from 'node:module'
-import { dirname, join, resolve } from 'node:path'
+import * as os from 'node:os'
+import { dirname, isAbsolute, join, resolve } from 'node:path'
 import type { ProviderModule, MeshCoordinatorMcpConfigFormat } from '../providers/contracts.js'
 
 export interface MeshCoordinatorMcpServerLaunch {
@@ -80,7 +81,7 @@ export function resolveMeshCoordinatorSetup(options: ResolveMeshCoordinatorSetup
     return {
       kind: 'auto_import',
       serverName,
-      configPath: join(workspace, path),
+      configPath: resolveMcpConfigPath(path, workspace),
       configFormat: mcpConfig.format,
       mcpServer,
     }
@@ -118,6 +119,14 @@ function renderMeshCoordinatorTemplate(template: string, values: Record<string,
   return template.replace(/\{\{\s*(meshId|workspace|serverName|adhdevMcpCommand)\s*\}\}/g, (_, key: string) => values[key] || '')
 }
 
+function resolveMcpConfigPath(configPath: string, workspace: string): string {
+  const trimmed = configPath.trim()
+  if (trimmed === '~') return os.homedir()
+  if (trimmed.startsWith('~/')) return join(os.homedir(), trimmed.slice(2))
+  if (isAbsolute(trimmed)) return trimmed
+  return join(workspace, trimmed)
+}
+
 function resolveAdhdevMcpServerLaunch(options: {
   meshId: string
   nodeExecutable?: string

package/src/commands/router.ts

@@ -30,6 +30,7 @@ import { SessionRegistry } from '../sessions/registry.js';
 import { LOG } from '../logging/logger.js';
 import { logCommand } from '../logging/command-log.js';
 import type { CommandLogEntry } from '../logging/command-log.js';
+import * as yaml from 'js-yaml';
 import { getRecentLogs, LOG_PATH } from '../logging/logger.js';
 import { createInteractionId, getRecentDebugTrace, recordDebugTrace } from '../logging/debug-trace.js';
 import { getSessionHostSurfaceKind, partitionSessionHostRecords } from '../session-host/runtime-surface.js';
@@ -63,6 +64,28 @@ function resolveUpgradeChannel(args: any): ReleaseChannel {
 }
 import * as fs from 'fs';
 
+type MeshCoordinatorConfigFormat = 'claude_mcp_json' | 'hermes_config_yaml';
+
+function loadYamlModule(): { load: (input: string) => any; dump: (input: any, options?: Record<string, any>) => string } {
+    return yaml as { load: (input: string) => any; dump: (input: any, options?: Record<string, any>) => string };
+}
+
+function getMcpServersKey(format: MeshCoordinatorConfigFormat): 'mcpServers' | 'mcp_servers' {
+    return format === 'hermes_config_yaml' ? 'mcp_servers' : 'mcpServers';
+}
+
+function parseMeshCoordinatorMcpConfig(text: string, format: MeshCoordinatorConfigFormat): Record<string, any> {
+    if (!text.trim()) return {};
+    if (format === 'claude_mcp_json') return JSON.parse(text);
+    const parsed = loadYamlModule().load(text);
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+}
+
+function serializeMeshCoordinatorMcpConfig(config: Record<string, any>, format: MeshCoordinatorConfigFormat): string {
+    if (format === 'claude_mcp_json') return JSON.stringify(config, null, 2);
+    return loadYamlModule().dump(config, { noRefs: true, lineWidth: 120 });
+}
+
 // ─── Types ───
 
 export interface SessionHostControlPlane {
@@ -1231,7 +1254,8 @@ export class DaemonCommandRouter {
                         };
                     }
 
-                    if (coordinatorSetup.configFormat !== 'claude_mcp_json') {
+                    const configFormat = coordinatorSetup.configFormat as MeshCoordinatorConfigFormat;
+                    if (configFormat !== 'claude_mcp_json' && configFormat !== 'hermes_config_yaml') {
                         return {
                             success: false,
                             code: 'mesh_coordinator_unsupported',
@@ -1261,18 +1285,27 @@ export class DaemonCommandRouter {
                         };
                     }
 
-                    // 1. Write provider-declared MCP config to workspace for CLIs that auto-import it.
-                    const { existsSync, readFileSync, writeFileSync, copyFileSync } = await import('fs');
+                    // 1. Write provider-declared MCP config for CLIs that auto-import it.
+                    const { existsSync, readFileSync, writeFileSync, copyFileSync, mkdirSync } = await import('fs');
+                    const { dirname } = await import('path');
                     const mcpConfigPath = coordinatorSetup.configPath;
+                    mkdirSync(dirname(mcpConfigPath), { recursive: true });
 
                     // Backup existing MCP config if present.
                     const hadExistingMcpConfig = existsSync(mcpConfigPath);
-                    let existingMcpConfig: any = {};
+                    let existingMcpConfig: Record<string, any> = {};
                     if (hadExistingMcpConfig) {
                         try {
-                            existingMcpConfig = JSON.parse(readFileSync(mcpConfigPath, 'utf-8'));
+                            existingMcpConfig = parseMeshCoordinatorMcpConfig(readFileSync(mcpConfigPath, 'utf-8'), configFormat);
                             copyFileSync(mcpConfigPath, mcpConfigPath + '.backup');
-                        } catch { /* empty */ }
+                        } catch (error: any) {
+                            LOG.error('MeshCoordinator', `Failed to parse existing MCP config ${mcpConfigPath}: ${error?.message || error}`);
+                            return {
+                                success: false,
+                                code: 'mesh_coordinator_config_parse_failed',
+                                error: `Failed to parse existing MCP config at ${mcpConfigPath}`,
+                            };
+                        }
                     }
 
                     // Merge ADHDev mesh server into existing config.
@@ -1288,31 +1321,39 @@ export class DaemonCommandRouter {
                             ADHDEV_MCP_TRANSPORT: 'ipc',
                         };
                     }
+                    const mcpServersKey = getMcpServersKey(configFormat);
+                    const existingServers = existingMcpConfig[mcpServersKey];
                     const mcpConfig = {
                         ...existingMcpConfig,
-                        mcpServers: {
-                            ...(existingMcpConfig.mcpServers || {}),
+                        [mcpServersKey]: {
+                            ...(existingServers && typeof existingServers === 'object' && !Array.isArray(existingServers) ? existingServers : {}),
                             [coordinatorSetup.serverName]: mcpServerEntry,
                         },
                     };
-                    writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), 'utf-8');
+                    writeFileSync(mcpConfigPath, serializeMeshCoordinatorMcpConfig(mcpConfig, configFormat), 'utf-8');
                     LOG.info('MeshCoordinator', `Wrote ${mcpConfigPath} with ${coordinatorSetup.serverName} server`);
 
                     const cliArgs: string[] = [];
+                    const launchEnv: Record<string, string> = {};
                     if (systemPrompt) {
-                        cliArgs.push('--append-system-prompt', systemPrompt);
+                        if (configFormat === 'hermes_config_yaml') {
+                            launchEnv.HERMES_EPHEMERAL_SYSTEM_PROMPT = systemPrompt;
+                        } else {
+                            cliArgs.push('--append-system-prompt', systemPrompt);
+                        }
                     }
                     if (cliType === 'claude-cli') {
                         cliArgs.push('--mcp-config', coordinatorSetup.configPath);
                     }
 
-                    // 3. Launch CLI session via existing cliManager
-                    // Pass coordinator system prompt via --append-system-prompt so the
-                    // CLI inherits its default behavior AND knows it is a mesh coordinator.
+                    // 3. Launch CLI session via existing cliManager.
+                    // Provider-specific prompt injection remains fail-closed: Claude gets
+                    // explicit CLI args, while Hermes reads HERMES_EPHEMERAL_SYSTEM_PROMPT.
                     const launchResult: any = await this.deps.cliManager.handleCliCommand('launch_cli', {
                         cliType,
                         dir: workspace,
                         cliArgs: cliArgs.length > 0 ? cliArgs : undefined,
+                        env: Object.keys(launchEnv).length > 0 ? launchEnv : undefined,
                         settings: {
                             meshCoordinatorFor: meshId
                         }

package/src/providers/cli-provider-instance.ts

@@ -214,6 +214,7 @@ export class CliProviderInstance implements ProviderInstance {
         options?: {
             providerSessionId?: string;
             launchMode?: 'new' | 'resume' | 'manual';
+            extraEnv?: Record<string, string>;
             onProviderSessionResolved?: (info: {
                 instanceId: string;
                 providerType: string;
@@ -230,7 +231,7 @@ export class CliProviderInstance implements ProviderInstance {
         this.providerSessionId = options?.providerSessionId;
         this.launchMode = options?.launchMode || 'new';
         this.onProviderSessionResolved = options?.onProviderSessionResolved;
-        this.adapter = new ProviderCliAdapter(provider as CliProviderModule, workingDir, cliArgs, transportFactory);
+        this.adapter = new ProviderCliAdapter(provider as CliProviderModule, workingDir, cliArgs, options?.extraEnv || {}, transportFactory);
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
     }