@agfpd/iapeer 0.4.67 → 0.4.69

package/src/supervisor/approvalRoute.ts

@@ -0,0 +1,76 @@
+// Supervisor circuit-breaker → human-approval routing (Unit 4, docs/17). The GATED half of the
+// nag-watcher's 'approve' branch: instead of auto-pressing YES (the yolo status-quo), POST the breaker
+// to the daemon approval broker, block on a human's allow/deny, and inject the decided keys into the
+// pty — the AFFIRMATIVE keys on allow, the taxonomy-specific DECLINE keys on deny.
+//
+// FAIL-SAFE by construction: ANY broker failure (daemon unreachable, abort/timeout, non-200) resolves
+// to DENY (inject the decline keys), NEVER auto-Yes — this is the engineering basis of gated=fail-safe
+// (a gated peer under a supervision fault falls back to the safe answer, not the permissive one). The
+// breaker still sits ABOVE the permission layer, so this is the ONLY interceptor for the prompts the
+// runtime hook cannot see (dangerous-rm; an rm from a subprocess/script).
+//
+// IO is injected (fetch, the pty-write, the log, the clock), so the routing + fail-safe + key selection
+// are unit-testable without a live daemon or a real pty.
+
+import { requestApproval, resolveFleetBase, type ApprovalDecision } from '../approval/brokerClient.ts'
+
+export interface BreakerApprovalInput {
+  /** Class tag — 'dangerous-rm' | 'command-approval'. Sent as the broker `tool` + `summary`. */
+  taxonomy: string
+  /** Best-effort one-line command/target trace parsed off the pane. Sent as the broker `content`. */
+  detail: string
+  /** Keys to inject on ALLOW — the position-robust affirmative ('1'+Enter). */
+  approveBytes: Buffer
+  /** Keys to inject on DENY — the taxonomy-specific decline (2.No | 3.No). */
+  denyBytes: Buffer
+}
+
+export interface BreakerRouteDeps {
+  personality: string
+  runtime: string
+  env: NodeJS.ProcessEnv
+  /** Inject keys into the pty (child.terminal.write). */
+  write: (bytes: Buffer) => void
+  /** Injectable fetch (tests). */
+  fetch?: typeof fetch
+  /** Injectable client timeout (tests). */
+  timeoutMs?: number
+  /** Post-hoc audit line (console.warn in prod; a spy in tests). */
+  log?: (line: string) => void
+  /** Injectable clock (tests). Default Date.now. */
+  now?: () => number
+}
+
+/**
+ * POST the circuit-breaker to the human-approval broker, await the decision, and inject the decided
+ * keys into the pty. Returns the decision for the caller's cooldown/in-flight bookkeeping. NEVER
+ * throws — a broker failure fails safe to deny (decline keys injected). Every path leaves one audit
+ * line: BREAKER-ALLOW / BREAKER-DENY with the taxonomy, the parsed detail, and (on deny) the reason.
+ */
+export async function routeCircuitBreaker(input: BreakerApprovalInput, deps: BreakerRouteDeps): Promise<ApprovalDecision> {
+  const now = deps.now ?? Date.now
+  let decision: ApprovalDecision
+  try {
+    decision = await requestApproval(
+      resolveFleetBase(deps.env),
+      {
+        personality: deps.personality,
+        runtime: deps.runtime,
+        kind: 'circuit-breaker',
+        tool: input.taxonomy,
+        content: input.detail,
+        summary: input.taxonomy,
+      },
+      { env: deps.env, fetch: deps.fetch, timeoutMs: deps.timeoutMs },
+    )
+  } catch (e) {
+    // Broker unreachable / abort / non-200 → DENY (never auto-Yes). gated = fail-safe.
+    decision = { decision: 'deny', reason: `iapeer approval unavailable (${e instanceof Error ? e.message : String(e)}) — denied fail-safe` }
+  }
+  deps.write(decision.decision === 'allow' ? input.approveBytes : input.denyBytes)
+  deps.log?.(
+    `[supervisor] BREAKER-${decision.decision.toUpperCase()} ${input.taxonomy} ts=${new Date(now()).toISOString()} ${input.detail}` +
+      (decision.reason ? ` reason=${JSON.stringify(decision.reason)}` : ''),
+  )
+  return decision
+}

package/src/supervisor/boot.ts

