@zeldrisho/pi-gate 0.7.0 → 0.7.2

package/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.2] - 2026-10-25
+
+### Changed
+
+- Show approval prompts in Pi’s normal dialog area, using the terminal background and Pi theme accents.
+- Highlight matched command text and clarify agent guidance for timeouts, denials, and policy blocks.
+
+## [0.7.1] - 2026-10-25
+
+### Changed
+
+- Create starter configuration when a session starts rather than when the extension is loaded.
+
+### Fixed
+
+- Cancel active approval dialogs and reject queued calls during shutdown, reload, and session replacement.
+
 ## [0.7.0] - 2026-10-24
 
 ### Changed
@@ -95,7 +112,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - support `prompt`, `block`, and `allow` actions, with longest-pattern-wins resolution
 - block rather than auto-approve in non-UI modes
 
-[Unreleased]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.7.0...HEAD
+[Unreleased]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.7.2...HEAD
+[0.7.2]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.7.1...pi-gate-v0.7.2
+[0.7.1]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.7.0...pi-gate-v0.7.1
 [0.7.0]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.6.1...pi-gate-v0.7.0
 [0.6.1]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.6.0...pi-gate-v0.6.1
 [0.6.0]: https://github.com/zeldrisho/pi-packages/compare/pi-gate-v0.5.0...pi-gate-v0.6.0

package/README.md

@@ -15,7 +15,7 @@ Use `pi config` to enable or disable this extension interactively. Run `pi list`
 
 ## Configure
 
