pum-agent 0.2.2-beta.1 → 0.2.4-beta.1

package/README.md

@@ -138,6 +138,7 @@ Set `PUM_DIR` to override PUM's complete configuration and data directory. Run `
 | `Ctrl+L` | Open the agent transcript selector |
 | `Shift+Tab` / `Ctrl+Shift+Tab` | Cycle through agent transcripts |
 | `Ctrl+H` | Open session history when the terminal reports the key distinctly |
+| `Ctrl+End` | Scroll to the end of the selected transcript |
 | `Ctrl+P` | Open settings |
 | `Ctrl+T` | Open supervised external triggers |
 | `Esc` twice | Cancel the selected working agent |
@@ -177,7 +178,7 @@ PUM runs up to 10 active subagents by default. Configure a limit from 1 through
 - Its own transcript, draft, usage data, and cancellation state
 - Tools for progress messages and a single final completion report
 
-Select a range of stashed prompts and press `Enter`. The main agent can group related work and run independent groups in parallel. Successful managed merges remove the completed worktree and branch. A parent cannot finish, merge, or be removed until every retained descendant closes deepest-first.
+Select a range of stashed prompts and press `Enter`. The main agent can group related work and run independent groups in parallel. A managed merge requires both authoritative `completed` status and a persisted completion notice. Idle settlement is not completion. Successful managed merges remove the completed worktree and branch. A parent cannot finish, merge, or be removed until every retained descendant closes deepest-first.
 
 Use `Ctrl+L` to select an agent transcript. Input then goes to that agent. Finished or interrupted agents remain available until PUM merges or removes them.
 
@@ -185,7 +186,7 @@ The public `spawn_subagent` tool accepts `preview: true`. PUM then shows the exa
 
 Press `↑` on an empty single-line prompt to recall the newest queued user-authored message for the selected transcript. PUM removes the message from the authoritative queue before restoring its text. PUM does not recall inter-agent, trigger, lifecycle, cache, delivered, or image-bearing messages.
 
-Idle notices report settled work cycles to the direct spawner. They are not completion notices. PUM persists completion intent and delivery state so interrupted notification delivery can resume without duplicate completion messages.
+Idle notices report settled work cycles to the direct spawner. They are not completion notices. PUM acknowledges completion delivery only after the notice enters the parent session. Persisted completion intent and stable message identifiers let interrupted delivery resume without duplicate completion messages.
 
 ## Tools and safeguards
 
@@ -201,7 +202,7 @@ Main and managed child agents can list and read the current workspace message ca
 
 Agents can add entries. An agent can delete only entries created by that exact agent. User-created and legacy entries remain user-owned.
 
-The `message_cache_send` tool accepts stable entry IDs. Single entries use the selected agent delivery path. Multiple entries use main-agent worktree orchestration.
+The `message_cache_send` tool accepts stable entry IDs. Single entries use the selected agent delivery path. Multiple entries use main-agent worktree orchestration. PUM reserves selected entries during delivery and marks them executed only after delivery succeeds. Failed main or child delivery leaves the entries pending.
 
 ### External triggers
 

package/package.json

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

package/src/app.tsx

@@ -486,6 +486,7 @@ export function App({
   ), [modelRuntime, modelId, modelQuery, loginPage]);
 
   const inputRef = useRef<TextareaRenderable>(null);
+  const transcriptScrollRef = useRef<ScrollBoxRenderable>(null);
   const questionnaireInputRef = useRef<TextareaRenderable>(null);
   const spawnPreviewInputRef = useRef<TextareaRenderable>(null);
   const settingsOpenRef = useRef(settingsOpen);
