pum-agent 0.2.10-beta.1 → 0.2.12-beta.1

package/README.md

@@ -47,7 +47,7 @@ The following screens are real OpenTUI renders captured through `tmux`. A local
 - **External triggers:** Supervise background commands such as `gh run watch` and automatically wake the exact target agent when they exit.
 - **Provider choice:** Search the providers exposed by pi, or add an OpenAI-compatible custom endpoint.
 - **Filesystem boundary:** `read`, `write`, and `edit` stay inside the project and configured allowed roots. `apply_patch` stays project-local.
-- **Optional safeguards:** Use strict, balanced, or ask Check mode for `bash`, `edit`, `apply_patch`, and external-trigger process proposals. Supported hosts can also use native Bash sandboxing through Bubblewrap or Windows CreateProcessInSandbox.
+- **Optional safeguards:** Turn on Check mode to gate `bash`, `edit`, `apply_patch`, and external-trigger process proposals. Supported hosts can also use native Bash sandboxing through Bubblewrap or Windows CreateProcessInSandbox.
 - **Terminal-first appearance:** Nine themes, semantic color overrides, Unicode glyphs, and optional animation.
 
 PUM uses [pi](https://github.com/earendil-works/pi) for the agent loop and [OpenTUI](https://github.com/anomalyco/opentui) for rendering.
@@ -250,21 +250,22 @@ This boundary does not isolate `bash`, package scripts, extensions, or trigger p
 
 ### Check mode
 
-Select a Check mode profile in `Ctrl+P`. It applies to `bash`, `edit`, `apply_patch`, and external-trigger process execution:
+Select Check mode in `Ctrl+P` — either **Off** or **On**. It applies to `bash`, `edit`, `apply_patch`, and external-trigger process execution:
 
-- **Strict:** Run deterministic hard rules, then require a clear verifier approval.
-- **Balanced:** Block deterministic hard-rule or suspicious findings. Allow ordinary complete project-local calls, explicit non-sensitive external reads, and narrow lifecycle-disabled npm release verification operations whose writes stay in approved roots. Verifier review is non-blocking unless the verifier returns explicit `UNSAFE`.
-- **Ask:** Show the approval popup for every checked call that passes hard rules, unless an exact session or project approval already matches. A verifier `SAFE`, unclear, error, or unavailable result still requires approval.
+- **Off:** Checked tools run without the deterministic policy or the advisory verifier.
+- **On:** The deterministic policy runs first, then an advisory verifier reviews the complete proposal.
 
-Every active profile hard-blocks external writes, location changes, execution operands, ambiguous path access, escaping links, credential access, privilege escalation, persistence, remote-script execution, destructive Git operations, and broad deletion. Balanced permits explicit, deterministically classified, non-sensitive external reads. It accepts one direct `npm pack` only when lifecycle scripts are disabled, an explicit cache stays in an approved root, output stays in an approved root, and any package operand is one exact registry version. Balanced also accepts one direct `npm install` of one exact registry version only when `--ignore-scripts`, an approved `--prefix`, and an approved `--cache` are explicit. File, Git, URL, tag, range, composed, general install, and global-install forms remain blocked. These hard blocks cannot be overridden and do not open the popup. An explicit verifier `UNSAFE` verdict also blocks without a popup. The only publication exception is a deterministic match for direct main-agent `npm publish` or `npm dist-tag add`. The verifier category does not control this exception. The exception still requires explicit popup approval. Managed subagents cannot use it.
+On allows ordinary complete project-local calls, explicit on-mode external reads (read-only), and project-local edits. It accepts one direct `npm pack` only when lifecycle scripts are disabled, an explicit cache stays in an approved root, output stays in an approved root, and any package operand is one exact registry version. On also accepts one direct `npm install` of one exact registry version only when `--ignore-scripts`, an approved `--prefix`, and an approved `--cache` are explicit. File, Git, URL, tag, range, composed, general install, and global-install forms remain blocked. On hard-blocks external writes, location changes, execution operands, ambiguous path access, escaping links or junctions, credential access, privilege escalation, persistence, remote-script execution, destructive Git operations, and broad deletion. These hard blocks cannot be overridden and never open a popup.
 
-Use `/check-path list`, `/check-path add <directory>`, `/check-path remove <directory>`, or `/check-path clear` to manage up to 16 additional directory roots for the current launch project. The filesystem sandbox applies these roots to `read`, `write`, and `edit`. Bash, edit, and external-trigger checks also use these roots; `apply_patch` remains project-local. Added roots are canonicalized and remain subject to credential, traversal, symlink or junction, broad-deletion, and other hard blocks.
+On blocks an explicit verifier verdict of `UNSAFE`. An unclear, unavailable, failed, or timed-out review does not block a fully validated call. The only exception outside the verifier verdict is a deterministic match for a direct main-agent `npm publish` or `npm dist-tag add ... latest`, which On allows outright. The verifier category does not control this exception. Managed subagents cannot use it.
+
+There is no approval popup and no approval store. Check mode is off by default.
 
-For `edit` and `apply_patch`, PUM validates the complete proposed change before any mutation. Review data includes the unified diff, changed paths, line counts, sensitivity flags, project containment, and full-content SHA-256. Invalid, stale, malformed, escaping, or incompletely analyzed input blocks the call. Patch length alone does not block a valid Balanced call.
+Use `/check-path list`, `/check-path add <directory>`, `/check-path remove <directory>`, or `/check-path clear` to manage up to 16 additional directory roots for the current launch project. The filesystem sandbox applies these roots to `read`, `write`, and `edit`. Bash, edit, and external-trigger checks also use these roots; `apply_patch` remains project-local. Added roots are canonicalized and remain subject to credential, traversal, symlink or junction, broad-deletion, and other hard blocks.
 
-Ask mode can allow an exact call once, for the current session, or for the current project. Approvals match the authoritative main or child identity, tool, verifier model, project, and canonical complete input. Chat text is not approval. Use **Clear approvals** in Settings to remove project approvals.
+For `edit` and `apply_patch`, PUM validates the complete proposed change before any mutation. Review data includes the unified diff, changed paths, line counts, sensitivity flags, project containment, and full-content SHA-256. Invalid, stale, malformed, escaping, or incompletely analyzed input blocks the call. Patch length alone does not block a complete validated on-mode call.
 
-The verifier uses a structured decision schema. One unclear response can receive one adjudication under the shared 15-second watchdog. Strict blocks malformed replies, errors, aborts, and timeouts. Balanced allows a fully validated call after an unclear, unavailable, failed, or timed-out review. Balanced still blocks explicit verifier `UNSAFE`, aborts, deterministic suspicious findings, malformed structures, and incomplete analysis. Ask requires the popup after hard rules for verifier `SAFE`, unclear, error, and unavailable results. Check mode is off by default.
+The verifier uses a structured decision schema. One unclear response can receive one bounded adjudication under the shared 15-second watchdog. On blocks aborts, malformed verifier replies, and incomplete analysis, and it blocks any explicit `UNSAFE` verdict. Check mode is off by default.
 
 #### Native Bash sandbox
 
@@ -276,7 +277,7 @@ The **Sandbox** setting has three modes:
 
 Check mode **Off** always uses pi's normal unsandboxed Bash backend. For an active Check mode, PUM recomputes the sandbox policy from the exact approved command, authoritative working directory, configured additional roots, and deterministic access analysis. Model input cannot supply policy fields.
 
-The project and configured additional roots are writable. Explicit Balanced external reads are mounted read-only. PUM configuration and common credential paths are denied, and credential-shaped or process-injection environment variables are removed. A private temporary directory is supplied for the command. Safe pi metadata such as `PI_PROVIDER`, `PI_MODEL`, and `PI_REASONING_LEVEL` remains available; session paths and identifiers are withheld.
+The project and configured additional roots are writable. Explicit on-mode external reads are mounted read-only. PUM configuration and common credential paths are denied, and credential-shaped or process-injection environment variables are removed. A private temporary directory is supplied for the command. Safe pi metadata such as `PI_PROVIDER`, `PI_MODEL`, and `PI_REASONING_LEVEL` remains available; session paths and identifiers are withheld.
 
 Network access is denied unless deterministic analysis recognizes an approved network operation. Bubblewrap's host-network mode is all-or-nothing and is **not domain-filtered**. Windows similarly grants or withholds the SDK's broad network capabilities; it does not provide hostname allowlists.
 
@@ -286,7 +287,7 @@ External triggers preserve direct executable/argument boundaries and continue to
 
 The filesystem sandbox is a process-local path guard for `read`, `write`, `edit`, and `apply_patch`. It does not replace native Bash isolation and does not cover scripts, extensions, or trigger processes.
 
-Verifier prompts stay bounded. For an oversized Balanced review, PUM sends complete validation metadata, counts, findings, and SHA-256 digests. PUM does not send a raw prefix or suffix as if it were complete. Strict and Ask keep their fail-closed oversized-input behavior.
+Verifier prompts stay bounded. For an oversized On-mode review, PUM sends complete validation metadata, counts, findings, and SHA-256 digests. PUM does not send a raw prefix or suffix as if it were complete.
 
 ### Hosted web search
 
@@ -328,8 +329,6 @@ Set `PUM_DIR` to override the complete PUM data directory.
 | `prompt-stash.json` | Stashed prompts by working directory |
 | `sessions/` | Main conversation sessions |
 | `subagents/` | Persistent subagent sessions |
-| `check-mode-cache.json` | Accepted checks for eligible read-only Git commands |
-| `check-mode-approvals.json` | Exact project approvals created in Ask mode |
 
 PUM preserves all stashed prompt occurrences. PUM also keeps the 100 most recent additional sent-history occurrences for each working directory.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pum-agent",
-  "version": "0.2.10-beta.1",
+  "version": "0.2.12-beta.1",
   "description": "A compact terminal coding agent powered by pi and OpenTUI.",
   "license": "MIT",
   "type": "module",

package/src/app.tsx

@@ -1037,9 +1037,15 @@ export function App({
       else if (event.type === "main-pending-add") addPending(event.pending);
       else if (event.type === "main-pending-resolve") resolvePending(event.id);
       else if (event.type === "main-pending-drop") dropPending(event.id);
+      else if (event.type === "news-changed") {
+        const loaded = loadNewsItems(session.sessionFile);
+        newsRef.current = loaded;
+        setNews(loaded);
+        setTx((value) => ({ ...value, lines: tagNewsLines(value.lines, loaded) }));
+      }
       setAgentRevision((revision) => revision + 1);
     }),
-    [subagentManager],
+    [subagentManager, session],
   );
 
   useEffect(() => {
@@ -1506,29 +1512,47 @@ export function App({
   const jumpFromNews = (target: "answer" | "prompt") => {
     const item = newsRef.current[newsCursorRef.current];
     if (!item) return;
-    const lines = txRef.current.lines;
-    const answerIndex = lines.findIndex((line) =>
-      line.kind === "text" && line.role === "assistant" && line.newsId === item.id,
-    );
+    const requesterAgentId = item.completion?.requesterAgentId ?? null;
+    const lines = requesterAgentId === null
+      ? txRef.current.lines
+      : subagentManager.getAgent(requesterAgentId)?.transcript.lines;
+    if (!lines) return;
+    const completionPromptIndex = item.completion
+      ? lines.findIndex((line) =>
+        line.kind === "agent-message" && line.messageId === item.completion?.messageId,
+      )
+      : -1;
+    const answerIndex = item.completion
+      ? lines.findIndex((line, index) =>
+        index > completionPromptIndex
+          && line.kind === "text"
+          && line.role === "assistant"
+          && line.text === item.text,
+      )
+      : lines.findIndex((line) =>
+        line.kind === "text" && line.role === "assistant" && line.newsId === item.id,
+      );
     let targetIndex = answerIndex;
     if (target === "prompt") {
-      const promptText = item.prompts?.find((prompt) => !prompt.steer)?.text
-        ?? item.prompts?.[0]?.text;
-      targetIndex = -1;
-      if (promptText) {
-        const end = answerIndex >= 0 ? answerIndex : lines.length;
-        for (let index = end - 1; index >= 0; index--) {
-          const line = lines[index];
-          if (line?.kind === "text" && line.role === "user" && line.text === promptText) {
-            targetIndex = index;
-            break;
+      targetIndex = completionPromptIndex;
+      if (!item.completion) {
+        const promptText = item.prompts?.find((prompt) => !prompt.steer)?.text
+          ?? item.prompts?.[0]?.text;
+        if (promptText) {
+          const end = answerIndex >= 0 ? answerIndex : lines.length;
+          for (let index = end - 1; index >= 0; index--) {
+            const line = lines[index];
+            if (line?.kind === "text" && line.role === "user" && line.text === promptText) {
+              targetIndex = index;
+              break;
+            }
           }
         }
       }
     }
     if (targetIndex < 0) return;
 
-    if (activeAgentIdRef.current !== null && !selectAgentView(null)) return;
+    if (activeAgentIdRef.current !== requesterAgentId && !selectAgentView(requesterAgentId)) return;
     newsOpenRef.current = false;
     setNewsOpen(false);
     const scrollToTarget = () => {
@@ -1590,8 +1614,12 @@ export function App({
     const firstLine = item.text.split("\n")[0] ?? item.text;
     const preview = firstLine.length > 240 ? `${firstLine.slice(0, 240)} …` : firstLine;
     const quote = `> ${preview}\n\n`;
-    viewDrafts.current.set("main", quote);
-    if (activeAgentIdRef.current !== null) selectAgentView(null);
+    const requesterAgentId = item.completion?.requesterAgentId ?? null;
+    const targetAgentId = requesterAgentId && subagentManager.getAgent(requesterAgentId)
+      ? requesterAgentId
+      : null;
+    viewDrafts.current.set(targetAgentId ?? "main", quote);
+    if (activeAgentIdRef.current !== targetAgentId) selectAgentView(targetAgentId);
     else setEditorText(quote);
     queueMicrotask(() => {
       inputRef.current?.focus();

package/src/check-policy.ts

@@ -549,6 +549,12 @@ export function analyzeBashCommand(command: string, requestedLimits?: Partial<Ch
   let pipeline = 0;
   let annotations = 0;
   let truncated = false;
+  let commandStart = true;
+  const caseContexts: Array<{
+    phase: "subject" | "pattern" | "body";
+    parenDepth: number;
+    braceDepth: number;
+  }> = [];
 
   const addAnnotation = <T>(list: T[], value: T) => {
     annotations++;
@@ -607,9 +613,37 @@ export function analyzeBashCommand(command: string, requestedLimits?: Partial<Ch
       index++;
       continue;
     }
-    if (char === "'" || char === "\"") { quote = char; index++; continue; }
-    if (char === "(") { parenDepth++; index++; continue; }
-    if (char === ")") { if (parenDepth === 0) errors.push(`unexpected ) at ${index}`); else parenDepth--; index++; continue; }
+    if (char === "'" || char === "\"") { quote = char; commandStart = false; index++; continue; }
+
+    const word = command.slice(index).match(/^[A-Za-z_][A-Za-z0-9_]*/)?.[0];
+    if (word) {
+      const next = command[index + word.length];
+      const reservedBoundary = next === undefined || /[\s;&|(){}<>]/.test(next);
+      const activeCase = caseContexts.at(-1);
+      const atCaseLevel = activeCase?.parenDepth === parenDepth && activeCase.braceDepth === braceDepth;
+      if (commandStart && word === "case" && reservedBoundary) {
+        caseContexts.push({ phase: "subject", parenDepth, braceDepth });
+      } else if (activeCase?.phase === "subject" && atCaseLevel && word === "in" && reservedBoundary) {
+        activeCase.phase = "pattern";
+      } else if (commandStart && activeCase && atCaseLevel && word === "esac" && reservedBoundary) {
+        caseContexts.pop();
+      }
+      commandStart = commandStart && reservedBoundary && new Set(["do", "then", "else", "elif"]).has(word);
+      index += word.length;
+      continue;
+    }
+
+    if (char === "(") { parenDepth++; commandStart = true; index++; continue; }
+    if (char === ")") {
+      const activeCase = caseContexts.at(-1);
+      if (activeCase?.phase === "pattern" && activeCase.parenDepth === parenDepth && activeCase.braceDepth === braceDepth) {
+        activeCase.phase = "body";
+        commandStart = true;
+      } else if (parenDepth === 0) errors.push(`unexpected ) at ${index}`);
+      else parenDepth--;
+      index++;
+      continue;
+    }
     if (char === "{") { braceDepth++; index++; continue; }
     if (char === "}") { if (braceDepth === 0) errors.push(`unexpected } at ${index}`); else braceDepth--; index++; continue; }
 
@@ -632,6 +666,15 @@ export function analyzeBashCommand(command: string, requestedLimits?: Partial<Ch
       index = newline + 1;
       continue;
     }
+    const activeCase = caseContexts.at(-1);
+    const inCasePattern = activeCase?.phase === "pattern"
+      && activeCase.parenDepth === parenDepth
+      && activeCase.braceDepth === braceDepth;
+    if (char === "|" && inCasePattern && !command.startsWith("||", index) && !command.startsWith("|&", index)) {
+      commandStart = false;
+      index++;
+      continue;
+    }
     const rawOperator = [";;&", "&&", "||", "|&", ";;", ";&", ";", "|", "&", "\n"].find((item) => command.startsWith(item, index));
     if (rawOperator) {
       const normalized = rawOperator === "\n" ? "newline" : rawOperator as BashOperator["operator"];
@@ -643,9 +686,15 @@ export function analyzeBashCommand(command: string, requestedLimits?: Partial<Ch
         stageStart = index + rawOperator.length;
         operatorBefore = normalized;
       }
+      if (activeCase?.phase === "body" && activeCase.parenDepth === parenDepth && activeCase.braceDepth === braceDepth
+        && (rawOperator === ";;" || rawOperator === ";&" || rawOperator === ";;&")) {
+        activeCase.phase = "pattern";
+      }
+      commandStart = true;
       index += rawOperator.length;
       continue;
     }
+    if (!/\s/.test(char)) commandStart = false;
     index++;
   }
   addStage(command.length);
@@ -655,6 +704,7 @@ export function analyzeBashCommand(command: string, requestedLimits?: Partial<Ch
   if (backtickStart !== undefined) errors.push(`unterminated backtick substitution at ${backtickStart}`);
   if (parenDepth) errors.push("unbalanced parentheses");
   if (braceDepth) errors.push("unbalanced braces");
+  if (caseContexts.length) errors.push("unterminated case statement");
   if (truncated) errors.push("analysis annotation limit exceeded");
 
   const stages: BashStage[] = stageRanges.map((range, index) => {

package/src/news-popup.tsx

@@ -69,6 +69,15 @@ export function NewsPopup({
             <box style={{ flexGrow: 1, width: 1 }} />
             <text content={formatAge(current.at)} fg={theme.dim} bg={theme.popupBg} wrapMode="none" />
           </box>
+          {current.completion ? (
+            <text
+              content={`${current.completion.agentName} → ${current.completion.requesterName} · finish_subagent`}
+              fg={theme.dim}
+              bg={theme.popupBg}
+              wrapMode="none"
+              style={{ height: 1, flexShrink: 0 }}
+            />
+          ) : null}
           <box style={{ height: 1, flexShrink: 0 }} />
           <scrollbox
             id="news-scrollbox"

package/src/news.ts

@@ -8,6 +8,16 @@ export type NewsPrompt = {
   steer: boolean;
 };
 
+export type NewsCompletion = {
+  settlementId: string;
+  messageId: string;
+  agentId: string;
+  agentName: string;
+  requesterAgentId: string | null;
+  requesterName: string;
+  summary: string;
+};
+
 export type NewsItem = {
   /** Stable identifier used to tag the matching transcript line. */
   id: string;
@@ -21,6 +31,8 @@ export type NewsItem = {
   answered: boolean;
   /** User prompt and steers that produced this answer, oldest first. */
   prompts?: NewsPrompt[];
+  /** Managed completion identity for a finish_subagent-triggered answer. */
+  completion?: NewsCompletion;
 };
 
 /** The list never holds more than this many answers. */
@@ -48,10 +60,23 @@ function isNewsItem(value: unknown): value is NewsItem {
             Boolean(prompt) &&
             typeof (prompt as Record<string, unknown>).text === "string" &&
             typeof (prompt as Record<string, unknown>).steer === "boolean",
-        )))
+        ))) &&
+    (item.completion === undefined || isNewsCompletion(item.completion))
   );
 }
 
+function isNewsCompletion(value: unknown): value is NewsCompletion {
+  if (!value || typeof value !== "object") return false;
+  const completion = value as Record<string, unknown>;
+  return typeof completion.settlementId === "string"
+    && typeof completion.messageId === "string"
+    && typeof completion.agentId === "string"
+    && typeof completion.agentName === "string"
+    && (completion.requesterAgentId === null || typeof completion.requesterAgentId === "string")
+    && typeof completion.requesterName === "string"
+    && typeof completion.summary === "string";
+}
+
 /** Load the persisted news list for a session. Never throws. */
 export function loadNewsItems(sessionFile: string | undefined): NewsItem[] {
   if (!sessionFile) return [];
@@ -81,16 +106,79 @@ export function saveNewsItems(
   }
 }
 
+export type FinishNewsSettlement = {
+  id: string;
+  messageId: string;
+  agentId: string;
+  agentName: string;
+  parentAgentId: string | null;
+  requesterName: string;
+  status: "idle" | "completed" | "failed";
+  summary?: string;
+  content: string;
+  createdAt: number;
+  response?: string;
+};
+
+/** Project one completed finish settlement into the persisted News model. */
+export function newsItemFromFinishSettlement(
+  settlement: FinishNewsSettlement,
+): NewsItem | undefined {
+  if (settlement.status !== "completed" || !settlement.response?.trim()) return undefined;
+  if (/^(?:ack(?:nowledged)?|got it|noted|ok(?:ay)?|thanks|thank you|understood)[.!\s]*$/i.test(
+    settlement.response.trim(),
+  )) return undefined;
+  return {
+    id: `subagent-finish:${settlement.messageId}`,
+    text: settlement.response.trim(),
+    at: settlement.createdAt,
+    read: false,
+    answered: false,
+    prompts: [{ text: settlement.content, steer: false }],
+    completion: {
+      settlementId: settlement.id,
+      messageId: settlement.messageId,
+      agentId: settlement.agentId,
+      agentName: settlement.agentName,
+      requesterAgentId: settlement.parentAgentId,
+      requesterName: settlement.requesterName,
+      summary: settlement.summary ?? "",
+    },
+  };
+}
+
+/** Upsert stable News identities while preserving local read and reply state. */
+export function mergeNewsItems(
+  existing: readonly NewsItem[],
+  incoming: readonly NewsItem[],
+): NewsItem[] {
+  const byId = new Map(existing.map((item) => [item.id, item]));
+  for (const item of incoming) {
+    const current = byId.get(item.id);
+    byId.set(item.id, current
+      ? { ...item, read: current.read, answered: current.answered }
+      : item);
+  }
+  return [...byId.values()]
+    .sort((a, b) => b.at - a.at)
+    .slice(0, NEWS_CAPACITY);
+}
+
 /**
  * Attach news identifiers to replayed assistant lines that exactly match a
  * stored answer. Each stored answer claims the first later unmatched line with
  * the same text, so resumed transcripts keep their circle/checkmark markers.
  */
-export function tagNewsLines<T>(lines: readonly T[], items: readonly NewsItem[]): T[] {
+export function tagNewsLines<T>(
+  lines: readonly T[],
+  items: readonly NewsItem[],
+  requesterAgentId: string | null = null,
+): T[] {
   if (items.length === 0 || lines.length === 0) return lines.map((line) => line);
   const claimed = new Set<number>();
   const out = lines.map((line) => line);
   for (const item of items) {
+    if ((item.completion?.requesterAgentId ?? null) !== requesterAgentId) continue;
     const maybe = (value: T) =>
       value as unknown as { kind?: unknown; role?: unknown; text?: unknown; newsId?: unknown };
     const index = out.findIndex((line, i) =>

package/src/replay.ts

@@ -120,6 +120,7 @@ export function replayEntries(
           sender: agentMessage.sender,
           recipient: agentMessage.recipient,
           text: agentMessage.text,
+          messageId: agentMessage.id,
         });
       }
       continue;

package/src/subagents/manager.ts

@@ -19,6 +19,13 @@ import {
   usageFromEntries,
 } from "../agent-usage";
 import { replayEntries } from "../replay";
+import {
+  loadNewsItems,
+  mergeNewsItems,
+  newsItemFromFinishSettlement,
+  saveNewsItems,
+  tagNewsLines,
+} from "../news";
 import { isRejectedToolResult, rejectedToolReason } from "../check-mode";
 import {
   observeSearchCalls,
@@ -185,6 +192,8 @@ type RuntimeRecord = {
    * it to idle and blocking its managed merge.
    */
   statusBeforeTurn?: SubagentStatus;
+  completionMessageIds?: Set<string>;
+  completionResponse?: string;
 };
 
 type IdleOpenReminderState = {
@@ -289,6 +298,8 @@ export class SubagentManager {
   private mainCwd = process.cwd();
   private parentSessionId = "detached";
   private mainRunning = false;
+  private readonly mainCompletionMessageIds = new Set<string>();
+  private mainCompletionResponse = "";
   private maxActiveSubagents: number;
   private worktreeQueue: Promise<void> = Promise.resolve();
   private readonly messageTimes = new Map<string, number[]>();
@@ -365,6 +376,8 @@ export class SubagentManager {
     this.mainCwd = cwd;
     this.parentSessionId = sessionId;
     this.mainRunning = false;
+    this.mainCompletionMessageIds.clear();
+    this.mainCompletionResponse = "";
     this.emit({
       type: "trigger-target",
       sessionId,
@@ -374,6 +387,7 @@ export class SubagentManager {
     });
 
     const restored = new Map<string, Omit<SubagentSnapshot, "transcript">>();
+    const restoredEntries = new Map<string, readonly any[]>();
     const restoredActivity = new Map<string, { activityGeneration: number; idleNotifiedGeneration: number }>();
     const restoredFinish = new Map<string, string>();
     for (const entry of sessionManager.getEntries()) {
@@ -421,6 +435,7 @@ export class SubagentManager {
           const childManager = (await import("@earendil-works/pi-coding-agent")).SessionManager.open(
             snapshot.sessionFile,
           );
+          restoredEntries.set(snapshot.id, childManager.getEntries());
           transcript = {
             lines: replayEntries(childManager.buildContextEntries(), snapshot.worktree.path, true),
             stream: null,
@@ -463,6 +478,8 @@ export class SubagentManager {
         this.persistActivity(this.records.get(snapshot.id)!);
       }
     }
+    this.restoreSettlementResponses(sessionManager.getEntries(), restoredEntries);
+    this.reconcileFinishNews();
     await this.retrySettlementsForParent(null);
     this.emit();
   }
@@ -733,7 +750,14 @@ export class SubagentManager {
           if (typeof id === "string") {
             this.resolvePending(record, id);
             this.acknowledgeSettlementMessage(id);
+            if (message.customType === AGENT_MESSAGE_CUSTOM_TYPE
+              && message.details?.kind === "completion") {
+              record.completionMessageIds ??= new Set<string>();
+              record.completionMessageIds.add(id);
+            }
           }
+        } else if (message?.role === "assistant" && record.completionMessageIds?.size) {
+          record.completionResponse = "";
         } else if (message?.role === "user") {
           const text = typeof message.content === "string"
             ? message.content
@@ -766,6 +790,9 @@ export class SubagentManager {
         const update = event.assistantMessageEvent;
         const kind = update.type === "text_delta" ? "assistant" : update.type === "thinking_delta" ? "thinking" : null;
         if (!kind) return;
+        if (kind === "assistant" && record.completionMessageIds?.size) {
+          record.completionResponse = (record.completionResponse ?? "") + update.delta;
+        }
         this.updateTranscript(record, (value) => {
           if (value.stream?.kind === kind) {
             return { ...value, stream: { kind, text: value.stream.text + update.delta } };
@@ -833,6 +860,13 @@ export class SubagentManager {
       case "agent_settled": {
         this.messageCacheController?.releaseRequester({ kind: "subagent", id: record.snapshot.id });
         this.updateTranscript(record, flushTranscript);
+        if (record.completionMessageIds?.size) {
+          for (const messageId of record.completionMessageIds) {
+            this.recordSettlementResponse(messageId, record.completionResponse ?? "");
+          }
+          record.completionMessageIds.clear();
+          record.completionResponse = "";
+        }
         if (record.session) {
           void this.triggerManager?.markTargetSettled(
             record.session.sessionId,
@@ -1112,6 +1146,13 @@ export class SubagentManager {
         });
         pi.on("agent_settled", () => {
           this.mainRunning = false;
+          if (this.mainCompletionMessageIds.size > 0) {
+            for (const messageId of this.mainCompletionMessageIds) {
+              this.recordSettlementResponse(messageId, this.mainCompletionResponse);
+            }
+            this.mainCompletionMessageIds.clear();
+            this.mainCompletionResponse = "";
+          }
           this.messageCacheController?.releaseRequester({ kind: "main", id: this.parentSessionId });
           void this.triggerManager?.markTargetSettled(this.parentSessionId, null);
           this.emit({
@@ -1126,12 +1167,26 @@ export class SubagentManager {
         pi.on("message_start", (event) => {
           const message = event.message;
           this.acceptIdleOpenReminder(null, message);
+          if (message.role === "assistant" && this.mainCompletionMessageIds.size > 0) {
+            this.mainCompletionResponse = "";
+            return;
+          }
           if (message.role !== "custom"
             || ![AGENT_MESSAGE_CUSTOM_TYPE, TRIGGER_EVENT_CUSTOM_TYPE].includes(message.customType)) return;
-          const id = (message.details as AgentMessageData | undefined)?.id;
+          const details = message.details as AgentMessageData | undefined;
+          const id = details?.id;
           if (typeof id === "string") {
             this.acknowledgeSettlementMessage(id);
             this.emit({ type: "main-pending-resolve", id });
+            if (message.customType === AGENT_MESSAGE_CUSTOM_TYPE && details?.kind === "completion") {
+              this.mainCompletionMessageIds.add(id);
+            }
+          }
+        });
+        pi.on("message_update", (event) => {
+          const update = event.assistantMessageEvent;
+          if (this.mainCompletionMessageIds.size > 0 && update.type === "text_delta") {
+            this.mainCompletionResponse += update.delta;
           }
         });
         pi.on("session_start", async (_event, ctx) => {
@@ -1719,6 +1774,7 @@ export class SubagentManager {
       sender: data.sender,
       recipient: data.recipient,
       text: data.text,
+      messageId: data.id,
     };
   }
 
@@ -1893,6 +1949,89 @@ export class SubagentManager {
     if (!delivered) this.emit({ type: "main-pending-drop", id: pending.id });
   }
 
+  private responseAfterSettlement(entries: readonly any[], messageId: string): string {
+    let active = false;
+    let response = "";
+    for (const entry of entries) {
+      const message = entry?.type === "message"
+        ? entry.message
+        : entry?.type === "custom_message"
+          ? { ...entry, role: "custom" }
+          : entry;
+      if (message?.role === "custom") {
+        if (message.customType === AGENT_MESSAGE_CUSTOM_TYPE && message.details?.id === messageId) {
+          active = true;
+        }
+        continue;
+      }
+      if (!active) continue;
+      if (message?.role === "user") break;
+      if (message?.role !== "assistant" || !Array.isArray(message.content)) continue;
+      const text = message.content
+        .filter((block: any) => block?.type === "text" && typeof block.text === "string")
+        .map((block: any) => block.text)
+        .join("")
+        .trim();
+      if (text) response = text;
+    }
+    return response;
+  }
+
+  private restoreSettlementResponses(
+    mainEntries: readonly any[],
+    childEntries: ReadonlyMap<string, readonly any[]>,
+  ): void {
+    for (const settlement of this.settlements.values()) {
+      if (settlement.status !== "completed" || settlement.response?.trim()) continue;
+      const entries = settlement.parentAgentId === null
+        ? mainEntries
+        : childEntries.get(settlement.parentAgentId) ?? [];
+      const response = this.responseAfterSettlement(entries, settlement.messageId);
+      if (response) this.recordSettlementResponse(settlement.messageId, response, false);
+    }
+  }
+
+  private recordSettlementResponse(messageId: string, response: string, reconcile = true): void {
+    const settlement = [...this.settlements.values()].find((item) => item.messageId === messageId);
+    if (!settlement || settlement.status !== "completed" || !response.trim()) return;
+    if (settlement.response === response.trim()) return;
+    settlement.response = response.trim();
+    settlement.respondedAt = Date.now();
+    this.persist({
+      event: "settlement",
+      id: settlement.agentId,
+      at: settlement.respondedAt,
+      settlement: { ...settlement },
+    });
+    if (reconcile) this.reconcileFinishNews();
+  }
+
+  private reconcileFinishNews(): void {
+    const sessionFile = this.mainSessionManager?.getSessionFile?.();
+    if (!sessionFile) return;
+    const incoming = [...this.settlements.values()]
+      .map((settlement) => newsItemFromFinishSettlement({
+        ...settlement,
+        agentName: settlement.agentName
+          ?? this.records.get(settlement.agentId)?.snapshot.name
+          ?? settlement.agentId,
+        requesterName: settlement.requesterName
+          ?? (settlement.parentAgentId
+            ? this.records.get(settlement.parentAgentId)?.snapshot.name ?? settlement.parentAgentId
+            : "main"),
+      }))
+      .filter((item): item is NonNullable<typeof item> => item !== undefined);
+    const next = mergeNewsItems(loadNewsItems(sessionFile), incoming);
+    saveNewsItems(sessionFile, next);
+    for (const record of this.records.values()) {
+      record.snapshot.transcript = {
+        ...record.snapshot.transcript,
+        lines: tagNewsLines(record.snapshot.transcript.lines, next, record.snapshot.id),
+      };
+    }
+    this.emit({ type: "news-changed" });
+  }
+
   private settlementId(record: RuntimeRecord, status: "idle" | "completed" | "failed"): string {
     return `${record.snapshot.id}:${record.activityGeneration}:${status}`;
   }
@@ -1912,11 +2051,16 @@ export class SubagentManager {
         `worktree: ${record.snapshot.worktree.path}`,
         summary ? `summary: ${summary}` : "",
       ].filter(Boolean).join("\n");
+      const requester = record.snapshot.parentAgentId
+        ? this.records.get(record.snapshot.parentAgentId)?.snapshot.name ?? record.snapshot.parentAgentId
+        : "main";
       settlement = {
         id,
         messageId: `settlement-${id}`,
         agentId: record.snapshot.id,
+        agentName: record.snapshot.name,
         parentAgentId: record.snapshot.parentAgentId,
+        requesterName: requester,
         status,
         summary,
         activityGeneration: record.activityGeneration,

package/src/subagents/types.ts

@@ -60,9 +60,13 @@ export type SubagentSettlement = {
   parentAgentId: string | null;
   status: "idle" | "completed" | "failed";
   summary?: string;
+  agentName?: string;
+  requesterName?: string;
   activityGeneration: number;
   content: string;
   createdAt: number;
+  response?: string;
+  respondedAt?: number;
   acknowledgedAt?: number;
 };
 
@@ -96,6 +100,7 @@ export type TriggerEventData = ExternalTriggerEventData & {
 
 export type SubagentManagerEvent =
   | { type: "changed" }
+  | { type: "news-changed" }
   | { type: "main-line"; line: Line }
   | { type: "main-pending-add"; pending: PendingLine }
   | { type: "main-pending-resolve"; id: string }

package/src/transcript.tsx

@@ -20,7 +20,7 @@ export type Role = "user" | "assistant" | "thinking" | "system" | "error";
 export type Line =
   | { kind: "text"; role: Role; text: string; newsId?: string }
   | { kind: "tool"; call: ToolCall }
-  | { kind: "agent-message"; sender: string; recipient: string; text: string };
+  | { kind: "agent-message"; sender: string; recipient: string; text: string; messageId?: string };
 
 export type PendingLine = {
   id: string;
@@ -232,7 +232,7 @@ export function TextLine({
     <Row glyph={GUTTER} glyphColor={color}>
       <text
         ref={workingCaret ? textCaret : undefined}
-        content={workingCaret ? undefined : displayText}
+        content={workingCaret ? "" : displayText}
         fg={color}
         selectable
         wrapMode="word"
@@ -424,7 +424,7 @@ export function ToolLine({
           {prefix ? <text content={prefix} selectable style={{ flexShrink: 0 }} /> : null}
           <text
             ref={workingCaret ? caret : undefined}
-            content={workingCaret ? undefined : new StyledText(bodyChunks)}
+            content={workingCaret ? "" : new StyledText(bodyChunks)}
             selectable
             wrapMode="word"
             style={{ flexGrow: 1, flexShrink: 1, minWidth: 0 }}