weir-harness 1.2.0 → 1.2.2

package/src/delegate/group-coordinator.js

@@ -1,6 +1,7 @@
 // Supervised group coordinator: registry state machine for grouped delegation.
 // Pure logic (no DSH imports) — the mount layer (index.js/tool.js) feeds it
 // session events and injects the effectors (sendMessage/interrupt/timers).
+import { isTerminalStatus, parseTerminalStatus } from '../shared/terminal-evidence.js'
 
 export const SUPERVISION_CONTRACT = `
 
@@ -30,15 +31,6 @@ export const DEFAULT_SUPERVISION = {
 /** Bounded wait for the last settlement notice before the fallback delivery. */
 export const SIGNAL_FALLBACK_MS = 1000
 
-/** Parse a child's final assistant text into a terminal status, or null. */
-export function parseTerminalStatus(text) {
-  if (typeof text !== 'string' || text.length === 0) return null
-  const match = /^STATUS:[ \t]*(completed|blocked)[ \t]*$/m.exec(text)
-  if (!match) return null
-  const reportMatch = /^REPORT:[ \t]*([\s\S]*)$/m.exec(text.slice(match.index))
-  return { status: match[1], report: (reportMatch?.[1] ?? '').trim() }
-}
-
 /**
  * Canonical member record shape: eight fields, fixed order. The single source
  * every construction site converges on (registerMember, hydrate, rehydrate).
@@ -55,26 +47,31 @@ export function createGroupRecord(name, { sealed = false, settled = false, membe
 }
 
 /**
- * Single exit for the terminal-status predicate: statuses that count toward
- * group completion (blocked waits for a resume, so it is NOT terminal here).
- */
-export function isTerminalStatus(status) {
-  return status === 'completed' || status === 'terminated'
-}
-
-/**
- * Single exit for the untracked-catalog predicate: continuable catalog entries
- * the registry does not track. mode is normalized (undefined → 'continuable');
- * the row shape is { id, label, mode }. `isTracked(id)` is the caller's lookup.
+ * Single exit for the untracked-catalog predicate: catalog children the
+ * supervision registry does not track AND no one-shot/continuable spawn fact
+ * claims. The row shape is { id, label, mode } (mode is passed through
+ * verbatim: DSH 0.2.1 reports every local child as 'continuable' and may also
+ * report 'external', so the catalog mode no longer discriminates lanes — the
+ * durable spawn facts do).
+ * `isTracked(id)` is the caller's registry lookup. `spawnFactOf(id)` returns
+ * the durable delegate/spawn fact for a weir-spawned child (lane included):
+ * one-shot and plain-continuable children must never be resurrected as
+ * supervision orphans, while a supervised child normally IS tracked and a
+ * supervised child missing from the fact chain stays visible as an orphan
+ * (never hidden). Only a fact-less orphan (not spawned by this weir build)
+ * keeps the promoted/recovered semantics.
+ * @param {object[]} entries - DSH catalog children
+ * @param {(id: string) => boolean} isTracked
+ * @param {(id: string) => { lane?: string } | undefined} [spawnFactOf]
  */
-export function untrackedCatalogEntries(entries, isTracked) {
+export function untrackedCatalogEntries(entries, isTracked, spawnFactOf) {
   const untracked = []
   for (const entry of entries ?? []) {
     if (!entry || typeof entry !== 'object') continue
-    const mode = entry.mode === undefined ? 'continuable' : entry.mode
-    if (mode !== 'continuable') continue
     if (isTracked(entry.id)) continue
-    untracked.push({ id: entry.id, label: entry.label ?? '', mode })
+    const lane = spawnFactOf?.(entry.id)?.lane
+    if (lane === 'one-shot' || lane === 'continuable') continue
+    untracked.push({ id: entry.id, label: entry.label ?? '', mode: entry.mode })
   }
   return untracked
 }
@@ -89,7 +86,8 @@ export function untrackedCatalogEntries(entries, isTracked) {
  * @param {(delayMs: number, fn: () => void) => void} deps.schedule - delayed retry scheduler
  * @param {(reason: string) => void} [deps.onAudit]
   * @param {(fact: object) => void} [deps.onFact] - structured supervision facts (durability)
-  * @param {(text: string) => void} [deps.notifyParent] - deliver a parent-facing signal (timer-deferred followup)
+ * @param {(text: string) => void} [deps.notifyParent] - deliver a parent-facing signal (timer-deferred followup)
+ * @param {(childId: string) => { lane?: string } | undefined} [deps.spawnFactOf] - durable delegate/spawn fact for one child id (lane decides orphan resurrection; see untrackedCatalogEntries)
   */
 export function createGroupCoordinator(deps, config = {}) {
   const cfg = { ...DEFAULT_SUPERVISION, ...config }
@@ -190,9 +188,9 @@ export function createGroupCoordinator(deps, config = {}) {
     }
   }
 
-  /** Catalog cross-check: continuable catalog entries this registry does not track. */
+  /** Catalog cross-check: catalog children this registry does not track (spawn-fact aware). */
   function untrackedAgainstCatalog(entries) {
-    return untrackedCatalogEntries(entries, (id) => children.has(id))
+    return untrackedCatalogEntries(entries, (id) => children.has(id), deps.spawnFactOf)
   }
 
   function noteAssistantText(childId, text) {

package/src/delegate/index.js

@@ -1,7 +1,9 @@
 // Weir delegate plugin: category registry + curated agents + the delegate
 // tool. Plain ESM, ctx-only. Composition root: all policy lives in the sibling
 // modules (settings-overlay / target-resolver / supervision-tools /
-// supervision-mount / audit-readers); apply() only constructs and wires them.
+// supervision-mount); apply() only constructs and wires them. The terminal-
+// evidence cold readers live in src/shared/terminal-evidence.js (shared with
+// the worktree plugin).
 import { CURATED_AGENTS } from './agents.js'
 import { createSettingsOverlay } from './settings-overlay.js'
 import { createTargetResolver } from './target-resolver.js'
@@ -11,11 +13,12 @@ import { skillSelectionFor } from '../capabilities/skill-selection-plugin.js'
 import { createResumeTool, createTerminateTool } from './supervision-tools.js'
 import { mountSupervision } from './supervision-mount.js'
 import { createAudit } from '../shared/audit.js'
-import { FALLBACK_TABLES } from '../shared/whitelist-defaults.js'
+import { FALLBACK_TABLES } from './whitelist-defaults.js'
 import { createDelegateTool } from './tool.js'
 import { attachWorktreeModeGuard } from './worktree-mode.js'
 import { DOCTRINE_SECTION_ORDER } from '../core/doctrine.js'
 import { isDelegatedChild } from '../shared/child-scope.js'
+import { createChildComposition } from './child-composition.js'
 import {
   DELEGATE_TARGETS_SECTION_NAME,
   DELEGATE_TARGETS_SECTION_ORDER_OFFSET,
@@ -95,6 +98,20 @@ function apply(ctx, config = {}) {
     onAdaptersUpdated: (fn) => ctx.on('llm/adapters-updated', fn),
   })
 
+  // Creation-window child composition (DSH 0.2.1 removed the request-level
+  // persona/toolFilter): the shim applies the reserved spawn's composition in
+  // the child's agent/created window and replays it from the audit channel on
+  // cold resume. One instance per plugin context; dispose unregisters it.
+  const composition = createChildComposition({
+    ctx,
+    audit,
+    logger: ctx.logger,
+    restrictableNames: () => ctx.tools.view?.(undefined)?.restrictableNames,
+    // Feed the supervision catalog cross-check the same durable fact without a
+    // file re-read (spawn-fact lane decides orphan resurrection).
+    onSpawn: mount.noteSpawnFact,
+  })
+
   ctx.tools.register(
     createDelegateTool({
       resolveTarget: targetResolver.resolveTarget,
@@ -112,6 +129,7 @@ function apply(ctx, config = {}) {
       // names, so the child deny list names only tools this composition
       // actually registers (tools.restrict() rejects unknown deny names).
       restrictableNames: () => ctx.tools.view?.(undefined)?.restrictableNames,
+      composition,
     }),
   )
 
@@ -163,6 +181,7 @@ function apply(ctx, config = {}) {
   return () => {
     offModeGuard()
     mount.dispose()
+    composition.dispose()
   }
 }
 

package/src/delegate/rehydrate.js

@@ -2,27 +2,44 @@
 // restart. Pure logic — the mount layer feeds it parsed audit records and the
 // DSH catalog; no DSH imports, no fs.
 
-import { parseTerminalStatus, createMemberRecord, createGroupRecord, isTerminalStatus, untrackedCatalogEntries } from './group-coordinator.js'
+import { createMemberRecord, createGroupRecord, untrackedCatalogEntries } from './group-coordinator.js'
+import { parseTerminalStatus, isTerminalStatus } from '../shared/terminal-evidence.js'
 
 /**
  * Rebuild supervision state by replaying structured audit facts and
  * cross-checking the DSH subagent catalog.
  *
+ * Two fact channels ride the same audit file: the supervision facts
+ * (`weir/supervision/<kind>`) and the child-composition spawn facts
+ * (`weir/delegate/spawn`, which carry the lane). The spawn facts decide which
+ * catalog children are supervision orphans — DSH 0.2.1 reports every local
+ * child as mode 'continuable', so the catalog mode can no longer tell a
+ * one-shot child from a supervised one.
+ *
  * @param {object} input
  * @param {string} input.parentId - the parent session id (record filter key)
  * @param {object[]} input.records - parsed audit JSONL records (already tail-read; may contain other sessions/types)
  * @param {object[]} input.catalogChildren - DSH catalog entries ({ id, label?, mode? }); best-effort
- * @returns {{ children: object[], groups: object[], untracked: object[], confidence: 'full'|'partial', factsSeen: number }}
+ * @returns {{ children: object[], groups: object[], untracked: object[], spawnFacts: object[], confidence: 'full'|'partial', factsSeen: number }}
  */
 export function rehydrateSupervision({ parentId, records, catalogChildren }) {
   const children = new Map()
   const groups = new Map()
+  /** @type {Map<string, { childId: string, lane?: string }>} */
+  const spawnFacts = new Map()
   let factsSeen = 0
 
   for (const record of records ?? []) {
     if (!record || typeof record !== 'object') continue
     if (record.session !== undefined && record.session !== null && record.session !== parentId) continue
     const type = typeof record.type === 'string' ? record.type : ''
+    if (type === 'weir/delegate/spawn') {
+      const fact = record.data
+      if (fact && typeof fact === 'object' && typeof fact.childId === 'string' && fact.childId.length > 0) {
+        spawnFacts.set(fact.childId, { childId: fact.childId, lane: typeof fact.lane === 'string' ? fact.lane : undefined })
+      }
+      continue
+    }
     if (!type.startsWith('weir/supervision/')) continue
     const fact = record.data
     if (!fact || typeof fact !== 'object' || typeof fact.kind !== 'string') continue
@@ -36,13 +53,16 @@ export function rehydrateSupervision({ parentId, records, catalogChildren }) {
     group.settled = group.sealed === true && group.memberIds.length > 0 && terminal
   }
 
-  // Catalog cross-check: continuable children the registry does not track.
-  const untracked = untrackedCatalogEntries(catalogChildren, (id) => children.has(id))
+  // Catalog cross-check: only fact-less orphans remain untracked (the spawn
+  // facts identify the one-shot/continuable children this registry must never
+  // resurrect, and keep a supervised child whose fact chain is broken visible).
+  const untracked = untrackedCatalogEntries(catalogChildren, (id) => children.has(id), (id) => spawnFacts.get(id))
 
   return {
     children: [...children.values()],
     groups: [...groups.values()],
     untracked,
+    spawnFacts: [...spawnFacts.values()],
     confidence: factsSeen > 0 ? 'full' : 'partial',
     factsSeen,
   }

package/src/delegate/robash-guard-core.js

@@ -1,7 +1,7 @@
 // Read-only shell guard core: the single canonical home of every cross-shell
 // policy the bash and pwsh adapters share — the whitelist tables (one
 // representation, consumed by the guard adapters, delegate/index.js, and
-// shared/whitelist-defaults.js), the git gate, the GIT_CONFIG_* environment
+// whitelist-defaults.js), the git gate, the GIT_CONFIG_* environment
 // smuggle refusal, the recursion budget, the redirect sink policy, and the
 // per-executable verdict tail. Pure functions, no ctx access.
 //
@@ -10,7 +10,7 @@
 // the three & roles, alias expansion), so the scanners are not merged.
 
 /** Canonical whitelist tables, organized by the five published keys so
- * shared/whitelist-defaults.js derives FALLBACK_TABLES with zero translation.
+ * whitelist-defaults.js derives FALLBACK_TABLES with zero translation.
  * Entries moved verbatim from the former DEFAULT_ROBASH (robash-guard.js) and
  * DEFAULT_ROBASH_PWSH (robash-guard-pwsh.js); pwsh entries keep their original
  * casing (the pwsh adapter lowercases at lookup) so the shipped