@adhdev/daemon-core 0.9.82-rc.462 → 0.9.82-rc.463

package/dist/commands/router-aggregate-status.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Aggregate mesh-status cache — extracted from router.ts (behavior-preserving code move).
+ *
+ * These functions were `DaemonCommandRouter` methods; they now take the router
+ * instance as `self`. The class keeps thin delegating wrappers
+ * (getCachedAggregateMeshStatus / rememberAggregateMeshStatus are bound into
+ * HighFamilyContext — intra-cluster calls therefore go through `self.` so instance
+ * dispatch is preserved). No log string, error message, refusal condition, or
+ * result shape changed — only physical location + `this.` → `self.`.
+ *
+ * The group is self-contained: it reads only `self.aggregateMeshStatusCache` and
+ * imported mesh-node-identity / mesh-work-queue helpers. It does NOT touch the
+ * inline-mesh cache cluster, so the move is a pure lift.
+ */
+import type { DaemonCommandRouter } from './router.js';
+export declare function cloneJsonValue<T>(value: T): T;
+export declare function hydrateCachedAggregateMeshStatusFromInline(self: DaemonCommandRouter, snapshot: any, mesh: any, options?: {
+    requireDirectPeerTruth?: boolean;
+}): any;
+export declare function getCachedAggregateMeshStatus(self: DaemonCommandRouter, meshId: string, mesh?: any, options?: {
+    requireDirectPeerTruth?: boolean;
+    allowStalePending?: boolean;
+}): any | null;
+export declare function rememberAggregateMeshStatus(self: DaemonCommandRouter, meshId: string, snapshot: any, refreshReason: string): any;

package/dist/commands/router-mesh-session-owner.d.ts

@@ -0,0 +1,59 @@
+/**
+ * Remote mesh-session owner resolution — extracted from router.ts (behavior-preserving code move).
+ *
+ * These functions were `DaemonCommandRouter` methods; they now take the router
+ * instance as `self`. resolveRemoteMeshSessionOwnerDaemonId stays reachable as a
+ * public method (the [Z] session-scoped forward in executeDaemonCommand and the
+ * mesh-session-scoped-remote-forward test call it), so the class keeps a thin
+ * delegating wrapper. No log string, error message, refusal condition, or result
+ * shape changed — only physical location + `this.` → `self.`.
+ *
+ * The group is read-only: it reads self.deps.statusInstanceId, the cached inline-mesh
+ * nodes, and the aggregate-status snapshot nodes. It never mutates router state.
+ */
+import type { DaemonCommandRouter } from './router.js';
+/**
+ * Resolve the REMOTE worker daemonId that owns a given session, when the session
+ * belongs to a mesh node hosted on a DIFFERENT daemon than this coordinator.
+ *
+ * The coordinator does not host remote-worker session instances in its own
+ * instanceManager/sessionRegistry — only their cached mesh-node metadata. A
+ * dashboard-issued session-scoped command (invoke_provider_script / resolve_action /
+ * set_mode / …) lands on the coordinator with a targetSessionId the coordinator can't
+ * find locally, and without forwarding it dies as "Live session not found". send_chat
+ * happens to survive (its target resolves to the worker by another route), but the
+ * controlbar commands do not — so the controlbar buttons appear to do nothing.
+ *
+ * Mirror the existing node-level remote-forward pattern (fast_forward_mesh_node etc.):
+ * scan the candidate mesh nodes for the one hosting the targetSessionId, and return its
+ * daemonId when that daemonId is a remote daemon (i.e. not this coordinator's own
+ * statusInstanceId). Returns undefined for a locally-hosted session (no forward — execute
+ * locally as before) or when ownership can't be resolved.
+ *
+ * The candidate set spans BOTH the cached inline-mesh nodes and the live aggregate
+ * mesh-status snapshots. The inline cache reliably carries only each node's single primary
+ * session (cachedStatus.activeSession), so a worker hosting more than one session exposes its
+ * non-primary sessions only on the aggregate snapshot nodes (status.activeSessions /
+ * activeSessionDetails, built from live session records). collectMeshNodeHostedSessionIds does
+ * the wider plural-shape scan so a controlbar/modal command targeting a non-primary remote
+ * session still resolves its owner — the singular readCachedInlineMeshActiveSessions semantics
+ * other consumers depend on stay untouched.
+ *
+ * CANCEL-STOP-RELAY: the session-id cache scan above only matches when the coordinator's
+ * cached status snapshot already lists the worker's session id in a recognized active-sessions
+ * shape. A worktree-clone worker session whose id form/timing differs from the cached snapshot
+ * (or is simply not yet reflected) misses the scan, so a stop that carries the authoritative
+ * owning nodeId (mesh_queue_cancel knows assignedNodeId) used to silently fail to forward.
+ * `ownerNodeIdHint` adds a deterministic fallback: when the session-id scan misses, resolve the
+ * owner daemonId by matching the node by id (meshNodeIdMatches — same form-tolerant compare the
+ * rest of the router uses, no new raw compare). The same self-loopback guard applies to both
+ * paths, so a coordinator-hosted node is still never force-forwarded to a remote form of itself.
+ */
+export declare function resolveRemoteMeshSessionOwnerDaemonId(self: DaemonCommandRouter, sessionId: string, ownerNodeIdHint?: string): string | undefined;
+/**
+ * Candidate nodes for remote-session owner resolution: the cached inline-mesh nodes (which
+ * carry each node's primary session) plus the nodes from every cached aggregate mesh-status
+ * snapshot (which carry each node's full live session list). getCachedInlineMeshNodes()
+ * returns a fresh array, so appending the aggregate nodes never mutates cached state.
+ */
+export declare function collectMeshSessionOwnerCandidateNodes(self: DaemonCommandRouter): any[];