@@ -1361,12 +1362,12 @@ export function App({
     return true;
   };
 
-  const deliverMainPrompt = (
+  const deliverMainPrompt = async (
     promptText: string,
     displayText: string,
     images: ReturnType<typeof imageContent>[] = [],
     recallable = images.length === 0,
-  ) => {
+  ): Promise<void> => {
     const userLine: Extract<Line, { kind: "text" }> = {
       kind: "text",
       role: "user",
@@ -1383,20 +1384,26 @@ export function App({
         recallable,
       };
       addPending(pending);
-      withSearchRoute(session.sessionId, () => session.steer(promptText, images)).catch((error) => {
+      try {
+        await withSearchRoute(session.sessionId, () => session.steer(promptText, images));
+      } catch (error) {
         dropPending(pending.id);
         append({ kind: "text", role: "error", text: String(error) });
-      });
+        throw error;
+      }
       return;
     }
 
     append(userLine);
     inFlight.current = promptText;
     setWorking(true);
-    withSearchRoute(session.sessionId, () => session.prompt(promptText, { images })).catch((error) => {
+    try {
+      await withSearchRoute(session.sessionId, () => session.prompt(promptText, { images }));
+    } catch (error) {
       append({ kind: "text", role: "error", text: String(error) });
       setWorking(false);
-    });
+      throw error;
+    }
   };
 
   const submitPrompt = (value?: string, stashIndex?: number) => {
@@ -1443,7 +1450,7 @@ export function App({
     histCursor.current = null;
     draft.current = "";
     setSelectedStash(-1);
-    deliverMainPrompt(promptText, displayText, images);
+    void deliverMainPrompt(promptText, displayText, images).catch(() => {});
   };
 
   const cachedBatchDisplay = (prompts: readonly string[]): string => [
@@ -1477,7 +1484,7 @@ export function App({
     setStash(next);
     refreshHistoryAfterStashMutation();
     resetAfterCacheExecution();
-    deliverMainPrompt(buildStashBatchPrompt(prompts), cachedBatchDisplay(prompts), [], false);
+    void deliverMainPrompt(buildStashBatchPrompt(prompts), cachedBatchDisplay(prompts), [], false).catch(() => {});
   };
 
   useEffect(() => {
@@ -1493,24 +1500,22 @@ export function App({
     const detach = messageCacheController.bindExecutor(
       session.sessionId,
       async (request: MessageCacheSendRequest): Promise<MessageCacheSendResult> => {
-        const { entries, state } = messageCacheController.execute(request.ids);
-        stashRef.current = state.stash;
-        setStash(state.stash);
-        history.current = state.history;
-        resetAfterCacheExecution(
-          request.requester.kind === "subagent" ? request.requester.id : null,
-        );
-        const prompts = entries.map((entry) => entry.text);
+        const prompts = request.entries.map((entry) => entry.text);
         if (prompts.length > 1) {
-          deliverMainPrompt(buildStashBatchPrompt(prompts), cachedBatchDisplay(prompts), [], false);
+          await deliverMainPrompt(buildStashBatchPrompt(prompts), cachedBatchDisplay(prompts), [], false);
+          resetAfterCacheExecution(
+            request.requester.kind === "subagent" ? request.requester.id : null,
+          );
           return { count: prompts.length, route: "main" };
         }
         const prompt = prompts[0]!;
         if (request.requester.kind === "subagent") {
           await subagentManager.sendUserMessage(request.requester.id, prompt, [], prompt, false);
+          resetAfterCacheExecution(request.requester.id);
           return { count: 1, route: "subagent" };
         }
-        deliverMainPrompt(prompt, prompt, [], false);
+        await deliverMainPrompt(prompt, prompt, [], false);
+        resetAfterCacheExecution(null);
         return { count: 1, route: "main" };
       },
     );
@@ -1989,6 +1994,13 @@ export function App({
       return;
     }
 
+    if (key.ctrl && key.name === "end") {
+      key.stopPropagation();
+      const transcriptScroll = transcriptScrollRef.current;
+      if (transcriptScroll) transcriptScroll.scrollTop = transcriptScroll.scrollHeight;
+      return;
+    }
+
     const isAgentCycle =
       (key.name === "tab" && key.shift) ||
       key.name === "backtab" ||
@@ -2290,6 +2302,8 @@ export function App({
         />
         <scrollbox
           key={activeAgentId ?? "main"}
+          ref={transcriptScrollRef}
+          id="transcript-scrollbox"
           style={{ flexGrow: 1, paddingLeft: 1, paddingRight: 1 }}
           stickyScroll
           stickyStart="bottom"
@@ -2430,7 +2444,7 @@ export function App({
             textColor={theme.fg}
             cursorColor={theme.accent}
             selectionBg={theme.selectionBg}
-            wrapMode="char"
+            wrapMode="word"
             scrollMargin={1}
             focused={!settingsOpen && !helpOpen && !historyOpen && !agentSelectorOpen && !triggersOpen && !loginOpen && !questionnaire && !spawnPreview && !checkApproval}
             onContentChange={handleTextareaChange}

package/src/check-mutation.ts

@@ -1,7 +1,7 @@
 import { generateUnifiedPatch } from "@earendil-works/pi-coding-agent";
 import { createHash } from "node:crypto";
 import { lstat, readFile, realpath } from "node:fs/promises";
-import { basename, dirname, relative, resolve, sep } from "node:path";
+import { basename, dirname, parse, relative, resolve, sep } from "node:path";
 import { previewApplyPatch } from "./apply-patch";
 import type { CheckedToolName } from "./check-approvals";
 import {
@@ -85,6 +85,11 @@ async function validateEditPath(
   const roots = await Promise.all([projectRoot, ...allowedPaths].map((path) => realpath(path)));
   const absolute = resolve(projectRoot, inputPath);
   const sortedRoots = roots.sort((first, second) => second.length - first.length);
+  if (process.platform === "win32" && windowsAbsolute(inputPath)) {
+    const targetRoot = parse(absolute).root.toLowerCase();
+    const hasAllowedVolume = sortedRoots.some((candidate) => parse(candidate).root.toLowerCase() === targetRoot);
+    if (!hasAllowedVolume) throw new Error(`Edit path is outside the allowed Check mode paths: ${inputPath}`);
+  }
   let root = sortedRoots.find((candidate) => isPathInsideOrSame(candidate, absolute));
   if (!root) {
     let targetIdentity: string;

package/src/help-popup.tsx

@@ -66,6 +66,7 @@ export const HELP_GROUPS: HelpGroup[] = [
     controls: [
       ["Ctrl+P", "Open Settings"],
       ["Ctrl+T", "Open external triggers"],
+      ["Ctrl+End", "Scroll transcript to the end"],
       ["/ in Settings", "Focus settings search"],
       ["Esc", "Close; twice to cancel work"],
       ["Ctrl+C", "Clear; twice quits"],
@@ -154,8 +155,12 @@ export function helpPageSize(terminalHeight: number): number {
 export function maxHelpScrollOffset(terminalHeight: number): number {
   const lines = helpLines(terminalHeight);
   const raw = Math.max(0, lines.length - helpPageSize(terminalHeight));
+  const headingBeforeFirstControl =
+    raw > 0 && lines[raw]?.kind === "control" && lines[raw - 1]?.kind === "heading"
+      ? raw - 1
+      : raw;
   const lastHeading = lines.findLastIndex((line) => line.kind === "heading");
-  return lastHeading < 0 ? raw : Math.min(raw, lastHeading);
+  return lastHeading < 0 ? headingBeforeFirstControl : Math.min(headingBeforeFirstControl, lastHeading);
 }
 
 function HelpLineRow({ line, theme }: { line: HelpLine; theme: Theme }) {

package/src/message-cache.ts

@@ -18,6 +18,7 @@ export type MessageCacheRequester =
 export type MessageCacheSendRequest = {
   requester: MessageCacheRequester;
   ids: string[];
+  entries: StashedPrompt[];
 };
 
 export type MessageCacheSendResult = {
@@ -83,6 +84,8 @@ export class MessageCacheController {
   private executor?: MessageCacheExecutor;
   private readonly listeners = new Set<() => void>();
   private readonly active = new Set<string>();
+  private readonly reservations = new Map<string, symbol>();
+  private readonly operations = new Map<symbol, Set<string>>();
   private mainSessionId?: string;
 
   constructor(
@@ -107,12 +110,28 @@ export class MessageCacheController {
       if (this.mainSessionId === sessionId) {
         this.mainSessionId = undefined;
         this.active.clear();
+        this.reservations.clear();
+        this.operations.clear();
       }
     };
   }
 
   releaseRequester(requester: Pick<MessageCacheRequester, "kind" | "id">): void {
-    this.active.delete(`${requester.kind}:${requester.id}`);
+    const key = `${requester.kind}:${requester.id}`;
+    this.active.delete(key);
+    for (const [token, keys] of this.operations) {
+      keys.delete(key);
+      if (keys.size === 0) this.releaseOperation(token);
+    }
+  }
+
+  private releaseOperation(token: symbol): void {
+    const keys = this.operations.get(token);
+    if (keys) for (const key of keys) this.active.delete(key);
+    this.operations.delete(token);
+    for (const [id, owner] of this.reservations) {
+      if (owner === token) this.reservations.delete(id);
+    }
   }
 
   list(): StashedPrompt[] {
@@ -135,11 +154,12 @@ export class MessageCacheController {
   }
 
   delete(requester: MessageCacheRequester, id: string): void {
+    if (this.reservations.has(id)) throw new Error("The cache entry is reserved by an active send");
     this.store.removeStashById(this.workspaceCwd, id, requester.id);
     this.emit();
   }
 
-  execute(ids: readonly string[]): { entries: StashedPrompt[]; state: PromptCacheState } {
+  private execute(ids: readonly string[]): { entries: StashedPrompt[]; state: PromptCacheState } {
     const result = this.store.executeStashByIds(this.workspaceCwd, ids);
     this.emit();
     return result;
@@ -150,21 +170,29 @@ export class MessageCacheController {
     if (requester.kind === "main" && requester.id !== this.mainSessionId) {
       throw new Error("The requesting main session is no longer active");
     }
-    this.read(ids);
+    const entries = this.read(ids);
     const requesterKey = `${requester.kind}:${requester.id}`;
     const targetKey = ids.length > 1 || requester.kind === "main"
       ? `main:${this.mainSessionId}`
       : requesterKey;
-    if (this.active.has(requesterKey) || this.active.has(targetKey)) {
+    if (
+      this.active.has(requesterKey)
+      || this.active.has(targetKey)
+      || ids.some((id) => this.reservations.has(id))
+    ) {
       throw new Error("A message-cache send is already active for this requester or target");
     }
-    this.active.add(requesterKey);
-    this.active.add(targetKey);
+    const keys = new Set([requesterKey, targetKey]);
+    const token = Symbol("message-cache-send");
+    for (const key of keys) this.active.add(key);
+    for (const id of ids) this.reservations.set(id, token);
+    this.operations.set(token, keys);
     try {
-      return await this.executor({ requester, ids: [...ids] });
+      const result = await this.executor({ requester, ids: [...ids], entries: [...entries] });
+      this.execute(ids);
+      return result;
     } catch (error) {
-      this.active.delete(requesterKey);
-      this.active.delete(targetKey);
+      this.releaseOperation(token);
       throw error;
     }
   }
@@ -226,10 +254,13 @@ export class MessageCacheController {
     pi.registerTool({
       name: "message_cache_send",
       label: "Message Cache Send",
-      description: "Send cached messages by stable ID through PUM's authoritative user execution path. Order and duplicates are preserved.",
+      description: "Execute cached messages by stable ID through PUM's authoritative user execution path. This marks entries executed and produces the main-agent coordination path. Order and duplicates are preserved.",
       promptSnippet: "Send one or more cached messages through PUM coordination",
       promptGuidelines: [
         "Use stable IDs from message_cache_list or message_cache_read.",
+        "When the user asks to do, run, or execute open or pending cached tasks, call message_cache_send before spawning or assigning work.",
+        "Listing entries or reading previews is not execution and does not replace message_cache_send.",
+        "After the generated coordination prompt arrives, reuse agents already assigned to those tasks and never create duplicate assignments.",
         "Do not retry a send while the requester or target is still processing a prior cache send.",
       ],
       parameters: Type.Object({ ids: IdsSchema }, { additionalProperties: false }),

package/src/sandbox/windows.ts

@@ -1,5 +1,5 @@
 import type { ChildProcess } from "node:child_process";
-import { delimiter, join, win32 } from "node:path";
+import { join, win32 } from "node:path";
 import type {
 	ContainerConfig,
 	PlatformSupport,
@@ -31,16 +31,19 @@ const REQUIRED_UI_CAPABILITIES = [
 
 const loadMxcSdk: MxcSdkLoader = async () => {
 	// MXC 0.7 resolves `whoami /user` through a shell during module import.
-	// Prefer the native Windows binary so a Git/MSYS PATH does not select GNU whoami.
-	const pathKey = Object.keys(process.env).find((key) => key.toLowerCase() === "path") ?? "PATH";
-	const previous = process.env[pathKey];
+	// Bun caches the default child-process environment, so changing PATH here
+	// does not affect MXC after node:child_process has already been imported.
 	const systemRoot = process.env.SystemRoot ?? process.env.WINDIR;
-	if (systemRoot) process.env[pathKey] = [join(systemRoot, "System32"), previous].filter(Boolean).join(delimiter);
+	const system32 = join(systemRoot ?? "C:\\Windows", "System32");
+	const previousCwd = process.cwd();
+	const specifier = import.meta.resolve("@microsoft/mxc-sdk");
 	try {
-		return await import("@microsoft/mxc-sdk");
+		// Bun can synchronously require this ESM package. Keep the cwd change
+		// synchronous so no unrelated work can observe the temporary directory.
+		process.chdir(system32);
+		return require(specifier) as MxcSdk;
 	} finally {
-		if (previous === undefined) delete process.env[pathKey];
-		else process.env[pathKey] = previous;
+		process.chdir(previousCwd);
 	}
 };
 

package/src/stash-batch.ts

@@ -9,6 +9,8 @@ export function buildStashBatchPrompt(prompts: string[]): string {
   return `Coordinate the following cached tasks with managed worktree subagents.
 
 Rules:
+- This prompt is the authoritative execution path created by message_cache_send or the cache selection UI.
+- Reuse agents already assigned to these tasks. Never create duplicate assignments.
 - Count only starting and running subagents as active. Use the configured capacity from the system prompt.
 - Use spawn_subagent for implementation work while capacity is available.
 - At capacity, queue related work to an appropriate running subagent with message_agent.
@@ -18,7 +20,7 @@ Rules:
 - Run independent task groups in parallel.
 - Keep each subagent task complete and self-contained.
 - Track every unfinished task group through completion notifications.
-- Merge each successful subagent with the worktree tool as soon as it settles.
+- Merge each successful subagent only after a completion notice arrives and authoritative status is \`completed\`; idle settlement is not completion.
 - Before merging a managed parent, recursively merge or resolve every retained descendant.
 - Close the deepest descendants first. Every retained status blocks the parent, including completed and failed descendants.
 - Wait to merge only for a concrete dependency, known conflict risk, or required integration order. State that reason explicitly.

package/src/subagents/manager.ts

@@ -243,6 +243,7 @@ export class SubagentManager {
   private readonly messageTimes = new Map<string, number[]>();
   private readonly settlements = new Map<string, SubagentSettlement>();
   private readonly acceptedSettlementMessageIds = new Set<string>();
+  private readonly settlementDeliveriesInFlight = new Set<string>();
 
   constructor(options: ManagerOptions) {
     this.modelRuntime = options.modelRuntime;
@@ -303,6 +304,7 @@ export class SubagentManager {
     this.messageTimes.clear();
     this.settlements.clear();
     this.acceptedSettlementMessageIds.clear();
+    this.settlementDeliveriesInFlight.clear();
     this.mainApi = pi;
     this.mainSessionManager = sessionManager;
     this.mainCwd = cwd;
@@ -430,6 +432,7 @@ export class SubagentManager {
     });
     this.mainApi = undefined;
     this.mainSessionManager = undefined;
+    this.settlementDeliveriesInFlight.clear();
     this.records.clear();
     this.emit();
   }
@@ -1343,6 +1346,22 @@ export class SubagentManager {
     );
   }
 
+  private assertManagedMergeReady(record: RuntimeRecord): void {
+    if (record.snapshot.status !== "completed") {
+      throw new Error(
+        `Cannot merge ${record.snapshot.name} while its authoritative status is ${record.snapshot.status}. ` +
+          "A managed merge requires status completed after its completion notice arrives. Idle settlement is not completion.",
+      );
+    }
+    const completion = this.settlements.get(this.settlementId(record, "completed"));
+    if (completion?.acknowledgedAt === undefined) {
+      throw new Error(
+        `Cannot merge ${record.snapshot.name} before its completion notice arrives. ` +
+          "Authoritative status completed alone is not sufficient.",
+      );
+    }
+  }
+
   async sendUserMessage(
     id: string,
     text: string,
@@ -1646,6 +1665,7 @@ export class SubagentManager {
   }
 
   private acknowledgeSettlement(settlement: SubagentSettlement): void {
+    this.settlementDeliveriesInFlight.delete(settlement.messageId);
     if (settlement.acknowledgedAt !== undefined) return;
     settlement.acknowledgedAt = Date.now();
     this.acceptedSettlementMessageIds.add(settlement.messageId);
@@ -1662,6 +1682,14 @@ export class SubagentManager {
     if (settlement) this.acknowledgeSettlement(settlement);
   }
 
+  private clearSettlementDeliveriesForParent(parentAgentId: string): void {
+    for (const settlement of this.settlements.values()) {
+      if (settlement.parentAgentId === parentAgentId) {
+        this.settlementDeliveriesInFlight.delete(settlement.messageId);
+      }
+    }
+  }
+
   private async deliverSettlement(settlement: SubagentSettlement): Promise<boolean> {
     if (settlement.acknowledgedAt !== undefined) return true;
     const source = this.records.get(settlement.agentId);
@@ -1673,6 +1701,7 @@ export class SubagentManager {
         this.acknowledgeSettlement(settlement);
         return true;
       }
+      if (this.settlementDeliveriesInFlight.has(settlement.messageId)) return true;
       const data: AgentMessageData = {
         id: settlement.messageId,
         sender,
@@ -1681,14 +1710,17 @@ export class SubagentManager {
         at: settlement.createdAt,
         kind: settlement.status === "idle" ? "idle" : settlement.status === "completed" ? "completion" : "status",
       };
+      this.settlementDeliveriesInFlight.add(settlement.messageId);
       const delivered = this.wakeMain({
         customType: AGENT_MESSAGE_CUSTOM_TYPE,
         content: settlement.content,
         display: true,
         details: data,
       }, settlement.content);
-      if (!delivered) return false;
-      this.acknowledgeSettlement(settlement);
+      if (!delivered) {
+        this.settlementDeliveriesInFlight.delete(settlement.messageId);
+        return false;
+      }
       this.emit({ type: "main-line", line: this.agentMessageLine(data) });
       return true;
     }
@@ -1702,6 +1734,7 @@ export class SubagentManager {
         this.acknowledgeSettlement(settlement);
         return true;
       }
+      if (this.settlementDeliveriesInFlight.has(settlement.messageId)) return true;
       const data: AgentMessageData = {
         id: settlement.messageId,
         sender,
@@ -1714,6 +1747,7 @@ export class SubagentManager {
       if (!parent.snapshot.transcript.pending.some((item) => item.id === pending.id)) {
         this.addPending(parent, pending);
       }
+      this.settlementDeliveriesInFlight.add(settlement.messageId);
       try {
         withSearchRoute(parent.session.sessionId, () => {
           parent.api!.sendMessage(
@@ -1730,11 +1764,11 @@ export class SubagentManager {
           );
         });
       } catch {
+        this.settlementDeliveriesInFlight.delete(settlement.messageId);
         this.dropPending(parent, pending.id);
         return false;
       }
       this.updateStatus(parent, "running");
-      this.acknowledgeSettlement(settlement);
       return true;
     } catch {
       return false;
@@ -1761,6 +1795,7 @@ export class SubagentManager {
     if (!record) return;
     const sessionId = record.session?.sessionId;
     if (record.dispose) await record.dispose();
+    this.clearSettlementDeliveriesForParent(record.snapshot.id);
     if (sessionId) {
       await this.triggerManager?.invalidateAgent(sessionId, record.snapshot.id);
       this.emit({
@@ -1825,10 +1860,10 @@ export class SubagentManager {
     if (action === "merge") {
       return this.withWorktreeLock(async () => {
         const managedAgent = this.findRecord(target);
-        if (managedAgent && ["starting", "running"].includes(managedAgent.snapshot.status)) {
-          throw new Error(`Stop ${managedAgent.snapshot.name} before ${action}`);
+        if (managedAgent) {
+          this.assertNoRetainedDescendants(managedAgent, "merge");
+          this.assertManagedMergeReady(managedAgent);
         }
-        if (managedAgent) this.assertNoRetainedDescendants(managedAgent, "merge");
         const record = managedAgent?.snapshot.worktree
           ?? (await listWorktrees(cwd)).find((item) => item.name === target || item.branch === target);
         if (!record) throw new Error(`Unknown worktree: ${target}`);

package/src/theme.ts

@@ -23,7 +23,7 @@ export type Theme = {
   success: string;
   error: string;
   warn: string;
-  /** Foreground and background for tool calls blocked before execution. */
+  /** Orange foreground and existing background for tool calls blocked before execution. */
   rejection: string;
   rejectionBg: string;
   selectionBg: string;
@@ -59,7 +59,7 @@ const tokyonight: Theme = {
   success: "#9ece6a",
   error: "#f7768e",
   warn: "#ff9e64",
-  rejection: "#e0af68",
+  rejection: "#ff9e64",
   rejectionBg: "#332b24",
   selectionBg: "#33467c",
   popupBg: "#1f2335",
@@ -91,7 +91,7 @@ const gruvbox: Theme = {
   success: "#b8bb26",
   error: "#fb4934",
   warn: "#fe8019",
-  rejection: "#fabd2f",
+  rejection: "#fe8019",
   rejectionBg: "#3c3836",
   selectionBg: "#504945",
   popupBg: "#32302f",
@@ -123,7 +123,7 @@ const catppuccin: Theme = {
   success: "#a6e3a1",
   error: "#f38ba8",
   warn: "#fab387",
-  rejection: "#f9e2af",
+  rejection: "#fab387",
   rejectionBg: "#3b342f",
   selectionBg: "#45475a",
   popupBg: "#181825",
@@ -155,7 +155,7 @@ const nord: Theme = {
   success: "#a3be8c",
   error: "#bf616a",
   warn: "#d08770",
-  rejection: "#ebcb8b",
+  rejection: "#d08770",
   rejectionBg: "#3b3b3b",
   selectionBg: "#4c566a",
   popupBg: "#3b4252",
@@ -187,7 +187,7 @@ const dracula: Theme = {
   success: "#50fa7b",
   error: "#ff5555",
   warn: "#ffb86c",
-  rejection: "#f1fa8c",
+  rejection: "#ffb86c",
   rejectionBg: "#3d3f36",
   selectionBg: "#44475a",
   popupBg: "#21222c",
@@ -251,7 +251,7 @@ const solarized: Theme = {
   success: "#859900",
   error: "#dc322f",
   warn: "#cb4b16",
-  rejection: "#b58900",
+  rejection: "#cb4b16",
   rejectionBg: "#343b35",
   selectionBg: "#0b4b59",
   popupBg: "#073642",
@@ -283,7 +283,7 @@ const kanagawa: Theme = {
   success: "#98bb6c",
   error: "#e46876",
   warn: "#ffa066",
-  rejection: "#e6c384",
+  rejection: "#ffa066",
   rejectionBg: "#39352d",
   selectionBg: "#2d4f67",
   popupBg: "#16161d",
@@ -315,7 +315,7 @@ const githubLight: Theme = {
   success: "#1a7f37",
   error: "#cf222e",
   warn: "#bc4c00",
-  rejection: "#9a6700",
+  rejection: "#bc4c00",
   rejectionBg: "#fff1c2",
   selectionBg: "#b6d7ff",
   popupBg: "#f6f8fa",

package/src/transcript.tsx

@@ -1,4 +1,4 @@
-import { StyledText, fg, type MarkdownRenderable, type SyntaxStyle } from "@opentui/core";
+import { StyledText, bold, fg, type MarkdownRenderable, type SyntaxStyle } from "@opentui/core";
 import type { MarkdownProps } from "@opentui/react";
 import {
   useBlinkingText,
@@ -353,6 +353,18 @@ export function toolStateGlyph(state: ToolCall["state"]): string {
   return "✗";
 }
 
+const CHECK_MODE_HARD_BLOCK_PREFIX = "Check mode hard block:";
+
+function rejectedDetail(theme: Theme, detail: string): StyledText {
+  if (!detail.startsWith(CHECK_MODE_HARD_BLOCK_PREFIX)) {
+    return new StyledText([fg(theme.rejection)(detail)]);
+  }
+  return new StyledText([
+    bold(fg(theme.rejection)(CHECK_MODE_HARD_BLOCK_PREFIX)),
+    fg(theme.rejection)(detail.slice(CHECK_MODE_HARD_BLOCK_PREFIX.length)),
+  ]);
+}
+
 export function ToolLine({
   theme,
   call,
@@ -420,8 +432,7 @@ export function ToolLine({
       {rejected && call.detail ? (
         <Row glyph={GUTTER} glyphColor={theme.rejection} background={theme.rejectionBg}>
           <text
-            content={call.detail}
-            fg={theme.rejection}
+            content={rejectedDetail(theme, call.detail)}
             selectable
             wrapMode="word"
             style={{ flexGrow: 1, flexShrink: 1, minWidth: 0, width: "100%" }}