@@ -38,12 +38,14 @@ export function nextBootAction(adapter: BootPredicates, viewport: string, enc: K
  *  claudeAdapter satisfies both; codex/router omit them → no action. */
 export interface NagPredicate {
   nagDismissKeys?(pane: string): string[] | null
-  blockingConfirm?(pane: string): { keys: string[]; taxonomy: string; detail: string } | null
+  blockingConfirm?(pane: string): { keys: string[]; denyKeys: string[]; taxonomy: string; detail: string } | null
 }
 
 export type NagAction =
   | { kind: 'dismiss'; keys: string[]; bytes: Buffer } // benign upsell — press keys silently
-  | { kind: 'approve'; keys: string[]; bytes: Buffer; taxonomy: string; detail: string } // circuit-breaker — press keys + LOG
+  // circuit-breaker — press `bytes` to AFFIRM (yolo auto-Yes / gated-approved) or `denyBytes` to DECLINE
+  // (gated-denied / broker fail-safe); LOG the taxonomy + detail either way.
+  | { kind: 'approve'; keys: string[]; bytes: Buffer; denyKeys: string[]; denyBytes: Buffer; taxonomy: string; detail: string }
   | { kind: 'none' }
 
 /**
@@ -59,7 +61,15 @@ export type NagAction =
 export function nextNagAction(adapter: NagPredicate, viewport: string, enc: KeyEncoding = {}): NagAction {
   const confirm = adapter.blockingConfirm?.(viewport)
   if (confirm && confirm.keys.length)
-    return { kind: 'approve', keys: confirm.keys, bytes: keysToBytes(confirm.keys, enc), taxonomy: confirm.taxonomy, detail: confirm.detail }
+    return {
+      kind: 'approve',
+      keys: confirm.keys,
+      bytes: keysToBytes(confirm.keys, enc),
+      denyKeys: confirm.denyKeys,
+      denyBytes: keysToBytes(confirm.denyKeys, enc),
+      taxonomy: confirm.taxonomy,
+      detail: confirm.detail,
+    }
   const keys = adapter.nagDismissKeys?.(viewport)
   if (keys && keys.length) return { kind: 'dismiss', keys, bytes: keysToBytes(keys, enc) }
   return { kind: 'none' }

package/src/supervisor/daemon.ts

@@ -31,6 +31,8 @@ import { newStuckGate, nextBootAction, nextNagAction, paneIsStuck, type BootPred
 import { modelToPlainText } from './render.ts'
 import { codexAdapter } from '../launch/adapters/codex.ts'
 import { claudeAdapter } from '../launch/adapters/claude.ts'
+import { approvalModeOf, readPeerProfile, type ApprovalMode } from '../identity/index.ts'
+import { routeCircuitBreaker } from './approvalRoute.ts'
 
 /** Resolve a runtime launcher from the host AT CALL TIME — env override (IAPEER_<RT>_BIN, the same
  *  knob the rest of the foundation uses) → PATH lookup — never a baked machine-specific path. Returns
@@ -688,6 +690,30 @@ export function runSupervisorDaemon(opts: SupervisorDaemonOptions): void {
   // the now-visible composer). Only runs for a runtime whose adapter declares nagDismissKeys.
   const nagAdapter = BOOT_ADAPTERS[runtime] as NagPredicate | undefined
   if (nagAdapter?.nagDismissKeys || nagAdapter?.blockingConfirm) {
+    // ── Unit 4 — approval-mode routing for the circuit-breaker ──────────────────────
+    // Resolve the peer's approval mode ONCE at watcher setup: the profile is stable for the session (a
+    // mid-session flip needs a fresh launch), and re-reading it every tick would hammer the fs. yolo
+    // (default) → the breaker AUTO-presses YES as before (restores the pre-2.1.x bypass status quo,
+    // owner decision). gated → the breaker ROUTES the confirm to the human-approval broker (blocking
+    // POST, inject the human's Yes/No). approvalModeOf is the ONE "absent⇒yolo" default — never
+    // re-derived here; an unreadable/malformed profile → yolo (approvalModeOf(null)), the safe backstop
+    // (a gated peer only launched WITHOUT bypass because the SAME profile read gated moments earlier).
+    let approvalMode: ApprovalMode = 'yolo'
+    try {
+      approvalMode = approvalModeOf(readPeerProfile(opts.cwd ?? runDir))
+    } catch {
+      /* unreadable / malformed profile → yolo default */
+    }
+    // Broker identity: prefer the composed child-env ABI (PEER_PERSONALITY/RUNTIME, invocation.ts), else
+    // derive from the session name (`<runtime>-<personality>`) by STRIPPING the runtime prefix — the
+    // personality itself may carry a '-', so never split on the first dash.
+    const brokerEnv = opts.env ?? process.env
+    const brokerPersonality =
+      brokerEnv.PEER_PERSONALITY?.trim() || (session.startsWith(`${runtime}-`) ? session.slice(runtime.length + 1) : session)
+    const brokerRuntime = brokerEnv.PEER_RUNTIME?.trim() || runtime
+    // In-flight guard: the setInterval keeps firing while a gated POST is outstanding (the modal stays up,
+    // the pane stays stuck), so gate to EXACTLY ONE broker request per wedged modal.
+    let brokerInFlight = false
     let nagFiredMs = 0
     // В60 — stuck-gate: a REAL blocked modal freezes the pty entirely, while a live peer merely
     // RENDERING the modal text (code review / quoted report — the В40 false-fire class) keeps
