@gotgenes/pi-permission-system 10.3.1 → 10.5.0

package/test/helpers/handler-fixtures.ts

@@ -21,10 +21,8 @@ import {
   ToolCallGatePipeline,
 } from "#src/handlers/gates/tool-call-gate-pipeline";
 import { PermissionGateHandler } from "#src/handlers/permission-gate-handler";
-import type { PermissionPromptDecision } from "#src/permission-dialog";
 import type { PermissionDecisionEvent } from "#src/permission-events";
 import { PERMISSIONS_DECISION_CHANNEL } from "#src/permission-events";
-import type { PromptPermissionDetails } from "#src/permission-prompter";
 import type { Rule } from "#src/rule";
 import type { SessionApprovalRecorder } from "#src/session-approval-recorder";
 import type { SessionLogger } from "#src/session-logger";
@@ -35,10 +33,10 @@ import type { PermissionCheckResult, PermissionState } from "#src/types";
 /**
  * Precise mock boundary for PermissionGateHandler integration tests.
  *
- * Intersection of every role the handler and its collaborators require,
- * plus the context-bound prompting helpers that GatePrompter delegates to.
- * Without a cast, TypeScript enforces this at the call sites where the
- * mock is passed to GateRunner / ToolCallGatePipeline / PermissionGateHandler.
+ * Intersection of every role the handler and its collaborators require.
+ * Prompting is not included here — it moved to `PromptingGateway` (#339).
+ * Pass a `prompter` override to `makeHandler` to steer GateRunner's prompting
+ * role; `makeHandler` creates a clean default prompter when none is supplied.
  *
  * The 4-arg `checkPermission` overrides the 3-arg version from
  * GateHandlerSession so the `resolve` delegation can forward session rules.
@@ -46,7 +44,6 @@ import type { PermissionCheckResult, PermissionState } from "#src/types";
 export type MockGateHandlerSession = ToolCallGateInputs &
   SkillInputGateInputs &
   SessionApprovalRecorder &
-  GatePrompter &
   GateHandlerSession & {
     /** Logger source for the reporter the fixture builds. */
     logger: SessionLogger;
@@ -59,13 +56,6 @@ export type MockGateHandlerSession = ToolCallGateInputs &
       agentName?: string,
       rules?: Rule[],
     ): PermissionCheckResult;
