@adhdev/daemon-core 0.9.76-rc.2 → 0.9.76-rc.20

package/src/mesh/coordinator-prompt.ts

@@ -16,6 +16,7 @@ import type {
     RepoMeshStatus,
     RepoMeshNodeStatus,
 } from '../repo-mesh-types.js';
+import { DEFAULT_MESH_POLICY } from '../repo-mesh-types.js';
 
 // ─── Prompt Builder ─────────────────────────────
 
@@ -23,10 +24,11 @@ export interface CoordinatorPromptContext {
     mesh: LocalMeshEntry;
     status?: RepoMeshStatus;
     userInstruction?: string;
+    coordinatorCliType?: string;
 }
 
 export function buildCoordinatorSystemPrompt(ctx: CoordinatorPromptContext): string {
-    const { mesh, status, userInstruction } = ctx;
+    const { mesh, status, userInstruction, coordinatorCliType } = ctx;
     const sections: string[] = [];
 
     // ── Identity ──
@@ -45,7 +47,7 @@ Repository: \`${mesh.repoIdentity}\`${mesh.defaultBranch ? `\nDefault branch: \`
     }
 
     // ── Policy ──
-    sections.push(buildPolicySection(mesh.policy));
+    sections.push(buildPolicySection({ ...DEFAULT_MESH_POLICY, ...(mesh.policy || {}) }));
 
     // ── Tools ──
     sections.push(TOOLS_SECTION);
@@ -54,14 +56,14 @@ Repository: \`${mesh.repoIdentity}\`${mesh.defaultBranch ? `\nDefault branch: \`
     sections.push(WORKFLOW_SECTION);
 
     // ── Rules ──
-    sections.push(RULES_SECTION);
+    sections.push(buildRulesSection(coordinatorCliType));
 
     // ── User instruction ──
     if (userInstruction) {
         sections.push(`## Additional Context\n${userInstruction}`);
     }
 
-    if (mesh.coordinator.systemPromptSuffix) {
+    if (mesh.coordinator?.systemPromptSuffix) {
         sections.push(mesh.coordinator.systemPromptSuffix);
     }
 
@@ -130,7 +132,9 @@ const TOOLS_SECTION = `## Available Tools
 | \`mesh_read_chat\` | Read an agent's recent messages to check progress |
 | \`mesh_git_status\` | Check git status on a specific node |
 | \`mesh_checkpoint\` | Create a git checkpoint on a node |
-| \`mesh_approve\` | Approve/reject a pending agent action |`;
+| \`mesh_approve\` | Approve/reject a pending agent action |
+| \`mesh_clone_node\` | Create a worktree node for isolated parallel branch work |
+| \`mesh_remove_node\` | Remove a node (cleans up worktree if applicable) |`;
 
 const WORKFLOW_SECTION = `## Orchestration Workflow
 
@@ -138,21 +142,32 @@ const WORKFLOW_SECTION = `## Orchestration Workflow
 2. **Plan** — Decompose the user's request into independent tasks for parallel execution, or sequential tasks when dependencies exist.
 3. **Delegate** — For each task:
    a. Pick the best node (consider: health, dirty state, current workload).
-   b. If no session exists, call \`mesh_launch_session\` to start one.
-   c. Call \`mesh_send_task\` with a **complete, self-contained** instruction that includes all context the agent needs (file paths, line numbers, what to change, why). Do not send partial instructions expecting future follow-up.
+   b. If you need branch isolation for parallel work, call \`mesh_clone_node\` to create a worktree node first.
+   c. If no session exists, call \`mesh_launch_session\` to start one.
+   d. Call \`mesh_send_task\` with a **complete, self-contained** instruction that includes all context the agent needs (file paths, line numbers, what to change, why). Do not send partial instructions expecting future follow-up.
 4. **Monitor** — Periodically call \`mesh_read_chat\` to check progress. Handle approvals via \`mesh_approve\`.
 5. **Verify** — When a task reports completion, call \`mesh_git_status\` to verify changes were made.
 6. **Checkpoint** — Call \`mesh_checkpoint\` to save the work.
-7. **Report** — Summarize what was done, what changed, and any issues.`;
+7. **Clean up** — Remove worktree nodes via \`mesh_remove_node\` after their work is merged or no longer needed.
+8. **Report** — Summarize what was done, what changed, and any issues.`;
 
-const RULES_SECTION = `## Rules
+function buildRulesSection(coordinatorCliType?: string): string {
+    const coordinatorNote = coordinatorCliType
+        ? `\n- **Coordinator runtime is not a delegation default.** This coordinator is running as \`${coordinatorCliType}\`, but delegated node sessions must follow the user's requested provider, not the coordinator's own runtime.`
+        : '';
+
+    return `## Rules
 
 - **Minimize coordinator context.** The coordinator's job is routing, not implementing. Do not read source files, run commands, or analyze code directly — delegate all of that to node agents. Your context should stay lean.
 - **Delegate analysis too.** If you need to understand a bug or explore the codebase, send that investigation as a task to a node. Do not do it yourself.
+- **Respect explicit provider requests.** If the user names an agent/provider, pass the matching provider type to \`mesh_launch_session\`: Hermes → \`hermes-cli\`, Claude Code/Claude → \`claude-cli\`, Codex → \`codex-cli\`, Gemini → \`gemini-cli\`. Never substitute \`claude-cli\` just because the coordinator itself is Claude Code.
 - **Front-load the task message.** When calling \`mesh_send_task\`, include everything the agent needs: what files to touch, what the problem is, what the fix should look like. The agent won't ask follow-up questions.
 - **Don't inspect code.** Trust the agent's output. Verify via \`mesh_git_status\`, not by reading source files.
 - **Don't over-parallelize.** Start with 1-2 concurrent tasks. Scale up if they succeed.
 - **Handle failures gracefully.** If a task fails, read the chat to understand why, then retry or reassign.
 - **Keep the user informed.** Report progress after each delegation round — one or two sentences, not a narration.
 - **Respect node capabilities.** Don't send build tasks to read-only nodes. Don't push from nodes that aren't allowed to.
-- **Never fabricate tool results.** Always call the actual tool; never pretend you did.`;
+- **Never fabricate tool results.** Always call the actual tool; never pretend you did.
+- **Clean up worktree nodes.** After a worktree task completes and its changes are merged or checkpointed, call \`mesh_remove_node\` to free resources.
+- **Name worktree branches meaningfully.** Use descriptive names like \`feat/auth-refactor\` or \`fix/build-123\`.${coordinatorNote}`;
+}

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

