@adhdev/daemon-core 0.9.82-rc.43 → 0.9.82-rc.430

package/src/commands/med-family/mesh-crud.ts

@@ -0,0 +1,1066 @@
+/**
+ * RF-ROUTER MED family — mesh CRUD + node CRUD commands.
+ *
+ * Mesh records (list/get/create/update/delete_mesh) and node lifecycle
+ * (add/update/remove/clone_mesh_node, cleanup_mesh_sessions,
+ * retry_mesh_node_bootstrap). get_mesh hydrates direct git truth; the mutating
+ * node commands gate on the Mesh Host owner check and bust the aggregate-status
+ * cache; clone/remove/retry forward to the owning daemon for remote worktrees.
+ * Extracted verbatim from executeDaemonCommand; the inline-cache, session/worktree
+ * cleanup and aggregate-status collaborators come from ctx.
+ */
+import { daemonIdsEquivalent, meshNodeIdMatches } from '@adhdev/mesh-shared';
+import { resolveMeshHostStatus, normalizeMeshDaemonRole } from '../../mesh/mesh-host-ownership.js';
+import {
+    loadMeshWorktreeBootstrapConfig,
+    runMeshWorktreeBootstrap,
+    type WorktreeBootstrapState,
+} from '../../mesh/worktree-bootstrap-config.js';
+import { loadRepoSettings } from '../../config/repo-settings.js';
+import { handleMeshForwardEvent, queuePendingMeshCoordinatorEvent } from '../../mesh/mesh-events.js';
+import { noteRecentlyClonedNode } from '../../mesh/mesh-clone-grace.js';
+import { loadConfig } from '../../config/config.js';
+import {
+    hydrateInlineMeshDirectTruth,
+    normalizeProviderRoles,
+    readMeshNodeMachineId,
+} from '../router.js';
+import type { CommandRouterResult } from '../router.js';
+import type { GitRepoIdentity } from '../../git/git-types.js';
+import type { MedFamilyContext, MedFamilyHandler } from './types.js';
+
+/**
+ * Decision for syncing a freshly-cloned worktree's `oss` submodule to its clone
+ * source node, applying resolveWorktreeBaseStartPoint's origin-tip-priority
+ * policy to the submodule.
+ *
+ * On clone, `submodule update --init` checks the worktree's `oss` out at the
+ * gitlink recorded in the FRESH root base — which the root base-stale fix
+ * branches from origin/main, so it is the up-to-date origin tip. The clone
+ * source node's *working* `oss` SHA can lag that tip. The original sync blindly
+ * checked out the source SHA whenever it merely differed, which REWINDS the
+ * submodule back onto the stale source and re-introduces staleness.
+ *
+ * Guard policy (never rewind, mirror the base-start-point resolver):
+ *   - source SHA == worktree SHA            → `noop`
+ *   - source SHA is an ancestor of worktree → `skip_rewind`  (source is behind; keep fresh tip)
+ *   - worktree SHA is an ancestor of source → `advance`      (source strictly newer; safe fast-forward)
+ *   - neither is an ancestor (diverged)     → `skip_diverged` (keep fresh tip; coordinator reconciles)
+ *
+ * Both SHAs must already be resolvable in `ossCtx` (the caller fetches the
+ * source SHA first). A non-1 git exit (unresolvable SHA / real failure) is
+ * rethrown so the caller can fall back to keeping the fresh worktree HEAD.
+ */
+export type OssCloneSyncAction = 'noop' | 'advance' | 'skip_rewind' | 'skip_diverged';
+
+export async function decideOssCloneSync(
+    ossCtx: GitRepoIdentity,
+    worktreeOssSha: string,
+    sourceSha: string,
+    rg: (ctx: GitRepoIdentity, argv: string[], opts?: { timeoutMs?: number }) => Promise<unknown>,
+): Promise<OssCloneSyncAction> {
+    if (!worktreeOssSha || !sourceSha || worktreeOssSha === sourceSha) return 'noop';
+
+    const isAncestor = async (ancestor: string, descendant: string): Promise<boolean> => {
+        try {
+            await rg(ossCtx, ['merge-base', '--is-ancestor', ancestor, descendant], { timeoutMs: 10000 });
+            return true;
+        } catch (err: any) {
+            // `merge-base --is-ancestor` exits 1 for a clean "not an ancestor".
+            // Any other exit (128 = unresolvable commit, etc.) is a real failure.
+            if (err?.exitCode === 1 || err?.code === 1) return false;
+            throw err;
+        }
+    };
+
+    // Source is an ancestor of the fresh worktree tip → checking it out rewinds.
+    if (await isAncestor(sourceSha, worktreeOssSha)) return 'skip_rewind';
+    // Worktree tip is an ancestor of source → source is strictly newer → safe FF.
+    if (await isAncestor(worktreeOssSha, sourceSha)) return 'advance';
+    // Neither is an ancestor → diverged → keep the fresh worktree HEAD.
+    return 'skip_diverged';
+}
+
+export const meshCrudHandlers: Record<string, MedFamilyHandler> = {
+    list_meshes: async (_ctx: MedFamilyContext, _args: any) => {
+        try {
+            const { listMeshes } = await import('../../config/mesh-config.js');
+            return { success: true, meshes: listMeshes() };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    get_mesh: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+        if (!meshRecord?.mesh) return { success: false, error: 'Mesh not found' };
+
+        const requireDirectPeerTruth = args?.requireDirectPeerTruth === true;
+        // Only an explicit refresh fans out a blocking peer probe.
+        // Default loads are satisfied from held standing-state git truth.
+        const probeRemotePeers = args?.refresh === true || args?.forceRefresh === true;
+        const directTruth = await hydrateInlineMeshDirectTruth({
+            mesh: meshRecord.mesh,
+            meshSource: meshRecord.source,
+            dispatchMeshCommand: ctx.deps.dispatchMeshCommand,
+            getMeshPeerConnectionStatus: ctx.deps.getMeshPeerConnectionStatus,
+            statusInstanceId: ctx.deps.statusInstanceId,
+            localMachineId: loadConfig().machineId || '',
+            probeRemotePeers,
+            probeCache: ctx.meshGitProbeCache,
+        });
+        const directTruthSatisfied = meshRecord.source !== 'inline_bootstrap' || directTruth.directEvidenceCount > 0;
+        const sourceOfTruth = {
+            membership: meshRecord.source === 'inline_cache'
+                ? 'coordinator_inline_mesh_cache'
+                : meshRecord.source === 'local_config'
+                    ? 'local_mesh_config'
+                    : 'inline_bootstrap_snapshot',
+            coordinatorOwnsLiveTruth: directTruthSatisfied,
+            directPeerTruth: {
+                required: requireDirectPeerTruth,
+                satisfied: directTruthSatisfied,
+                directEvidenceCount: directTruth.directEvidenceCount,
+                localConfirmedCount: directTruth.localConfirmedCount,
+                peerAttemptedCount: directTruth.peerAttemptedCount,
+                peerConfirmedCount: directTruth.peerConfirmedCount,
+                unavailableNodeIds: directTruth.unavailableNodeIds,
+            },
+        };
+        if (requireDirectPeerTruth && !directTruthSatisfied) {
+            return {
+                success: false,
+                code: 'mesh_direct_peer_truth_unavailable',
+                error: 'Selected coordinator could not confirm direct mesh truth yet. Bootstrap inventory stays unavailable until direct get_mesh probes succeed.',
+                sourceOfTruth,
+            };
+        }
+        return { success: true, mesh: meshRecord.mesh, sourceOfTruth };
+    },
+
+    create_mesh: async (_ctx: MedFamilyContext, args: any) => {
+        const name = typeof args?.name === 'string' ? args.name.trim() : '';
+        const repoIdentity = typeof args?.repoIdentity === 'string' ? args.repoIdentity.trim() : '';
+        const repoRemoteUrl = typeof args?.repoRemoteUrl === 'string' ? args.repoRemoteUrl.trim() : undefined;
+        const defaultBranch = typeof args?.defaultBranch === 'string' ? args.defaultBranch.trim() : undefined;
+        if (!name) return { success: false, error: 'name required' };
+        try {
+            const { createMesh } = await import('../../config/mesh-config.js');
+            const meshHost = args?.meshHost && typeof args.meshHost === 'object' && !Array.isArray(args.meshHost)
+                ? args.meshHost
+                : undefined;
+            const mesh = createMesh({ name, repoIdentity, repoRemoteUrl, defaultBranch, policy: args?.policy, meshHost });
+            return { success: true, mesh };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    update_mesh: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        try {
+            const { updateMesh } = await import('../../config/mesh-config.js');
+            const patch: Record<string, unknown> = {};
+            if (typeof args?.name === 'string') patch.name = args.name;
+            if (typeof args?.defaultBranch === 'string') patch.defaultBranch = args.defaultBranch;
+            if (args?.policy && typeof args.policy === 'object' && !Array.isArray(args.policy)) patch.policy = args.policy;
+            if (args?.coordinator && typeof args.coordinator === 'object' && !Array.isArray(args.coordinator)) patch.coordinator = args.coordinator;
+            if (args?.meshHost && typeof args.meshHost === 'object' && !Array.isArray(args.meshHost)) patch.meshHost = args.meshHost;
+            if (!Object.keys(patch).length) return { success: false, error: 'No updates provided' };
+            const mesh = updateMesh(meshId, patch as any);
+            if (!mesh) return { success: false, error: 'Mesh not found' };
+            ctx.inlineMeshCache.set(meshId, mesh);
+            ctx.invalidateAggregateMeshStatus(meshId);
+            return { success: true, mesh };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    // OPSRULES — emit a `.adhdev/mesh.json` DRAFT from the machine-local mesh
+    // entry. This is an export scaffold for the operator to review and commit to
+    // the repo, NOT an automatic data migration: nothing is written to disk and
+    // meshes.json is untouched. The returned `scaffold` (object) + `scaffoldJson`
+    // (2-space text) capture the coordinator prompt override/append (policy is
+    // machine-local and is intentionally NOT exported into mesh.json).
+    export_mesh_json_config: async (_ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        try {
+            const { getMesh } = await import('../../config/mesh-config.js');
+            const mesh = getMesh(meshId);
+            if (!mesh) return { success: false, error: 'Mesh not found' };
+            const { buildMeshJsonConfigScaffold, serializeMeshJsonConfigScaffold, MESH_JSON_CONFIG_LOCATIONS } =
+                await import('../../config/mesh-json-config.js');
+            const scaffold = buildMeshJsonConfigScaffold(mesh);
+            const scaffoldJson = serializeMeshJsonConfigScaffold(scaffold);
+            return {
+                success: true,
+                meshId,
+                suggestedPath: MESH_JSON_CONFIG_LOCATIONS[0],
+                scaffold,
+                scaffoldJson,
+                note: 'Draft only — review and commit to the repo at the suggested path. Nothing was written; meshes.json is unchanged (local-wins).',
+            };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    delete_mesh: async (_ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        try {
+            const { deleteMesh } = await import('../../config/mesh-config.js');
+            const deleted = deleteMesh(meshId);
+            return { success: true, deleted };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    // ─── MAGI panels (machine-local config, sibling to meshes) ───────────────
+    // Panels live in ~/.adhdev/meshes.json `magiPanels` and are pure local config
+    // (no mesh ownership). These three handlers mirror list_meshes/create_mesh/
+    // update_mesh: dynamic-import the already-exported mesh-config accessors and
+    // surface normalizeMagiPanel's structured error codes (invalid_magi_panel,
+    // magi_panel_exists) verbatim so the dashboard can render them.
+    //
+    // Permission: magi_panel_set / magi_panel_remove are WRITE commands. They are
+    // intentionally NOT listed in canPeerUsePrivilegedShareCommand (daemon-cloud
+    // data-channel-router), so a peer holding ANY share permission hits its
+    // `default → false` branch — identical owner-only gating to create_mesh /
+    // update_mesh / list_meshes (none of which are listed there either). A trusted
+    // peer (no permission = the owner) passes the top `!permission → true` guard.
+    // Mirror, don't invent: do not add a new policy tier here.
+    //
+    // Resolvability (coupling / stale / available) is deliberately NOT computed
+    // here: buildMagiFanoutPlan lives in mcp-server, unreachable from daemon-core.
+    // magi_panel_list returns the raw definitions only; the dashboard derives
+    // member resolvability client-side (web-core MagiPanelManager, reusing the
+    // MagiGroupRow coupling logic) against live mesh_status.
+    magi_panel_list: async (_ctx: MedFamilyContext, _args: any) => {
+        try {
+            const { listMagiPanels } = await import('../../config/mesh-config.js');
+            return { success: true, panels: listMagiPanels() };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    magi_panel_set: async (_ctx: MedFamilyContext, args: any) => {
+        const name = typeof args?.name === 'string' ? args.name.trim() : '';
+        if (!name) return { success: false, error: 'invalid_magi_panel: panel name is required' };
+        try {
+            const { upsertMagiPanel } = await import('../../config/mesh-config.js');
+            // normalizeMagiPanel (invoked inside upsertMagiPanel) validates members,
+            // enforces MAX_MAGI_PANEL_MEMBERS, and clamps replica counts. Its
+            // invalid_magi_panel / magi_panel_exists messages flow back as `error`.
+            const panel = upsertMagiPanel(name, args?.panel, { overwrite: args?.overwrite === true });
+            return { success: true, name, panel };
+        } catch (e: any) {
+            // Surface the structured code (invalid_magi_panel: … / magi_panel_exists: …)
+            // verbatim so the editor can map it to a field-level message.
+            return { success: false, error: e.message };
+        }
+    },
+
+    magi_panel_remove: async (_ctx: MedFamilyContext, args: any) => {
+        const name = typeof args?.name === 'string' ? args.name.trim() : '';
+        if (!name) return { success: false, error: 'invalid_magi_panel: panel name is required' };
+        try {
+            const { removeMagiPanel } = await import('../../config/mesh-config.js');
+            const removed = removeMagiPanel(name);
+            return { success: true, removed };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    add_mesh_node: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const workspace = typeof args?.workspace === 'string' ? args.workspace.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        if (!workspace) return { success: false, error: 'workspace required' };
+        const ownerFailure = await ctx.requireMeshHostMutationOwner(meshId, args?.inlineMesh, 'node addition');
+        if (ownerFailure) return ownerFailure;
+        try {
+            const { addNode } = await import('../../config/mesh-config.js');
+            const providerPriority = Array.isArray(args?.providerPriority)
+                ? args.providerPriority.map((type: any) => typeof type === 'string' ? type.trim() : '').filter(Boolean)
+                : [];
+            const readOnly = args?.readOnly === true;
+            const providerRoles = normalizeProviderRoles(args?.providerRoles);
+            const policy = {
+                ...(readOnly ? { readOnly: true } : {}),
+                ...(providerPriority.length ? { providerPriority } : {}),
+                ...(providerRoles.length ? { providerRoles } : {}),
+            };
+            const role = normalizeMeshDaemonRole(args?.role);
+            const daemonId = typeof args?.daemonId === 'string' && args.daemonId.trim() ? args.daemonId.trim() : undefined;
+            const machineId = typeof args?.machineId === 'string' && args.machineId.trim() ? args.machineId.trim() : undefined;
+            const repoRoot = typeof args?.repoRoot === 'string' && args.repoRoot.trim() ? args.repoRoot.trim() : undefined;
+            const node = addNode(meshId, {
+                workspace,
+                ...(repoRoot ? { repoRoot } : {}),
+                ...(daemonId ? { daemonId } : {}),
+                ...(machineId ? { machineId } : {}),
+                ...(policy ? { policy } : {}),
+                ...(role ? { role } : {}),
+            });
+            if (!node) return { success: false, error: 'Mesh not found' };
+            // mesh_status hands back a coordinator-memory aggregate
+            // snapshot keyed on (meshId, queueRevision). Adding a
+            // node touches neither, so without an explicit cache
+            // bust the dashboard graph keeps rendering the pre-add
+            // node list (empty for a fresh mesh) even after the
+            // user clicks Refresh.
+            ctx.invalidateAggregateMeshStatus(meshId);
+            return { success: true, node };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    update_mesh_node: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
+        if (!meshId || !nodeId) return { success: false, error: 'meshId and nodeId required' };
+        const ownerFailure = await ctx.requireMeshHostMutationOwner(meshId, args?.inlineMesh, 'node update');
+        if (ownerFailure) return ownerFailure;
+        try {
+            const { updateNode } = await import('../../config/mesh-config.js');
+            const policy = args?.policy && typeof args.policy === 'object' && !Array.isArray(args.policy)
+                ? { ...(args.policy as Record<string, unknown>) }
+                : {};
+            if (Array.isArray(args?.providerPriority)) {
+                const providerPriority = args.providerPriority
+                    .map((type: any) => typeof type === 'string' ? type.trim() : '')
+                    .filter(Boolean);
+                delete (policy as any).provider_priority;
+                if (providerPriority.length) {
+                    (policy as any).providerPriority = providerPriority;
+                } else {
+                    delete (policy as any).providerPriority;
+                }
+            }
+            // providerRoles: per-(node, provider) role label + maxParallel cap.
+            // Passing an explicit (possibly empty) array clears/replaces the
+            // declarations; omitting the arg leaves any value already on policy
+            // untouched (a full policy object passed by the caller still carries it).
+            if (Array.isArray(args?.providerRoles)) {
+                const providerRoles = normalizeProviderRoles(args.providerRoles);
+                if (providerRoles.length) {
+                    (policy as any).providerRoles = providerRoles;
+                } else {
+                    delete (policy as any).providerRoles;
+                }
+            }
+            const patch: Record<string, unknown> = { policy: policy as any };
+            if (typeof args?.systemPrompt === 'string') {
+                const trimmed = (args.systemPrompt as string).trim();
+                patch.systemPrompt = trimmed || undefined;
+            } else if (args?.systemPrompt === null) {
+                patch.systemPrompt = undefined;
+            }
+            const node = updateNode(meshId, nodeId, patch as any);
+            if (!node) return { success: false, error: 'Mesh node not found' };
+            // Provider priority / systemPrompt changes don't touch
+            // the queue revision, so without a manual bust the
+            // cached aggregate keeps surfacing pre-update values
+            // (priority chip, coordinator prompt preview, etc.).
+            ctx.invalidateAggregateMeshStatus(meshId);
+            return { success: true, node };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    cleanup_mesh_sessions: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
+        if (!meshId || !nodeId) return { success: false, error: 'meshId and nodeId required' };
+        const ownerFailure = await ctx.requireMeshHostMutationOwner(meshId, args?.inlineMesh, 'node removal');
+        if (ownerFailure) return ownerFailure;
+        try {
+            // preferInline so inline-cache-only clone nodes resolve (matches owner check above).
+            const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+            const mesh = meshRecord?.mesh;
+            if (!mesh) return { success: false, error: 'Mesh not found' };
+            const node = mesh?.nodes?.find((n: any) => meshNodeIdMatches(n, nodeId));
+            if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
+            const mode = ctx.normalizeMeshSessionCleanupMode(args?.mode ?? mesh?.policy?.sessionCleanupOnNodeRemove);
+            const sessionIds = Array.isArray(args?.sessionIds)
+                ? args.sessionIds.map((id: any) => typeof id === 'string' ? id.trim() : '').filter(Boolean)
+                : undefined;
+            // MAGI post-review auto-cleanup routes through this same command with
+            // source:'magi_session_cleanup' and a per-session autoLaunchedForQueueTaskId
+            // map, which gates cleanup to sessions THIS fan-out actually auto-launched.
+            const source = args?.source === 'magi_session_cleanup' ? 'magi_session_cleanup' : 'mesh_cleanup_sessions';
+            const requireAutoLaunchedForTaskIds = (args?.requireAutoLaunchedForTaskIds
+                && typeof args.requireAutoLaunchedForTaskIds === 'object'
+                && !Array.isArray(args.requireAutoLaunchedForTaskIds))
+                ? args.requireAutoLaunchedForTaskIds as Record<string, string>
+                : undefined;
+            const result = await ctx.cleanupMeshSessions({
+                meshId,
+                nodeId,
+                node,
+                mode,
+                sessionIds,
+                dryRun: args?.dryRun === true,
+                source,
+                requireAutoLaunchedForTaskIds,
+            });
+            return result;
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    remove_mesh_node: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
+        if (!meshId || !nodeId) return { success: false, error: 'meshId and nodeId required' };
+        try {
+            // preferInline so removal can resolve inline-cache-only clone worktree nodes.
+            const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+            const mesh = meshRecord?.mesh;
+            const node = mesh?.nodes?.find((n: any) => meshNodeIdMatches(n, nodeId));
+
+            // Guard: refuse to remove the coordinator's OWN local base node
+            // (same machine, NOT a worktree). Removing it breaks live mesh
+            // membership — the coordinator can no longer be reached and has
+            // to be restarted. Worktree clones are always safe to remove;
+            // only the non-worktree node bound to this daemon is protected.
+            // An explicit force:true overrides for intentional mesh teardown.
+            if (node && !args?._meshDirectDispatch && node.isLocalWorktree !== true && args?.force !== true) {
+                const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : '';
+                const nodeMachineId = readMeshNodeMachineId(node as Record<string, unknown>) || '';
+                const selfDaemonId = ctx.deps.statusInstanceId || '';
+                const selfMachineId = (() => { try { return loadConfig().machineId || ''; } catch { return ''; } })();
+                // Identity match is form-safe: a daemon answers to the same machine
+                // under interchangeable id forms (bare `mach_X`, cloud `daemon_mach_X`,
+                // standalone `standalone_mach_X`). statusInstanceId/loadConfig().machineId
+                // and the node's stored daemonId/machineId frequently hold DIFFERENT forms
+                // of the same machine, so a raw `===` would miss the self-match and let the
+                // coordinator delete its own live base node (the very accident this guard
+                // exists to prevent). daemonIdsEquivalent collapses every form to its
+                // machine core before comparing, so a same-machine match is caught
+                // regardless of which form each side carries. This only widens matches
+                // (every raw-`===` hit still matches) — fail-open → fail-closed.
+                const isCoordinatorBaseNode =
+                    (!!selfDaemonId && (daemonIdsEquivalent(nodeDaemonId, selfDaemonId) || daemonIdsEquivalent(nodeMachineId, selfDaemonId)))
+                    || (!!selfMachineId && (daemonIdsEquivalent(nodeDaemonId, selfMachineId) || daemonIdsEquivalent(nodeMachineId, selfMachineId)));
+                if (isCoordinatorBaseNode) {
+                    return {
+                        success: false,
+                        removed: false,
+                        code: 'mesh_remove_coordinator_base_node_protected',
+                        error: `Refusing to remove the coordinator's own base node '${typeof node.workspace === 'string' ? node.workspace : nodeId}'. `
+                            + `It is the local non-worktree node bound to this coordinator daemon; removing it breaks live mesh membership and forces a restart.`,
+                        recoveryHint: 'Remove worktree clone nodes instead, or pass force:true only if you are intentionally tearing down this mesh and accept that the coordinator must be re-registered/restarted.',
+                    };
+                }
+            }
+
+            // Default worktree session cleanup ON: when the caller OMITS a mode and the
+            // node is a local worktree, default to 'stop_and_delete' instead of the mesh
+            // policy ('preserve' by default). A worktree's chat session has no reason to
+            // outlive the worktree's node + directory + branch, and leaving it on
+            // 'preserve' is what orphaned chats after a worktree remove. An explicit mode
+            // (including an explicit 'preserve') is always honored — only the OMITTED case
+            // changes, and only for worktrees. Base nodes keep arg ?? policy ?? preserve.
+            const explicitCleanupMode = args?.sessionCleanupMode ?? args?.session_cleanup_mode;
+            const sessionCleanupMode = ctx.normalizeMeshSessionCleanupMode(
+                explicitCleanupMode
+                ?? (node?.isLocalWorktree === true ? 'stop_and_delete' : undefined)
+                ?? mesh?.policy?.sessionCleanupOnNodeRemove,
+            );
+            // Explicit sessionIds (e.g. supplied by refine auto-cleanup) bypass the
+            // workspace-only-match guard so a delegate session that lacks a
+            // meta.meshNodeId binding can still be stopped/deleted.
+            const explicitSessionIds = Array.isArray(args?.sessionIds)
+                ? (args.sessionIds as unknown[]).filter((v): v is string => typeof v === 'string' && v.trim().length > 0).map(v => v.trim())
+                : undefined;
+            // Precheck-first: for a LOCAL worktree removal, validate removability
+            // with a purely non-destructive precheck BEFORE touching the session.
+            // The session cleanup below is destructive and irreversible
+            // (stop_and_delete), so a refusal that fires only AFTER it — as the old
+            // ordering did when removeWorktree rejected a dirty worktree — orphaned
+            // the delegated session. Running the precheck here means a refusal
+            // (dirty worktree, missing/mismatched metadata, etc.) returns with the
+            // session left fully intact. Remote-forwarded worktrees are prechecked
+            // on the owning daemon (it runs this same handler), so we only gate the
+            // local case here. Success/skip cases return ok:true and fall through to
+            // the unchanged normal flow.
+            if (node?.isLocalWorktree) {
+                const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
+                const isRemoteWorktree = nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, ctx.deps.statusInstanceId) && ctx.deps.dispatchMeshCommand
+                    && !args?._meshDirectDispatch;
+                if (!isRemoteWorktree) {
+                    const precheck = await ctx.precheckLocalWorktreeRemovable({ mesh, node, nodeId, force: args?.force === true });
+                    if (precheck.ok === false) {
+                        return {
+                            success: false,
+                            removed: false,
+                            code: precheck.code,
+                            error: precheck.error,
+                            recoveryHint: precheck.recoveryHint,
+                            // No sessionCleanup key: the session was deliberately NOT
+                            // touched. worktreeCleanup mirrors the destructive path's
+                            // refusal shape so existing callers see the same code.
+                            worktreeCleanup: { success: false, code: precheck.code, error: precheck.error, recoveryHint: precheck.recoveryHint },
+                        };
+                    }
+                }
+            }
+
+            let sessionCleanup: Record<string, unknown> | undefined;
+            if (node && sessionCleanupMode !== 'preserve') {
+                sessionCleanup = await ctx.cleanupMeshSessions({
+                    meshId,
+                    nodeId,
+                    node,
+                    mode: sessionCleanupMode,
+                    ...(explicitSessionIds && explicitSessionIds.length > 0 ? { sessionIds: explicitSessionIds } : {}),
+                    source: 'mesh_remove_node',
+                });
+                if (sessionCleanup.success === false) return { success: false, removed: false, sessionCleanup };
+            }
+
+            let worktreeCleanup: Record<string, unknown> | undefined;
+            if (node?.isLocalWorktree) {
+                const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
+                // daemonIdsEquivalent: an equivalent-form daemonId is this machine —
+                // clean up locally, do not forward. Equivalent → local.
+                const isRemoteWorktree = nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, ctx.deps.statusInstanceId) && ctx.deps.dispatchMeshCommand
+                    && !args?._meshDirectDispatch;
+                if (isRemoteWorktree) {
+                    // Worktree lives on a different machine — ask that daemon to clean it up.
+                    // _meshDirectDispatch prevents re-forwarding when stored daemonId uses legacy format.
+                    const forwarded = await ctx.deps.dispatchMeshCommand!(nodeDaemonId!, 'remove_mesh_node', {
+                        ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                        _meshDirectDispatch: true,
+                    });
+                    return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+                }
+                const cleanupResult = await ctx.cleanupLocalWorktreeNode({ mesh, node, nodeId, force: args?.force === true });
+                // De-gating: membership removal is NOT gated on the worktree
+                // directory actually being deleted. cleanupLocalWorktreeNode now
+                // returns success:true (with a residue flag) whenever the path is
+                // proven managed and the only remaining problem is leftover
+                // directory bytes (e.g. Windows EINVAL). A success:false here means
+                // a genuinely-unsafe condition — missing metadata, a non-managed /
+                // unexpected path, a branch mismatch, a dirty worktree, or an
+                // unverified force fallback — and those still block removal.
+                if (cleanupResult.success === false) {
+                    return {
+                        success: false,
+                        removed: false,
+                        code: cleanupResult.code,
+                        error: cleanupResult.error,
+                        recoveryHint: cleanupResult.recoveryHint,
+                        ...(sessionCleanup ? { sessionCleanup } : {}),
+                        worktreeCleanup: cleanupResult,
+                    };
+                }
+                worktreeCleanup = cleanupResult;
+            }
+
+            let removed = false;
+            if (meshRecord?.inline) {
+                removed = ctx.removeInlineMeshNode(meshId, mesh, nodeId);
+                // Inline meshes share the same aggregate snapshot cache as
+                // local-config meshes; without this bust the removed node
+                // keeps showing up in the dashboard graph until the cache
+                // ages out on its own.
+                if (removed) ctx.invalidateAggregateMeshStatus(meshId);
+                // Node was already absent from the inline mesh (e.g. removed by a
+                // prior refine cleanup). Treat as removed so caller gets removed:true.
+                if (!removed && !node) removed = true;
+            } else {
+                const { removeNode } = await import('../../config/mesh-config.js');
+                removed = removeNode(meshId, nodeId);
+                // Node already absent from config (e.g. removed by a prior refine
+                // cleanup after a successful Refinery merge). Treat as removed so
+                // the response is accurate.
+                if (!removed && !node) removed = true;
+                if (removed) ctx.invalidateAggregateMeshStatus(meshId);
+            }
+
+            // Record in task ledger
+            if (removed) {
+                try {
+                    const { appendLedgerEntry } = await import('../../mesh/mesh-ledger.js');
+                    appendLedgerEntry(meshId, {
+                        kind: 'node_removed',
+                        nodeId,
+                        payload: {
+                            worktree: !!node?.isLocalWorktree,
+                            sessionCleanupMode,
+                            workspace: typeof node?.workspace === 'string' ? node.workspace : undefined,
+                            daemonId: typeof node?.daemonId === 'string' ? node.daemonId : undefined,
+                            worktreeBranch: typeof node?.worktreeBranch === 'string' ? node.worktreeBranch : undefined,
+                            worktreeCleanupFallback: typeof worktreeCleanup?.fallback === 'string' ? worktreeCleanup.fallback : undefined,
+                            forced: worktreeCleanup?.forced === true ? true : undefined,
+                            forceFallbackReason: typeof worktreeCleanup?.reason === 'string' ? worktreeCleanup.reason : undefined,
+                            branchRefDeleted: typeof worktreeCleanup?.branchRefDeleted === 'boolean' ? worktreeCleanup.branchRefDeleted : undefined,
+                            branchRefReason: typeof worktreeCleanup?.branchRefReason === 'string' ? worktreeCleanup.branchRefReason : undefined,
+                        },
+                    });
+                } catch { /* ledger append is best-effort */ }
+            }
+
+            // Surface leftover-directory residue at the top level so callers
+            // see the node was dropped from the mesh even though the worktree
+            // directory could not be fully removed (best-effort, non-gating).
+            const residueWarning = worktreeCleanup?.residue === true && typeof worktreeCleanup?.residueWarning === 'string'
+                ? worktreeCleanup.residueWarning
+                : undefined;
+
+            // Surface a preserved-branch warning at the top level so callers see
+            // that the branch ref was intentionally NOT deleted (unmerged work is
+            // never silently dropped). When the branch ref WAS deleted, the nested
+            // worktreeCleanup.branchRefDeleted flag already records it.
+            const branchRefWarning = typeof worktreeCleanup?.branchRefWarning === 'string'
+                ? worktreeCleanup.branchRefWarning
+                : undefined;
+
+            // Orphan guard: if the session cleanup still left any LIVE session skipped
+            // (e.g. a future skip reason, or a workspace-only session on a base node),
+            // surface it at the top level so the caller knows a manual mesh_cleanup_sessions
+            // is still required for those sessionIds. Without this, a skipped-live session
+            // silently outlives a removed node (the very NODE-REMOVE-SESSION-ORPHAN bug).
+            const skippedLiveSessionIds = Array.isArray(sessionCleanup?.skippedLiveSessionIds)
+                ? (sessionCleanup!.skippedLiveSessionIds as unknown[]).filter((v): v is string => typeof v === 'string')
+                : [];
+            const orphanedSessionsRemaining = skippedLiveSessionIds.length > 0;
+            const orphanNextAction = orphanedSessionsRemaining
+                ? `Live session(s) [${skippedLiveSessionIds.join(', ')}] were skipped and still survive this node removal. `
+                    + `Run mesh_cleanup_sessions with mode:'stop_and_delete' and sessionIds:[${skippedLiveSessionIds.map(id => `'${id}'`).join(', ')}] to release them.`
+                : undefined;
+            return {
+                success: true,
+                removed,
+                ...(residueWarning ? { residueWarning } : {}),
+                ...(branchRefWarning ? { branchRefWarning } : {}),
+                ...(sessionCleanup ? { sessionCleanup } : {}),
+                ...(worktreeCleanup ? { worktreeCleanup } : {}),
+                ...(orphanedSessionsRemaining
+                    ? { orphanedSessionsRemaining: true, nextAction: orphanNextAction }
+                    : {}),
+            };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    clone_mesh_node: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const sourceNodeId = typeof args?.sourceNodeId === 'string' ? args.sourceNodeId.trim() : '';
+        const branch = typeof args?.branch === 'string' ? args.branch.trim() : '';
+        const baseBranch = typeof args?.baseBranch === 'string' ? args.baseBranch.trim() : undefined;
+        if (!meshId) return { success: false, error: 'meshId required' };
+        if (!sourceNodeId) return { success: false, error: 'sourceNodeId required' };
+        if (!branch) return { success: false, error: 'branch required' };
+        const ownerFailure = await ctx.requireMeshHostMutationOwner(meshId, args?.inlineMesh, 'worktree clone');
+        if (ownerFailure) return ownerFailure;
+
+        try {
+            // Resolve with preferInline so the clone writes the new node into the
+            // same representation that get_mesh reads back. The MCP coordinator
+            // passes inlineMesh on every mesh command, so when it owns an inline
+            // mesh the membership read path (get_mesh, preferInline: true) returns
+            // the inline cache. Without preferInline here, clone could resolve to a
+            // local-config mesh and write the node only to config — leaving the
+            // inline cache (and therefore get_mesh / refreshMeshFromDaemon) without
+            // the node, so the new worktree node is never visible in live mesh
+            // membership even though worktree_bootstrap_complete fires.
+            const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+            const mesh = meshRecord?.mesh;
+            if (!mesh) return { success: false, error: 'Mesh not found' };
+
+            const sourceNode = mesh.nodes?.find((n: any) => meshNodeIdMatches(n, sourceNodeId));
+            if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
+
+            // Forward to the source node's daemon if it's on a different machine.
+            // _meshDirectDispatch prevents infinite re-forwarding when the stored daemonId
+            // uses a legacy format that doesn't match the receiving daemon's statusInstanceId.
+            const sourceDaemonId = typeof sourceNode.daemonId === 'string' ? sourceNode.daemonId.trim() : undefined;
+            // daemonIdsEquivalent: an equivalent-form source daemonId is this machine —
+            // clone locally, do not forward. Equivalent → local.
+            if (sourceDaemonId && !daemonIdsEquivalent(sourceDaemonId, ctx.deps.statusInstanceId) && ctx.deps.dispatchMeshCommand
+                && !args?._meshDirectDispatch) {
+                const forwarded = await ctx.deps.dispatchMeshCommand(sourceDaemonId, 'clone_mesh_node', {
+                    ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                    _meshDirectDispatch: true,
+                });
+                // FALSE-BLOCKER-CLONE-QUEUE: open the transient grace window for the freshly
+                // cloned node on THIS coordinator daemon. The clone ran (and wrote the inline-
+                // cache node) on the remote source daemon; its inline entry has not propagated
+                // here yet, so a queue task pinned to it would transiently look like a permanent
+                // 'target_node_id_unmatched'. Recording its id marks the unmatch as transient.
+                const forwardedNodeId = (forwarded as { node?: { id?: unknown } } | null | undefined)?.node?.id;
+                if (typeof forwardedNodeId === 'string' && forwardedNodeId) noteRecentlyClonedNode(forwardedNodeId);
+                return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+            }
+
+            const repoRoot = sourceNode.repoRoot || sourceNode.workspace;
+            const { createWorktree } = await import('../../git/git-worktree.js');
+            const result = await createWorktree({
+                repoRoot,
+                branch,
+                baseBranch,
+                meshName: mesh.name,
+            });
+            if (result.baseSync?.warning) {
+                console.warn(`[mesh] clone_mesh_node base sync (${result.baseSync.action}): ${result.baseSync.warning}`);
+            } else if (result.baseSync && result.baseSync.action !== 'up_to_date') {
+                console.log(`[mesh] clone_mesh_node base sync: ${result.baseSync.action} (startRef=${result.baseSync.startRef})`);
+            }
+
+            let node: any;
+            if (meshRecord.inline) {
+                const { randomUUID } = await import('crypto');
+                node = {
+                    id: `node_${randomUUID().replace(/-/g, '')}`,
+                    workspace: result.worktreePath,
+                    repoRoot: result.worktreePath,
+                    daemonId: sourceNode.daemonId,
+                    machineId: sourceNode.machineId ?? (sourceNode as any).machine_id,
+                    userOverrides: { ...(sourceNode.userOverrides || {}) },
+                    policy: { ...(sourceNode.policy || {}) },
+                    isLocalWorktree: true,
+                    worktreeBranch: result.branch,
+                    clonedFromNodeId: sourceNodeId,
+                };
+                ctx.updateInlineMeshNode(meshId, mesh, node);
+            } else {
+                const { addNode } = await import('../../config/mesh-config.js');
+                node = addNode(meshId, {
+                    workspace: result.worktreePath,
+                    repoRoot: result.worktreePath,
+                    daemonId: sourceNode.daemonId,
+                    machineId: sourceNode.machineId ?? (sourceNode as any).machine_id,
+                    userOverrides: { ...(sourceNode.userOverrides || {}) },
+                    isLocalWorktree: true,
+                    worktreeBranch: result.branch,
+                    clonedFromNodeId: sourceNodeId,
+                    policy: { ...(sourceNode.policy || {}) },
+                });
+                if (!node) return { success: false, error: 'Failed to register worktree node' };
+                // Also reconcile the freshly-registered node into any warmed inline
+                // cache for this mesh. get_mesh (preferInline: true) reads the inline
+                // cache first when one exists; if we only wrote to local config the
+                // node would be invisible to membership reads. updateInlineMeshNode is
+                // a no-op when no inline cache is present.
+                const inlineForReconcile = ctx.getCachedInlineMesh(meshId);
+                if (inlineForReconcile) ctx.updateInlineMeshNode(meshId, inlineForReconcile, node);
+                ctx.invalidateAggregateMeshStatus(meshId);
+            }
+
+            // FALSE-BLOCKER-CLONE-QUEUE: open the transient grace window for the freshly cloned
+            // node. A queue task pinned to it (target_node pin) enqueued before bootstrap
+            // completes / the inline-cache entry fully settles must be classified as a transient
+            // skip, not a permanent 'target_node_id_unmatched' actionable blocker.
+            if (typeof node?.id === 'string' && node.id) noteRecentlyClonedNode(node.id);
+
+            const persistWorktreeSetupState = async (bootstrapState: WorktreeBootstrapState): Promise<void> => {
+                node.worktreeBootstrap = bootstrapState;
+                if (meshRecord.inline) {
+                    ctx.updateInlineMeshNode(meshId, mesh, node);
+                    return;
+                }
+                try {
+                    const { updateNode } = await import('../../config/mesh-config.js');
+                    updateNode(meshId, node.id, { worktreeBootstrap: bootstrapState });
+                    ctx.invalidateAggregateMeshStatus(meshId);
+                } catch { /* bootstrap status persistence is best-effort */ }
+            };
+
+            const appendCloneLedger = async (initSubmodules: boolean, bootstrapState: WorktreeBootstrapState): Promise<void> => {
+                try {
+                    const { appendLedgerEntry } = await import('../../mesh/mesh-ledger.js');
+                    appendLedgerEntry(meshId, {
+                        kind: 'node_cloned',
+                        nodeId: node.id,
+                        payload: {
+                            sourceNodeId,
+                            branch: result.branch,
+                            worktreePath: result.worktreePath,
+                            submodulesInitialized: initSubmodules,
+                            worktreeBootstrap: {
+                                status: bootstrapState.status,
+                                required: bootstrapState.required,
+                                configSource: bootstrapState.configSource,
+                                configSourceType: bootstrapState.configSourceType,
+                                lastCommand: bootstrapState.lastCommand,
+                                exitCode: bootstrapState.exitCode,
+                            },
+                        },
+                    });
+                } catch { /* ledger append is best-effort */ }
+            };
+
+            const initSubmodules = (sourceNode.policy as any)?.initSubmodulesOnClone !== false;
+            // Read the worktree bootstrap config through the unified RepoSettings
+            // loader (file-separated `.adhdev/worktree_bootstrap.json`; machine-local
+            // inline seam honored). runMeshWorktreeBootstrap below re-loads it to run.
+            const loadedBootstrap = loadRepoSettings({ workspace: result.worktreePath, mesh }).worktreeBootstrap;
+            const runningBootstrapState: WorktreeBootstrapState = {
+                status: 'running',
+                required: loadedBootstrap.config?.required !== false,
+                configSource: loadedBootstrap.path || loadedBootstrap.source,
+                configSourceType: loadedBootstrap.sourceType,
+                startedAt: new Date().toISOString(),
+            };
+            await persistWorktreeSetupState(runningBootstrapState);
+
+            const finishWorktreeSetup = async (): Promise<{ submodulesInitialized: boolean; bootstrapState: WorktreeBootstrapState }> => {
+                let submodulesInitialized = false;
+                if (initSubmodules) {
+                    try {
+                        const { runGit } = await import('../../git/git-executor.js');
+                        await runGit(
+                            { workspace: result.worktreePath, repoRoot: result.worktreePath, isGitRepo: true },
+                            ['submodule', 'update', '--init', '--recursive'],
+                            { timeoutMs: 120000 },
+                        );
+                        submodulesInitialized = true;
+
+                        // Sync oss submodule to source node HEAD (best-effort)
+                        const sourceWorkspace = sourceNode.repoRoot || sourceNode.workspace;
+                        if (sourceWorkspace) {
+                            try {
+                                const { runGit: rg } = await import('../../git/git-executor.js');
+                                const sourceCtx = { workspace: sourceWorkspace, repoRoot: sourceWorkspace, isGitRepo: true };
+                                const worktreeCtx = { workspace: result.worktreePath, repoRoot: result.worktreePath, isGitRepo: true };
+
+                                // Read source node's oss submodule SHA
+                                const sourceStatusOut = await rg(sourceCtx, ['submodule', 'status', 'oss'], { timeoutMs: 10000 });
+                                const sourceStatusLine = (typeof sourceStatusOut === 'string' ? sourceStatusOut : (sourceStatusOut as any)?.stdout ?? '').trim();
+                                const sourceShaMatch = sourceStatusLine.match(/^[+\- ]?([0-9a-f]{40})/);
+                                const sourceSha = sourceShaMatch?.[1];
+
+                                if (sourceSha) {
+                                    // Read worktree's current oss HEAD
+                                    const ossCtx = { workspace: `${result.worktreePath}/oss`, repoRoot: `${result.worktreePath}/oss`, isGitRepo: true };
+                                    const worktreeOssHeadOut = await rg(ossCtx, ['rev-parse', 'HEAD'], { timeoutMs: 10000 });
+                                    const worktreeOssSha = (typeof worktreeOssHeadOut === 'string' ? worktreeOssHeadOut : (worktreeOssHeadOut as any)?.stdout ?? '').trim();
+
+                                    if (worktreeOssSha && worktreeOssSha !== sourceSha) {
+                                        // Bring the source node's oss HEAD into the worktree object DB so
+                                        // both SHAs are resolvable for the ancestry (rewind) guard below.
+                                        await rg(ossCtx, ['fetch', `${sourceWorkspace}/oss`, 'HEAD'], { timeoutMs: 60000 });
+
+                                        // Rewind guard: the worktree oss HEAD was just checked out from the
+                                        // FRESH (origin/main-derived) root base. Only advance to the source
+                                        // SHA when it is strictly newer — never rewind to a stale source.
+                                        let ossAction: OssCloneSyncAction;
+                                        try {
+                                            ossAction = await decideOssCloneSync(ossCtx, worktreeOssSha, sourceSha, rg);
+                                        } catch (decideErr: any) {
+                                            ossAction = 'skip_diverged';
+                                            console.warn(`[mesh] oss submodule sync guard could not resolve ancestry (kept fresh worktree HEAD): ${decideErr?.message ?? decideErr}`);
+                                        }
+
+                                        if (ossAction === 'advance') {
+                                            await rg(ossCtx, ['checkout', sourceSha], { timeoutMs: 10000 });
+                                            await rg(worktreeCtx, ['add', 'oss'], { timeoutMs: 10000 });
+                                            await rg(worktreeCtx, ['commit', '-m', 'chore: sync oss to source node HEAD on clone'], { timeoutMs: 10000 });
+                                            console.log(`[mesh] Advanced oss submodule to newer source HEAD ${sourceSha.slice(0, 8)} in worktree`);
+                                        } else if (ossAction === 'skip_rewind') {
+                                            console.warn(`[mesh] Skipped oss submodule rewind on clone: source node oss ${sourceSha.slice(0, 8)} is an ancestor of the fresh worktree oss ${worktreeOssSha.slice(0, 8)} — kept fresher worktree HEAD`);
+                                        } else if (ossAction === 'skip_diverged') {
+                                            console.warn(`[mesh] Skipped oss submodule sync on clone: source node oss ${sourceSha.slice(0, 8)} diverged from the fresh worktree oss ${worktreeOssSha.slice(0, 8)} — kept worktree HEAD (coordinator reconciles)`);
+                                        }
+                                    }
+                                }
+                            } catch (ossErr: any) {
+                                console.warn('[mesh] oss submodule sync to source HEAD failed (best-effort):', ossErr.message);
+                            }
+                        }
+                    } catch (subErr: any) {
+                        // Submodule init is best-effort; don't fail the clone
+                        console.warn('[mesh] Submodule init failed for worktree:', subErr.message);
+                    }
+                }
+                const bootstrapState: WorktreeBootstrapState = await runMeshWorktreeBootstrap(mesh, result.worktreePath);
+                await persistWorktreeSetupState(bootstrapState);
+                await appendCloneLedger(submodulesInitialized, bootstrapState);
+                return { submodulesInitialized, bootstrapState };
+            };
+
+            const requestedSetupWaitMs = Number(args?.setupWaitMs ?? args?.bootstrapWaitMs ?? 8000);
+            const setupWaitMs = Number.isFinite(requestedSetupWaitMs)
+                ? Math.min(Math.max(requestedSetupWaitMs, 0), 14000)
+                : 8000;
+            const setupPromise = finishWorktreeSetup();
+            const setupResult = await Promise.race([
+                setupPromise.then((value) => ({ completed: true as const, value })),
+                new Promise<{ completed: false }>((resolve) => setTimeout(() => resolve({ completed: false }), setupWaitMs)),
+            ]);
+
+            const emitBootstrapEvent = (eventStatus: 'bootstrap_complete' | 'bootstrap_failed', bootstrapState: WorktreeBootstrapState, startedAtMs: number, extraPayload?: Record<string, unknown>): void => {
+                try {
+                    const durationMs = Date.now() - startedAtMs;
+                    const event = `worktree_${eventStatus}` as const;
+                    const metadataEvent = {
+                        source: 'clone_mesh_node_bootstrap',
+                        nodeId: node.id,
+                        status: eventStatus,
+                        worktreePath: result.worktreePath,
+                        durationMs,
+                        bootstrapStatus: bootstrapState.status,
+                        ...(bootstrapState.error ? { error: bootstrapState.error } : {}),
+                        ...(bootstrapState.exitCode !== undefined ? { exitCode: bootstrapState.exitCode } : {}),
+                        ...(extraPayload || {}),
+                    };
+                    if (typeof ctx.deps.instanceManager?.getByCategory === 'function') {
+                        const forwarded = handleMeshForwardEvent(
+                            { instanceManager: ctx.deps.instanceManager } as any,
+                            { event, meshId, nodeId: node.id, workspace: result.worktreePath, metadataEvent },
+                        );
+                        if (forwarded?.success === true) return;
+                    }
+                    queuePendingMeshCoordinatorEvent({
+                        event,
+                        meshId,
+                        nodeLabel: node.id,
+                        nodeId: node.id,
+                        workspace: result.worktreePath,
+                        metadataEvent,
+                        queuedAt: Date.now(),
+                    });
+                } catch { /* event emission is best-effort */ }
+            };
+
+            const bootstrapStartedMs = Date.now();
+
+            if (!setupResult.completed) {
+                setupPromise
+                    .then(({ bootstrapState }) => {
+                        emitBootstrapEvent('bootstrap_complete', bootstrapState, bootstrapStartedMs);
+                    })
+                    .catch((error: any) => {
+                        const failedState: WorktreeBootstrapState = {
+                            ...runningBootstrapState,
+                            status: 'failed',
+                            completedAt: new Date().toISOString(),
+                            error: error?.message || String(error),
+                        };
+                        void persistWorktreeSetupState(failedState);
+                        void appendCloneLedger(false, failedState);
+                        emitBootstrapEvent('bootstrap_failed', failedState, bootstrapStartedMs, { error: error?.message || String(error) });
+                    });
+                return {
+                    success: true,
+                    async: true,
+                    status: 'accepted',
+                    node,
+                    worktreePath: result.worktreePath,
+                    branch: result.branch,
+                    ...(result.baseSync ? { baseSync: result.baseSync } : {}),
+                    ...(result.baseSync?.warning ? { baseStaleWarning: result.baseSync.warning } : {}),
+                    worktreeBootstrap: runningBootstrapState,
+                    worktreeSetup: {
+                        status: 'running',
+                        setupWaitMs,
+                        message: 'Worktree node is registered; submodule/bootstrap setup is continuing in the background.',
+                    },
+                };
+            }
+
+            const { submodulesInitialized, bootstrapState } = setupResult.value;
+            emitBootstrapEvent('bootstrap_complete', bootstrapState, bootstrapStartedMs);
+            return {
+                success: true,
+                node,
+                worktreePath: result.worktreePath,
+                branch: result.branch,
+                ...(result.baseSync ? { baseSync: result.baseSync } : {}),
+                ...(result.baseSync?.warning ? { baseStaleWarning: result.baseSync.warning } : {}),
+                submodulesInitialized,
+                worktreeBootstrap: bootstrapState,
+            };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+
+    retry_mesh_node_bootstrap: async (ctx: MedFamilyContext, args: any) => {
+        const meshId = typeof args?.meshId === 'string' ? args.meshId.trim() : '';
+        const nodeId = typeof args?.nodeId === 'string' ? args.nodeId.trim() : '';
+        if (!meshId) return { success: false, error: 'meshId required' };
+        if (!nodeId) return { success: false, error: 'nodeId required' };
+        const ownerFailure = await ctx.requireMeshHostMutationOwner(meshId, args?.inlineMesh, 'bootstrap retry');
+        if (ownerFailure) return ownerFailure;
+
+        try {
+            // preferInline so bootstrap-retry can resolve inline-cache-only clone worktree nodes.
+            const meshRecord = await ctx.getMeshForCommand(meshId, args?.inlineMesh, { preferInline: true });
+            const mesh = meshRecord?.mesh;
+            if (!mesh) return { success: false, error: 'Mesh not found' };
+
+            const node = mesh.nodes?.find((n: any) => meshNodeIdMatches(n, nodeId));
+            if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
+            if (!node.isLocalWorktree) return { success: false, error: 'Node is not a local worktree node' };
+
+            // Bootstrap runs scripts in the worktree path — forward to the node's daemon if remote.
+            // _meshDirectDispatch prevents re-forwarding when stored daemonId uses legacy format.
+            const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
+            // daemonIdsEquivalent: an equivalent-form daemonId is this machine —
+            // bootstrap locally, do not forward. Equivalent → local.
+            if (nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, ctx.deps.statusInstanceId) && ctx.deps.dispatchMeshCommand
+                && !args?._meshDirectDispatch) {
+                const forwarded = await ctx.deps.dispatchMeshCommand(nodeDaemonId, 'retry_mesh_node_bootstrap', {
+                    ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                    _meshDirectDispatch: true,
+                });
+                return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+            }
+
+            const currentBootstrap = node.worktreeBootstrap as WorktreeBootstrapState | undefined;
+            if (currentBootstrap?.status === 'running') {
+                return { success: false, error: 'Bootstrap is already running for this node' };
+            }
+
+            const worktreePath: string = node.workspace || node.repoRoot;
+            if (!worktreePath) return { success: false, error: 'Node has no workspace path' };
+
+            const loadedBootstrap = loadMeshWorktreeBootstrapConfig(mesh, worktreePath);
+            const runningState: WorktreeBootstrapState = {
+                status: 'running',
+                required: loadedBootstrap.config?.required !== false,
+                configSource: loadedBootstrap.path || loadedBootstrap.source,
+                configSourceType: loadedBootstrap.sourceType,
+                startedAt: new Date().toISOString(),
+            };
+
+            const persistState = async (bootstrapState: WorktreeBootstrapState): Promise<void> => {
+                node.worktreeBootstrap = bootstrapState;
+                if (meshRecord.inline) {
+                    ctx.updateInlineMeshNode(meshId, mesh, node);
+                    return;
+                }
+                try {
+                    const { updateNode } = await import('../../config/mesh-config.js');
+                    updateNode(meshId, node.id, { worktreeBootstrap: bootstrapState });
+                    ctx.invalidateAggregateMeshStatus(meshId);
+                } catch { /* best-effort */ }
+            };
+
+            await persistState(runningState);
+            const bootstrapState = await runMeshWorktreeBootstrap(mesh, worktreePath);
+            await persistState(bootstrapState);
+
+            return { success: true, bootstrapState };
+        } catch (e: any) {
+            return { success: false, error: e.message };
+        }
+    },
+};