@adhdev/daemon-core 0.9.76-rc.3 → 0.9.76-rc.31

package/dist/mesh/coordinator-prompt.d.ts

@@ -14,5 +14,6 @@ export interface CoordinatorPromptContext {
     mesh: LocalMeshEntry;
     status?: RepoMeshStatus;
     userInstruction?: string;
+    coordinatorCliType?: string;
 }
 export declare function buildCoordinatorSystemPrompt(ctx: CoordinatorPromptContext): string;

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

@@ -8,6 +8,7 @@ import { type ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
+import type { ChatMessage } from '../types.js';
 type PersistableCliHistoryMessage = {
     role: string;
     content: string;
@@ -67,6 +68,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;
@@ -112,6 +114,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private maybeAppendRuntimeRecoveryMessage;
     private appendRuntimeSystemMessage;
     private appendRuntimeMessage;
+    mergeRuntimeChatMessages(parsedMessages: ChatMessage[]): ChatMessage[];
     private mergeConversationMessages;
     private formatApprovalRequestMessage;
     private promoteProviderSessionId;

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

@@ -67,6 +67,7 @@ export declare class ProviderInstanceManager {
     onEvent(listener: (event: ProviderEvent & {
         providerType: string;
     }) => void): void;
+    emitProviderEvent(providerType: string, instanceId: string, event: ProviderEvent): void;
     private emitPendingEvents;
     /**
     * Forward event to specific Instance

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

@@ -147,6 +147,8 @@ export interface InstanceContext {
     onPtyData?: (data: string) => void;
     /** Provider configvalue (resolved) */
     settings: Record<string, any>;
+    /** Immediate provider-originated status/event emission. Used to avoid waiting for status polling. */
+    emitProviderEvent?: (event: ProviderEvent) => void;
 }
 export interface ProviderInstance {
     /** Provider type */

package/dist/repo-mesh-types.d.ts

@@ -53,6 +53,8 @@ export interface RepoMeshNodePolicy {
     readOnly?: boolean;
     canPush?: boolean;
     maxConcurrentSessions?: number;
+    /** Ordered provider preference used when mesh_launch_session omits an explicit type. */
+    providerPriority?: string[];
 }
 export declare const DEFAULT_MESH_POLICY: RepoMeshPolicy;
 export interface RepoMeshNodeCapabilities {
@@ -149,6 +151,10 @@ export interface LocalMeshNodeEntry {
     policy: RepoMeshNodePolicy;
     /** For single-machine mesh: same daemon, different worktree */
     isLocalWorktree?: boolean;
+    /** Branch this worktree tracks (set when created via clone_mesh_node) */
+    worktreeBranch?: string;
+    /** Node ID this worktree was cloned from */
+    clonedFromNodeId?: string;
 }
 export interface RepoMeshStatus {
     meshId: string;

package/dist/shared-types.d.ts

@@ -328,6 +328,15 @@ export interface CompactSessionEntry {
     settings?: Record<string, any>;
 }
 export type VersionUpdateReason = 'force_update_below' | 'major_minor_mismatch' | 'patch_mismatch' | 'daemon_ahead';
+export type ReleaseChannel = 'stable' | 'preview';
+export type NpmUpdateTag = 'latest' | 'next';
+export interface VersionUpdatePolicy {
+    channel: ReleaseChannel;
+    npmTag: NpmUpdateTag;
+    targetVersion: string;
+    minVersion?: string;
+    updateCommand: string;
+}
 /** Available provider information */
 export interface AvailableProviderInfo {
     type: string;
@@ -469,6 +478,10 @@ export interface CompactDaemonEntry {
     versionMismatch?: boolean;
     versionUpdateRequired?: boolean;
     versionUpdateReason?: VersionUpdateReason;
+    releaseChannel?: ReleaseChannel;
+    updateChannel?: ReleaseChannel;
+    updatePolicy?: VersionUpdatePolicy;
+    updateCommand?: string;
     terminalBackend?: TerminalBackendStatus;
     detectedIdes?: DetectedIdeInfo[];
     availableProviders?: AvailableProviderInfo[];
@@ -490,10 +503,14 @@ export interface CloudDaemonSummaryEntry {
     versionMismatch?: boolean;
     versionUpdateRequired?: boolean;
     versionUpdateReason?: VersionUpdateReason;
+    releaseChannel?: ReleaseChannel;
+    updateChannel?: ReleaseChannel;
+    updatePolicy?: VersionUpdatePolicy;
+    updateCommand?: string;
     terminalBackend?: TerminalBackendStatus;
 }
 /** Minimal daemon bootstrap payload used by dashboard WS to initiate P2P. */
-export interface DashboardBootstrapDaemonEntry {
+export interface DashboardBootstrapDaemonEntry extends Partial<CloudDaemonSummaryEntry> {
     id: string;
     p2p?: StatusReportPayload['p2p'];
     timestamp?: number;
@@ -505,6 +522,8 @@ export interface DaemonStatusEventPayload {
     timestamp: number;
     targetSessionId?: string;
     providerType?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;
@@ -518,6 +537,8 @@ export interface DashboardStatusEventPayload {
     daemonId?: string;
     providerType?: string;
     targetSessionId?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.3",
+  "version": "0.9.76-rc.31",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,16 +52,15 @@
     "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"
   },
-  "bundleDependencies": [
-    "@adhdev/session-host-core"
-  ],
   "optionalDependencies": {
     "@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

@@ -266,9 +266,10 @@ export class ProviderCliAdapter implements CliAdapter {
         const currentSnapshot = normalizeScreenSnapshot(screenText);
         const lastSnapshot = this.lastScreenSnapshot;
         if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
-        const staleSnapshotLooksActive = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(lastSnapshot);
-        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:\n|\r|$)/.test(screenText)
-            && !/\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(screenText);
+        const activeScreenPattern = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel|Enter to confirm\s*[·•-]\s*Esc to cancel|\b(?:MCP servers?|tool calls?)\b[^\n\r]{0,160}\brequire approval\b/i;
+        const staleSnapshotLooksActive = activeScreenPattern.test(lastSnapshot);
+        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:Try\s+["“][^\n\r"”]+["”])?\s*(?:\n|\r|$)/.test(screenText)
+            && !activeScreenPattern.test(screenText);
         if (staleSnapshotLooksActive && currentScreenLooksIdle) return screenText;
         if (currentSnapshot.length >= lastSnapshot.length) return screenText;
         // Terminal screen reads can miss a just-rendered completed Hermes box while
@@ -421,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;
@@ -522,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/chat-commands.ts

@@ -28,6 +28,10 @@ interface ApprovalSelectableInstance extends ProviderInstance {
     recordApprovalSelection?(buttonText: string): void;
 }
 
+interface RuntimeChatMessageMerger extends ProviderInstance {
+    mergeRuntimeChatMessages?(messages: ChatMessage[]): ChatMessage[];
+}
+
 type LegacyStringScript = (params?: Record<string, unknown> | string) => string;
 
 function getCurrentProviderType(h: CommandHelpers, fallback = ''): string {
@@ -250,6 +254,40 @@ function normalizeReadChatCommandStatus(status: unknown, activeModal: unknown):
     }
 }
 
+function isGeneratingLikeStatus(status: unknown): boolean {
+    return status === 'generating' || status === 'streaming' || status === 'long_generating' || status === 'starting';
+}
+
+function shouldTrustCliAdapterTerminalStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): boolean {
+    if (!isGeneratingLikeStatus(parsedStatus)) return false;
+    if (hasNonEmptyModalButtons(activeModal)) return false;
+    const adapterRawStatus = typeof adapterStatus?.status === 'string' ? adapterStatus.status.trim() : '';
+    if (adapterRawStatus !== 'idle') return false;
+    if (typeof adapter.isProcessing === 'function' && adapter.isProcessing()) return false;
+    return true;
+}
+
+function normalizeCliReadChatStatus(parsedStatus: unknown, activeModal: unknown, adapter: CliAdapter, adapterStatus: any): string {
+    if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return 'idle';
+    return typeof parsedStatus === 'string' && parsedStatus.trim() ? parsedStatus : 'idle';
+}
+
+function finalizeStreamingMessagesWhenIdle(messages: ChatMessage[], status: string): ChatMessage[] {
+    if (status !== 'idle') return messages;
+    return messages.map((message) => {
+        const meta = message.meta && typeof message.meta === 'object'
+            ? message.meta as Record<string, unknown>
+            : undefined;
+        const hasStreamingMeta = meta?.streaming === true;
+        if (message.bubbleState !== 'streaming' && !hasStreamingMeta) return message;
+        return {
+            ...message,
+            ...(message.bubbleState === 'streaming' ? { bubbleState: 'final' as const } : {}),
+            ...(hasStreamingMeta ? { meta: { ...meta, streaming: false } } : {}),
+        };
+    });
+}
+
 function buildReadChatCommandResult(payload: Record<string, any>, args: any): CommandResult {
     let validatedPayload: Record<string, any>;
     const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === 'object'
@@ -720,7 +758,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 }
 
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
-    const provider = h.getProvider(args?.agentType);
+    const provider = h.getProvider(args?.agentType || args?.providerType);
     const transport = getTargetTransport(h, provider);
     const historySessionId = getHistorySessionId(h, args);
 
@@ -760,10 +798,17 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 ? parsedRecord.coverage
                 : undefined;
             const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-            const returnedStatus = parsedRecord.status || 'idle';
-            LOG.debug('Command', `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord.status || '')} parsedMsgCount=${parsedRecord.messages.length}`);
+            const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
+            const runtimeMessageMerger = getTargetInstance(h, args) as RuntimeChatMessageMerger | null;
+            const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages as ChatMessage[], returnedStatus);
+            const returnedMessages = runtimeMessageMerger?.category === 'cli'
+                && runtimeMessageMerger.type === adapter.cliType
+                && typeof runtimeMessageMerger.mergeRuntimeChatMessages === 'function'
+                ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages)
+                : parsedMessages;
+            LOG.debug('Command', `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord.status || '')} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
             return buildReadChatCommandResult({
-                messages: parsedRecord.messages,
+                messages: returnedMessages,
                 status: returnedStatus,
                 activeModal,
                 debugReadChat: {
@@ -774,7 +819,7 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     returnedStatus: String(returnedStatus || ''),
                     shouldPreferAdapterMessages: false,
                     parsedMsgCount: parsedRecord.messages.length,
-                    returnedMsgCount: parsedRecord.messages.length,
+                    returnedMsgCount: returnedMessages.length,
                 },
                 ...(title ? { title } : {}),
                 ...(providerSessionId ? { providerSessionId } : {}),

package/src/commands/cli-manager.ts

@@ -8,7 +8,7 @@
 import * as os from 'os';
 import * as path from 'path';
 import * as crypto from 'crypto';
-import { existsSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { execFileSync } from 'child_process';
 import chalk from 'chalk';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
@@ -132,6 +132,62 @@ type CliAdapterWithExtraArgs = CliAdapter & {
     extraArgs?: string[];
 };
 
+type CliStartOptions = {
+    resumeSessionId?: string;
+    settingsOverride?: Record<string, any>;
+    extraEnv?: Record<string, string>;
+};
+
+const COORDINATOR_DELEGATED_ENV_UNSETS: Record<string, string> = {
+    ADHDEV_INLINE_MESH: '',
+    ADHDEV_MCP_TRANSPORT: '',
+    ADHDEV_MESH_ID: '',
+    HERMES_EPHEMERAL_SYSTEM_PROMPT: '',
+};
+
+export interface CoordinatorDelegatedCliLaunchOptionsInput {
+    cliType: string;
+    workspace: string;
+    cliArgs?: string[];
+    env?: Record<string, string>;
+}
+
+export interface CoordinatorDelegatedCliLaunchOptions {
+    cliArgs: string[];
+    env: Record<string, string>;
+}
+
+function hasCliArg(args: string[], flag: string): boolean {
+    return args.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
+}
+
+function ensureEmptyDelegatedMcpConfig(workspace: string): string {
+    const baseDir = path.join(os.tmpdir(), 'adhdev-delegated-agent-empty-mcp');
+    mkdirSync(baseDir, { recursive: true });
+    const workspaceHash = crypto.createHash('sha256').update(path.resolve(workspace || os.tmpdir())).digest('hex').slice(0, 16);
+    const filePath = path.join(baseDir, `${workspaceHash}.json`);
+    writeFileSync(filePath, JSON.stringify({ mcpServers: {} }, null, 2), 'utf-8');
+    return filePath;
+}
+
+export function buildCoordinatorDelegatedCliLaunchOptions(
+    input: CoordinatorDelegatedCliLaunchOptionsInput,
+): CoordinatorDelegatedCliLaunchOptions {
+    const cliType = String(input.cliType || '').trim();
+    const cliArgs = Array.isArray(input.cliArgs) ? [...input.cliArgs] : [];
+    const env: Record<string, string> = { ...(input.env || {}), ...COORDINATOR_DELEGATED_ENV_UNSETS };
+
+    if (cliType === 'hermes-cli' && !hasCliArg(cliArgs, '--ignore-user-config')) {
+        cliArgs.unshift('--ignore-user-config');
+    }
+
+    if (cliType === 'claude-cli' && !hasCliArg(cliArgs, '--mcp-config')) {
+        cliArgs.unshift('--mcp-config', ensureEmptyDelegatedMcpConfig(input.workspace));
+    }
+
+    return { cliArgs, env };
+}
+
 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 +421,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 +439,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 +482,7 @@ export class DaemonCliManager {
         options?: {
             providerSessionId?: string;
             launchMode?: CliLaunchMode;
+            extraEnv?: Record<string, string>;
             onProviderSessionResolved?: (info: {
                 instanceId: string;
                 providerType: string;
@@ -480,7 +538,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 +687,7 @@ export class DaemonCliManager {
                 {
                     providerSessionId: sessionBinding.providerSessionId,
                     launchMode: sessionBinding.launchMode,
+                    extraEnv: options?.extraEnv,
                     onProviderSessionResolved: ({ providerSessionId, providerName, providerType, workspace }) => {
                         this.persistRecentActivity({
                             kind: 'cli',
@@ -651,6 +710,7 @@ export class DaemonCliManager {
                 key,
                 sessionBinding.providerSessionId,
                 false,
+                options?.extraEnv,
             );
             try {
                 await adapter.spawn();
@@ -899,12 +959,25 @@ export class DaemonCliManager {
                 const launchSource = resolved.source;
                 if (!cliType) throw new Error('cliType required');
 
+                const settingsOverride = args?.settings && typeof args.settings === 'object' ? args.settings : undefined;
+                const delegatedLaunch = settingsOverride?.launchedByCoordinator === true
+                    ? buildCoordinatorDelegatedCliLaunchOptions({
+                        cliType,
+                        workspace: dir,
+                        cliArgs: args?.cliArgs,
+                        env: args?.env,
+                    })
+                    : null;
                 const started = await this.startSession(
                     cliType,
                     dir,
-                    args?.cliArgs,
+                    delegatedLaunch ? delegatedLaunch.cliArgs : args?.cliArgs,
                     args?.initialModel,
-                    { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings },
+                    {
+                        resumeSessionId: args?.resumeSessionId,
+                        settingsOverride,
+                        extraEnv: delegatedLaunch ? delegatedLaunch.env : args?.env,
+                    },
                 );
 
                 return {

package/src/commands/handler.ts

@@ -303,14 +303,15 @@ export class DaemonCommandHandler implements CommandHelpers {
         const sessionLookupFailed = !!targetSessionId && !session;
 
         const managerKey = this.extractIdeType(args, sessionLookupFailed);
-        let providerType: string | undefined;
+        let providerType: string | undefined = args?.agentType || args?.providerType;
 
         if (!sessionLookupFailed) {
             providerType =
                 session?.providerType
-                || args?.agentType
-                || args?.providerType
+                || providerType
                 || this.inferProviderType(managerKey);
+        } else if (!providerType) {
+            providerType = this.inferProviderType(managerKey);
         }
 
         return { session, managerKey, providerType, sessionLookupFailed };
@@ -407,7 +408,15 @@ export class DaemonCommandHandler implements CommandHelpers {
             'invoke_provider_script',
         ]);
 
-        if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd)) {
+        const allowsInactiveReadChatFallback =
+            cmd === 'read_chat'
+            && !!this._currentRoute.providerType
+            && (
+                (typeof args?.providerSessionId === 'string' && args.providerSessionId.trim().length > 0)
+                || (typeof args?.historySessionId === 'string' && args.historySessionId.trim().length > 0)
+            );
+
+        if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd) && !allowsInactiveReadChatFallback) {
             const result = {
                 success: false,
                 error: `Live session not found for targetSessionId: ${String(args?.targetSessionId || '').trim() || 'unknown'}`,