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

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-commands.ts

@@ -152,6 +152,7 @@ const FAILURE_REASONS = new Set<GitFailureReason>([
   'dirty_index_required',
   'conflict',
   'invalid_args',
+  'nothing_to_commit',
   'git_command_failed',
 ]);
 
@@ -454,7 +455,10 @@ async function gitCheckpoint(
   } catch (err: any) {
     const output = (err?.stdout || '') + (err?.stderr || '');
     if (/nothing to commit/i.test(output)) {
-      throw new GitCommandError('git_command_failed', 'Nothing to commit');
+      throw new GitCommandError('nothing_to_commit', 'Nothing to commit — working tree is clean.', {
+        stdout: err?.stdout,
+        stderr: err?.stderr,
+      });
     }
     throw err;
   }

package/src/git/git-types.ts

@@ -14,6 +14,7 @@ export type GitFailureReason =
   | 'dirty_index_required'
   | 'conflict'
   | 'invalid_args'
+  | 'nothing_to_commit'
   | 'git_command_failed';
 
 export interface GitRepoIdentity {

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/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();
     }
@@ -737,7 +738,29 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     private pushEvent(event: ProviderEvent): void {
-        this.events.push(event);
+        const enrichedEvent: ProviderEvent = {
+            ...event,
+            instanceId: typeof event.instanceId === 'string' && event.instanceId.trim()
+                ? event.instanceId
+                : this.instanceId,
+            targetSessionId: typeof event.targetSessionId === 'string' && event.targetSessionId.trim()
+                ? event.targetSessionId
+                : this.instanceId,
+            providerType: typeof event.providerType === 'string' && event.providerType.trim()
+                ? event.providerType
+                : this.type,
+            workspaceName: typeof event.workspaceName === 'string' && event.workspaceName.trim()
+                ? event.workspaceName
+                : this.workingDir,
+            providerSessionId: typeof event.providerSessionId === 'string' && event.providerSessionId.trim()
+                ? event.providerSessionId
+                : this.providerSessionId,
+        };
+        if (this.context?.emitProviderEvent) {
+            this.context.emitProviderEvent(enrichedEvent);
+            return;
+        }
+        this.events.push(enrichedEvent);
     }
 
     private flushEvents(): ProviderEvent[] {
@@ -977,15 +1000,40 @@ 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);
 
-        return normalizeChatMessages([...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)]
-            .map((message, index) => ({ message, index }))
+        type MergeEntry = { message: ChatMessage; index: number; source: 'parsed' | 'runtime' };
+        const parsedEntries: MergeEntry[] = parsedMessages.map((message, index) => ({
+            message,
+            index,
+            source: 'parsed',
+        }));
+        const runtimeEntries: MergeEntry[] = this.runtimeMessages.map((entry, index) => ({
+            message: entry.message,
+            index: parsedMessages.length + index,
+            source: 'runtime',
+        }));
+        const getTime = (message: ChatMessage): number => {
+            const value = typeof message.receivedAt === 'number'
+                ? message.receivedAt
+                : typeof message.timestamp === 'number'
+                    ? message.timestamp
+                    : 0;
+            return Number.isFinite(value) && value > 0 ? value : 0;
+        };
+
+        return normalizeChatMessages([...parsedEntries, ...runtimeEntries]
             .sort((a, b) => {
-                const aTime = a.message.receivedAt || a.message.timestamp || 0;
-                const bTime = b.message.receivedAt || b.message.timestamp || 0;
-                if (aTime !== bTime) return aTime - bTime;
+                const aTime = getTime(a.message);
+                const bTime = getTime(b.message);
+                if (aTime && bTime && aTime !== bTime) return aTime - bTime;
+                if (aTime && !bTime && a.source === 'runtime' && b.source === 'parsed') return -1;
+                if (!aTime && bTime && a.source === 'parsed' && b.source === 'runtime') return 1;
                 return a.index - b.index;
             })
             .map((entry) => entry.message));

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

@@ -47,7 +47,10 @@ export class ProviderInstanceManager {
             this.instances.get(id)!.dispose();
         }
         this.instances.set(id, instance);
-        await instance.init(context);
+        await instance.init({
+            ...context,
+            emitProviderEvent: (event) => this.emitProviderEvent(instance.type, id, event),
+        });
     }
 
  /**
@@ -237,6 +240,22 @@ export class ProviderInstanceManager {
         this.eventListeners.push(listener);
     }
 
+    emitProviderEvent(providerType: string, instanceId: string, event: ProviderEvent): void {
+        const payload = {
+            ...event,
+            providerType,
+            instanceId: typeof event.instanceId === 'string' && event.instanceId.trim()
+                ? event.instanceId
+                : instanceId,
+            targetSessionId: typeof event.targetSessionId === 'string' && event.targetSessionId.trim()
+                ? event.targetSessionId
+                : instanceId,
+        } as ProviderEvent & { providerType: string };
+        for (const listener of this.eventListeners) {
+            listener(payload);
+        }
+    }
+
     private emitPendingEvents(
         providerType: string,
         state: ProviderState,

package/src/providers/provider-instance.ts

@@ -174,6 +174,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 {

package/src/repo-mesh-types.ts

@@ -69,6 +69,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 const DEFAULT_MESH_POLICY: RepoMeshPolicy = {
@@ -189,6 +191,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;
@@ -622,6 +641,8 @@ export interface DaemonStatusEventPayload {
     timestamp: number;
     targetSessionId?: string;
     providerType?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;
@@ -643,6 +664,8 @@ export interface DashboardStatusEventPayload {
     daemonId?: string;
     providerType?: string;
     targetSessionId?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;