@@ -712,12 +738,42 @@ export function runSupervisorDaemon(opts: SupervisorDaemonOptions): void {
         child.terminal.write(action.bytes)
         nagFiredMs = Date.now()
       } else if (action.kind === 'approve') {
-        // CIRCUIT-BREAKER confirm (e.g. dangerous-rm) — press the affirmative so a headless peer never
-        // hangs on it (owner decision: auto-YES restores the pre-2.1.x bypass status quo). Leave a
-        // post-hoc AUDIT line in the supervisor's own log (console → logPath): WHICH peer (session),
-        // WHAT (taxonomy + the parsed command/target), WHEN (ts). A rare bad rm is then at least visible
-        // after the fact — the interim before human-approval (Telegram) lands. Best-effort log, never
-        // gates the keypress.
+        // CIRCUIT-BREAKER confirm (e.g. dangerous-rm) — a headless peer has no human to press it, so it
+        // hangs forever. What we press depends on the peer's approval MODE (resolved once above):
+        if (approvalMode === 'gated') {
+          // GATED — route the confirm to the human-approval broker (docs/17, Unit 4). A blocking POST
+          // awaits a human's allow/deny (≤ broker 300s); routeCircuitBreaker injects the affirmative on
+          // allow, the taxonomy-specific decline on deny (dangerous-rm=2.No / command-approval=3.No), and
+          // fails safe to DENY on any broker fault. The breaker sits ABOVE the permission layer, so this
+          // is the ONLY interceptor for prompts the runtime hook cannot see (dangerous-rm; rm from a
+          // subprocess). Guarded by brokerInFlight so a re-firing tick never opens a second request.
+          if (brokerInFlight) return
+          brokerInFlight = true
+          void routeCircuitBreaker(
+            { taxonomy: action.taxonomy, detail: action.detail, approveBytes: action.bytes, denyBytes: action.denyBytes },
+            {
+              personality: brokerPersonality,
+              runtime: brokerRuntime,
+              env: brokerEnv,
+              write: b => child.terminal.write(b),
+              log: line => {
+                try {
+                  console.warn(line)
+                } catch {
+                  /* logging must never break the conduit */
+                }
+              },
+            },
+          ).finally(() => {
+            brokerInFlight = false
+            nagFiredMs = Date.now() // just answered → let the (now-clearing) modal repaint away before re-check
+          })
+          return
+        }
+        // YOLO (default) — auto-press YES so a headless peer never hangs (owner decision: restores the
+        // pre-2.1.x bypass status quo). Leave a post-hoc AUDIT line (WHICH peer, WHAT taxonomy + parsed
+        // command/target, WHEN) so a rare bad rm is at least visible after the fact. Best-effort log,
+        // never gates the keypress.
         child.terminal.write(action.bytes)
         nagFiredMs = Date.now()
         try {

package/src/tray/install.ts

@@ -100,9 +100,10 @@ export function buildPluginShim(binPath: string): string {
     '# <xbar.author>iapeer</xbar.author>',
     '# <xbar.desc>iapeer multi-agent fleet — live peer dashboard over the daemon fleet API.</xbar.desc>',
     '# <swiftbar.type>streamable</swiftbar.type>',
-    '# <swiftbar.hideRunInTerminal>true</swiftbar.hideRunInTerminal>',
-    '# <swiftbar.hideLastUpdated>true</swiftbar.hideLastUpdated>',
-    '# <swiftbar.hideDisablePlugin>true</swiftbar.hideDisablePlugin>',
+    // NB: deliberately NOT hiding SwiftBar's own service items (Run-in-Terminal /
+    // Disable / Last-Updated / Preferences / Refresh). They are the right-click "do
+    // stuff" menu the owner expects; hiding them made the icon feel dead. Minimalism is
+    // for OUR content (status + peer rows), not SwiftBar's utility menu.
     // The dashboard ONLY ever talks to the local daemon (unix socket / loopback), so it
     // must never route through an HTTP proxy. Bun's fetch caches proxy config at process
     // start and ignores NO_PROXY for loopback, so clearing the vars must happen in the

package/src/tray/render.ts

@@ -163,8 +163,11 @@ export function renderSwiftBar(snapshot: TraySnapshot, opts: RenderOptions): str
   lines.push(...renderManage(peers, bin))
 
   // ── footer ──
+  // No explicit "Refresh" item: the plugin is streamable + SSE-driven, so the menu is
+  // always current on open — a manual refresh gives the user nothing and (being a
+  // SwiftBar refresh) just closes the dropdown. The emergency "restart the plugin" lever
+  // lives in SwiftBar's own service menu (right-click → Refresh).
   lines.push('---')
-  lines.push(line(0, 'Refresh', { refresh: true, sfimage: 'arrow.clockwise' }))
   lines.push(line(0, `iapeer · fleet dashboard`, { color: COLOR.meta, size: 11 }))
   return lines.join('\n') + '\n'
 }
@@ -222,6 +225,8 @@ function renderManage(peers: TrayPeer[], bin: string): string[] {
   for (const p of peers) {
     out.push(line(1, p.personality))
     for (const c of MANAGE_COMMANDS) {
+      // No refresh=true: the SSE stream reflects the command's lifecycle event on its
+      // own (streamable is always fresh); a refresh would only restart the stream.
       out.push(
         line(2, c.label, {
           bash: bin,
@@ -230,7 +235,6 @@ function renderManage(peers: TrayPeer[], bin: string): string[] {
           param3: c.cmd,
           param4: p.personality,
           terminal: false,
-          refresh: true,
         }),
       )
     }