@adhdev/daemon-core 0.9.82-rc.360 → 0.9.82-rc.362

package/src/commands/router.ts

@@ -12,16 +12,17 @@
 import { DaemonCdpManager } from '../cdp/manager.js';
 import { registerExtensionProviders } from '../cdp/setup.js';
 import { DaemonCommandHandler } from './handler.js';
+import { lowFamilyRegistry } from './low-family/index.js';
 import { DaemonCliManager } from './cli-manager.js';
 import { supportsExplicitSessionResume } from './cli-manager.js';
 import type { HostedCliRuntimeDescriptor } from './cli-manager.js';
 import type { ProviderLoader } from '../providers/provider-loader.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
 import { launchWithCdp, killIdeProcess, isIdeRunning } from '../launch.js';
-import { loadConfig, saveConfig, updateConfig } from '../config/config.js';
+import { loadConfig, saveConfig } from '../config/config.js';
 import { loadState, saveState } from '../config/state-store.js';
 import { resolveIdeLaunchWorkspace } from '../config/workspaces.js';
-import { appendRecentActivity, getRecentActivity, markSessionSeen, dismissSessionNotification, markSessionNotificationUnread } from '../config/recent-activity.js';
+import { appendRecentActivity, getRecentActivity } from '../config/recent-activity.js';
 import { getSavedProviderSessions } from '../config/saved-sessions.js';
 import { listProviderHistorySessions } from '../config/chat-history.js';
 import { detectIDEs } from '../detection/ide-detector.js';
@@ -47,14 +48,10 @@ 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 { readDaemonLogTail, MAX_TAIL_BYTES } from '../logging/log-tail-reader.js';
-import { redactLogLines } from '../logging/log-redactor.js';
-import { createInteractionId, getRecentDebugTrace, recordDebugTrace } from '../logging/debug-trace.js';
+import { createInteractionId, recordDebugTrace } from '../logging/debug-trace.js';
 import { getSessionHostSurfaceKind, partitionSessionHostRecords } from '../session-host/runtime-surface.js';
 import { createHermesManualMeshCoordinatorSetup, resolveMeshCoordinatorSetup } from './mesh-coordinator.js';
-import { buildSessionEntries } from '../status/builders.js';
-import { registerMeshCoordinator, getCoordinatorForSession } from '../mesh/coordinator-registry.js';
+import { registerMeshCoordinator } from '../mesh/coordinator-registry.js';
 import { handleMeshForwardEvent, drainPendingMeshCoordinatorEvents, getPendingMeshCoordinatorEvents, queuePendingMeshCoordinatorEvent, type PendingMeshCoordinatorEvent } from '../mesh/mesh-events.js';
 import { getRecentUnroutableDeliveries } from '../mesh/mesh-routing.js';
 import { buildMeshWorkerRelayStamp } from '../mesh/mesh-events-utils.js';
@@ -81,10 +78,6 @@ import {
     type WorktreeBootstrapState,
 } from '../mesh/worktree-bootstrap-config.js';
 import { runMeshInit } from '../mesh/mesh-init.js';
-import { buildMachineInfo, buildStatusSnapshot } from '../status/snapshot.js';
-import { getDaemonBuildInfo } from '../build-info.js';
-import { getSessionCompletionMarker } from '../status/snapshot.js';
-import { execNpmCommandSync, resolveCurrentGlobalInstallSurface, spawnDetachedDaemonUpgradeHelper } from './upgrade-helper.js';
 import { getMeshQueueRevision } from '../mesh/mesh-work-queue.js';
 import type { RepoMeshSessionCleanupMode } from '../repo-mesh-types.js';
 import { DEFAULT_MESH_POLICY } from '../repo-mesh-types.js';
@@ -96,29 +89,6 @@ import { normalizeInteractivePromptResponse } from '../providers/types/interacti
 import { workingDirBasename } from '../providers/working-dir.js';
 import { resolveWin32Executable } from '../cli-adapters/resolve-executable.js';
 
