@adhdev/mesh-shared 1.0.60-rc.72 → 1.0.60-rc.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/mesh-shared",
-  "version": "1.0.60-rc.72",
+  "version": "1.0.60-rc.74",
   "description": "ADHDev mesh-shared — pure mesh/git status normalizers shared by daemon-core and web-core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/brain-routing.ts

@@ -5,10 +5,8 @@
  * per-difficulty "brain" preset resolves that into a concrete provider / model /
  * thinking-level for the launched session. The goal is token economy: an `easy`
  * task runs on a cheaper model at low reasoning effort; a `difficult` task gets a
- * stronger model at high effort. This is a separate axis from MAGI's review kinds
- * (rca/design/…) — MAGI fans out review replicas; this picks the single brain that
- * *executes* a task — but it reuses the same slot shape (provider/model) and the
- * same machine-local storage (`~/.adhdev/meshes.json`).
+ * stronger model at high effort. This picks the single brain that *executes* a
+ * task, stored machine-local (`~/.adhdev/meshes.json`).
  */
 
 /** The fixed difficulty axis the coordinator classifies a task into. */
@@ -33,8 +31,8 @@ export interface BrainSlot {
 
 /**
  * Per-difficulty brain bindings for ONE mesh, stored machine-local in
- * `~/.adhdev/meshes.json` under that mesh's entry (`meshes[].difficultyBrains`,
- * sibling of `magiKindPanels`). The scope is per mesh: two meshes on the same
+ * `~/.adhdev/meshes.json` under that mesh's entry (`meshes[].difficultyBrains`).
+ * The scope is per mesh: two meshes on the same
  * machine hold independent presets, so one can pin `difficult` to a cheaper model
  * without changing what any other mesh runs. (It formerly sat at the config root
  * keyed by difficulty alone — and since this map picks the MODEL a task runs on,
@@ -118,8 +116,8 @@ export function normalizeDifficultyBrainMap(raw: unknown): DifficultyBrainMap {
 // capability slots. Each slot bundles what used to be scattered across
 // providerPriority (order), a per-provider maxParallel cap, and the
 // the owning mesh's difficultyBrains (difficulty → model/thinking). Slot order =
-// preference. This single profile is the source of truth for task routing, MAGI
-// fan-out, and orchestrator-proposed edits.
+// preference. This single profile is the source of truth for task routing and
+// orchestrator-proposed edits.
 // ─────────────────────────────────────────────────────────────────────────────
 
 /**

package/src/git-diff.ts

@@ -0,0 +1,48 @@
+/**
+ * Projection of a daemon `git_diff_file` answer into the per-file row the MCP
+ * `git_diff` tool and the cloud git-diff shortcut both return: the diff text
+ * capped at `maxLines` (with a visible truncation marker), plus the file's
+ * change metadata from the diff summary.
+ */
+
+import { readRecord } from './json'
+
+export interface GitFileDiffRow {
+    path: string
+    old_path?: string | null
+    status?: string
+    diff: string
+    truncated: boolean
+    binary: boolean
+    error?: string
+}
+
+/** Cap diff text at `maxLines`; a truncated diff ends with a `... (truncated)` marker line. */
+function truncateDiffText(text: string, maxLines: number): { diff: string; truncated: boolean } {
+    const lines = text.split('\n')
+    const truncated = lines.length > maxLines
+    return {
+        diff: truncated ? lines.slice(0, maxLines).join('\n') + '\n... (truncated)' : text,
+        truncated,
+    }
+}
+
+/** One changed file's row from its `git_diff_file` answer (either `{ diff: {...} }` or the bare diff record). */
+export function projectFileDiffRow(
+    file: { path: string; oldPath?: string | null; status?: string },
+    rawResult: unknown,
+    maxLines: number,
+): GitFileDiffRow {
+    const raw = readRecord(rawResult)
+    const d = readRecord(raw.diff ?? rawResult)
+    const text = typeof d.diff === 'string' ? d.diff : ''
+    const { diff, truncated } = truncateDiffText(text, maxLines)
+    return {
+        path: file.path,
+        old_path: file.oldPath ?? null,
+        status: file.status ?? 'M',
+        diff,
+        truncated,
+        binary: typeof d.binary === 'boolean' ? d.binary : false,
+    }
+}

package/src/index.ts

@@ -19,7 +19,7 @@ export * from './node-facts'
 export * from './workspace-normalize'
 export * from './daemon-normalize'
 export * from './git-summarize'
-export * from './magi'
+export * from './git-diff'
 export * from './brain-routing'
 export * from './slot-proposal'
 export * from './interpolation'

package/src/json.ts

@@ -14,6 +14,11 @@ export function readRecord(value: unknown): JsonRecord {
     return value && typeof value === 'object' && !Array.isArray(value) ? value as JsonRecord : {}
 }
 
+/** A plain-object record, or undefined — for callers that must tell "absent" from "empty". */
+export function readOptionalRecord(value: unknown): JsonRecord | undefined {
+    return value && typeof value === 'object' && !Array.isArray(value) ? value as JsonRecord : undefined
+}
+
 export function readString(...values: unknown[]): string | undefined {
     for (const value of values) {
         if (typeof value !== 'string') continue
@@ -23,6 +28,11 @@ export function readString(...values: unknown[]): string | undefined {
     return undefined
 }
 
+/** The first non-blank trimmed string, or '' — readString for callers that want a plain string. */
+export function readText(...values: unknown[]): string {
+    return readString(...values) ?? ''
+}
+
 export function readNumber(...values: unknown[]): number | undefined {
     for (const value of values) {
         if (typeof value === 'number' && Number.isFinite(value)) return value

package/src/mesh-tool-names.ts

@@ -22,14 +22,10 @@ export const CANONICAL_MESH_TOOL_NAMES = [
     'mesh_status',
     'mesh_route_preview',
     'mesh_list_nodes',
-    // GRAPH-ORCHESTRATION Phase F — batch before task, mirroring ALL_MESH_TOOLS.
+    // Batch before task, mirroring ALL_MESH_TOOLS.
     'mesh_enqueue_batch',
     'mesh_enqueue_task',
     'mesh_view_queue',
-    // GRAPH-ORCHESTRATION Phase E — the coordinator gate + graph view surface.
-    'mesh_graph_view',
-    'mesh_graph_gate',
-    'mesh_graph_node_patch',
     'mesh_queue_cancel',
     'mesh_queue_requeue',
     'mesh_send_task',
@@ -64,9 +60,6 @@ export const CANONICAL_MESH_TOOL_NAMES = [
     'mesh_mission_upsert',
     'mesh_mission_list',
     'mesh_review_inbox',
-    'mesh_magi_review',
-    'mesh_magi_collect',
-    'mesh_magi_kind_panel',
     'mesh_node_slots',
     'mesh_coordinator_prompt_append',
 ] as const;
@@ -87,29 +80,16 @@ export const CANONICAL_MESH_TOOL_COUNT = CANONICAL_MESH_TOOL_NAMES.length;
  * test asserts none of these names is advertised anywhere in the prompt.
  *
  * `args` is the discriminator to add; every other argument keeps its name.
- * `note` covers the one rename where an argument moved (the old
- * `mesh_graph_gate_claim({ extend_seconds })` extend-only mode).
+ * `note` carries any extra guidance when an argument moved in a rename.
  */
 export const RETIRED_MESH_TOOLS: Readonly<Record<string, {
     readonly tool: CanonicalMeshToolName;
     readonly args: Readonly<Record<string, string>>;
     readonly note?: string;
 }>> = {
-    mesh_graph_gate_claim: {
-        tool: 'mesh_graph_gate',
-        args: { action: 'claim' },
-        note: 'The extend-only form (claim with extend_seconds) is now action: "extend" with the same extend_seconds.',
-    },
-    mesh_graph_gate_release: { tool: 'mesh_graph_gate', args: { action: 'release' } },
-    mesh_graph_gate_abandon: { tool: 'mesh_graph_gate', args: { action: 'abandon' } },
-    // Never a published tool (it is the daemon command behind the extend verb),
-    // but an older gate-expiry notice told coordinators to call it by this name.
-    mesh_graph_gate_extend: { tool: 'mesh_graph_gate', args: { action: 'extend' } },
     mesh_node_slots_set: { tool: 'mesh_node_slots', args: { action: 'set' } },
     mesh_node_slots_list: { tool: 'mesh_node_slots', args: { action: 'list' } },
     mesh_node_slots_propose: { tool: 'mesh_node_slots', args: { action: 'propose' } },
-    mesh_magi_kind_panel_set: { tool: 'mesh_magi_kind_panel', args: { action: 'set' } },
-    mesh_magi_kind_panel_list: { tool: 'mesh_magi_kind_panel', args: { action: 'list' } },
     mesh_coordinator_prompt_append_get: { tool: 'mesh_coordinator_prompt_append', args: { action: 'get' } },
     mesh_coordinator_prompt_append_set: { tool: 'mesh_coordinator_prompt_append', args: { action: 'set' } },
     mesh_record_note: { tool: 'mesh_note', args: { action: 'record' } },
@@ -123,11 +103,26 @@ export const RETIRED_MESH_TOOLS: Readonly<Record<string, {
 };
 
 /**
- * The error text for a call to a retired tool name, or null when `name` is not
- * retired. One wording shared by every MCP mode so the redirect reads the same
- * wherever an old prompt calls it.
+ * Tool names removed outright (no merged replacement), mapped to the guidance a
+ * coordinator on an old prompt needs to do the same job with the remaining tools.
+ */
+export const REMOVED_MESH_TOOLS: Readonly<Record<string, string>> = {
+    mesh_magi_review: 'For a multi-perspective review, send the same question to 2-3 workers on different providers with mesh_send_task, wait for their report_completion, then synthesize the answers yourself.',
+    mesh_magi_collect: 'Worker answers arrive as report_completion events; synthesize them yourself.',
+    mesh_magi_kind_panel: 'There are no review panels any more; pick the workers per review with mesh_send_task.',
+    mesh_magi_kind_panel_set: 'There are no review panels any more; pick the workers per review with mesh_send_task.',
+    mesh_magi_kind_panel_list: 'There are no review panels any more; pick the workers per review with mesh_send_task.',
+};
+
+/**
+ * The error text for a call to a retired or removed tool name, or null when
+ * `name` is neither. One wording shared by every MCP mode so the redirect reads
+ * the same wherever an old prompt calls it.
  */
 export function retiredMeshToolError(name: string): string | null {
+    if (Object.prototype.hasOwnProperty.call(REMOVED_MESH_TOOLS, name)) {
+        return `Tool "${name}" was removed. ${REMOVED_MESH_TOOLS[name]}`;
+    }
     const entry = Object.prototype.hasOwnProperty.call(RETIRED_MESH_TOOLS, name) ? RETIRED_MESH_TOOLS[name] : undefined;
     if (!entry) return null;
     const discriminator = Object.entries(entry.args).map(([k, v]) => `${k}: "${v}"`).join(', ');

package/src/mesh-vocabulary.ts

@@ -46,8 +46,7 @@ export const MESH_DELIVERY_MODES = ['when_idle', 'interrupt'] as const
 export type MeshDeliveryMode = typeof MESH_DELIVERY_MODES[number]
 
 /**
- * What to do with a node's sessions when the node is removed or a MAGI fan-out
- * settles. Declared here so daemon-core (`RepoMeshSessionCleanupMode`), the
+ * What to do with a node's sessions when the node is removed. Declared here so daemon-core (`RepoMeshSessionCleanupMode`), the
  * web dashboard picker and the MCP schemas all read one list.
  */
 export const MESH_SESSION_CLEANUP_MODES = ['preserve', 'stop', 'delete_stopped', 'stop_and_delete'] as const

package/src/outbound-message.ts

@@ -167,9 +167,8 @@ export type SendRefusal =
  *                   a turn is generating (`send_now`). Written, not yet answered;
  *   `interrupt`   — the turn in flight was stopped first, then this body was
  *                   written (or re-parked) as a new turn;
- *   `acp`         — handed to an ACP agent's `session/prompt`.
  */
-export type SubmitRoute = 'pty' | 'agent_queue' | 'interrupt' | 'acp'
+export type SubmitRoute = 'pty' | 'agent_queue' | 'interrupt'
 
 /** The stop key pressed by an `interrupt` submit (logs / operator display). */
 export interface SubmitInterruptDetail {

package/src/protocol/daemon-server.ts

@@ -195,8 +195,6 @@ export type AuthOkWirePayload = {
     machineNickname: string | null
     seqscribeFleetSecret?: string
     seqscribeFleetSecretVersion?: number
-    /** Beacon board seed for cold start (advisory, may be absent). */
-    beaconSeed?: { reports: unknown[]; truncated: number }
     limits: AuthOkPlanLimits
 }
 
@@ -251,12 +249,6 @@ export type DaemonErrorWirePayload = {
     detail?: unknown
 }
 
-// ─── Beacon (seqscribe vector board, design §7.1) ──────────────────────────
-
-export type BeaconVectorsWirePayload =
-    | { op: 'put'; report: unknown }
-    | { op: 'get'; topics: string[]; requestId: string }
-
 // ─── P2P signaling (dashboard ↔ daemon through the server) ─────────────────
 
 export const P2P_SIGNAL_TYPES = ['p2p_ready', 'p2p_offer', 'p2p_answer', 'p2p_ice'] as const
@@ -308,7 +300,6 @@ export const DAEMON_TO_SERVER_TYPES = [
     'command_result',
     'error',
     'agent_event',
-    'beacon_vectors',
     'daemon_mesh_command',
     'p2p_offer',
     'p2p_ice',
@@ -324,7 +315,6 @@ export type CommandResultMsg = Envelope<'command_result', CommandResultWirePaylo
 export type DaemonErrorMsg = Envelope<'error', DaemonErrorWirePayload>
 /** Agent-level event forwarded verbatim to the `agent:status` webhook (throttled server-side). Dynamic by design. */
 export type AgentEventMsg = Envelope<'agent_event', CommandPayload>
-export type BeaconVectorsMsg = Envelope<'beacon_vectors', BeaconVectorsWirePayload>
 export type DaemonP2POfferMsg = Envelope<'p2p_offer', P2POfferWirePayload>
 export type DaemonP2PIceMsg = Envelope<'p2p_ice', P2PIceWirePayload>
 /**
@@ -349,7 +339,6 @@ export type DaemonToServerMsg =
     | CommandResultMsg
     | DaemonErrorMsg
     | AgentEventMsg
-    | BeaconVectorsMsg
     | DaemonMeshCommandMsg
     | DaemonP2POfferMsg
     | DaemonP2PIceMsg
@@ -398,7 +387,6 @@ export const SERVER_TO_DAEMON_CONTROL_TYPES = [
     'command',
     'agent_command',
     'resolve_action',
-    'beacon_vectors_result',
     'daemon_mesh_result',
     'p2p_ready',
     'p2p_offer',
@@ -428,15 +416,6 @@ export type ServerAgentCommandMsg = Envelope<'agent_command', { action: string }
 export type ServerResolveActionMsg = Envelope<'resolve_action', CommandPayload> & ServerRelayFields
 export type ServerP2PSignalMsg = Envelope<P2PSignalType, RelayedP2PSignalWirePayload> & ServerRelayFields
 export type ServerMeshP2PSignalMsg = Envelope<MeshP2PSignalType, MeshP2PSignalWirePayload> & ServerRelayFields
-/** Reply to a `beacon_vectors` GET, correlated by `requestId` (top-level, no payload). A PUT gets no reply. */
-export type BeaconVectorsResultMsg = {
-    type: 'beacon_vectors_result'
-    requestId: string
-    success: boolean
-    reports?: unknown[]
-    truncated?: number
-    error?: string
-}
 /** Correlated ack/nack of a `daemon_mesh_command` (top-level, no payload). */
 export type DaemonMeshResultMsg = {
     type: 'daemon_mesh_result'
@@ -457,7 +436,6 @@ export type ServerToDaemonControlMsg =
     | ServerCommandMsg
     | ServerAgentCommandMsg
     | ServerResolveActionMsg
-    | BeaconVectorsResultMsg
     | DaemonMeshResultMsg
     | ServerP2PSignalMsg
     | ServerMeshP2PSignalMsg
@@ -491,7 +469,7 @@ export function isServerDirectCommandMsg(msg: ServerToDaemonMsg): msg is ServerD
 }
 
 /** Members of the control set that carry a `payload` object. */
-export type ServerToDaemonPayloadType = Exclude<ServerToDaemonControlMsg, BeaconVectorsResultMsg | DaemonMeshResultMsg>['type']
+export type ServerToDaemonPayloadType = Exclude<ServerToDaemonControlMsg, DaemonMeshResultMsg>['type']
 export type ServerToDaemonPayloadOf<T extends ServerToDaemonPayloadType> = Extract<ServerToDaemonControlMsg, { type: T }>['payload']
 
 /** Command types a daemon must never receive as a direct command: they are daemon→server frames or reserved envelope words. */
@@ -504,7 +482,7 @@ export function isDaemonDirectCommandType(value: unknown): value is DaemonDirect
 /**
  * Parse boundary for the daemon: is `raw` a frame this link accepts from the server?
  * Control members are checked for their discriminant and envelope shape; the
- * two payload-less replies need their `requestId`; any other well-formed
+ * payload-less `daemon_mesh_result` reply needs its `requestId`; any other well-formed
  * command name becomes a `ServerDirectCommandMsg`.
  */
 export function decodeServerToDaemon(raw: unknown): ServerToDaemonMsg | null {
@@ -513,18 +491,9 @@ export function decodeServerToDaemon(raw: unknown): ServerToDaemonMsg | null {
         ...readEnvelopeFields(raw),
         ...(isNonEmptyString(raw.source) ? { source: raw.source } : {}),
     }
-    if (raw.type === 'beacon_vectors_result' || raw.type === 'daemon_mesh_result') {
+    if (raw.type === 'daemon_mesh_result') {
         if (!isNonEmptyString(raw.requestId)) return null
         const base = { requestId: raw.requestId, success: raw.success === true }
-        if (raw.type === 'beacon_vectors_result') {
-            return {
-                type: 'beacon_vectors_result',
-                ...base,
-                ...(Array.isArray(raw.reports) ? { reports: raw.reports } : {}),
-                ...(typeof raw.truncated === 'number' ? { truncated: raw.truncated } : {}),
-                ...(typeof raw.error === 'string' ? { error: raw.error } : {}),
-            }
-        }
         return {
             type: 'daemon_mesh_result',
             ...base,

package/src/session-launch.ts

@@ -28,6 +28,8 @@
  * only `SessionLaunchRecord.launchedBy` records that the session came back via
  * restore.
  */
+import { readString } from './json'
+
 export const MODEL_AXIS_SOURCES = [
     /** Picked explicitly for this launch (dashboard dropdown, coordinator dialog). */
     'user',
@@ -173,10 +175,6 @@ export function sanitizeModelIdentifier(value: unknown): string | undefined {
     return MODEL_IDENTIFIER_PATTERN.test(trimmed) ? trimmed : undefined
 }
 
-function readString(value: unknown): string | undefined {
-    return typeof value === 'string' && value.trim() ? value.trim() : undefined
-}
-
 function readFiniteNumber(value: unknown): number | undefined {
     return typeof value === 'number' && Number.isFinite(value) ? value : undefined
 }

package/src/slot-proposal.ts

@@ -1,5 +1,5 @@
 /**
- * CLI auto-detect → capability-slot / MAGI-panel PROPOSAL generator.
+ * CLI auto-detect → capability-slot PROPOSAL generator.
  *
  * Detection of installed CLI providers already exists per node (the status
  * snapshot's `availableProviders`), and applying a slot profile already exists
@@ -31,7 +31,6 @@ import {
     type MeshTaskDifficulty,
     type NodeCapabilitySlot,
 } from './brain-routing'
-import type { MagiSlot } from './magi'
 
 /**
  * One provider's seeded slot recipe. A provider may map to MORE THAN ONE slot
@@ -280,48 +279,3 @@ export function buildSlotProposal(
         destructive: droppedSlots.length > 0,
     }
 }
-
-/**
- * Build a MAGI panel proposal from the same detections.
- *
- * ─── Deliberately narrow ──────────────────────────────────────────────────────
- *
- * MAGI's value is provider INDEPENDENCE: replicas from different providers
- * (ideally different machines) answering the same question, so agreement means
- * something. Detection tells us which providers exist — that is exactly enough
- * to propose one panel of distinct providers, and no more.
- *
- * What detection does NOT tell us is which provider suits which review KIND
- * (rca vs design vs claim_audit). Nothing in any manifest grades a provider for
- * root-cause analysis over design review, and inventing a per-kind assignment
- * would fabricate a rationale that does not exist. So this proposes ONE panel of
- * the detected providers and leaves the kind binding to the operator; the caller
- * decides which `task_kind` to bind it to via the existing dry-run tool.
- *
- * Ordering follows {@link CLI_SLOT_RECIPES} insertion order (recipe-known
- * providers first, in table order), so the panel leads with the providers whose
- * suitability is actually attested.
- */
-export function buildMagiPanelProposal(
-    detected: readonly DetectedCliProvider[],
-    opts: { nodeId?: string; maxSlots?: number } = {},
-): MagiSlot[] {
-    const providers = dedupeDetected(detected ?? [])
-    const tableOrder = Object.keys(CLI_SLOT_RECIPES)
-    const rank = (type: string): number => {
-        const i = tableOrder.indexOf(type)
-        return i === -1 ? Number.MAX_SAFE_INTEGER : i
-    }
-    const ordered = [...providers].sort((a, b) => rank(a.type) - rank(b.type))
-    const limit = Number.isFinite(opts.maxSlots) && (opts.maxSlots as number) > 0
-        ? Math.floor(opts.maxSlots as number)
-        : ordered.length
-
-    return ordered.slice(0, limit).map((p): MagiSlot => ({
-        ...(opts.nodeId ? { nodeId: opts.nodeId } : {}),
-        provider: p.type,
-        // A model is intentionally NOT pinned: the panel's job is cross-provider
-        // independence, and pinning models here would silently couple the panel
-        // to this table's cost assumptions rather than to review quality.
-    }))
-}

package/src/turn-ipc-guards.ts

@@ -0,0 +1,61 @@
+/**
+ * turn-ipc shared runtime-guard primitives (the protocol version stamp and the
+ * small structural checks every command decoder composes). Part of the turn-ipc
+ * wire contract (./turn-ipc.ts).
+ */
+
+import { isEvidenceIdentifier } from './turn-evidence';
+import { isRecord } from './protocol/envelope';
+
+// ─── shared primitives ─────────────────────────────────────────────────────
+
+/** Every request in this file is versioned so a responder can reject a shape it predates. */
+export const TURN_IPC_PROTOCOL_VERSION = 1 as const
+
+export function isFiniteNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value)
+}
+
+export function isNonNegativeInt(value: unknown): value is number {
+    return Number.isSafeInteger(value) && (value as number) >= 0
+}
+
+export function isOptionalId(value: unknown): boolean {
+    return value === undefined || isEvidenceIdentifier(value)
+}
+
+export function hasOnlyKeys(value: Record<string, unknown>, allowed: readonly string[]): boolean {
+    for (const key of Object.keys(value)) {
+        if (!allowed.includes(key)) return false
+    }
+    return true
+}
+
+export function makeGuard<T extends readonly string[]>(values: T): (value: unknown) => value is T[number] {
+    const set: ReadonlySet<string> = new Set(values)
+    return (value: unknown): value is T[number] => typeof value === 'string' && set.has(value)
+}
+
+export function isStringArray(value: unknown): value is readonly string[] {
+    return Array.isArray(value) && value.every((v) => typeof v === 'string')
+}
+
+export function isOptionalShortString(value: unknown, max = 512): boolean {
+    return value === undefined || (typeof value === 'string' && value.trim().length > 0 && value.length <= max)
+}
+
+export function isRecordArray(value: unknown): value is readonly Record<string, unknown>[] {
+    return Array.isArray(value) && value.every(isRecord)
+}
+
+export function isOptionalRecord(value: unknown): boolean {
+    return value === undefined || isRecord(value)
+}
+
+export function isOptionalBoolean(value: unknown): boolean {
+    return value === undefined || typeof value === 'boolean'
+}
+
+export function isOptionalString(value: unknown): boolean {
+    return value === undefined || typeof value === 'string'
+}