-    /** Context-bound canPrompt — overriding this steers canConfirm. */
-    canPrompt(ctx: ExtensionContext): boolean;
-    /** Context-bound prompt — overriding this steers promptPermission. */
-    prompt(
-      ctx: ExtensionContext,
-      details: PromptPermissionDetails,
-    ): Promise<PermissionPromptDecision>;
   };
 
 export function makeEvents() {
@@ -134,9 +124,7 @@ export function makeCheckResult(
  * field against `MockGateHandlerSession` individually — a missing field fails
  * `pnpm run check` instead of failing silently at runtime.
  *
- * The `resolve`, `canConfirm`, and `promptPermission` delegations are inlined
- * as closures that read `session` at call time, so overriding `checkPermission`,
- * `canPrompt`, or `prompt` automatically steers them without extra guards.
+ * Prompting is not part of this mock — pass `prompter` to `makeHandler`.
  */
 export function makeSession(
   overrides: Partial<MockGateHandlerSession> = {},
@@ -177,35 +165,6 @@ export function makeSession(
       vi
         .fn<MockGateHandlerSession["getToolPreviewLimits"]>()
         .mockReturnValue(resolveToolPreviewLimits(DEFAULT_EXTENSION_CONFIG)),
-    canPrompt:
-      overrides.canPrompt ??
-      vi.fn<MockGateHandlerSession["canPrompt"]>().mockReturnValue(true),
-    prompt:
-      overrides.prompt ??
-      vi
-        .fn<MockGateHandlerSession["prompt"]>()
-        .mockResolvedValue({ approved: true, state: "approved" }),
-    // Delegations — closures read `session` at call time so overrides win.
-    resolve:
-      overrides.resolve ??
-      vi.fn<MockGateHandlerSession["resolve"]>((surface, input, agentName) =>
-        session.checkPermission(
-          surface,
-          input,
-          agentName,
-          session.getSessionRuleset(),
-        ),
-      ),
-    canConfirm:
-      overrides.canConfirm ??
-      vi.fn<MockGateHandlerSession["canConfirm"]>(() =>
-        session.canPrompt(undefined as unknown as ExtensionContext),
-      ),
-    promptPermission:
-      overrides.promptPermission ??
-      vi.fn<MockGateHandlerSession["promptPermission"]>((details) =>
-        session.prompt(undefined as unknown as ExtensionContext, details),
-      ),
   };
   return session;
 }
@@ -296,10 +255,15 @@ export function makeBashCommandCheck(opts: {
  * Constructs a PermissionGateHandler with mocked collaborators.
  *
  * Returns all collaborators so each test file can destructure only what
- * it needs — handler, events, session, and toolRegistry are all available.
+ * it needs — handler, events, session, toolRegistry, and prompter are all available.
+ *
+ * The default prompter approves all requests. Pass `prompter` explicitly to
+ * steer canConfirm/prompt behavior for the test.
  */
 export function makeHandler(overrides?: {
   session?: Partial<MockGateHandlerSession>;
+  /** Override the GatePrompter passed to GateRunner. Defaults to an allow-all stub. */
+  prompter?: GatePrompter;
   toolRegistry?: Partial<ToolRegistry>;
   /** Sugar: builds the `getAll` mock from a list of tool names. */
   tools?: string[];
@@ -314,10 +278,27 @@ export function makeHandler(overrides?: {
             .mockReturnValue(overrides.tools.map((name) => ({ name }))),
         })
       : makeToolRegistry(overrides?.toolRegistry);
-  const pipeline = new ToolCallGatePipeline(session);
+  // Resolver delegates to session's checkPermission + getSessionRuleset —
+  // overriding session.checkPermission steers resolve automatically.
+  const resolver = {
+    resolve: (surface: string, input: unknown, agentName?: string) =>
+      session.checkPermission(
+        surface,
+        input,
+        agentName,
+        session.getSessionRuleset(),
+      ),
+  };
+  const pipeline = new ToolCallGatePipeline(resolver, session);
   const skillInputPipeline = new SkillInputGatePipeline(session);
   const reporter = new GateDecisionReporter(session.logger, events);
-  const runner = new GateRunner(session, session, session, reporter);
+  const prompter: GatePrompter = overrides?.prompter ?? {
+    canConfirm: vi.fn().mockReturnValue(true),
+    prompt: vi
+      .fn<GatePrompter["prompt"]>()
+      .mockResolvedValue({ approved: true, state: "approved" }),
+  };
+  const runner = new GateRunner(resolver, session, prompter, reporter);
   const handler = new PermissionGateHandler(
     session,
     toolRegistry,
@@ -325,7 +306,7 @@ export function makeHandler(overrides?: {
     skillInputPipeline,
     runner,
   );
-  return { handler, events, session, toolRegistry };
+  return { handler, events, session, toolRegistry, prompter };
 }
 
 /** Extract all permissions:decision payloads from the events.emit mock. */

package/test/permission-event-rpc.test.ts

@@ -36,13 +36,13 @@ function makeDeps(
   overrides: Partial<PermissionRpcDeps> = {},
 ): PermissionRpcDeps {
   return {
-    getPermissionManager: vi.fn().mockReturnValue({
+    permissionManager: {
       checkPermission: vi.fn().mockReturnValue(makeCheckResult("allow")),
-    }),
-    getSessionRules: vi.fn().mockReturnValue([]),
-    getRuntimeContext: vi.fn().mockReturnValue(null),
+    },
+    sessionRules: { getRuleset: vi.fn().mockReturnValue([]) },
+    session: { getRuntimeContext: vi.fn().mockReturnValue(null) },
     requestPermissionDecisionFromUi: vi.fn(),
-    writeReviewLog: vi.fn(),
+    logger: { review: vi.fn() },
     ...overrides,
   };
 }
@@ -73,9 +73,9 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
   it("replies allow for an allowed surface/value", async () => {
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({
+      permissionManager: {
         checkPermission: vi.fn().mockReturnValue(makeCheckResult("allow")),
-      }),
+      },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -100,14 +100,14 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
   it("replies deny for a denied surface/value", async () => {
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({
+      permissionManager: {
         checkPermission: vi.fn().mockReturnValue(
           makeCheckResult("deny", {
             origin: "project",
             matchedPattern: "rm *",
           }),
         ),
-      }),
+      },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -131,13 +131,13 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
   it("replies ask for an ask surface/value", async () => {
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({
+      permissionManager: {
         checkPermission: vi
           .fn()
           .mockReturnValue(
             makeCheckResult("ask", { matchedPattern: undefined }),
           ),
-      }),
+      },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -161,7 +161,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
     const checkPermission = vi.fn().mockReturnValue(makeCheckResult("allow"));
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({ checkPermission }),
+      permissionManager: { checkPermission },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -197,8 +197,8 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
     const checkPermission = vi.fn().mockReturnValue(makeCheckResult("allow"));
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({ checkPermission }),
-      getSessionRules: vi.fn().mockReturnValue(sessionRules),
+      permissionManager: { checkPermission },
+      sessionRules: { getRuleset: vi.fn().mockReturnValue(sessionRules) },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -246,7 +246,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:check", () => {
     const checkPermission = vi.fn().mockReturnValue(makeCheckResult("allow"));
     const bus = createEventBus();
     const deps = makeDeps({
-      getPermissionManager: vi.fn().mockReturnValue({ checkPermission }),
+      permissionManager: { checkPermission },
     });
     const handles = registerPermissionRpcHandlers(bus, deps);
     handles.unsubCheck();
@@ -290,7 +290,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
     const ctx = makeCtxWithUi();
     const approvedDecision = { approved: true, state: "approved" as const };
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: vi
         .fn()
         .mockResolvedValue(approvedDecision),
@@ -325,7 +325,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
       .fn()
       .mockResolvedValue({ approved: true, state: "approved" as const });
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: requestUi,
     });
     registerPermissionRpcHandlers(bus, deps);
@@ -363,7 +363,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
       .fn()
       .mockResolvedValue({ approved: true, state: "approved" as const });
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: requestUi,
     });
     registerPermissionRpcHandlers(bus, deps);
@@ -399,7 +399,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
       denialReason: "Too risky",
     };
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: vi
         .fn()
         .mockResolvedValue(deniedDecision),
@@ -430,7 +430,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
   it("replies with no_ui error when context has no UI", async () => {
     const bus = createEventBus();
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(null),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(null) },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -453,9 +453,11 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
   it("replies with no_ui error when context hasUI is false", async () => {
     const bus = createEventBus();
     const deps = makeDeps({
-      getRuntimeContext: vi
-        .fn()
-        .mockReturnValue({ hasUI: false, ui: makeUi() }),
+      session: {
+        getRuntimeContext: vi
+          .fn()
+          .mockReturnValue({ hasUI: false, ui: makeUi() }),
+      },
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -478,13 +480,13 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
   it("writes to the review log after a prompt decision", async () => {
     const bus = createEventBus();
     const ctx = makeCtxWithUi();
-    const writeReviewLog = vi.fn();
+    const logger = { review: vi.fn() };
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: vi
         .fn()
         .mockResolvedValue({ approved: true, state: "approved" as const }),
-      writeReviewLog,
+      logger,
     });
     registerPermissionRpcHandlers(bus, deps);
 
@@ -501,7 +503,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
     });
     await replyPromise;
 
-    expect(writeReviewLog).toHaveBeenCalledWith(
+    expect(logger.review).toHaveBeenCalledWith(
       "permission_request.rpc_prompt",
       expect.objectContaining({
         requestId: "req-log",
@@ -520,7 +522,7 @@ describe("registerPermissionRpcHandlers — permissions:rpc:prompt", () => {
     const bus = createEventBus();
     const ctx = makeCtxWithUi();
     const deps = makeDeps({
-      getRuntimeContext: vi.fn().mockReturnValue(ctx),
+      session: { getRuntimeContext: vi.fn().mockReturnValue(ctx) },
       requestPermissionDecisionFromUi: requestUi,
     });
     const handles = registerPermissionRpcHandlers(bus, deps);

package/test/permission-forwarder.test.ts

@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { afterEach, describe, expect, test, vi } from "vitest";
-
+import { DEFAULT_EXTENSION_CONFIG } from "#src/extension-config";
 import {
   PermissionForwarder,
   type PermissionForwarderDeps,
@@ -18,12 +18,11 @@ function makeDeps(
   return {
     forwardingDir: "/tmp/forwarding",
     subagentSessionsDir: "/tmp/subagents",
-    logger: { writeReviewLog: vi.fn(), writeDebugLog: vi.fn() },
-    writeReviewLog: vi.fn(),
+    logger: { review: vi.fn(), debug: vi.fn() },
     requestPermissionDecisionFromUi: vi
       .fn()
       .mockResolvedValue({ approved: true, state: "approved" as const }),
-    shouldAutoApprove: () => false,
+    config: { current: () => ({ ...DEFAULT_EXTENSION_CONFIG }) },
     ...overrides,
   };
 }
@@ -271,7 +270,9 @@ describe("processInbox", () => {
           forwardingDir,
           events,
           requestPermissionDecisionFromUi,
-          shouldAutoApprove: () => true,
+          config: {
+            current: () => ({ ...DEFAULT_EXTENSION_CONFIG, yoloMode: true }),
+          },
         }),
       );
 

package/test/permission-prompter.test.ts

@@ -50,7 +50,7 @@ function makeDeps(
 ): PermissionPrompterDeps {
   return {
     config: makeConfigReader(),
-    writeReviewLog: vi.fn(),
+    logger: { review: vi.fn() },
     events: { emit: vi.fn(), on: vi.fn().mockReturnValue(() => undefined) },
     forwarder: { requestApproval: mockRequestApproval },
     ...overrides,
@@ -97,32 +97,32 @@ describe("PermissionPrompter", () => {
     });
 
     it("logs permission_request.auto_approved in yolo mode", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       const deps = makeDeps({
         config: makeConfigReader({ yoloMode: true }),
-        writeReviewLog,
+        logger,
       });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(false), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.auto_approved",
         expect.objectContaining({ requestId: "req-123" }),
       );
     });
 
     it("does not log permission_request.waiting in yolo mode", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       const deps = makeDeps({
         config: makeConfigReader({ yoloMode: true }),
-        writeReviewLog,
+        logger,
       });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(false), makeDetails());
 
-      expect(writeReviewLog).not.toHaveBeenCalledWith(
+      expect(logger.review).not.toHaveBeenCalledWith(
         "permission_request.waiting",
         expect.anything(),
       );
@@ -144,18 +144,18 @@ describe("PermissionPrompter", () => {
 
   describe("non-yolo path (UI present)", () => {
     it("logs permission_request.waiting before calling confirmPermission", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       const approved: PermissionPromptDecision = {
         approved: true,
         state: "approved",
       };
       mockRequestApproval.mockResolvedValue(approved);
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(true), makeDetails());
 
-      const calls = writeReviewLog.mock.calls.map((c) => c[0] as string);
+      const calls = logger.review.mock.calls.map((c) => c[0] as string);
       expect(
         calls.indexOf("permission_request.waiting"),
       ).toBeGreaterThanOrEqual(0);
@@ -249,17 +249,17 @@ describe("PermissionPrompter", () => {
     });
 
     it("logs permission_request.approved when confirmPermission returns approved", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: true,
         state: "approved",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(true), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.approved",
         expect.objectContaining({
           requestId: "req-123",
@@ -269,17 +269,17 @@ describe("PermissionPrompter", () => {
     });
 
     it("logs permission_request.denied when confirmPermission returns denied", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: false,
         state: "denied",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(true), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.denied",
         expect.objectContaining({
           requestId: "req-123",
@@ -289,18 +289,18 @@ describe("PermissionPrompter", () => {
     });
 
     it("logs permission_request.denied with denialReason when present", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: false,
         state: "denied_with_reason",
         denialReason: "too sensitive",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(true), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.denied",
         expect.objectContaining({
           denialReason: "too sensitive",
@@ -406,12 +406,12 @@ describe("PermissionPrompter", () => {
 
   describe("review log fields", () => {
     it("includes all standard fields in the waiting log entry", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: true,
         state: "approved",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
       const details = makeDetails({
         toolCallId: "tc-1",
@@ -424,7 +424,7 @@ describe("PermissionPrompter", () => {
 
       await prompter.prompt(makeCtx(true), details);
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.waiting",
         expect.objectContaining({
           requestId: "req-123",
@@ -443,17 +443,17 @@ describe("PermissionPrompter", () => {
     });
 
     it("uses null for optional fields not present in details", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: true,
         state: "approved",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(true), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.waiting",
         expect.objectContaining({
           toolCallId: null,
@@ -499,17 +499,17 @@ describe("PermissionPrompter", () => {
     });
 
     it("logs the outcome when confirmPermission resolves via forwarding", async () => {
-      const writeReviewLog = vi.fn();
+      const logger = { review: vi.fn() };
       mockRequestApproval.mockResolvedValue({
         approved: true,
         state: "approved",
       });
-      const deps = makeDeps({ writeReviewLog });
+      const deps = makeDeps({ logger });
       const prompter = new PermissionPrompter(deps);
 
       await prompter.prompt(makeCtx(false), makeDetails());
 
-      expect(writeReviewLog).toHaveBeenCalledWith(
+      expect(logger.review).toHaveBeenCalledWith(
         "permission_request.approved",
         expect.objectContaining({ requestId: "req-123" }),
       );