@aliou/pi-guardrails 0.7.1 → 0.7.3

package/hooks/permission-gate.ts

@@ -10,6 +10,7 @@ import {
   wrapTextWithAnsi,
 } from "@mariozechner/pi-tui";
 import type { DangerousPattern, ResolvedConfig } from "../config";
+import { configLoader } from "../config";
 import { emitBlocked, emitDangerous } from "../utils/events";
 import {
   type CompiledPattern,
@@ -119,7 +120,11 @@ function findDangerousMatch(
         }
         return false;
       });
-      if (match) return match;
+      // Structural matching succeeded -- return result (even if no match).
+      // Do NOT fall through to compiled patterns which do raw substring
+      // matching and would false-positive on e.g. "sudo" inside a quoted
+      // commit message argument.
+      return match;
     } catch {
       // Parse failed -- fall back to substring matching on raw string
       for (const p of fallbackPatterns) {
@@ -131,7 +136,8 @@ function findDangerousMatch(
   }
 
   // Check compiled patterns (substring/regex on raw string).
-  // When customPatterns replaces defaults, this is the only matching path.
+  // Only reached when customPatterns replaces defaults (useBuiltinMatchers
+  // is false) or when the structural parse failed and no fallback matched.
   for (const cp of compiledPatterns) {
     if (cp.test(command)) {
       const src = cp.source as DangerousPattern;
@@ -221,70 +227,100 @@ export function setupPermissionGateHook(
         return { block: true, reason };
       }
 
-      const proceed = await ctx.ui.custom<boolean>((_tui, theme, _kb, done) => {
-        const container = new Container();
-        const redBorder = (s: string) => theme.fg("error", s);
+      type ConfirmResult = "allow" | "allow-session" | "deny";
 
-        container.addChild(new DynamicBorder(redBorder));
-        container.addChild(
-          new Text(
-            theme.fg("error", theme.bold("Dangerous Command Detected")),
-            1,
-            0,
-          ),
-        );
-        container.addChild(new Spacer(1));
-        container.addChild(
-          new Text(
-            theme.fg("warning", `This command contains ${description}:`),
-            1,
-            0,
-          ),
-        );
-        container.addChild(new Spacer(1));
-        container.addChild(
-          new DynamicBorder((s: string) => theme.fg("muted", s)),
-        );
-        const commandText = new Text("", 1, 0);
-        container.addChild(commandText);
-        container.addChild(
-          new DynamicBorder((s: string) => theme.fg("muted", s)),
-        );
-        container.addChild(new Spacer(1));
-        container.addChild(
-          new Text(theme.fg("text", "Allow execution?"), 1, 0),
-        );
-        container.addChild(new Spacer(1));
-        container.addChild(
-          new Text(theme.fg("dim", "y/enter: allow • n/esc: deny"), 1, 0),
-        );
-        container.addChild(new DynamicBorder(redBorder));
+      const result = await ctx.ui.custom<ConfirmResult>(
+        (_tui, theme, _kb, done) => {
+          const container = new Container();
+          const redBorder = (s: string) => theme.fg("error", s);
 
-        return {
-          render: (width: number) => {
-            const wrappedCommand = wrapTextWithAnsi(
-              theme.fg("text", command),
-              width - 4,
-            ).join("\n");
-            commandText.setText(wrappedCommand);
-            return container.render(width);
-          },
-          invalidate: () => container.invalidate(),
-          handleInput: (data: string) => {
-            if (matchesKey(data, Key.enter) || data === "y" || data === "Y") {
-              done(true);
-            } else if (
-              matchesKey(data, Key.escape) ||
-              data === "n" ||
-              data === "N"
-            ) {
-              done(false);
-            }
+          container.addChild(new DynamicBorder(redBorder));
+          container.addChild(
+            new Text(
+              theme.fg("error", theme.bold("Dangerous Command Detected")),
+              1,
+              0,
+            ),
+          );
+          container.addChild(new Spacer(1));
+          container.addChild(
+            new Text(
+              theme.fg("warning", `This command contains ${description}:`),
+              1,
+              0,
+            ),
+          );
+          container.addChild(new Spacer(1));
+          container.addChild(
+            new DynamicBorder((s: string) => theme.fg("muted", s)),
+          );
+          const commandText = new Text("", 1, 0);
+          container.addChild(commandText);
+          container.addChild(
+            new DynamicBorder((s: string) => theme.fg("muted", s)),
+          );
+          container.addChild(new Spacer(1));
+          container.addChild(
+            new Text(theme.fg("text", "Allow execution?"), 1, 0),
+          );
+          container.addChild(new Spacer(1));
+          container.addChild(
+            new Text(
+              theme.fg(
+                "dim",
+                "y/enter: allow • a: allow for session • n/esc: deny",
+              ),
+              1,
+              0,
+            ),
+          );
+          container.addChild(new DynamicBorder(redBorder));
+
+          return {
+            render: (width: number) => {
+              const wrappedCommand = wrapTextWithAnsi(
+                theme.fg("text", command),
+                width - 4,
+              ).join("\n");
+              commandText.setText(wrappedCommand);
+              return container.render(width);
+            },
+            invalidate: () => container.invalidate(),
+            handleInput: (data: string) => {
+              if (matchesKey(data, Key.enter) || data === "y" || data === "Y") {
+                done("allow");
+              } else if (data === "a" || data === "A") {
+                done("allow-session");
+              } else if (
+                matchesKey(data, Key.escape) ||
+                data === "n" ||
+                data === "N"
+              ) {
+                done("deny");
+              }
+            },
+          };
+        },
+      );
+
+      if (result === "allow-session") {
+        // Save command as allowed in memory scope (session-only).
+        // Spread the resolved allowed patterns and append the new one.
+        const resolved = configLoader.getConfig();
+        await configLoader.save("memory", {
+          permissionGate: {
+            allowedPatterns: [
+              ...resolved.permissionGate.allowedPatterns,
+              { pattern: command },
+            ],
           },
-        };
-      });
+        });
+
+        // Update the local cache so it takes effect immediately
+        allowedPatterns.push(...compileCommandPatterns([{ pattern: command }]));
+      }
 
-      if (!proceed) {
+      if (result === "deny") {
         emitBlocked(pi, {
           feature: "permissionGate",
           toolName: "bash",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aliou/pi-guardrails",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "type": "module",
   "private": false,
   "keywords": [
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@aliou/sh": "^0.1.0",
-    "@aliou/pi-utils-settings": "^0.2.1"
+    "@aliou/pi-utils-settings": "^0.3.0"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.51.0"