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

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/repo-mesh-types.d.ts

@@ -149,6 +149,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.10",
+  "version": "0.9.76-rc.11",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/router.ts

@@ -226,6 +226,43 @@ export class DaemonCommandRouter {
         this.deps = deps;
     }
 
+    private getCachedInlineMesh(meshId: string, inlineMesh?: unknown): any | undefined {
+        if (inlineMesh && typeof inlineMesh === 'object') {
+            this.inlineMeshCache.set(meshId, inlineMesh as any);
+            return inlineMesh as any;
+        }
+        return this.inlineMeshCache.get(meshId);
+    }
+
+    private async getMeshForCommand(meshId: string, inlineMesh?: unknown): Promise<{ mesh: any; inline: boolean } | null> {
+        try {
+            const { getMesh } = await import('../config/mesh-config.js');
+            const mesh = getMesh(meshId);
+            if (mesh) return { mesh, inline: false };
+        } catch { /* fall through to inline cache */ }
+        const cached = this.getCachedInlineMesh(meshId, inlineMesh);
+        return cached ? { mesh: cached, inline: true } : null;
+    }
+
+    private updateInlineMeshNode(meshId: string, mesh: any, node: any): void {
+        if (!mesh || !Array.isArray(mesh.nodes) || !node?.id) return;
+        const idx = mesh.nodes.findIndex((entry: any) => entry?.id === node.id || entry?.nodeId === node.id);
+        if (idx >= 0) mesh.nodes[idx] = node;
+        else mesh.nodes.push(node);
+        mesh.updatedAt = new Date().toISOString();
+        this.inlineMeshCache.set(meshId, mesh);
+    }
+
+    private removeInlineMeshNode(meshId: string, mesh: any, nodeId: string): boolean {
+        if (!mesh || !Array.isArray(mesh.nodes)) return false;
+        const idx = mesh.nodes.findIndex((entry: any) => entry?.id === nodeId || entry?.nodeId === nodeId);
+        if (idx === -1) return false;
+        mesh.nodes.splice(idx, 1);
+        mesh.updatedAt = new Date().toISOString();
+        this.inlineMeshCache.set(meshId, mesh);
+        return true;
+    }
+
     private async traceSessionHostAction<T>(
         action: string,
         args: any,
@@ -1022,14 +1059,107 @@ export class DaemonCommandRouter {
                 const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
                 if (!meshId || !nodeId) return { success: false, error: 'meshId and nodeId required' };
                 try {
-                    const { removeNode } = await import('../config/mesh-config.js');
-                    const removed = removeNode(meshId, nodeId);
+                    const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
+                    const mesh = meshRecord?.mesh;
+                    const node = mesh?.nodes?.find((n: any) => n.id === nodeId || n.nodeId === nodeId);
+
+                    // If this is a worktree node, clean up the git worktree first
+                    if (node?.isLocalWorktree && node.workspace) {
+                        try {
+                            const sourceNode = node.clonedFromNodeId
+                                ? mesh?.nodes.find((n: any) => n.id === node.clonedFromNodeId || n.nodeId === node.clonedFromNodeId)
+                                : mesh?.nodes.find((n: any) => !n.isLocalWorktree);
+                            const repoRoot = sourceNode?.repoRoot || sourceNode?.workspace;
+                            if (repoRoot) {
+                                const { removeWorktree } = await import('../git/git-worktree.js');
+                                await removeWorktree(repoRoot, node.workspace);
+                            }
+                        } catch (e: any) {
+                            LOG.warn('MeshNode', `Worktree cleanup failed for ${nodeId}: ${e.message}`);
+                            // Continue with node removal even if worktree cleanup fails
+                        }
+                    }
+
+                    let removed = false;
+                    if (meshRecord?.inline) {
+                        removed = this.removeInlineMeshNode(meshId, mesh, nodeId);
+                    } else {
+                        const { removeNode } = await import('../config/mesh-config.js');
+                        removed = removeNode(meshId, nodeId);
+                    }
                     return { success: true, removed };
                 } catch (e: any) {
                     return { success: false, error: e.message };
                 }
             }
 
+            case 'clone_mesh_node': {
+                const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+                const sourceNodeId = typeof args?.sourceNodeId === 'string' ? args.sourceNodeId.trim() : '';
+                const branch = typeof args?.branch === 'string' ? args.branch.trim() : '';
+                const baseBranch = typeof args?.baseBranch === 'string' ? args.baseBranch.trim() : undefined;
+                if (!meshId) return { success: false, error: 'meshId required' };
+                if (!sourceNodeId) return { success: false, error: 'sourceNodeId required' };
+                if (!branch) return { success: false, error: 'branch required' };
+
+                try {
+                    const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
+                    const mesh = meshRecord?.mesh;
+                    if (!mesh) return { success: false, error: 'Mesh not found' };
+
+                    const sourceNode = mesh.nodes?.find((n: any) => n.id === sourceNodeId || n.nodeId === sourceNodeId);
+                    if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
+
+                    const repoRoot = sourceNode.repoRoot || sourceNode.workspace;
+                    const { createWorktree } = await import('../git/git-worktree.js');
+                    const result = await createWorktree({
+                        repoRoot,
+                        branch,
+                        baseBranch,
+                        meshName: mesh.name,
+                    });
+
+                    let node: any;
+                    if (meshRecord.inline) {
+                        const { randomUUID } = await import('crypto');
+                        node = {
+                            id: `node_${randomUUID().replace(/-/g, '')}`,
+                            workspace: result.worktreePath,
+                            repoRoot: result.worktreePath,
+                            daemonId: sourceNode.daemonId,
+                            userOverrides: { ...(sourceNode.userOverrides || {}) },
+                            policy: { ...(sourceNode.policy || {}) },
+                            isLocalWorktree: true,
+                            worktreeBranch: result.branch,
+                            clonedFromNodeId: sourceNodeId,
+                        };
+                        this.updateInlineMeshNode(meshId, mesh, node);
+                    } else {
+                        const { addNode } = await import('../config/mesh-config.js');
+                        node = addNode(meshId, {
+                            workspace: result.worktreePath,
+                            repoRoot: result.worktreePath,
+                            daemonId: sourceNode.daemonId,
+                            userOverrides: { ...(sourceNode.userOverrides || {}) },
+                            isLocalWorktree: true,
+                            worktreeBranch: result.branch,
+                            clonedFromNodeId: sourceNodeId,
+                            policy: { ...(sourceNode.policy || {}) },
+                        });
+                        if (!node) return { success: false, error: 'Failed to register worktree node' };
+                    }
+
+                    return {
+                        success: true,
+                        node,
+                        worktreePath: result.worktreePath,
+                        branch: result.branch,
+                    };
+                } catch (e: any) {
+                    return { success: false, error: e.message };
+                }
+            }
+
             // ─── Mesh Coordinator Launch ───
             case 'launch_mesh_coordinator': {
                 const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
@@ -1112,6 +1242,25 @@ export class DaemonCommandRouter {
                         };
                     }
 
+                    // Build the coordinator prompt before mutating workspace config or launching.
+                    // Prompt generation failures are configuration/data-shape errors; fail closed so
+                    // broken mesh state is visible instead of silently launching with weaker rules.
+                    let systemPrompt = '';
+                    try {
+                        systemPrompt = buildCoordinatorSystemPrompt({ mesh, coordinatorCliType: cliType });
+                    } catch (error: any) {
+                        const message = error?.message || String(error);
+                        LOG.error('MeshCoordinator', `Failed to build coordinator prompt: ${message}`);
+                        return {
+                            success: false,
+                            code: 'mesh_coordinator_prompt_failed',
+                            error: `Failed to build Repo Mesh coordinator prompt: ${message}`,
+                            meshId,
+                            cliType,
+                            workspace,
+                        };
+                    }
+
                     // 1. Write provider-declared MCP config to workspace for CLIs that auto-import it.
                     const { existsSync, readFileSync, writeFileSync, copyFileSync } = await import('fs');
                     const mcpConfigPath = coordinatorSetup.configPath;
@@ -1149,14 +1298,6 @@ export class DaemonCommandRouter {
                     writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), 'utf-8');
                     LOG.info('MeshCoordinator', `Wrote ${mcpConfigPath} with ${coordinatorSetup.serverName} server`);
 