-type ReleaseChannel = 'stable' | 'preview';
-const CHANNEL_NPM_TAG: Record<ReleaseChannel, 'latest' | 'next'> = { stable: 'latest', preview: 'next' };
-const CHANNEL_SERVER_URL: Record<ReleaseChannel, string> = {
-    stable: 'https://api.adhf.dev',
-    preview: 'https://api-preview.adhf.dev',
-};
-
-function normalizeReleaseChannel(value: unknown): ReleaseChannel | null {
-    if (typeof value !== 'string') return null;
-    const normalized = value.trim().toLowerCase();
-    if (normalized === 'stable' || normalized === 'latest') return 'stable';
-    if (normalized === 'preview' || normalized === 'next') return 'preview';
-    return null;
-}
-
-function resolveUpgradeChannel(args: any): ReleaseChannel {
-    return normalizeReleaseChannel(args?.channel)
-        || normalizeReleaseChannel(args?.updatePolicy?.channel)
-        || normalizeReleaseChannel(args?.npmTag)
-        || normalizeReleaseChannel(loadConfig().updateChannel)
-        || 'stable';
-}
-
 function readProviderPriorityFromPolicy(policy: unknown): string[] {
     const record = policy && typeof policy === 'object' && !Array.isArray(policy)
         ? policy as Record<string, unknown>
@@ -336,7 +306,7 @@ function buildMeshNodeMachineIdentity(node: Record<string, unknown>, opts: {
     const machineName = readMeshNodeDisplayMachineName(node);
     const coordinatorHostname = readStringValue(opts.coordinatorHostname);
     const machineIdMatches = Boolean(opts.localMachineId && machineId && opts.localMachineId === machineId);
-    const daemonIdMatches = Boolean(opts.localDaemonId && daemonId && opts.localDaemonId === daemonId);
+    const daemonIdMatches = Boolean(opts.localDaemonId && daemonId && daemonIdsEquivalent(opts.localDaemonId, daemonId));
     const hostnameMatches = Boolean(
         normalizeMeshHostname(hostname)
         && normalizeMeshHostname(coordinatorHostname)
@@ -1403,7 +1373,7 @@ async function hydrateInlineMeshDirectTruth(args: {
         const isSelfNode = Boolean(
             nodeId && selectedCoordinatorNodeId && nodeId === selectedCoordinatorNodeId,
         ) || Boolean(
-            daemonId && (daemonId === args.localMachineId || daemonId === args.statusInstanceId),
+            daemonId && (daemonIdsEquivalent(daemonId, args.localMachineId) || daemonIdsEquivalent(daemonId, args.statusInstanceId)),
         ) || Boolean(args.meshSource !== 'local_config' && nodeIndex === 0);
 
         // A dead local worktree owned by this coordinator (isLocalWorktree, the
@@ -1415,7 +1385,7 @@ async function hydrateInlineMeshDirectTruth(args: {
         // strictly self + isLocalWorktree + absent-path; remote peers and nodes
         // whose workspace still exists are unaffected and stay classifiable.
         const isSelfDaemonNode = Boolean(
-            daemonId && (daemonId === args.localMachineId || daemonId === args.statusInstanceId),
+            daemonId && (daemonIdsEquivalent(daemonId, args.localMachineId) || daemonIdsEquivalent(daemonId, args.statusInstanceId)),
         );
         if ((isSelfNode || isSelfDaemonNode) && isDeadLocalWorktreeNode(node)) {
             deadNodeIds.push(nodeId);
@@ -3471,7 +3441,6 @@ const MESH_FORWARDABLE_SESSION_COMMANDS = new Set([
     // delivers it to the real worker instead. (findAdapter is also fail-closed as the backstop.)
     'agent_command',
 ]);
-const READ_DEBUG_ENABLED = process.argv.includes('--dev') || process.env.ADHDEV_READ_DEBUG === '1';
 
 function normalizeCommandSource(source: string): CommandLogEntry['source'] {
     switch (source) {
@@ -3501,117 +3470,6 @@ function normalizeCommandArgsWithInteractionId(args: any): Record<string, unknow
  * basename to be a literal `*.json`, and re-joins under the verified parent so
  * the returned path can't point outside the tree. Used by get/write_spec_source.
  */
-function resolveSpecPathInProviders(
-    specPath: string,
-    fsm: typeof import('node:fs'),
-    pathm: typeof import('node:path'),
-    osm: typeof import('node:os'),
-): { ok: true; path: string } | { ok: false; error: string } {
-    let rootReal: string;
-    try {
-        rootReal = fsm.realpathSync(pathm.join(osm.homedir(), '.adhdev', 'providers'));
-    } catch (e) {
-        return { ok: false, error: `providers root unavailable: ${(e as Error).message}` };
-    }
-    const resolved = pathm.resolve(specPath);
-    const base = pathm.basename(resolved);
-    if (!/^[\w.-]+\.json$/.test(base)) {
-        return { ok: false, error: 'refused: spec file must be a *.json basename' };
-    }
-    let parentReal: string;
-    try {
-        parentReal = fsm.realpathSync(pathm.dirname(resolved));
-    } catch (e) {
-        return { ok: false, error: `spec directory not found: ${(e as Error).message}` };
-    }
-    if (parentReal !== rootReal && !parentReal.startsWith(rootReal + pathm.sep)) {
-        return { ok: false, error: 'refused: spec path must be under the providers root' };
-    }
-    const safe = pathm.join(parentReal, base);
-    // Reject if the final file itself is a symlink pointing elsewhere.
-    try {
-        const st = fsm.lstatSync(safe);
-        if (st.isSymbolicLink()) return { ok: false, error: 'refused: spec path is a symlink' };
-    } catch { /* file may not exist yet (write case) — fine */ }
-    return { ok: true, path: safe };
-}
-
-function toHostedCliRuntimeDescriptor(record: any): HostedCliRuntimeDescriptor | null {
-    if (!record || typeof record !== 'object') return null;
-    const runtimeId = typeof record.sessionId === 'string' ? record.sessionId : '';
-    const cliType = typeof record.providerType === 'string' ? record.providerType : '';
-    const workspace = typeof record.workspace === 'string' ? record.workspace : '';
-    if (!runtimeId || !cliType || !workspace) return null;
-    return {
-        runtimeId,
-        runtimeKey: typeof record.runtimeKey === 'string' ? record.runtimeKey : undefined,
-        displayName: typeof record.displayName === 'string' ? record.displayName : undefined,
-        workspaceLabel: typeof record.workspaceLabel === 'string' ? record.workspaceLabel : undefined,
-        lifecycle: typeof record.lifecycle === 'string' ? record.lifecycle as HostedCliRuntimeDescriptor['lifecycle'] : undefined,
-        recoveryState: typeof record.meta?.runtimeRecoveryState === 'string'
-            ? String(record.meta.runtimeRecoveryState)
-            : null,
-        cliType,
-        workspace,
-        cliArgs: Array.isArray(record.meta?.cliArgs) ? record.meta.cliArgs as string[] : [],
-        providerSessionId: typeof record.meta?.providerSessionId === 'string'
-            ? String(record.meta.providerSessionId)
-            : undefined,
-    };
-}
-
-function getWriteConflictOwnerClientId(error: unknown): string | undefined {
-    const message = typeof error === 'string'
-        ? error
-        : error instanceof Error
-            ? error.message
-            : '';
-    const match = /^Write owned by\s+(.+)$/.exec(message.trim());
-    return match?.[1]?.trim() || undefined;
-}
-
-function summarizeSessionHostRecord(result: unknown): Record<string, unknown> {
-    if (!result || typeof result !== 'object') return {};
-    const record = result as Record<string, any>;
-    return {
-        runtimeKey: typeof record.runtimeKey === 'string' ? record.runtimeKey : undefined,
-        lifecycle: typeof record.lifecycle === 'string' ? record.lifecycle : undefined,
-        surfaceKind: getSessionHostSurfaceKind(record as any),
-        attachedClientCount: Array.isArray(record.attachedClients) ? record.attachedClients.length : undefined,
-        hasWriteOwner: !!record.writeOwner,
-        writeOwnerClientId: typeof record.writeOwner?.clientId === 'string' ? record.writeOwner.clientId : undefined,
-    };
-}
-
-function summarizeSessionHostRecords(result: unknown): Record<string, unknown> {
-    const records = Array.isArray(result) ? result : [];
-    const groups = partitionSessionHostRecords(records as any[]);
-    return {
-        sessionCount: records.length,
-        liveRuntimeCount: groups.liveRuntimes.length,
-        recoverySnapshotCount: groups.recoverySnapshots.length,
-        inactiveRecordCount: groups.inactiveRecords.length,
-    };
-}
-
-function summarizeSessionHostDiagnostics(result: unknown): Record<string, unknown> {
-    const diagnostics = result && typeof result === 'object' ? result as Record<string, any> : {};
-    const sessions = Array.isArray(diagnostics.sessions) ? diagnostics.sessions : [];
-    return {
-        runtimeCount: typeof diagnostics.runtimeCount === 'number' ? diagnostics.runtimeCount : undefined,
-        ...summarizeSessionHostRecords(sessions),
-    };
-}
-
-function summarizeSessionHostPruneResult(result: unknown): Record<string, unknown> {
-    const value = result && typeof result === 'object' ? result as Record<string, any> : {};
-    return {
-        duplicateGroupCount: typeof value.duplicateGroupCount === 'number' ? value.duplicateGroupCount : undefined,
-        prunedCount: Array.isArray(value.prunedSessionIds) ? value.prunedSessionIds.length : undefined,
-        keptCount: Array.isArray(value.keptSessionIds) ? value.keptSessionIds.length : undefined,
-    };
-}
-
 function normalizeStandaloneHostCommandUrl(hostAddress: string): string {
     const raw = hostAddress.trim();
     if (!raw) throw new Error('hostAddress required');
@@ -4671,65 +4529,6 @@ export class DaemonCommandRouter {
             ...(errors.length ? { errors } : {}),
         };
     }
-
-    private async traceSessionHostAction<T>(
-        action: string,
-        args: any,
-        run: () => Promise<T>,
-        summarizeResult?: (result: T) => Record<string, unknown>,
-    ): Promise<T> {
-        const interactionId = typeof args?._interactionId === 'string' ? args._interactionId : undefined;
-        const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : undefined;
-        const requestedPayload: Record<string, unknown> = { action };
-        if (sessionId) requestedPayload.sessionId = sessionId;
-        if (typeof args?.clientId === 'string') requestedPayload.clientId = args.clientId;
-        if (typeof args?.signal === 'string') requestedPayload.signal = args.signal;
-        if (typeof args?.providerType === 'string') requestedPayload.providerType = args.providerType;
-        if (typeof args?.workspace === 'string') requestedPayload.workspace = args.workspace;
-        if (typeof args?.dryRun === 'boolean') requestedPayload.dryRun = args.dryRun;
-
-        recordDebugTrace({
-            interactionId,
-            category: 'session_host',
-            stage: 'action_requested',
-            level: 'info',
-            sessionId,
-            payload: requestedPayload,
-        });
-
-        try {
-            const result = await run();
-            recordDebugTrace({
-                interactionId,
-                category: 'session_host',
-                stage: 'action_result',
-                level: 'info',
-                sessionId,
-                payload: {
-                    ...requestedPayload,
-                    success: true,
-                    ...(summarizeResult ? summarizeResult(result) : {}),
-                },
-            });
-            return result;
-        } catch (error: any) {
-            recordDebugTrace({
-                interactionId,
-                category: 'session_host',
-                stage: 'action_failed',
-                level: 'error',
-                sessionId,
-                payload: {
-                    ...requestedPayload,
-                    error: error?.message || String(error),
-                    failureKind: getWriteConflictOwnerClientId(error) ? 'write_conflict' : 'request_failed',
-                    conflictOwnerClientId: getWriteConflictOwnerClientId(error),
-                },
-            });
-            throw error;
-        }
-    }
-
     /**
      * Unified command routing.
      * Returns result for all commands:
@@ -6372,6 +6171,18 @@ export class DaemonCommandRouter {
             }
         }
 
+        // RF-ROUTER LOW family: low-coupling commands (session-host control, spec
+        // provider-dev, refine/change-impact config) are handled by the registry
+        // before the switch. A hit returns the same CommandRouterResult the inlined
+        // case used to; a miss falls through to the switch unchanged.
+        const lowFamilyHandler = lowFamilyRegistry.get(cmd);
+        if (lowFamilyHandler) {
+            return await lowFamilyHandler({
+                deps: this.deps,
+                getMeshForCommand: this.getMeshForCommand.bind(this),
+            }, args);
+        }
+
         switch (cmd) {
             // ─── CLI / ACP commands ───
             case 'mesh_forward_event': {
@@ -6411,7 +6222,7 @@ export class DaemonCommandRouter {
                 // fail-closes for a remote node when none resolve. We deliberately do NOT
                 // self-stamp this daemon's own id when the field is missing: for a
                 // P2P-relayed remote worker launch, stamping the worker's own id would make
-                // the self-forward gate (mesh-events-coordinator: sameDaemonId) treat the
+                // the self-forward gate (mesh-events-coordinator: daemonIdsEquivalent) treat the
                 // worker as its own coordinator, suppressing the spontaneous completion-event
                 // forward and leaving the event in the pending inbox until a read_chat
                 // reconcile drains it. If the anchor is genuinely absent here, leave it
@@ -6506,174 +6317,6 @@ export class DaemonCommandRouter {
             }
 
             // ─── Logs ───
-            case 'get_logs': {
-                const count = parseInt(args?.count) || parseInt(args?.lines) || 100;
-                const minLevel = args?.minLevel || 'info';
-                const sinceTs = args?.since || 0;
-
-                try {
-                    // Priority 1: ring buffer (fast and structured)
-                    let logs = getRecentLogs(count, minLevel);
-                    if (sinceTs > 0) {
-                        logs = logs.filter((l: any) => l.ts > sinceTs);
-                    }
-                    if (logs.length > 0) {
-                        return { success: true, logs, totalBuffered: logs.length };
-                    }
-                    // Incremental polling must not fall back to unfiltered file text: the file
-                    // format is not timestamp-filterable, and returning its tail makes the UI
-                    // replace structured logs with old raw fallback lines when nothing new exists.
-                    if (sinceTs > 0) {
-                        return { success: true, logs: [], totalBuffered: 0 };
-                    }
-                    // Priority 2: file fallback
-                    if (fs.existsSync(LOG_PATH)) {
-                        const content = fs.readFileSync(LOG_PATH, 'utf-8');
-                        const allLines = content.split('\n');
-                        const recent = allLines.slice(-count).join('\n');
-                        return { success: true, logs: recent, totalLines: allLines.length };
-                    }
-                    return { success: true, logs: [], totalBuffered: 0 };
-                } catch (e: any) {
-                    return { success: false, error: e.message };
-                }
-            }
-
-            case 'get_debug_trace': {
-                const count = parseInt(args?.count) || parseInt(args?.limit) || 100;
-                const sinceTs = Number(args?.since) || 0;
-                const interactionId = typeof args?.interactionId === 'string' ? args.interactionId : undefined;
-                const category = typeof args?.category === 'string' ? args.category : undefined;
-                const trace = getRecentDebugTrace({ interactionId, category, limit: count })
-                    .filter((entry) => !sinceTs || entry.ts > sinceTs);
-                return { success: true, trace, count: trace.length };
-            }
-
-            case 'session_host_get_diagnostics': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const diagnostics = await this.traceSessionHostAction('session_host_get_diagnostics', args, () => this.deps.sessionHostControl!.getDiagnostics({
-                    includeSessions: args?.includeSessions !== false,
-                    limit: Number(args?.limit) || undefined,
-                }), (result) => ({
-                    includeSessions: args?.includeSessions !== false,
-                    limit: Number(args?.limit) || undefined,
-                    ...summarizeSessionHostDiagnostics(result),
-                }));
-                return { success: true, diagnostics };
-            }
-
-            case 'session_host_list_sessions': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessions = await this.traceSessionHostAction('session_host_list_sessions', args, () => this.deps.sessionHostControl!.listSessions(), (records) => summarizeSessionHostRecords(records));
-                return { success: true, sessions };
-            }
-
-            case 'session_host_stop_session': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                const record = await this.traceSessionHostAction('session_host_stop_session', args, () => this.deps.sessionHostControl!.stopSession(sessionId), (result) => summarizeSessionHostRecord(result));
-                return { success: true, record };
-            }
-
-            case 'session_host_resume_session': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                const record = await this.traceSessionHostAction('session_host_resume_session', args, async () => {
-                    const nextRecord = await this.deps.sessionHostControl!.resumeSession(sessionId);
-                    const hosted = toHostedCliRuntimeDescriptor(nextRecord);
-                    if (hosted) {
-                        await this.deps.cliManager.restoreHostedSessions([hosted]);
-                    }
-                    return nextRecord;
-                }, (result) => ({
-                    ...summarizeSessionHostRecord(result),
-                    restoredHostedSession: !!toHostedCliRuntimeDescriptor(result),
-                }));
-                return { success: true, record };
-            }
-
-            case 'session_host_restart_session': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                const record = await this.traceSessionHostAction('session_host_restart_session', args, async () => {
-                    const nextRecord = await this.deps.sessionHostControl!.restartSession(sessionId);
-                    const hosted = toHostedCliRuntimeDescriptor(nextRecord);
-                    if (hosted) {
-                        await this.deps.cliManager.restoreHostedSessions([hosted]);
-                    }
-                    return nextRecord;
-                }, (result) => ({
-                    ...summarizeSessionHostRecord(result),
-                    restoredHostedSession: !!toHostedCliRuntimeDescriptor(result),
-                }));
-                return { success: true, record };
-            }
-
-            case 'session_host_send_signal': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                const signal = typeof args?.signal === 'string' ? args.signal : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                if (!signal) return { success: false, error: 'signal required' };
-                const record = await this.traceSessionHostAction('session_host_send_signal', args, () => this.deps.sessionHostControl!.sendSignal(sessionId, signal), (result) => summarizeSessionHostRecord(result));
-                return { success: true, record };
-            }
-
-            case 'session_host_force_detach_client': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                const clientId = typeof args?.clientId === 'string' ? args.clientId : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                if (!clientId) return { success: false, error: 'clientId required' };
-                const record = await this.traceSessionHostAction('session_host_force_detach_client', args, () => this.deps.sessionHostControl!.forceDetachClient(sessionId, clientId), (result) => summarizeSessionHostRecord(result));
-                return { success: true, record };
-            }
-
-            case 'session_host_prune_duplicate_sessions': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const result = await this.traceSessionHostAction('session_host_prune_duplicate_sessions', args, () => this.deps.sessionHostControl!.pruneDuplicateSessions({
-                    providerType: typeof args?.providerType === 'string' ? args.providerType : undefined,
-                    workspace: typeof args?.workspace === 'string' ? args.workspace : undefined,
-                    dryRun: args?.dryRun === true,
-                }), (value) => summarizeSessionHostPruneResult(value));
-                return { success: true, result };
-            }
-
-            case 'session_host_acquire_write': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                const clientId = typeof args?.clientId === 'string' ? args.clientId : '';
-                const ownerType = args?.ownerType === 'agent' ? 'agent' : 'user';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                if (!clientId) return { success: false, error: 'clientId required' };
-                const record = await this.traceSessionHostAction('session_host_acquire_write', args, () => this.deps.sessionHostControl!.acquireWrite({
-                    sessionId,
-                    clientId,
-                    ownerType,
-                    force: args?.force !== false,
-                }), (result) => ({
-                    ...summarizeSessionHostRecord(result),
-                    ownerType,
-                }));
-                return { success: true, record };
-            }
-
-            case 'session_host_release_write': {
-                if (!this.deps.sessionHostControl) return { success: false, error: 'Session host control unavailable' };
-                const sessionId = typeof args?.sessionId === 'string' ? args.sessionId : '';
-                const clientId = typeof args?.clientId === 'string' ? args.clientId : '';
-                if (!sessionId) return { success: false, error: 'sessionId required' };
-                if (!clientId) return { success: false, error: 'clientId required' };
-                const record = await this.traceSessionHostAction('session_host_release_write', args, () => this.deps.sessionHostControl!.releaseWrite({
-                    sessionId,
-                    clientId,
-                }), (result) => summarizeSessionHostRecord(result));
-                return { success: true, record };
-            }
-
             case 'list_saved_sessions': {
                 const providerType = typeof args?.providerType === 'string'
                     ? args.providerType.trim()
@@ -6889,511 +6532,6 @@ export class DaemonCommandRouter {
                 return { success: true, detectedInfo: results };
             }
 
-            // ─── Set User Name ───
-            case 'set_user_name': {
-                const name = args?.userName;
-                if (!name || typeof name !== 'string') throw new Error('userName required');
-                updateConfig({ userName: name });
-                return { success: true, userName: name };
-            }
-
-            case 'get_status_metadata': {
-                const snapshot = buildStatusSnapshot({
-                    allStates: this.deps.instanceManager.collectAllStates(),
-                    cdpManagers: this.deps.cdpManagers,
-                    providerLoader: this.deps.providerLoader,
-                    detectedIdes: this.deps.detectedIdes.value,
-                    instanceId: this.deps.statusInstanceId || loadConfig().machineId || 'daemon',
-                    version: this.deps.statusVersion || 'unknown',
-                    profile: 'metadata',
-                });
-                // Surface the daemon's build stamp so coordinators (mesh_status)
-                // can detect a running daemon that predates a just-merged fix and
-                // is awaiting deploy/restart. Sibling of `status` to avoid
-                // perturbing the dashboard status snapshot shape.
-                return { success: true, status: snapshot, daemonBuild: getDaemonBuildInfo() };
-            }
-
-            case 'get_machine_runtime_stats': {
-                return {
-                    success: true,
-                    machine: buildMachineInfo('full'),
-                    timestamp: Date.now(),
-                };
-            }
-
-            // Session-info popup data. Aggregates whatever the daemon knows
-            // about a single live session into one envelope so the dashboard
-            // doesn't need to stitch together status + coordinator registry +
-            // session registry on the client. Includes the actual system
-            // prompt that was injected at launch when the session is a mesh
-            // coordinator — that's the "what prompt did the agent see?"
-            // question the info-icon dialog is meant to answer.
-            case 'get_session_info': {
-                const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
-                    : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
-                if (!sessionId) return { success: false, error: 'targetSessionId required' };
-                // Fetch both lookups up front. We used to bail with "Session not
-                // found" when sessionRegistry forgot the SID (auto-cleanup,
-                // daemon restart with the session not yet restored, etc), which
-                // hid the coordinator-side metadata even though the
-                // coordinator-registry still has it. Now we return whichever
-                // side we have. The dashboard renders "no coordinator-specific
-                // prompt" only when *neither* side knows the session.
-                const target = this.deps.sessionRegistry.get(sessionId);
-                const coord = getCoordinatorForSession(sessionId);
-                if (!target && !coord) return { success: false, error: 'Session not found', sessionId };
-                const adapter = target
-                    ? this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter
-                    : undefined;
-                const runtimeMeta = (adapter && typeof (adapter as any).getRuntimeMetadata === 'function')
-                    ? (adapter as any).getRuntimeMetadata()
-                    : undefined;
-                // Launch metadata (args / cwd / extra-env keys / providerSessionId) is
-                // derived from the live adapter's spawn plan; only available while the
-                // adapter is alive (resumed-from-history sessions report nothing here).
-                const launchInfo = (adapter && typeof (adapter as any).getLaunchInfo === 'function')
-                    ? (adapter as any).getLaunchInfo()
-                    : undefined;
-                const providerType = target?.providerType || coord?.cliType || '';
-                const providerMetaForSession = providerType
-                    ? this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType)
-                    : undefined;
-                return {
-                    success: true,
-                    session: {
-                        sessionId,
-                        providerType,
-                        providerName: providerMetaForSession?.name,
-                        transport: target?.transport,
-                        workspace: (target as any)?.workspace || coord?.workspace,
-                        spawnedAtMs: (target as any)?.spawnedAtMs || coord?.startedAt,
-                        // providerSessionId now comes from the live adapter's launch info
-                        // (the registry target never carried it — it was always undefined).
-                        providerSessionId: launchInfo?.providerSessionId || (target as any)?.providerSessionId,
-                        runtimeMetadata: runtimeMeta,
-                        launch: launchInfo,
-                    },
-                    coordinator: coord ? {
-                        meshId: coord.meshId,
-                        startedAt: coord.startedAt,
-                        cliType: coord.cliType,
-                        systemPrompt: coord.systemPrompt,
-                        extraSystemPrompt: coord.extraSystemPrompt,
-                        injection: coord.injection,
-                        mcpConfigPath: coord.mcpConfigPath,
-                    } : null,
-                };
-            }
-
-            case 'get_spec_debug': {
-                const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
-                    : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
-                if (!sessionId) return { success: false, error: 'targetSessionId required' };
-                const target = this.deps.sessionRegistry.get(sessionId);
-                if (!target) return { success: false, error: 'Session not found', sessionId };
-                const adapterObj = this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter;
-                const snapshot = adapterObj
-                    ? (typeof (adapterObj as any).getDebugSnapshot === 'function'
-                        ? (adapterObj as any).getDebugSnapshot()
-                        : typeof (adapterObj as any).getDebugState === 'function'
-                            ? (adapterObj as any).getDebugState()
-                            : null)
-                    : null;
-                return {
-                    success: true,
-                    sessionId,
-                    providerType: target.providerType,
-                    isSpecProvider: snapshot !== null,
-                    snapshot,
-                };
-            }
-
-            // ── Spec source read/write for the debug panel's live editor.
-            //    Lets the dashboard load a session's spec.json, edit it, and
-            //    save it back — the driver's fs.watch picks up the change and
-            //    hot-reloads the FSM with no restart. Writes are confined to
-            //    files under ~/.adhdev/providers to avoid arbitrary fs access.
-            case 'get_spec_source': {
-                const fsm = await import('node:fs');
-                const pathm = await import('node:path');
-                const osm = await import('node:os');
-                const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
-                    : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
-                let specPath = typeof args?.specPath === 'string' ? args.specPath : '';
-                if (!specPath && sessionId) {
-                    const target = this.deps.sessionRegistry.get(sessionId);
-                    const adapterObj = target ? this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter : null;
-                    const snap = adapterObj && typeof (adapterObj as any).getDebugSnapshot === 'function' ? (adapterObj as any).getDebugSnapshot() : null;
-                    specPath = snap?.specPath ?? '';
-                }
-                if (!specPath) return { success: false, error: 'specPath or resolvable targetSessionId required' };
-                // Confine reads to the providers tree, resolving symlinks so a
-                // crafted path can't escape via a symlinked spec file.
-                const safe = resolveSpecPathInProviders(specPath, fsm, pathm, osm);
-                if (!safe.ok) return { success: false, error: safe.error, specPath };
-                try {
-                    const content = fsm.readFileSync(safe.path, 'utf8');
-                    return { success: true, specPath: safe.path, content };
-                } catch (e) {
-                    return { success: false, error: `read failed: ${(e as Error).message}`, specPath };
-                }
-            }
-
-            case 'write_spec_source': {
-                const fsm = await import('node:fs');
-                const pathm = await import('node:path');
-                const osm = await import('node:os');
-                const specPath = typeof args?.specPath === 'string' ? args.specPath : '';
-                const content = typeof args?.content === 'string' ? args.content : '';
-                if (!specPath) return { success: false, error: 'specPath required' };
-                if (!content) return { success: false, error: 'content required' };
-                // Confine writes to the providers tree (symlink-safe — see helper).
-                const safe = resolveSpecPathInProviders(specPath, fsm, pathm, osm);
-                if (!safe.ok) return { success: false, error: safe.error };
-                // Validate JSON + (if v4) FSM structure before writing so a bad
-                // edit can't break the live session — return precise errors.
-                let parsed: unknown;
-                try { parsed = JSON.parse(content); }
-                catch (e) { return { success: false, error: `invalid JSON: ${(e as Error).message}` }; }
-                if ((parsed as any)?.$schema === 'adhdev:cli/spec@4') {
-                    const { validateFsmSpec } = await import('../providers/spec/fsm-loader.js');
-                    const errs = validateFsmSpec(parsed);
-                    if (errs.length) return { success: false, error: 'spec invalid', validationErrors: errs };
-                }
-                try {
-                    fsm.writeFileSync(safe.path, content, 'utf8');
-                    return { success: true, specPath: safe.path };
-                } catch (e) {
-                    return { success: false, error: `write failed: ${(e as Error).message}` };
-                }
-            }
-
-            // ── Validate an in-progress spec (string or object) without writing.
-            //    The form builder calls this on every change so Save can stay
-            //    disabled while there are structural / reference / regex errors.
-            case 'validate_spec': {
-                let parsed: unknown = args?.spec;
-                if (typeof args?.content === 'string') {
-                    try { parsed = JSON.parse(args.content); }
-                    catch (e) { return { success: true, valid: false, errors: [`invalid JSON: ${(e as Error).message}`] }; }
-                }
-                if (!parsed || typeof parsed !== 'object') {
-                    return { success: true, valid: false, errors: ['spec must be an object or content string'] };
-                }
-                const schema = (parsed as any).$schema;
-                if (schema === 'adhdev:cli/spec@4') {
-                    const { validateFsmSpec } = await import('../providers/spec/fsm-loader.js');
-                    const errors = validateFsmSpec(parsed);
-                    return { success: true, valid: errors.length === 0, errors };
-                }
-                // v1/v3 left to the legacy loader path; the builder is v4-only.
-                return { success: true, valid: false, errors: [`unsupported $schema "${schema}" — form builder is v4-only`] };
-            }
-
-            // ── Evaluate a single condition against a live session's current
-            //    screen — powers the editor's "does this match right now?"
-            //    preview. Returns the recursive match tree.
-            case 'eval_condition_preview': {
-                const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
-                    : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
-                if (!sessionId) return { success: false, error: 'targetSessionId required' };
-                if (!args?.condition || typeof args.condition !== 'object') return { success: false, error: 'condition required' };
-                const target = this.deps.sessionRegistry.get(sessionId);
-                if (!target) return { success: false, error: 'Session not found', sessionId };
-                const adapterObj = this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter as any;
-                const snap = adapterObj && typeof adapterObj.getDebugSnapshot === 'function' ? adapterObj.getDebugSnapshot() : null;
-                if (!snap?.screen) return { success: false, error: 'no live screen for session' };
-                // Reconstruct the sections map the spec would resolve. We pass
-                // the spec's sections so section-scoped regexes resolve the same
-                // way they do at runtime; fall back to the on-disk spec.
-                let sectionsDef: Record<string, unknown> | undefined;
-                try {
-                    const fsm2 = await import('node:fs');
-                    if (snap.specPath) {
-                        const raw = JSON.parse(fsm2.readFileSync(snap.specPath, 'utf8'));
-                        sectionsDef = raw?.sections;
-                    }
-                } catch { /* fall back to whole-screen matching */ }
-                const { evaluateConditionPreview } = await import('../providers/spec/fsm-evaluator.js');
-                try {
-                    const result = evaluateConditionPreview(
-                        args.condition,
-                        sectionsDef as any,
-                        snap.screen,
-                        snap.cursorPosition ?? undefined,
-                    );
-                    return { success: true, result, sections: snap.sections ?? null };
-                } catch (e) {
-                    return { success: false, error: `eval failed: ${(e as Error).message}` };
-                }
-            }
-
-            // ── Resolve a sections map against a live session's screen — the
-            //    section editor's "test" button. Returns, for each section id,
-            //    the line range + the text it captures, so the author can SEE
-            //    whether a from_top/until/anchor definition carves the screen
-            //    the way they intend. Accepts an in-progress sections map so it
-            //    previews unsaved edits.
-            case 'resolve_section_preview': {
-                const sessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim()
-                    : typeof args?.sessionId === 'string' ? args.sessionId.trim() : '';
-                if (!sessionId) return { success: false, error: 'targetSessionId required' };
-                if (!args?.sections || typeof args.sections !== 'object') return { success: false, error: 'sections map required' };
-                const target = this.deps.sessionRegistry.get(sessionId);
-                if (!target) return { success: false, error: 'Session not found', sessionId };
-                const adapterObj = this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter as any;
-                const snap = adapterObj && typeof adapterObj.getDebugSnapshot === 'function' ? adapterObj.getDebugSnapshot() : null;
-                if (!snap?.screen) return { success: false, error: 'no live screen for session' };
-                const { resolveSections } = await import('../providers/spec/evaluator.js');
-                try {
-                    const lines = String(snap.screen).split('\n').map((l: string) => l.endsWith('\r') ? l.slice(0, -1) : l);
-                    const resolved = resolveSections(args.sections as any, lines);
-                    return {
-                        success: true,
-                        screenLineCount: lines.length,
-                        sections: resolved.map(s => ({ id: s.id, fromLine: s.fromLine, toLine: s.toLine, text: s.text })),
-                    };
-                } catch (e) {
-                    return { success: false, error: `resolve failed: ${(e as Error).message}` };
-                }
-            }
-
-            // ── User-level coordinator-prompt files (~/.adhdev/coordinator-prompts/).
-            //    These live on this daemon's filesystem and never sync to the
-            //    cloud / other daemons — they're per-machine config. The
-            //    Settings page in the dashboard reads/writes via these two
-            //    commands instead of going through fs from the browser.
-            case 'list_coordinator_prompts': {
-                const fs = await import('node:fs');
-                const path = await import('node:path');
-                const os = await import('node:os');
-                const dir = path.join(os.homedir(), '.adhdev', 'coordinator-prompts');
-                const entries: Record<string, { override: string; append: string }> = {};
-                try {
-                    if (fs.existsSync(dir)) {
-                        for (const name of fs.readdirSync(dir)) {
-                            // Bucket files into <key>.{md|append.md}; ignore others
-                            // so a stray README or .DS_Store doesn't show up.
-                            const matchOverride = name.match(/^([a-zA-Z0-9_.-]+)\.md$/);
-                            const matchAppend = name.match(/^([a-zA-Z0-9_.-]+)\.append\.md$/);
-                            // append-pattern wins when both match (file is `.append.md`).
-                            const m = matchAppend || matchOverride;
-                            if (!m) continue;
-                            const isAppend = !!matchAppend;
-                            const key = m[1];
-                            const full = path.join(dir, name);
-                            let content = '';
-                            try { content = fs.readFileSync(full, 'utf8'); } catch { /* skip */ }
-                            if (!entries[key]) entries[key] = { override: '', append: '' };
-                            if (isAppend) entries[key].append = content;
-                            else entries[key].override = content;
-                        }
-                    }
-                } catch (error: any) {
-                    return { success: false, error: error?.message || String(error) };
-                }
-                return { success: true, dir, entries };
-            }
-
-            case 'write_coordinator_prompt': {
-                const fs = await import('node:fs');
-                const path = await import('node:path');
-                const os = await import('node:os');
-                const key = typeof args?.key === 'string' ? args.key.trim() : '';
-                const kind = args?.kind === 'append' ? 'append' : 'override';
-                const content = typeof args?.content === 'string' ? args.content : '';
-                // Whitelist key chars so a malicious caller can't write
-                // ../../etc/passwd. Same charset readUserPromptFile accepts.
-                if (!key || !/^[a-zA-Z0-9_.-]+$/.test(key)) {
-                    return { success: false, error: 'key must match [a-zA-Z0-9_.-]+' };
-                }
-                const dir = path.join(os.homedir(), '.adhdev', 'coordinator-prompts');
-                const filename = kind === 'append' ? `${key}.append.md` : `${key}.md`;
-                const full = path.join(dir, filename);
-                try {
-                    fs.mkdirSync(dir, { recursive: true });
-                    if (content.trim()) {
-                        fs.writeFileSync(full, content, { encoding: 'utf8', mode: 0o600 });
-                    } else if (fs.existsSync(full)) {
-                        // Empty content = "reset to default" — delete the file
-                        // so the daemon's readUserPromptFile path falls through.
-                        fs.unlinkSync(full);
-                    }
-                    return { success: true, path: full, kind, key };
-                } catch (error: any) {
-                    return { success: false, error: error?.message || String(error) };
-                }
-            }
-
-            case 'mark_session_seen': {
-                const sessionId = args?.sessionId;
-                if (!sessionId || typeof sessionId !== 'string') {
-                    return { success: false, error: 'sessionId is required' };
-                }
-                const currentState = loadState();
-                const prevSeenAt = currentState.sessionReads?.[sessionId] || 0;
-                const sessionEntries = buildSessionEntries(
-                    this.deps.instanceManager.collectAllStates(),
-                    this.deps.cdpManagers,
-                );
-                const targetSession = sessionEntries.find((entry) => entry.id === sessionId);
-                const requestedCompletionMarker = typeof args?.completionMarker === 'string'
-                    ? args.completionMarker.trim()
-                    : '';
-                const completionMarker = requestedCompletionMarker || (targetSession ? getSessionCompletionMarker(targetSession) : '');
-                const requestedProviderSessionId = typeof args?.providerSessionId === 'string'
-                    ? args.providerSessionId.trim()
-                    : '';
-                const providerSessionId = requestedProviderSessionId || targetSession?.providerSessionId;
-                const next = markSessionSeen(
-                    currentState,
-                    sessionId,
-                    typeof args?.seenAt === 'number' ? args.seenAt : Date.now(),
-                    completionMarker,
-                    providerSessionId,
-                );
-                if (READ_DEBUG_ENABLED) {
-                    LOG.info('RecentRead', `mark_session_seen sessionId=${sessionId} seenAt=${String(args?.seenAt || '')} prevSeenAt=${String(prevSeenAt)} nextSeenAt=${String(next.sessionReads?.[sessionId] || 0)} marker=${completionMarker || '-'}`);
-                }
-                saveState(next);
-                this.deps.onStatusChange?.();
-                return {
-                    success: true,
-                    sessionId,
-                    seenAt: next.sessionReads?.[sessionId] || Date.now(),
-                    completionMarker,
-                };
-            }
-
-            case 'delete_notification': {
-                const sessionId = args?.sessionId;
-                const notificationId = typeof args?.notificationId === 'string' ? args.notificationId.trim() : '';
-                if (!sessionId || typeof sessionId !== 'string') {
-                    return { success: false, error: 'sessionId is required' };
-                }
-                if (!notificationId) {
-                    return { success: false, error: 'notificationId is required' };
-                }
-                const sessionEntries = buildSessionEntries(
-                    this.deps.instanceManager.collectAllStates(),
-                    this.deps.cdpManagers,
-                );
-                const targetSession = sessionEntries.find((entry) => entry.id === sessionId);
-                const next = dismissSessionNotification(
-                    loadState(),
-                    sessionId,
-                    notificationId,
-                    targetSession?.providerSessionId,
-                );
-                saveState(next);
-                this.deps.onStatusChange?.();
-                return {
-                    success: true,
-                    sessionId,
-                    notificationId,
-                };
-            }
-
-            case 'mark_notification_unread': {
-                const sessionId = args?.sessionId;
-                const notificationId = typeof args?.notificationId === 'string' ? args.notificationId.trim() : '';
-                if (!sessionId || typeof sessionId !== 'string') {
-                    return { success: false, error: 'sessionId is required' };
-                }
-                if (!notificationId) {
-                    return { success: false, error: 'notificationId is required' };
-                }
-                const sessionEntries = buildSessionEntries(
-                    this.deps.instanceManager.collectAllStates(),
-                    this.deps.cdpManagers,
-                );
-                const targetSession = sessionEntries.find((entry) => entry.id === sessionId);
-                const next = markSessionNotificationUnread(
-                    loadState(),
-                    sessionId,
-                    notificationId,
-                    targetSession?.providerSessionId,
-                );
-                saveState(next);
-                this.deps.onStatusChange?.();
-                return {
-                    success: true,
-                    sessionId,
-                    notificationId,
-                };
-            }
-
-            // ─── Daemon Self-Upgrade ───
-            case 'daemon_upgrade': {
-                LOG.info('Upgrade', 'Remote upgrade requested from dashboard');
-                try {
-                    // Detect package name for upgrade
-                    const isStandalone = this.deps.packageName === '@adhdev/daemon-standalone'
-                        || process.argv[1]?.includes('daemon-standalone');
-                    const pkgName = isStandalone ? '@adhdev/daemon-standalone' : 'adhdev';
-                    const npmSurface = resolveCurrentGlobalInstallSurface({ packageName: pkgName });
-                    const channel = resolveUpgradeChannel(args);
-                    const npmTag = CHANNEL_NPM_TAG[channel];
-
-                    // Check channel-pinned dist-tag and resolve it to a concrete install version.
-                    const latest = String(execNpmCommandSync(['view', `${pkgName}@${npmTag}`, 'version'], { encoding: 'utf-8', timeout: 10000 }, npmSurface)).trim();
-                    LOG.info('Upgrade', `Latest ${pkgName}@${npmTag}: v${latest}`);
-                    updateConfig({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL[channel] } as any);
-                    let currentInstalled: string | null = null;
-                    try {
-                        const currentJson = String(execNpmCommandSync(['ls', '-g', pkgName, '--depth=0', '--json'], {
-                            encoding: 'utf-8',
-                            timeout: 10000,
-                            stdio: ['pipe', 'pipe', 'pipe'],
-                        }, npmSurface)).trim();
-                        const parsed = JSON.parse(currentJson);
-                        currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
-                    } catch {
-                        // ignore ls failures; upgrade can still proceed
-                    }
-
-                    const runningVersion = typeof this.deps.statusVersion === 'string'
-                        ? this.deps.statusVersion.trim().replace(/^v/, '')
-                        : null;
-                    if (currentInstalled === latest && runningVersion === latest) {
-                        LOG.info('Upgrade', `Already on ${channel} channel version v${latest}; skipping install`);
-                        return { success: true, upgraded: false, alreadyLatest: true, version: latest, channel, npmTag };
-                    }
-                    if (currentInstalled === latest && runningVersion && runningVersion !== latest) {
-                        LOG.info('Upgrade', `Installed package is v${latest}, but running daemon is v${runningVersion}; scheduling restart`);
-                    }
-
-                    spawnDetachedDaemonUpgradeHelper({
-                        packageName: pkgName,
-                        targetVersion: latest,
-                        parentPid: process.pid,
-                        restartArgv: process.argv.slice(1),
-                        cwd: process.cwd(),
-                        sessionHostAppName: process.env.ADHDEV_SESSION_HOST_NAME || 'adhdev',
-                    });
-                    LOG.info('Upgrade', `Scheduled detached ${channel} upgrade to v${latest}`);
-
-                    // Exit after the command response has been sent so the helper can replace the package cleanly.
-                    setTimeout(() => {
-                        LOG.info('Upgrade', 'Exiting daemon so detached upgrader can continue...');
-                        process.exit(0);
-                    }, 3000);
-
-                    return { success: true, upgraded: true, version: latest, restarting: true, channel, npmTag };
-                } catch (e: any) {
-                    LOG.error('Upgrade', `Failed: ${e.message}`);
-                    return { success: false, error: e.message };
-                }
-            }
-
-            // ─── Machine Settings ───
-            case 'set_machine_nickname': {
-                const nickname = args?.nickname;
-                updateConfig({ machineNickname: nickname || null });
-                return { success: true };
-            }
-
             // ─── Mesh CRUD (local meshes.json) ───
             case 'list_meshes': {
                 try {
@@ -7724,57 +6862,6 @@ export class DaemonCommandRouter {
                 }
             }
 
-            case 'get_mesh_ledger': {
-                const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
-                if (!meshId) return { success: false, error: 'meshId required' };
-                try {
-                    const { readLedgerEntries, getLedgerSummary } = await import('../mesh/mesh-ledger.js');
-                    const tail = typeof args?.tail === 'number' ? args.tail : 20;
-                    const since = typeof args?.since === 'string' ? args.since : undefined;
-                    const kind = Array.isArray(args?.kind) ? args.kind.filter((k: any) => typeof k === 'string') : undefined;
-                    const entries = readLedgerEntries(meshId, { tail, since, kind });
-                    const summary = getLedgerSummary(meshId);
-                    return { success: true, entries, summary };
-                } catch (e: any) {
-                    return { success: false, error: e.message };
-                }
-            }
-
-            case 'get_mesh_ledger_slice': {
-                const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
-                if (!meshId) return { success: false, error: 'meshId required' };
-                try {
-                    const { readLedgerSlice } = await import('../mesh/mesh-ledger.js');
-                    const kind = Array.isArray(args?.kind) ? args.kind.filter((k: any) => typeof k === 'string') : undefined;
-                    const slice = readLedgerSlice(meshId, {
-                        afterId: typeof args?.afterId === 'string' ? args.afterId : undefined,
-                        since: typeof args?.since === 'string' ? args.since : undefined,
-                        kind,
-                        limit: typeof args?.limit === 'number' ? args.limit : undefined,
-                    });
-                    return { success: true, slice };
-                } catch (e: any) {
-                    return { success: false, error: e.message };
-                }
-            }
-
-            case 'import_mesh_ledger_slice': {
-                const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
-                if (!meshId) return { success: false, error: 'meshId required' };
-                try {
-                    const { appendRemoteLedgerEntries, getLedgerSummary } = await import('../mesh/mesh-ledger.js');
-                    const entries = Array.isArray(args?.entries)
-                        ? args.entries as any[]
-                        : Array.isArray(args?.slice?.entries)
-                            ? args.slice.entries as any[]
-                            : [];
-                    const result = appendRemoteLedgerEntries(meshId, entries as any);
-                    return { success: true, result, summary: getLedgerSummary(meshId) };
-                } catch (e: any) {
-                    return { success: false, error: e.message };
-                }
-            }
-
             case 'get_mesh_queue': {
                 const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
                 if (!meshId) return { success: false, error: 'meshId required' };
@@ -7977,83 +7064,6 @@ export class DaemonCommandRouter {
                 }
             }
 
-            case 'get_mesh_refine_config_schema': {
-                return {
-                    success: true,
-                    schema: MESH_REFINE_CONFIG_SCHEMA,
-                    locations: MESH_REFINE_CONFIG_LOCATIONS,
-                    worktreeBootstrap: {
-                        schema: MESH_WORKTREE_BOOTSTRAP_CONFIG_SCHEMA,
-                        locations: MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS,
-                        sourceOfTruth: 'repo worktree bootstrap config',
-                        runBehavior: 'When present and enabled, clone_mesh_node runs commands after submodule initialization and records status on the worktree node.',
-                    },
-                    sourceOfTruth: 'repo mesh/refine config',
-                    heuristicRole: 'suggestions_only_not_execution_path',
-                };
-            }
-
-            case 'validate_mesh_refine_config': {
-                const workspace = typeof args?.workspace === 'string' ? args.workspace : process.cwd();
-                const mesh = args?.inlineMesh || {};
-                const loaded = args?.config !== undefined
-                    ? { config: args.config, source: 'inline', sourceType: 'mesh_policy' as const }
-                    : loadMeshRefineConfig(mesh, workspace);
-                const validation = loaded.config
-                    ? validateMeshRefineConfig(loaded.config, loaded.source)
-                    : { valid: false, errors: [((loaded as { error?: string }).error) || 'repo mesh/refine config unavailable'], commands: [], rejectedCommands: [] };
-                return { success: validation.valid, ...loaded, ...validation };
-            }
-
-            case 'suggest_mesh_refine_config': {
-                const workspace = typeof args?.workspace === 'string' ? args.workspace : process.cwd();
-                const mesh = args?.inlineMesh || {};
-                return {
-                    success: true,
-                    ...suggestMeshRefineConfig(mesh, workspace),
-                    note: 'Suggestions are heuristic scaffold only; Refinery will not execute them until saved into repo mesh/refine config.',
-                };
-            }
-
-            case 'get_mesh_change_impact_config_schema': {
-                return {
-                    success: true,
-                    schema: CHANGE_IMPACT_CONFIG_SCHEMA,
-                    locations: CHANGE_IMPACT_CONFIG_LOCATIONS,
-                    sourceOfTruth: 'repo change-impact config',
-                    heuristicRole: 'suggestions_only_not_execution_path',
-                    note: 'Declarative config only — JSON/YAML are parsed but never executed. Defines which package/file changes require a daemon rebuild/restart vs. a web-only redeploy vs. nothing.',
-                };
-            }
-
-            case 'validate_mesh_change_impact_config': {
-                const workspace = typeof args?.workspace === 'string' ? args.workspace : process.cwd();
-                if (args?.config !== undefined) {
-                    const validation = validateChangeImpactConfig(args.config, 'inline');
-                    return { success: validation.valid, source: 'inline', sourceType: 'mesh_policy', ...validation };
-                }
-                const loaded = loadChangeImpactConfig(workspace);
-                if (loaded.sourceType === 'repo_file') {
-                    const validation = validateChangeImpactConfig(loaded.config, loaded.source);
-                    return { success: validation.valid, ...loaded, ...validation };
-                }
-                return {
-                    success: false,
-                    ...loaded,
-                    valid: false,
-                    errors: [loaded.error || 'repo change-impact config unavailable'],
-                };
-            }
-
-            case 'suggest_mesh_change_impact_config': {
-                const workspace = typeof args?.workspace === 'string' ? args.workspace : process.cwd();
-                return {
-                    success: true,
-                    ...suggestChangeImpactConfig(workspace),
-                    note: 'Suggestions are heuristic scaffold only; the draft must be reviewed and saved into repo change-impact config before it takes effect. Nothing is executed.',
-                };
-            }
-
             case 'mesh_init': {
                 const workspace = typeof args?.workspace === 'string' && args.workspace.trim() ? args.workspace.trim() : process.cwd();
                 const mesh = args?.inlineMesh || {};
@@ -8143,70 +7153,6 @@ export class DaemonCommandRouter {
                 return result as CommandRouterResult;
             }
 
-            case 'get_mesh_node_logs': {
-                // Coordinator-driven remote log fetch: read a (possibly remote)
-                // daemon's recent log tail over P2P instead of opening a session
-                // and grepping the file by hand. Mirrors fast_forward_mesh_node's
-                // forward pattern — resolve the node, forward to its owning daemon
-                // when remote, otherwise read locally. The reply tail is HARD
-                // byte-bounded and secret-redacted before it leaves the machine.
-                const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
-                const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
-                let nodeDaemonId: string | undefined;
-                if (meshId && nodeId) {
-                    const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
-                    const node = meshRecord?.mesh?.nodes?.find((n: any) => meshNodeIdMatches(n, nodeId));
-                    nodeDaemonId = typeof node?.daemonId === 'string' ? node.daemonId.trim() : undefined;
-                }
-                // _meshDirectDispatch prevents re-forwarding (and P2P self-dial)
-                // once the call lands on the owning daemon — that daemon then reads
-                // its own logs even if the stored daemonId uses a legacy form.
-                const selfDaemonId = this.deps.statusInstanceId;
-                // daemonIdsEquivalent: a legacy-form daemonId resolving to this machine's core is
-                // local — read locally instead of forwarding. Equivalent → local.
-                const isRemote = nodeDaemonId && selfDaemonId && !daemonIdsEquivalent(nodeDaemonId, selfDaemonId);
-                if (isRemote && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
-                    const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId!, 'get_mesh_node_logs', {
-                        ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
-                        _meshDirectDispatch: true,
-                    });
-                    return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
-                }
-
-                // Local read on the owning daemon.
-                const rawTailBytes = Number(args?.tailBytes);
-                const tail = readDaemonLogTail({
-                    date: typeof args?.date === 'string' ? args.date : undefined,
-                    tailBytes: Number.isFinite(rawTailBytes) ? Math.min(rawTailBytes, MAX_TAIL_BYTES) : undefined,
-                    grep: typeof args?.grep === 'string' ? args.grep : undefined,
-                    sinceMs: Number.isFinite(Number(args?.sinceMs)) ? Number(args?.sinceMs) : undefined,
-                });
-                if (!tail.success) {
-                    return {
-                        success: false,
-                        error: tail.error || 'failed to read daemon log tail',
-                        nodeId,
-                        logPath: tail.logPath,
-                        platform: tail.platform,
-                    } as CommandRouterResult;
-                }
-                // SECURITY: redact secrets from every line before returning over P2P.
-                const redactedLines = redactLogLines(tail.lines);
-                return {
-                    success: true,
-                    nodeId,
-                    daemonId: selfDaemonId,
-                    logPath: tail.logPath,
-                    platform: tail.platform,
-                    lines: redactedLines,
-                    lineCount: redactedLines.length,
-                    truncated: tail.truncated,
-                    filtered: tail.filtered,
-                    bytesReturned: tail.bytesReturned,
-                    ...(tail.grep ? { grep: tail.grep } : {}),
-                } as CommandRouterResult;
-            }
-
             case 'refine_mesh_node': {
                 const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
                 const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
@@ -9592,7 +8538,7 @@ export class DaemonCommandRouter {
                         const isSelfNode = Boolean(
                             nodeId && inlineCoordinatorNodeId && nodeId === inlineCoordinatorNodeId,
                         ) || Boolean(
-                            daemonId && (daemonId === localMachineId || daemonId === this.deps.statusInstanceId),
+                            daemonId && (daemonIdsEquivalent(daemonId, localMachineId) || daemonIdsEquivalent(daemonId, this.deps.statusInstanceId)),
                         ) || Boolean(meshRecord?.inline && nodeIndex === 0)
                             || sparseConfiguredCoordinatorNode;
                         const machineIdentity = buildMeshNodeMachineIdentity(node as Record<string, unknown>, {