@@ -6,6 +6,7 @@
  */
 import type { ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, InstanceContext } from './provider-instance.js';
+import type { ChatMessage } from '../types.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 export declare class CliProviderInstance implements ProviderInstance {
@@ -77,6 +78,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private formatMarkerTimestamp;
     private maybeAppendRuntimeRecoveryMessage;
     private appendRuntimeSystemMessage;
+    mergeRuntimeChatMessages(parsedMessages: ChatMessage[]): ChatMessage[];
     private mergeConversationMessages;
     private formatApprovalRequestMessage;
     private promoteProviderSessionId;

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();
     }
@@ -977,6 +978,10 @@ export class CliProviderInstance implements ProviderInstance {
         }
     }
 
+    mergeRuntimeChatMessages(parsedMessages: ChatMessage[]): ChatMessage[] {
+        return this.mergeConversationMessages(parsedMessages);
+    }
+
     private mergeConversationMessages(parsedMessages: any[]): ChatMessage[] {
         if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
 

package/src/repo-mesh-types.ts

@@ -189,6 +189,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;
 }
 
 // ─── Mesh Status (runtime, not persisted) ───────

package/src/shared-types.ts

@@ -432,6 +432,17 @@ export type VersionUpdateReason =
     | '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;
@@ -577,6 +588,10 @@ export interface CompactDaemonEntry {
     versionMismatch?: boolean;
     versionUpdateRequired?: boolean;
     versionUpdateReason?: VersionUpdateReason;
+    releaseChannel?: ReleaseChannel;
+    updateChannel?: ReleaseChannel;
+    updatePolicy?: VersionUpdatePolicy;
+    updateCommand?: string;
     terminalBackend?: TerminalBackendStatus;
     detectedIdes?: DetectedIdeInfo[];
     availableProviders?: AvailableProviderInfo[];
@@ -599,11 +614,15 @@ 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;

package/src/status/builders.ts

@@ -43,6 +43,19 @@ function getActiveChatOptions(profile: SessionEntryProfile): NormalizeActiveChat
     return LIVE_STATUS_ACTIVE_CHAT_OPTIONS;
 }
 
+function resolveSessionStatus(
+    activeChat: { status?: string | null; activeModal?: { buttons?: unknown[] | null } | null } | null | undefined,
+    providerStatus?: string | null,
+) {
+    const chatStatus = normalizeManagedStatus(activeChat?.status, { activeModal: activeChat?.activeModal || null });
+    const topLevelStatus = normalizeManagedStatus(providerStatus, { activeModal: activeChat?.activeModal || null });
+
+    if (chatStatus === 'waiting_approval' || topLevelStatus === 'waiting_approval') return 'waiting_approval';
+    if (chatStatus === 'generating' || topLevelStatus === 'generating') return 'generating';
+    if (topLevelStatus !== 'idle') return topLevelStatus;
+    return chatStatus;
+}
+
 function shouldIncludeSessionControls(profile: SessionEntryProfile): boolean {
     return profile !== 'live';
 }
@@ -170,9 +183,7 @@ function buildIdeWorkspaceSession(
         providerName: state.name,
         kind: 'workspace',
         transport: 'cdp-page',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title,
         workspace,
         ...(git && { git }),
@@ -212,9 +223,7 @@ function buildExtensionAgentSession(
         providerSessionId: ext.providerSessionId,
         kind: 'agent',
         transport: 'cdp-webview',
-        status: normalizeManagedStatus(activeChat?.status || ext.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, ext.status),
         title: activeChat?.title || ext.name,
         workspace,
         ...(git && { git }),
@@ -277,9 +286,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         providerSessionId: state.providerSessionId,
         kind: 'agent',
         transport: 'pty',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title: activeChat?.title || state.name,
         workspace,
         ...(git && { git }),
@@ -328,9 +335,7 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         providerName: state.name,
         kind: 'agent',
         transport: 'acp',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title: activeChat?.title || state.name,
         workspace,
         ...(git && { git }),