-                    // 2. Build coordinator system prompt
-                    let systemPrompt = '';
-                    try {
-                        systemPrompt = buildCoordinatorSystemPrompt({ mesh });
-                    } catch {
-                        systemPrompt = `You are a Repo Mesh Coordinator for "${mesh.name}". Use the adhdev-mesh MCP tools (mesh_status, mesh_list_nodes, mesh_send_task, mesh_read_chat, mesh_launch_session, etc.) to orchestrate work across ${mesh.nodes.length} node(s).`;
-                    }
-
                     const cliArgs: string[] = [];
                     if (systemPrompt) {
                         cliArgs.push('--append-system-prompt', systemPrompt);

package/src/config/mesh-config.ts

@@ -160,9 +160,12 @@ export function deleteMesh(meshId: string): boolean {
 export interface AddNodeOptions {
     workspace: string;
     repoRoot?: string;
+    daemonId?: string;
     userOverrides?: Partial<RepoMeshNodeCapabilities>;
     policy?: RepoMeshNodePolicy;
     isLocalWorktree?: boolean;
+    worktreeBranch?: string;
+    clonedFromNodeId?: string;
 }
 
 export function addNode(meshId: string, opts: AddNodeOptions): LocalMeshNodeEntry | undefined {
@@ -183,9 +186,12 @@ export function addNode(meshId: string, opts: AddNodeOptions): LocalMeshNodeEntr
         id: `node_${randomUUID().replace(/-/g, '')}`,
         workspace: opts.workspace.trim(),
         repoRoot: opts.repoRoot,
+        daemonId: opts.daemonId,
         userOverrides: opts.userOverrides || {},
         policy: opts.policy || {},
         isLocalWorktree: opts.isLocalWorktree,
+        worktreeBranch: opts.worktreeBranch,
+        clonedFromNodeId: opts.clonedFromNodeId,
     };
 
     mesh.nodes.push(node);

package/src/git/git-worktree.ts

@@ -0,0 +1,214 @@
+/**
+ * Git Worktree — Create/remove/list worktrees for Repo Mesh node cloning
+ *
+ * Used by the `clone_mesh_node` daemon command to create isolated
+ * worktree-based nodes for parallel branch work within a mesh.
+ *
+ * Worktrees are placed outside the source repo to avoid .gitignore
+ * pollution and submodule conflicts:
+ *   <repoParent>/.adhdev-worktrees/<meshName>/<branch>/
+ */
+
+import * as path from 'node:path';
+import { mkdir } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+
+const execFileAsync = promisify(execFile);
+
+const WORKTREE_DIR_NAME = '.adhdev-worktrees';
+const GIT_TIMEOUT_MS = 30_000;
+const GIT_MAX_BUFFER = 4 * 1024 * 1024;
+
+// ─── Types ──────────────────────────────────────
+
+export interface WorktreeCreateOptions {
+    /** Absolute path to the source repo's git root */
+    repoRoot: string;
+    /** Branch name for the new worktree */
+    branch: string;
+    /** Starting point for the branch (default: HEAD) */
+    baseBranch?: string;
+    /** Mesh name, used for organizing worktree directories */
+    meshName: string;
+    /** Override the auto-resolved target directory */
+    targetDir?: string;
+}
+
+export interface WorktreeCreateResult {
+    success: true;
+    worktreePath: string;
+    branch: string;
+}
+
+export interface WorktreeEntry {
+    path: string;
+    head: string;
+    branch: string | null;
+    bare: boolean;
+}
+
+export interface WorktreeRemoveResult {
+    success: true;
+    removedPath: string;
+}
+
+// ─── Path Resolution ────────────────────────────
+
+/**
+ * Resolve the target directory for a new worktree.
+ * Places worktrees at: <repoParent>/.adhdev-worktrees/<meshName>/<branch>/
+ */
+export function resolveWorktreePath(repoRoot: string, meshName: string, branch: string): string {
+    // Sanitize branch name for filesystem (e.g. feat/auth → feat-auth)
+    const safeBranch = branch.replace(/[/\\:*?"<>|]/g, '-').replace(/^\.+|\.+$/g, '');
+    const safeMeshName = meshName.replace(/[/\\:*?"<>|]/g, '-').replace(/^\.+|\.+$/g, '');
+    const parentDir = path.dirname(repoRoot);
+    return path.join(parentDir, WORKTREE_DIR_NAME, safeMeshName, safeBranch);
+}
+
+// ─── Create ─────────────────────────────────────
+
+/**
+ * Create a new git worktree with a fresh branch.
+ *
+ * Runs: git worktree add <targetDir> -b <branch> [baseBranch]
+ */
+export async function createWorktree(opts: WorktreeCreateOptions): Promise<WorktreeCreateResult> {
+    const { repoRoot, branch, baseBranch, meshName } = opts;
+    const targetDir = opts.targetDir || resolveWorktreePath(repoRoot, meshName, branch);
+
+    if (existsSync(targetDir)) {
+        throw new Error(`Worktree target directory already exists: ${targetDir}`);
+    }
+
+    // Ensure parent directory exists
+    await mkdir(path.dirname(targetDir), { recursive: true });
+
+    const args = ['worktree', 'add', targetDir, '-b', branch];
+    if (baseBranch) {
+        args.push(baseBranch);
+    }
+
+    try {
+        await execFileAsync('git', args, {
+            cwd: repoRoot,
+            encoding: 'utf8',
+            timeout: GIT_TIMEOUT_MS,
+            maxBuffer: GIT_MAX_BUFFER,
+            windowsHide: true,
+        });
+    } catch (error: any) {
+        const stderr = typeof error.stderr === 'string' ? error.stderr : '';
+        // Clean error messages for common failures
+        if (/already exists/i.test(stderr)) {
+            throw new Error(`Branch '${branch}' already exists or is checked out in another worktree`);
+        }
+        throw new Error(`git worktree add failed: ${stderr.trim() || error.message}`);
+    }
+
+    return {
+        success: true,
+        worktreePath: targetDir,
+        branch,
+    };
+}
+
+// ─── Remove ─────────────────────────────────────
+
+/**
+ * Remove a git worktree and clean up the directory.
+ *
+ * Runs: git worktree remove <worktreePath> --force
+ */
+export async function removeWorktree(repoRoot: string, worktreePath: string): Promise<WorktreeRemoveResult> {
+    if (!existsSync(worktreePath)) {
+        // Already gone — just prune
+        await pruneWorktrees(repoRoot);
+        return { success: true, removedPath: worktreePath };
+    }
+
+    try {
+        await execFileAsync('git', ['worktree', 'remove', worktreePath, '--force'], {
+            cwd: repoRoot,
+            encoding: 'utf8',
+            timeout: GIT_TIMEOUT_MS,
+            maxBuffer: GIT_MAX_BUFFER,
+            windowsHide: true,
+        });
+    } catch (error: any) {
+        const stderr = typeof error.stderr === 'string' ? error.stderr : '';
+        throw new Error(`git worktree remove failed: ${stderr.trim() || error.message}`);
+    }
+
+    return { success: true, removedPath: worktreePath };
+}
+
+// ─── List ───────────────────────────────────────
+
+/**
+ * List all worktrees for a repository.
+ *
+ * Runs: git worktree list --porcelain
+ */
+export async function listWorktrees(repoRoot: string): Promise<WorktreeEntry[]> {
+    const { stdout } = await execFileAsync('git', ['worktree', 'list', '--porcelain'], {
+        cwd: repoRoot,
+        encoding: 'utf8',
+        timeout: GIT_TIMEOUT_MS,
+        maxBuffer: GIT_MAX_BUFFER,
+        windowsHide: true,
+    });
+
+    return parseWorktreeListOutput(stdout);
+}
+
+/**
+ * Parse `git worktree list --porcelain` output into structured entries.
+ */
+export function parseWorktreeListOutput(output: string): WorktreeEntry[] {
+    const entries: WorktreeEntry[] = [];
+    const blocks = output.trim().split(/\n\n+/);
+
+    for (const block of blocks) {
+        if (!block.trim()) continue;
+        const lines = block.trim().split('\n');
+        const entry: WorktreeEntry = { path: '', head: '', branch: null, bare: false };
+
+        for (const line of lines) {
+            if (line.startsWith('worktree ')) {
+                entry.path = line.slice('worktree '.length).trim();
+            } else if (line.startsWith('HEAD ')) {
+                entry.head = line.slice('HEAD '.length).trim();
+            } else if (line.startsWith('branch ')) {
+                const ref = line.slice('branch '.length).trim();
+                // refs/heads/feat/auth → feat/auth
+                entry.branch = ref.replace(/^refs\/heads\//, '');
+            } else if (line === 'bare') {
+                entry.bare = true;
+            }
+        }
+
+        if (entry.path) {
+            entries.push(entry);
+        }
+    }
+
+    return entries;
+}
+
+// ─── Prune ──────────────────────────────────────
+
+async function pruneWorktrees(repoRoot: string): Promise<void> {
+    try {
+        await execFileAsync('git', ['worktree', 'prune'], {
+            cwd: repoRoot,
+            encoding: 'utf8',
+            timeout: GIT_TIMEOUT_MS,
+            windowsHide: true,
+        });
+    } catch {
+        // Prune is best-effort
+    }
+}

package/src/git/index.ts

@@ -73,3 +73,17 @@ export type {
 
 export { TurnSnapshotTracker } from './turn-snapshot-tracker.js';
 export type { TurnCompletedCallback } from './turn-snapshot-tracker.js';
+
+export {
+  createWorktree,
+  listWorktrees,
+  parseWorktreeListOutput,
+  removeWorktree,
+  resolveWorktreePath,
+} from './git-worktree.js';
+export type {
+  WorktreeCreateOptions,
+  WorktreeCreateResult,
+  WorktreeEntry,
+  WorktreeRemoveResult,
+} from './git-worktree.js';

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/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) ───────