package/dist/commands/router.d.ts

@@ -113,8 +113,13 @@ export declare class DaemonCommandRouter {
      *  on disk) clears the tombstone and merges normally, preserving clone
      *  worktree visibility and legitimate node re-creation. */
     private removedInlineMeshNodeIds;
-    /** Coordinator-owned whole-mesh aggregate status snapshots. Browser callers read this by default. */
-    private aggregateMeshStatusCache;
+    /** Coordinator-owned whole-mesh aggregate status snapshots. Browser callers read this by default.
+     *  Public (not private) so the extracted ./router-aggregate-status.ts orchestration can reach it via `self`. */
+    aggregateMeshStatusCache: Map<string, {
+        builtAt: number;
+        snapshot: any;
+        queueRevision: string;
+    }>;
     /** Shared per-peer git_status probe dedup + recently-probed reuse gate.
      *  Spans separate mesh_status/get_mesh calls so the dashboard auto-retry
      *  loop cannot storm a slow peer with back-to-back refreshUpstream probes. */
@@ -133,56 +138,11 @@ export declare class DaemonCommandRouter {
     /** Terminal async batch Refinery jobs preserve the last batch outcome for late readers. */
     terminalRefineBatchJobs: Map<string, MeshRefineBatchTerminalJob>;
     constructor(deps: CommandRouterDeps);
-    private cloneJsonValue;
     private hydrateCachedAggregateMeshStatusFromInline;
     private getCachedAggregateMeshStatus;
     private rememberAggregateMeshStatus;
     getCachedInlineMeshNodes(): any[];
-    /**
-     * Resolve the REMOTE worker daemonId that owns a given session, when the session
-     * belongs to a mesh node hosted on a DIFFERENT daemon than this coordinator.
-     *
-     * The coordinator does not host remote-worker session instances in its own
-     * instanceManager/sessionRegistry — only their cached mesh-node metadata. A
-     * dashboard-issued session-scoped command (invoke_provider_script / resolve_action /
-     * set_mode / …) lands on the coordinator with a targetSessionId the coordinator can't
-     * find locally, and without forwarding it dies as "Live session not found". send_chat
-     * happens to survive (its target resolves to the worker by another route), but the
-     * controlbar commands do not — so the controlbar buttons appear to do nothing.
-     *
-     * Mirror the existing node-level remote-forward pattern (fast_forward_mesh_node etc.):
-     * scan the candidate mesh nodes for the one hosting the targetSessionId, and return its
-     * daemonId when that daemonId is a remote daemon (i.e. not this coordinator's own
-     * statusInstanceId). Returns undefined for a locally-hosted session (no forward — execute
-     * locally as before) or when ownership can't be resolved.
-     *
-     * The candidate set spans BOTH the cached inline-mesh nodes and the live aggregate
-     * mesh-status snapshots. The inline cache reliably carries only each node's single primary
-     * session (cachedStatus.activeSession), so a worker hosting more than one session exposes its
-     * non-primary sessions only on the aggregate snapshot nodes (status.activeSessions /
-     * activeSessionDetails, built from live session records). collectMeshNodeHostedSessionIds does
-     * the wider plural-shape scan so a controlbar/modal command targeting a non-primary remote
-     * session still resolves its owner — the singular readCachedInlineMeshActiveSessions semantics
-     * other consumers depend on stay untouched.
-     *
-     * CANCEL-STOP-RELAY: the session-id cache scan above only matches when the coordinator's
-     * cached status snapshot already lists the worker's session id in a recognized active-sessions
-     * shape. A worktree-clone worker session whose id form/timing differs from the cached snapshot
-     * (or is simply not yet reflected) misses the scan, so a stop that carries the authoritative
-     * owning nodeId (mesh_queue_cancel knows assignedNodeId) used to silently fail to forward.
-     * `ownerNodeIdHint` adds a deterministic fallback: when the session-id scan misses, resolve the
-     * owner daemonId by matching the node by id (meshNodeIdMatches — same form-tolerant compare the
-     * rest of the router uses, no new raw compare). The same self-loopback guard applies to both
-     * paths, so a coordinator-hosted node is still never force-forwarded to a remote form of itself.
-     */
     resolveRemoteMeshSessionOwnerDaemonId(sessionId: string, ownerNodeIdHint?: string): string | undefined;
-    /**
-     * Candidate nodes for remote-session owner resolution: the cached inline-mesh nodes (which
-     * carry each node's primary session) plus the nodes from every cached aggregate mesh-status
-     * snapshot (which carry each node's full live session list). getCachedInlineMeshNodes()
-     * returns a fresh array, so appending the aggregate nodes never mutates cached state.
-     */
-    private collectMeshSessionOwnerCandidateNodes;
     getCachedInlineMesh(meshId: string, inlineMesh?: unknown): any | undefined;
     private warmInlineMeshCache;
     getMeshForCommand(meshId: string, inlineMesh?: unknown, options?: {