@heretek-ai/epistemic-swarm 1.1.4 → 2.3.0

package/src/tools.ts

@@ -14,6 +14,7 @@ import {
   scoutTools,
 } from "@heretek-ai/es-core"
 import { Error as ToolError } from "@opencode/plugin/promise/tool"
+import { modelProblemLines } from "./agents.ts"
 import type { Runtime } from "./runtime.ts"
 
 export function registerTools(editor: { add(tool: any): void }, runtime: Runtime) {
@@ -64,7 +65,10 @@ export function registerTools(editor: { add(tool: any): void }, runtime: Runtime
       },
       execute: async (input: unknown, context: { agent: string; sessionID: string; signal: AbortSignal }) => {
         try {
-          return { content: await def.execute(input ?? {}, context) }
+          const content = await def.execute(input ?? {}, context)
+          if (def.name !== "es_status" || runtime.modelProblems.size === 0 || typeof content !== "string")
+            return { content }
+          return { content: [content, ...modelProblemLines(runtime.modelProblems)].join("\n") }
         } catch (error) {
           if (error instanceof ToolError) throw error
           throw new ToolError({ message: error instanceof Error ? error.message : String(error) })

package/src/tui.tsx

@@ -1,13 +1,25 @@
-// Epistemic Swarm TUI plugin: previews for the human-only actions. Approvals,
-// trust and resume are previewed here, then recorded at a terminal with the
-// passphrase-sealed human key (`es approve`, `es trust`, `es factory resume`),
-// never through an agent tool or RPC. Only lspInstall still mutates via RPC.
+// Epistemic Swarm TUI plugin: human-only actions. Approvals complete here,
+// through a masked passphrase dialog and in-process signing with the
+// passphrase-sealed human key (`channel: "tui"`); trust and resume are
+// previewed here, then recorded at a terminal with the same key
+// (`es trust`, `es factory resume`), never through an agent tool or RPC.
+// Only lspInstall still mutates via RPC.
 import { userInfo } from "node:os"
 import { Plugin } from "@opencode/plugin/tui"
+import { approveInTui } from "./approve-tui.ts"
+import { readMaskedPassphrase } from "./masked-input.tsx"
 import { registerPanels } from "./panels.tsx"
 import { EsRpc } from "./rpc-def.ts"
 
-type Preview = { ok: boolean; title: string; lines: string[]; problems: string[]; token?: string }
+type Preview = {
+  ok: boolean
+  title: string
+  lines: string[]
+  problems: string[]
+  token?: string
+  subjectHash?: string
+  issuedAt?: number
+}
 
 export default Plugin.define({
   id: "epistemic-swarm.tui",
@@ -67,10 +79,51 @@ export default Plugin.define({
       const preview: Preview = await call("previewApproval", { stage })
       const token = await confirm(preview, "Approve")
       if (!token) return
-      await context.ui.dialog.alert({
-        title: preview.title,
-        message: `${preview.lines.join("\n")}\n\nRun \`es approve ${stage}\` at a terminal with your passphrase (1.1.1: approvals need the sealed human key).`,
+      // Approvals complete inside the TUI (ADR 0002): masked passphrase
+      // dialog, in-process signing through the core service, channel "tui".
+      // No passphrase and no approval cross RPC. Trust and resume keep the
+      // terminal alert below.
+      const terminalAlert = () =>
+        context.ui.dialog.alert({
+          title: preview.title,
+          message: `${preview.lines.join("\n")}\n\nRun \`es approve ${stage}\` at a terminal with your passphrase (approvals need the sealed human key).`,
+        })
+      if (!preview.subjectHash) {
+        await terminalAlert()
+        return
+      }
+      const outcome = await approveInTui({
+        root: location().directory,
+        stage,
+        expectedSubjectHash: preview.subjectHash,
+        // ADR 0002 I3: the preview ticket is redeemed exactly once inside
+        // approveInTui (single-use + 120 s TTL). The redeem is validate-only:
+        // signing stays in-process below (#49).
+        ...(token ? { previewToken: token } : {}),
+        ...(preview.issuedAt !== undefined ? { previewIssuedAt: preview.issuedAt } : {}),
+        redeemPreview: (previewToken) =>
+          call("redeemApproval", { stage, token: previewToken, subjectHash: preview.subjectHash }),
+        approvedBy: user,
+        readPassphrase: (title) => readMaskedPassphrase(context.ui.dialog, title),
       })
+      if (outcome.ok) {
+        toast(
+          `Approved ${stage} as ${outcome.record.approvedBy} (${outcome.record.subject.length} artifact(s)).`,
+          "success",
+        )
+        return
+      }
+      if ("fallback" in outcome) {
+        await terminalAlert()
+        return
+      }
+      if ("locked" in outcome) {
+        await context.ui.dialog.alert({
+          title: preview.title,
+          message: `Too many wrong passphrases. Try again in ${outcome.retryAfterSec}s (the lockout is audited).`,
+        })
+        return
+      }
     })
 
     const trust = guarded(async () => {