@gotgenes/pi-permission-system 5.8.0 → 5.9.0

package/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.9.0](https://github.com/gotgenes/pi-permission-system/compare/v5.8.0...v5.9.0) (2026-05-08)
+
+
+### Features
+
+* add ForwardingManager class ([#128](https://github.com/gotgenes/pi-permission-system/issues/128)) ([7790380](https://github.com/gotgenes/pi-permission-system/commit/7790380eb0291f55724425a0bd6bd0b45cf15d91))
+
+
+### Documentation
+
+* plan ForwardingManager extraction ([#128](https://github.com/gotgenes/pi-permission-system/issues/128)) ([2f10450](https://github.com/gotgenes/pi-permission-system/commit/2f10450974adaedd7a43e8a7d986f8f61a0508db))
+* **retro:** add retro notes for issue [#127](https://github.com/gotgenes/pi-permission-system/issues/127) ([2dde534](https://github.com/gotgenes/pi-permission-system/commit/2dde53416c535331972367ca2a44ba302b25d2a0))
+
 ## [5.8.0](https://github.com/gotgenes/pi-permission-system/compare/v5.7.0...v5.8.0) (2026-05-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotgenes/pi-permission-system",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "Permission enforcement extension for the Pi coding agent.",
   "type": "module",
   "files": [

package/src/forwarding-manager.ts

@@ -0,0 +1,76 @@
+import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+
+import type { PermissionForwardingDeps } from "./forwarded-permissions/polling";
+import { processForwardedPermissionRequests } from "./forwarded-permissions/polling";
+import { PERMISSION_FORWARDING_POLL_INTERVAL_MS } from "./permission-forwarding";
+import { isSubagentExecutionContext } from "./subagent-context";
+
+/**
+ * Narrow interface for the forwarding lifecycle used by `HandlerDeps`.
+ * `ForwardingManager` satisfies it; tests can provide a plain object mock.
+ */
+export interface ForwardingController {
+  start(ctx: ExtensionContext): void;
+  stop(): void;
+}
+
+/**
+ * Encapsulates the forwarded-permission polling lifecycle.
+ *
+ * Owns the timer, current context, and processing-lock state that previously
+ * lived as 3 mutable fields on `ExtensionRuntime`. Call `start(ctx)` on each
+ * session event that may activate forwarding; call `stop()` on session
+ * shutdown.
+ */
+export class ForwardingManager {
+  private timer: NodeJS.Timeout | null = null;
+  private context: ExtensionContext | null = null;
+  private processing = false;
+
+  constructor(
+    private readonly subagentSessionsDir: string,
+    private readonly forwardingDeps: PermissionForwardingDeps,
+  ) {}
+
+  /**
+   * Start polling if `ctx` has UI and is not a subagent execution context.
+   * No-op (timer stays running) if already polling — updates the stored
+   * context so the next tick uses the latest session.
+   * Stops any existing poll when the context does not qualify for forwarding.
+   */
+  start(ctx: ExtensionContext): void {
+    if (
+      !ctx.hasUI ||
+      isSubagentExecutionContext(ctx, this.subagentSessionsDir)
+    ) {
+      this.stop();
+      return;
+    }
+    this.context = ctx;
+    if (this.timer) {
+      return;
+    }
+    this.timer = setInterval(() => {
+      if (!this.context || this.processing) {
+        return;
+      }
+      this.processing = true;
+      void processForwardedPermissionRequests(
+        this.context,
+        this.forwardingDeps,
+      ).finally(() => {
+        this.processing = false;
+      });
+    }, PERMISSION_FORWARDING_POLL_INTERVAL_MS);
+  }
+
+  /** Stop polling and clear all internal state. */
+  stop(): void {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    this.context = null;
+    this.processing = false;
+  }
+}

package/src/handlers/before-agent-start.ts

@@ -43,7 +43,7 @@ export async function handleBeforeAgentStart(
 ): Promise<BeforeAgentStartEventResult> {
   deps.session.runtimeContext = ctx;
   deps.refreshExtensionConfig(ctx);
-  deps.startForwardedPermissionPolling(ctx);
+  deps.forwarding.start(ctx);
 
   const agentName = deps.resolveAgentName(ctx, event.systemPrompt);
   const { permissionManager } = deps.session;

package/src/handlers/input.ts

@@ -41,7 +41,7 @@ export async function handleInput(
   ctx: ExtensionContext,
 ): Promise<InputEventResult> {
   deps.session.runtimeContext = ctx;
-  deps.startForwardedPermissionPolling(ctx);
+  deps.forwarding.start(ctx);
 
   const skillName = extractSkillNameFromInput(event.text);
   if (!skillName) {

package/src/handlers/lifecycle.ts

@@ -26,7 +26,7 @@ export async function handleSessionStart(
   deps.session.lastActiveToolsCacheKey = null;
   deps.session.lastPromptStateCacheKey = null;
   deps.session.lastKnownActiveAgentName = getActiveAgentName(ctx);
-  deps.startForwardedPermissionPolling(ctx);
+  deps.forwarding.start(ctx);
   deps.logResolvedConfigPaths();
 
   const agentName = deps.session.lastKnownActiveAgentName;
@@ -77,6 +77,6 @@ export async function handleSessionShutdown(deps: HandlerDeps): Promise<void> {
   deps.session.lastActiveToolsCacheKey = null;
   deps.session.lastPromptStateCacheKey = null;
   deps.session.sessionRules.clear();
-  deps.stopForwardedPermissionPolling();
+  deps.forwarding.stop();
   deps.stopPermissionRpcHandlers();
 }

package/src/handlers/tool-call.ts

@@ -44,7 +44,7 @@ export async function handleToolCall(
   ctx: ExtensionContext,
 ): Promise<{ block?: true; reason?: string }> {
   deps.session.runtimeContext = ctx;
-  deps.startForwardedPermissionPolling(ctx);
+  deps.forwarding.start(ctx);
 
   const agentName = deps.resolveAgentName(ctx);
   const toolName = getToolNameFromValue(event);

package/src/handlers/types.ts

@@ -1,5 +1,6 @@
 import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
 
+import type { ForwardingController } from "../forwarding-manager";
 import type { PermissionPromptDecision } from "../permission-dialog";
 import type { PermissionEventBus } from "../permission-events";
 import type { PermissionManager } from "../permission-manager";
@@ -79,8 +80,7 @@ export interface HandlerDeps {
   createPermissionRequestId(prefix: string): string;
 
   // ── Forwarding ─────────────────────────────────────────────────────────
-  startForwardedPermissionPolling(ctx: ExtensionContext): void;
-  stopForwardedPermissionPolling(): void;
+  readonly forwarding: ForwardingController;
   /** Unsubscribe the permissions:rpc:check and permissions:rpc:prompt handlers. */
   stopPermissionRpcHandlers(): void;
 

package/src/index.ts

@@ -2,6 +2,7 @@ import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { registerPermissionSystemCommand } from "./config-modal";
 import { getGlobalConfigPath } from "./config-paths";
 import type { PermissionForwardingDeps } from "./forwarded-permissions/polling";
+import { ForwardingManager } from "./forwarding-manager";
 import {
   type HandlerDeps,
   handleBeforeAgentStart,
@@ -22,8 +23,6 @@ import {
   refreshExtensionConfig,
   resolveAgentName,
   saveExtensionConfig,
-  startForwardedPermissionPolling,
-  stopForwardedPermissionPolling,
 } from "./runtime";
 import { createSessionLogger } from "./session-logger";
 import { isSubagentExecutionContext } from "./subagent-context";
@@ -102,10 +101,10 @@ export default function piPermissionSystemExtension(pi: ExtensionAPI): void {
       }),
     promptPermission: (ctx, details) => prompter.prompt(ctx, details),
     createPermissionRequestId,
-    startForwardedPermissionPolling: (ctx) =>
-      startForwardedPermissionPolling(runtime, forwardingDeps, ctx),
-    stopForwardedPermissionPolling: () =>
-      stopForwardedPermissionPolling(runtime),
+    forwarding: new ForwardingManager(
+      runtime.subagentSessionsDir,
+      forwardingDeps,
+    ),
     stopPermissionRpcHandlers: () => {
       rpcHandles.unsubCheck();
       rpcHandles.unsubPrompt();

package/src/runtime.ts

@@ -38,17 +38,11 @@ import { computeExtensionPaths, type ExtensionPaths } from "./extension-paths";
 
 export type { ExtensionPaths } from "./extension-paths";
 
-import {
-  type PermissionForwardingDeps,
-  processForwardedPermissionRequests,
-} from "./forwarded-permissions/polling";
 import { createPermissionSystemLogger } from "./logging";
-import { PERMISSION_FORWARDING_POLL_INTERVAL_MS } from "./permission-forwarding";
 import { PermissionManager } from "./permission-manager";
 import { SessionRules } from "./session-rules";
 import type { SkillPromptEntry } from "./skill-prompt-sanitizer";
 import { syncPermissionSystemStatus } from "./status";
-import { isSubagentExecutionContext } from "./subagent-context";
 
 /**
  * Mutable session state — the subset of ExtensionRuntime that handlers
@@ -81,11 +75,6 @@ export interface ExtensionRuntime extends ExtensionPaths, SessionState {
   config: PermissionSystemExtensionConfig;
   lastConfigWarning: string | null;
 
-  // ── Forwarding polling state ───────────────────────────────────────────
-  permissionForwardingContext: ExtensionContext | null;
-  permissionForwardingTimer: NodeJS.Timeout | null;
-  isProcessingForwardedRequests: boolean;
-
   // ── Logging (backed by logger created at construction) ─────────────────
   writeDebugLog(event: string, details?: Record<string, unknown>): void;
   writeReviewLog(event: string, details?: Record<string, unknown>): void;
@@ -277,58 +266,6 @@ export function logResolvedConfigPaths(runtime: ExtensionRuntime): void {
   );
 }
 
-// ── Forwarding polling lifecycle ───────────────────────────────────────────
-
-/** Stop the forwarded-permission polling interval and clear related state. */
-export function stopForwardedPermissionPolling(
-  runtime: ExtensionRuntime,
-): void {
-  if (runtime.permissionForwardingTimer) {
-    clearInterval(runtime.permissionForwardingTimer);
-    runtime.permissionForwardingTimer = null;
-  }
-  runtime.permissionForwardingContext = null;
-  runtime.isProcessingForwardedRequests = false;
-}
-
-/**
- * Start the forwarded-permission polling interval.
- * No-ops (and stops any existing poll) when the context has no UI or is a
- * subagent execution context.
- */
-export function startForwardedPermissionPolling(
-  runtime: ExtensionRuntime,
-  forwardingDeps: PermissionForwardingDeps,
-  ctx: ExtensionContext,
-): void {
-  if (
-    !ctx.hasUI ||
-    isSubagentExecutionContext(ctx, runtime.subagentSessionsDir)
-  ) {
-    stopForwardedPermissionPolling(runtime);
-    return;
-  }
-  runtime.permissionForwardingContext = ctx;
-  if (runtime.permissionForwardingTimer) {
-    return;
-  }
-  runtime.permissionForwardingTimer = setInterval(() => {
-    if (
-      !runtime.permissionForwardingContext ||
-      runtime.isProcessingForwardedRequests
-    ) {
-      return;
-    }
-    runtime.isProcessingForwardedRequests = true;
-    void processForwardedPermissionRequests(
-      runtime.permissionForwardingContext,
-      forwardingDeps,
-    ).finally(() => {
-      runtime.isProcessingForwardedRequests = false;
-    });
-  }, PERMISSION_FORWARDING_POLL_INTERVAL_MS);
-}
-
 // ── Factory ────────────────────────────────────────────────────────────────
 
 /**
@@ -356,9 +293,6 @@ export function createExtensionRuntime(options?: {
     lastPromptStateCacheKey: null,
     lastConfigWarning: null,
     sessionRules: new SessionRules(),
-    permissionForwardingContext: null,
-    permissionForwardingTimer: null,
-    isProcessingForwardedRequests: false,
     // Logging methods are replaced below after the logger is constructed.
     writeDebugLog: () => {},
     writeReviewLog: () => {},

package/tests/forwarding-manager.test.ts

@@ -0,0 +1,211 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { ForwardingManager } from "../src/forwarding-manager";
+
+// ── Mocks ─────────────────────────────────────────────────────────────────
+
+const mockProcessForwardedPermissionRequests = vi.hoisted(() => vi.fn());
+const mockIsSubagentExecutionContext = vi.hoisted(() => vi.fn());
+
+vi.mock("../src/forwarded-permissions/polling", () => ({
+  processForwardedPermissionRequests: mockProcessForwardedPermissionRequests,
+}));
+
+vi.mock("../src/subagent-context", () => ({
+  isSubagentExecutionContext: mockIsSubagentExecutionContext,
+}));
+
+// ── Helpers ───────────────────────────────────────────────────────────────
+
+function makeCtx(overrides: { hasUI?: boolean; sessionId?: string } = {}) {
+  return {
+    hasUI: overrides.hasUI ?? true,
+    sessionManager: {
+      getSessionId: vi.fn().mockReturnValue(overrides.sessionId ?? "sess-1"),
+    },
+    cwd: "/project",
+  } as unknown as import("@mariozechner/pi-coding-agent").ExtensionContext;
+}
+
+function makeForwardingDeps() {
+  return {
+    forwardingDir: "/agent/sessions/permission-forwarding",
+    subagentSessionsDir: "/agent/subagent-sessions",
+    logger: { writeReviewLog: vi.fn(), writeDebugLog: vi.fn() },
+    writeReviewLog: vi.fn(),
+    requestPermissionDecisionFromUi: vi.fn(),
+    shouldAutoApprove: vi.fn().mockReturnValue(false),
+  } as unknown as import("../src/forwarded-permissions/polling").PermissionForwardingDeps;
+}
+
+function makeManager() {
+  return new ForwardingManager(
+    "/agent/subagent-sessions",
+    makeForwardingDeps(),
+  );
+}
+
+// ── Tests ─────────────────────────────────────────────────────────────────
+
+describe("ForwardingManager", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    mockIsSubagentExecutionContext.mockReset();
+    mockIsSubagentExecutionContext.mockReturnValue(false);
+    mockProcessForwardedPermissionRequests.mockReset();
+    mockProcessForwardedPermissionRequests.mockResolvedValue(undefined);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  describe("stop()", () => {
+    it("is a no-op when not started", () => {
+      const manager = makeManager();
+      expect(() => manager.stop()).not.toThrow();
+    });
+
+    it("clears the timer and processing state after start()", async () => {
+      const manager = makeManager();
+      const ctx = makeCtx();
+      manager.start(ctx);
+      manager.stop();
+
+      // After stop, the timer fires no more callbacks.
+      mockProcessForwardedPermissionRequests.mockClear();
+      await vi.advanceTimersByTimeAsync(500);
+      expect(mockProcessForwardedPermissionRequests).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("start()", () => {
+    it("does not start polling when hasUI is false", async () => {
+      const manager = makeManager();
+      const ctx = makeCtx({ hasUI: false });
+      manager.start(ctx);
+
+      await vi.advanceTimersByTimeAsync(500);
+      expect(mockProcessForwardedPermissionRequests).not.toHaveBeenCalled();
+    });
+
+    it("stops any existing poll and does not start a new one when hasUI is false", async () => {
+      const manager = makeManager();
+      const uiCtx = makeCtx({ hasUI: true });
+      const noUiCtx = makeCtx({ hasUI: false });
+
+      manager.start(uiCtx);
+      // Now stop the polling by calling start() with no-UI ctx.
+      manager.start(noUiCtx);
+
+      mockProcessForwardedPermissionRequests.mockClear();
+      await vi.advanceTimersByTimeAsync(500);
+      expect(mockProcessForwardedPermissionRequests).not.toHaveBeenCalled();
+    });
+
+    it("does not start polling when isSubagentExecutionContext returns true", async () => {
+      mockIsSubagentExecutionContext.mockReturnValue(true);
+      const manager = makeManager();
+      const ctx = makeCtx();
+      manager.start(ctx);
+
+      await vi.advanceTimersByTimeAsync(500);
+      expect(mockProcessForwardedPermissionRequests).not.toHaveBeenCalled();
+    });
+
+    it("stops any existing poll when called with a subagent context", async () => {
+      mockIsSubagentExecutionContext.mockReturnValueOnce(false);
+      const manager = makeManager();
+      const ctx1 = makeCtx();
+      manager.start(ctx1);
+
+      // Second call with a subagent context.
+      mockIsSubagentExecutionContext.mockReturnValue(true);
+      const ctx2 = makeCtx();
+      manager.start(ctx2);
+
+      mockProcessForwardedPermissionRequests.mockClear();
+      await vi.advanceTimersByTimeAsync(500);
+      expect(mockProcessForwardedPermissionRequests).not.toHaveBeenCalled();
+    });
+
+    it("starts polling and calls processForwardedPermissionRequests on tick", async () => {
+      const manager = makeManager();
+      const ctx = makeCtx();
+      manager.start(ctx);
+
+      await vi.advanceTimersByTimeAsync(250);
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledWith(
+        ctx,
+        expect.anything(),
+      );
+    });
+
+    it("is idempotent — calling start() twice does not create a second timer", async () => {
+      const manager = makeManager();
+      const ctx = makeCtx();
+      manager.start(ctx);
+      manager.start(ctx);
+
+      await vi.advanceTimersByTimeAsync(250);
+      // Only one tick should fire per interval, not two.
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledTimes(1);
+    });
+
+    it("updates the context when called again while already running", async () => {
+      const manager = makeManager();
+      const ctx1 = makeCtx({ sessionId: "sess-1" });
+      const ctx2 = makeCtx({ sessionId: "sess-2" });
+      manager.start(ctx1);
+      manager.start(ctx2);
+
+      await vi.advanceTimersByTimeAsync(250);
+      // The process call should use the newer context.
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledWith(
+        ctx2,
+        expect.anything(),
+      );
+    });
+
+    it("skips a tick while processing is in progress", async () => {
+      // Make processForwardedPermissionRequests hang so processing=true persists.
+      let resolveProcess: () => void;
+      mockProcessForwardedPermissionRequests.mockReturnValue(
+        new Promise<void>((resolve) => {
+          resolveProcess = resolve;
+        }),
+      );
+
+      const manager = makeManager();
+      const ctx = makeCtx();
+      manager.start(ctx);
+
+      // First tick starts processing.
+      await vi.advanceTimersByTimeAsync(250);
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledTimes(1);
+
+      // Second tick is skipped because processing flag is still true.
+      await vi.advanceTimersByTimeAsync(250);
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledTimes(1);
+
+      // Resolve and a third tick should fire.
+      resolveProcess!();
+      await vi.advanceTimersByTimeAsync(250);
+      expect(mockProcessForwardedPermissionRequests).toHaveBeenCalledTimes(2);
+    });
+
+    it("passes subagentSessionsDir from the constructor to isSubagentExecutionContext", () => {
+      const manager = new ForwardingManager(
+        "/custom/subagent-dir",
+        makeForwardingDeps(),
+      );
+      const ctx = makeCtx();
+      manager.start(ctx);
+
+      expect(mockIsSubagentExecutionContext).toHaveBeenCalledWith(
+        ctx,
+        "/custom/subagent-dir",
+      );
+    });
+  });
+});

package/tests/handlers/before-agent-start.test.ts

@@ -90,8 +90,7 @@ function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("test-id"),
     events: { emit: vi.fn(), on: vi.fn().mockReturnValue(() => undefined) },
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([]),
     setActiveTools: vi.fn(),
@@ -144,7 +143,7 @@ describe("handleBeforeAgentStart", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleBeforeAgentStart(deps, makeEvent(), ctx);
-    expect(deps.startForwardedPermissionPolling).toHaveBeenCalledWith(ctx);
+    expect(deps.forwarding.start).toHaveBeenCalledWith(ctx);
   });
 
   it("resolves agent name using systemPrompt", async () => {

package/tests/handlers/input-events.test.ts

@@ -81,8 +81,7 @@ function makeDeps(
       .fn()
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("req-id"),
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([]),
     setActiveTools: vi.fn(),

package/tests/handlers/input.test.ts

@@ -69,8 +69,7 @@ function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("req-id"),
     events: { emit: vi.fn(), on: vi.fn().mockReturnValue(() => undefined) },
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([]),
     setActiveTools: vi.fn(),
@@ -126,7 +125,7 @@ describe("handleInput", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleInput(deps, makeInputEvent("hello"), ctx);
-    expect(deps.startForwardedPermissionPolling).toHaveBeenCalledWith(ctx);
+    expect(deps.forwarding.start).toHaveBeenCalledWith(ctx);
   });
 
   it("returns continue for non-skill input", async () => {

package/tests/handlers/lifecycle.test.ts

@@ -98,8 +98,7 @@ function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("test-id"),
     events: { emit: vi.fn(), on: vi.fn().mockReturnValue(() => undefined) },
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([]),
     setActiveTools: vi.fn(),
@@ -171,7 +170,7 @@ describe("handleSessionStart", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, ctx);
-    expect(deps.startForwardedPermissionPolling).toHaveBeenCalledWith(ctx);
+    expect(deps.forwarding.start).toHaveBeenCalledWith(ctx);
   });
 
   it("logs resolved config paths", async () => {
@@ -319,7 +318,7 @@ describe("handleSessionShutdown", () => {
   it("stops forwarded permission polling", async () => {
     const deps = makeDeps();
     await handleSessionShutdown(deps);
-    expect(deps.stopForwardedPermissionPolling).toHaveBeenCalledOnce();
+    expect(deps.forwarding.stop).toHaveBeenCalledOnce();
   });
 
   it("calls stopPermissionRpcHandlers on shutdown", async () => {

package/tests/handlers/tool-call-events.test.ts

@@ -102,8 +102,7 @@ function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
       .fn()
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("req-id"),
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([{ name: "read" }, { name: "bash" }]),
     setActiveTools: vi.fn(),

package/tests/handlers/tool-call.test.ts

@@ -90,8 +90,7 @@ function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
       .mockResolvedValue({ approved: true, state: "approved" }),
     createPermissionRequestId: vi.fn().mockReturnValue("req-id"),
     events: { emit: vi.fn(), on: vi.fn().mockReturnValue(() => undefined) },
-    startForwardedPermissionPolling: vi.fn(),
-    stopForwardedPermissionPolling: vi.fn(),
+    forwarding: { start: vi.fn(), stop: vi.fn() },
     stopPermissionRpcHandlers: vi.fn(),
     getAllTools: vi.fn().mockReturnValue([{ name: "read" }, { name: "bash" }]),
     setActiveTools: vi.fn(),
@@ -139,7 +138,7 @@ describe("handleToolCall", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleToolCall(deps, makeToolCallEvent("read"), ctx);
-    expect(deps.startForwardedPermissionPolling).toHaveBeenCalledWith(ctx);
+    expect(deps.forwarding.start).toHaveBeenCalledWith(ctx);
   });
 
   it("blocks when tool name cannot be resolved", async () => {

package/tests/runtime.test.ts

@@ -212,21 +212,6 @@ describe("createExtensionRuntime", () => {
     expect(runtime.lastConfigWarning).toBeNull();
   });
 
-  it("initializes permissionForwardingContext to null", () => {
-    const runtime = createExtensionRuntime({ agentDir: "/test/agent" });
-    expect(runtime.permissionForwardingContext).toBeNull();
-  });
-
-  it("initializes permissionForwardingTimer to null", () => {
-    const runtime = createExtensionRuntime({ agentDir: "/test/agent" });
-    expect(runtime.permissionForwardingTimer).toBeNull();
-  });
-
-  it("initializes isProcessingForwardedRequests to false", () => {
-    const runtime = createExtensionRuntime({ agentDir: "/test/agent" });
-    expect(runtime.isProcessingForwardedRequests).toBe(false);
-  });
-
   it("creates a sessionRules instance", () => {
     const runtime = createExtensionRuntime({ agentDir: "/test/agent" });
     expect(runtime.sessionRules).toBeDefined();