-Edit `~/.pi/agent/gate.json` to choose which commands need approval. The extension creates this file with starter rules on first load. Changes apply before the next gated call, without restarting Pi. Add the optional `$schema` below for editor completion and validation:
+Edit `~/.pi/agent/gate.json` to choose which commands need approval. The extension creates this file with starter rules when the first session starts. Changes apply before the next gated call, without restarting Pi. Add the optional `$schema` below for editor completion and validation:
 
 ```json
 {
@@ -46,9 +46,9 @@ pi-gate is a guard rail, not a sandbox. Complex shell syntax, pipelines, redirec
 
 The built-in `bash` tool is gated, and `write`/`edit` calls targeting the gate config require approval. Prompt dialogs offer `Allow` and `Deny`; approvals are never remembered. To stop repeated prompts, add a specific `allow` rule to `gate.json`.
 
-Approval dialogs are serialized for concurrent tool calls; cancellation, session replacement, or a policy change while a dialog is open denies the pending call.
+Approval dialogs are serialized for concurrent tool calls; cancellation, shutdown, reload, session replacement, or a policy change while a dialog is open denies the pending call. Calls queued before shutdown or session replacement are also denied.
 
-Long commands are truncated in approval dialogs, but an approved command executes in full. Denied, dismissed, blocked, and timed-out calls stop the turn; other allowed calls in a parallel batch may still run. In non-interactive modes (`-p`, JSON), commands requiring approval are denied.
+The matched command text is highlighted in the TUI approval dialog. Long commands are truncated in approval dialogs, but an approved command executes in full. Denials, policy blocks, dismissals, and timeouts stop the turn; the agent is told to ask before retrying a denial or proceeding past a block, while a timeout asks whether to retry approval. Other allowed calls in a parallel batch may still run. In non-interactive modes (`-p`, JSON), commands requiring approval are denied.
 
 In Herdr-managed panes, install Herdr's Pi integration with `herdr integration install pi` to report pending approvals as `blocked`. Herdr is optional.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeldrisho/pi-gate",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Pi extension that gates bash commands and protects its configuration from tool edits",
   "keywords": [
     "command-blocking",
@@ -33,12 +33,15 @@
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^1.4.0",
+    "@earendil-works/pi-tui": "^1.4.0",
+    "typebox": "^1.4.2",
     "typescript": "^7.0.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   },
   "engines": {
     "node": ">=24"

package/src/approval-prompt.ts

@@ -0,0 +1,140 @@
+import type { Component } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+
+const ACTIONS = ["Allow", "Deny"] as const;
+
+type Action = (typeof ACTIONS)[number];
+
+type Foreground = "text" | "muted" | "accent" | "toolOutput" | "border";
+
+export interface ApprovalPromptTheme {
+  style(text: string, options: { fg?: Foreground; bold?: boolean }): string;
+  bold(text: string): string;
+}
+
+export interface ApprovalPromptKeybindings {
+  matches(
+    data: string,
+    action: "tui.select.up" | "tui.select.down" | "tui.select.confirm" | "tui.select.cancel",
+  ): boolean;
+}
+
+export interface ApprovalPromptTui {
+  requestRender(): void;
+}
+
+/** Theme-aware approval dialog used by the interactive TUI. */
+export function createApprovalPrompt(
+  tui: ApprovalPromptTui,
+  theme: ApprovalPromptTheme,
+  keybindings: ApprovalPromptKeybindings,
+  done: (result: Action | undefined) => void,
+  command: string,
+  rule: string,
+): Component {
+  let selectedIndex = 0;
+
+  const invalidate = () => {};
+
+  const innerWidth = (width: number) => Math.max(1, width - 4);
+
+  const panelLine = (
+    text: string,
+    width: number,
+    color: "text" | "muted" | "accent" | "toolOutput" = "text",
+  ) => {
+    const contentWidth = innerWidth(width);
+    const content = truncateToWidth(text, contentWidth, "…");
+    const padding = " ".repeat(Math.max(0, contentWidth - visibleWidth(content)));
+
+    const styled = theme.style(`${content}${padding}`, { fg: color });
+
+    return `  ${styled}  `;
+  };
+
+  const component: Component = {
+    render(width: number): string[] {
+      const available = innerWidth(width);
+      const border = theme.style("─".repeat(available + 4), { fg: "border" });
+
+      const lines = [
+        border,
+        panelLine(theme.bold("pi-gate: allow this command?"), width, "accent"),
+        panelLine("Review the requested command or file change:", width, "muted"),
+        panelLine("", width),
+        ...command.split("\n").map((line) => {
+          const contentWidth = innerWidth(width);
+          const parts = line.split(/([»«])/u);
+          let matched = false;
+
+          const rendered = parts
+            .map((part) => {
+              if (part === "»") {
+                matched = true;
+
+                return "";
+              }
+
+              if (part === "«") {
+                matched = false;
+
+                return "";
+              }
+
+              return theme.style(part, { fg: matched ? "accent" : "toolOutput", bold: matched });
+            })
+            .join("");
+
+          const visible = line.replace(/[»«]/gu, "");
+          const content = truncateToWidth(visible, contentWidth, "…");
+          const padding = " ".repeat(Math.max(0, contentWidth - visibleWidth(content)));
+
+          return `  ${rendered}${theme.style(padding, { fg: "toolOutput" })}  `;
+        }),
+        panelLine("", width),
+        panelLine(`Matched rule: ${rule}`, width, "muted"),
+        panelLine("", width),
+        ...ACTIONS.map((action, index) => {
+          const selected = index === selectedIndex;
+          const label = `${selected ? "→ " : "  "}${action}`;
+          const row = truncateToWidth(label, available);
+          const padded = `${row}${" ".repeat(Math.max(0, available - visibleWidth(row)))}`;
+
+          return theme.style(`  ${padded}  `, {
+            fg: selected ? "accent" : "text",
+          });
+        }),
+        panelLine("", width),
+        panelLine("↑↓ move · enter confirm · esc cancel", width, "muted"),
+        border,
+      ];
+
+      return lines.map((line) => truncateToWidth(line, width));
+    },
+    handleInput(data: string): void {
+      if (keybindings.matches(data, "tui.select.up") || data === "k") {
+        selectedIndex = Math.max(0, selectedIndex - 1);
+      } else if (keybindings.matches(data, "tui.select.down") || data === "j") {
+        selectedIndex = Math.min(ACTIONS.length - 1, selectedIndex + 1);
+      } else if (keybindings.matches(data, "tui.select.confirm")) {
+        done(ACTIONS[selectedIndex]);
+
+        return;
+      } else if (keybindings.matches(data, "tui.select.cancel")) {
+        done(undefined);
+
+        return;
+      } else {
+        return;
+      }
+
+      component.invalidate();
+      tui.requestRender();
+    },
+    invalidate,
+  };
+
+  return component;
+}
+
+export type ApprovalAction = Action;

package/src/index.ts

@@ -19,7 +19,7 @@
  * Matching is case-insensitive and whitespace-normalized. Allow occurrences
  * suppress contained restrictions in the same command; surviving blocks win.
  *
- * On first run, a configuration with the default prompt timeout and starter
+ * On first session start, a configuration with the default prompt timeout and starter
  * operation rules is written to `~/.pi/agent/gate.json` when neither file exists.
  *
  * Non-UI modes (print, JSON) never auto-approve. A `prompt` or `block` rule
@@ -31,8 +31,10 @@
 import {
   isToolCallEventType,
   type ExtensionAPI,
+  type ExtensionContext,
   type ToolCallEventResult,
 } from "@earendil-works/pi-coding-agent";
+import { createApprovalPrompt, type ApprovalAction } from "./approval-prompt";
 import { configPath, ensureConfig, loadConfigResult } from "./config";
 import {
   bashTouchesConfig,
@@ -44,6 +46,76 @@ import { formatCommandForDisplay, formatPromptCommand, formatRule } from "./disp
 
 const HERDR_BLOCKED_LABEL = "pi-gate: approval required";
 
+/** Uses a themed terminal component in TUI mode and Pi's standard selector elsewhere. */
+async function selectApproval(
+  ctx: ExtensionContext,
+  timeoutMs: number,
+  signal: AbortSignal,
+  command: string,
+  rule: string,
+  showMatchHint: boolean,
+): Promise<string | undefined> {
+  if (ctx.mode !== "tui" || !ctx.ui.custom) {
+    return ctx.ui.select(
+      `pi-gate: allow this command?\n\n${command}\n\nMatched rule: ${rule}${showMatchHint ? "\nMatched command text is wrapped in »…«" : ""}`,
+      ["Allow", "Deny"],
+      { timeout: timeoutMs, signal },
+    );
+  }
+
+  let uiDone: ((value: ApprovalAction | undefined) => void) | undefined;
+  let settled = false;
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  let removeAbortListener: (() => void) | undefined;
+
+  return new Promise<ApprovalAction | undefined>((resolve, reject) => {
+    const finish = (value: ApprovalAction | undefined) => {
+      if (settled) return;
+      settled = true;
+
+      if (timer !== undefined) clearTimeout(timer);
+      removeAbortListener?.();
+      resolve(value);
+      uiDone?.(value);
+    };
+
+    const onAbort = () => finish(undefined);
+
+    try {
+      timer = setTimeout(() => finish(undefined), timeoutMs);
+
+      const uiPromise = ctx.ui.custom<ApprovalAction | undefined>(
+        (tui, theme, keybindings, done) => {
+          uiDone = done;
+
+          return createApprovalPrompt(tui, theme, keybindings, done, command, rule);
+        },
+      );
+
+      uiPromise
+        .then(finish)
+        .catch(reject)
+        .finally(() => {
+          if (timer !== undefined) clearTimeout(timer);
+          removeAbortListener?.();
+        });
+
+      if (signal) {
+        signal.addEventListener("abort", onAbort, { once: true });
+        removeAbortListener = () => signal.removeEventListener("abort", onAbort);
+
+        if (signal.aborted) onAbort();
+      }
+    } catch (error) {
+      settled = true;
+
+      if (timer !== undefined) clearTimeout(timer);
+      removeAbortListener?.();
+      reject(error);
+    }
+  });
+}
+
 const MAX_REASON_RULE_NAME_LENGTH = 27;
 
 /** Escapes a rule pattern for terminal display and bounds its length in denial messages. */
@@ -57,7 +129,7 @@ function reasonRuleName(pattern: string): string {
 
 /** Formats an approval timeout with the matched rule, elapsed limit in seconds, and retry guidance. */
 function timeoutReason(pattern: string, timeoutMs: number): string {
-  return `pi-gate: no response to rule "${reasonRuleName(pattern)}" within ${timeoutMs / 1_000}s; command not run. Ask the user whether to retry.`;
+  return `pi-gate: no response to rule "${reasonRuleName(pattern)}" within ${timeoutMs / 1_000}s; command not run. Ask the user whether to retry approval.`;
 }
 
 function reportHerdrBlocked(pi: ExtensionAPI, ctx: { mode?: string }, active: boolean): void {
@@ -112,14 +184,16 @@ export {
 
 /**
  * Gates `bash` calls against user rules and requires approval for protected
- * configuration writes and edits. Attempts to create a starter configuration if absent.
+ * configuration writes and edits. Attempts to create a starter configuration
+ * at session start if absent.
  * Reloads rules before gating and after each prompt; approvals apply per call.
- * Dialogs are serialized, and cancellation, session starts, or policy changes
- * invalidate an active approval. UI failures reject the affected tool call.
+ * Dialogs are serialized. Cancellation, shutdown, and session replacement deny
+ * active and queued gated calls; policy changes invalidate an active approval.
+ * UI failures reject the affected tool call.
  */
 export default function piGate(pi: ExtensionAPI): void {
-  ensureConfig();
   let loadResult = loadConfigResult();
+  let session = new AbortController();
   let policy = JSON.stringify(loadResult);
   let revision = 0;
   let pending = Promise.resolve();
@@ -135,8 +209,16 @@ export default function piGate(pi: ExtensionAPI): void {
     }
   };
 
+  pi.on("session_shutdown", () => {
+    session.abort();
+    revision += 1;
+  });
+
   pi.on("session_start", (_event, ctx) => {
+    session.abort();
+    session = new AbortController();
     revision += 1;
+    ensureConfig();
     refreshConfig();
     const path = configPath();
     const ruleCount = Object.keys(loadResult.config.operations).length;
@@ -160,7 +242,14 @@ export default function piGate(pi: ExtensionAPI): void {
   });
 
   pi.on("tool_call", (event, ctx) => {
+    // Capture ownership before queueing so old calls cannot enter a replacement session.
+    const signal = ctx.signal ? AbortSignal.any([ctx.signal, session.signal]) : session.signal;
+
     // Pi can dispatch sibling tools concurrently; never overlap approval dialogs.
+    /**
+     * Returns a terminating block result for denied calls, or undefined to allow;
+     * UI errors propagate.
+     */
     const run = async (): Promise<ToolCallEventResult | undefined> => {
       let command: string;
       let configChange = false;
@@ -181,6 +270,14 @@ export default function piGate(pi: ExtensionAPI): void {
         return undefined;
       }
 
+      if (signal.aborted) {
+        return {
+          block: true,
+          reason: "pi-gate: approval cancelled; command not run.",
+          terminate: true,
+        };
+      }
+
       refreshConfig();
 
       const match = configChange
@@ -193,7 +290,7 @@ export default function piGate(pi: ExtensionAPI): void {
       const rule = configChange ? CONFIG_CHANGE_REASON : formatRule(match);
 
       if (match.action === "block") {
-        const reason = `pi-gate: blocked by rule "${reasonRuleName(match.pattern)}". Do not retry or use equivalent commands; ask the user.`;
+        const reason = `pi-gate: command blocked by rule "${reasonRuleName(match.pattern)}". Ask the user before proceeding.`;
 
         if (ctx.hasUI) ctx.ui.notify(reason, "warning");
 
@@ -205,15 +302,7 @@ export default function piGate(pi: ExtensionAPI): void {
           block: true,
           reason: configChange
             ? CONFIG_CHANGE_REASON
-            : `pi-gate: rule "${reasonRuleName(match.pattern)}" needs approval but no UI is available. Do not retry; ask the user.`,
-          terminate: true,
-        };
-      }
-
-      if (ctx.signal?.aborted) {
-        return {
-          block: true,
-          reason: "pi-gate: approval cancelled; command not run.",
+            : `pi-gate: rule "${reasonRuleName(match.pattern)}" needs approval but no UI is available. Ask the user before proceeding.`,
           terminate: true,
         };
       }
@@ -231,11 +320,7 @@ export default function piGate(pi: ExtensionAPI): void {
 
       try {
         const promptStartedAt = Date.now();
-        choice = await ctx.ui.select(
-          `pi-gate: allow this command?\n\n${promptCommand}\n\nMatched rule: ${rule}${configChange ? "" : "\nMatched command text is wrapped in »…«"}`,
-          ["Allow", "Deny"],
-          { timeout: timeoutMs, signal: ctx.signal },
-        );
+        choice = await selectApproval(ctx, timeoutMs, signal, promptCommand, rule, !configChange);
         // Pi returns undefined for both dismissal and timeout; elapsed time separates the timeout case.
         timedOut = choice === undefined && Date.now() - promptStartedAt >= timeoutMs;
       } finally {
@@ -244,7 +329,7 @@ export default function piGate(pi: ExtensionAPI): void {
 
       refreshConfig();
 
-      if (ctx.signal?.aborted || revision !== promptRevision) {
+      if (signal.aborted || revision !== promptRevision) {
         return {
           block: true,
           reason:
@@ -260,7 +345,7 @@ export default function piGate(pi: ExtensionAPI): void {
             ? timeoutReason(match.pattern, timeoutMs)
             : configChange
               ? CONFIG_CHANGE_REASON
-              : `pi-gate: denied by rule "${reasonRuleName(match.pattern)}". Do not retry or use equivalent commands; ask the user.`,
+              : `pi-gate: command not run because approval was denied. Ask the user before retrying (rule "${reasonRuleName(match.pattern)}").`,
           terminate: true,
         };
       }