@gotgenes/pi-permission-system 5.5.0 → 5.6.0

package/tests/handlers/input.test.ts

@@ -6,7 +6,7 @@ import {
   handleInput,
 } from "../../src/handlers/input";
 import type { HandlerDeps } from "../../src/handlers/types";
-import type { ExtensionRuntime } from "../../src/runtime";
+import type { SessionState } from "../../src/runtime";
 import type { SkillPromptEntry } from "../../src/skill-prompt-sanitizer";
 
 // ── helpers ────────────────────────────────────────────────────────────────
@@ -34,42 +34,32 @@ function makeInputEvent(text: string) {
   return { text };
 }
 
-function makeRuntime(
-  overrides: Partial<ExtensionRuntime> = {},
-): ExtensionRuntime {
+function makeSession(overrides: Partial<SessionState> = {}): SessionState {
   return {
-    agentDir: "/test/agent",
-    sessionsDir: "/test/agent/sessions",
-    subagentSessionsDir: "/test/agent/subagent-sessions",
-    forwardingDir: "/test/agent/sessions/permission-forwarding",
-    globalLogsDir: "/test/agent/extensions/pi-permission-system/logs",
-    config: { debugLog: false, permissionReviewLog: true, yoloMode: false },
     runtimeContext: null,
     permissionManager: {
       checkPermission: vi.fn().mockReturnValue({ state: "allow" }),
-    } as unknown as ExtensionRuntime["permissionManager"],
+    } as unknown as SessionState["permissionManager"],
     activeSkillEntries: [] as SkillPromptEntry[],
     lastKnownActiveAgentName: null,
     lastActiveToolsCacheKey: null,
     lastPromptStateCacheKey: null,
-    lastConfigWarning: null,
     sessionRules: {
       approve: vi.fn(),
       getRuleset: vi.fn().mockReturnValue([]),
       clear: vi.fn(),
-    } as unknown as ExtensionRuntime["sessionRules"],
-    permissionForwardingContext: null,
-    permissionForwardingTimer: null,
-    isProcessingForwardedRequests: false,
-    writeDebugLog: vi.fn(),
-    writeReviewLog: vi.fn(),
+    } as unknown as SessionState["sessionRules"],
     ...overrides,
-  } as ExtensionRuntime;
+  };
 }
 
 function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
   return {
-    runtime: makeRuntime(),
+    session: makeSession(),
+    writeDebugLog: vi.fn(),
+    writeReviewLog: vi.fn(),
+    piInfrastructureDirs: ["/test/agent", "/test/agent/git"],
+    getPiInfrastructureReadPaths: vi.fn().mockReturnValue([]),
     createPermissionManagerForCwd: vi.fn(),
     refreshExtensionConfig: vi.fn(),
     notifyWarning: vi.fn(),
@@ -131,7 +121,7 @@ describe("handleInput", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleInput(deps, makeInputEvent("hello"), ctx);
-    expect(deps.runtime.runtimeContext).toBe(ctx);
+    expect(deps.session.runtimeContext).toBe(ctx);
   });
 
   it("starts forwarded permission polling", async () => {
@@ -155,7 +145,7 @@ describe("handleInput", () => {
     const deps = makeDeps();
     await handleInput(deps, makeInputEvent("just a message"), makeCtx());
     expect(
-      deps.runtime.permissionManager.checkPermission,
+      deps.session.permissionManager.checkPermission,
     ).not.toHaveBeenCalled();
   });
 
@@ -175,9 +165,8 @@ describe("handleInput", () => {
       checkPermission: vi.fn().mockReturnValue({ state: "deny" }),
     };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
     });
     const result = await handleInput(
@@ -194,9 +183,8 @@ describe("handleInput", () => {
       checkPermission: vi.fn().mockReturnValue({ state: "deny" }),
     };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
     });
     await handleInput(deps, makeInputEvent("/skill:librarian"), ctx);
@@ -210,9 +198,8 @@ describe("handleInput", () => {
     const ctx = makeCtx({ hasUI: false });
     const pm = { checkPermission: vi.fn().mockReturnValue({ state: "deny" }) };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
     });
     await handleInput(deps, makeInputEvent("/skill:librarian"), ctx);
@@ -222,9 +209,8 @@ describe("handleInput", () => {
   it("returns handled when skill requires approval but no UI is available", async () => {
     const pm = { checkPermission: vi.fn().mockReturnValue({ state: "ask" }) };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
       canRequestPermissionConfirmation: vi.fn().mockReturnValue(false),
     });
@@ -239,9 +225,8 @@ describe("handleInput", () => {
   it("prompts and returns continue when skill ask is approved", async () => {
     const pm = { checkPermission: vi.fn().mockReturnValue({ state: "ask" }) };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
       canRequestPermissionConfirmation: vi.fn().mockReturnValue(true),
       promptPermission: vi
@@ -260,9 +245,8 @@ describe("handleInput", () => {
   it("returns handled when skill ask is denied by user", async () => {
     const pm = { checkPermission: vi.fn().mockReturnValue({ state: "ask" }) };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
       canRequestPermissionConfirmation: vi.fn().mockReturnValue(true),
       promptPermission: vi
@@ -280,9 +264,8 @@ describe("handleInput", () => {
   it("passes agentName in the prompt permission request", async () => {
     const pm = { checkPermission: vi.fn().mockReturnValue({ state: "ask" }) };
     const deps = makeDeps({
-      runtime: makeRuntime({
-        permissionManager:
-          pm as unknown as ExtensionRuntime["permissionManager"],
+      session: makeSession({
+        permissionManager: pm as unknown as SessionState["permissionManager"],
       }),
       resolveAgentName: vi.fn().mockReturnValue("code-agent"),
       canRequestPermissionConfirmation: vi.fn().mockReturnValue(true),

package/tests/handlers/lifecycle.test.ts

@@ -7,7 +7,7 @@ import {
 } from "../../src/handlers/lifecycle";
 import type { HandlerDeps } from "../../src/handlers/types";
 import type { PermissionManager } from "../../src/permission-manager";
-import type { ExtensionRuntime } from "../../src/runtime";
+import type { SessionState } from "../../src/runtime";
 import type { SessionRules } from "../../src/session-rules";
 import type { SkillPromptEntry } from "../../src/skill-prompt-sanitizer";
 
@@ -67,36 +67,26 @@ function makeSessionRules(): SessionRules {
   } as unknown as SessionRules;
 }
 
-function makeRuntime(
-  overrides: Partial<ExtensionRuntime> = {},
-): ExtensionRuntime {
+function makeSession(overrides: Partial<SessionState> = {}): SessionState {
   return {
-    agentDir: "/test/agent",
-    sessionsDir: "/test/agent/sessions",
-    subagentSessionsDir: "/test/agent/subagent-sessions",
-    forwardingDir: "/test/agent/sessions/permission-forwarding",
-    globalLogsDir: "/test/agent/extensions/pi-permission-system/logs",
-    config: { debugLog: false, permissionReviewLog: true, yoloMode: false },
     runtimeContext: null,
     permissionManager: makePermissionManager() as unknown as PermissionManager,
     activeSkillEntries: [] as SkillPromptEntry[],
     lastKnownActiveAgentName: null,
     lastActiveToolsCacheKey: null,
     lastPromptStateCacheKey: null,
-    lastConfigWarning: null,
     sessionRules: makeSessionRules(),
-    permissionForwardingContext: null,
-    permissionForwardingTimer: null,
-    isProcessingForwardedRequests: false,
-    writeDebugLog: vi.fn(),
-    writeReviewLog: vi.fn(),
     ...overrides,
-  } as ExtensionRuntime;
+  };
 }
 
 function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
   return {
-    runtime: makeRuntime(),
+    session: makeSession(),
+    writeDebugLog: vi.fn(),
+    writeReviewLog: vi.fn(),
+    piInfrastructureDirs: ["/test/agent", "/test/agent/git"],
+    getPiInfrastructureReadPaths: vi.fn().mockReturnValue([]),
     createPermissionManagerForCwd: vi
       .fn()
       .mockReturnValue(makePermissionManager()),
@@ -131,7 +121,7 @@ describe("handleSessionStart", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, ctx);
-    expect(deps.runtime.runtimeContext).toBe(ctx);
+    expect(deps.session.runtimeContext).toBe(ctx);
   });
 
   it("refreshes extension config with ctx", async () => {
@@ -151,16 +141,16 @@ describe("handleSessionStart", () => {
     expect(deps.createPermissionManagerForCwd).toHaveBeenCalledWith(
       "/my/project",
     );
-    expect(deps.runtime.permissionManager).toBe(newPm);
+    expect(deps.session.permissionManager).toBe(newPm);
   });
 
   it("clears the before_agent_start cache", async () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, ctx);
-    expect(deps.runtime.activeSkillEntries).toEqual([]);
-    expect(deps.runtime.lastActiveToolsCacheKey).toBeNull();
-    expect(deps.runtime.lastPromptStateCacheKey).toBeNull();
+    expect(deps.session.activeSkillEntries).toEqual([]);
+    expect(deps.session.lastActiveToolsCacheKey).toBeNull();
+    expect(deps.session.lastPromptStateCacheKey).toBeNull();
   });
 
   it("sets lastKnownActiveAgentName from getActiveAgentName", async () => {
@@ -168,7 +158,7 @@ describe("handleSessionStart", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, ctx);
-    expect(deps.runtime.lastKnownActiveAgentName).toBe("my-agent");
+    expect(deps.session.lastKnownActiveAgentName).toBe("my-agent");
   });
 
   it("sets lastKnownActiveAgentName to null when no agent is active", async () => {
@@ -176,7 +166,7 @@ describe("handleSessionStart", () => {
     const ctx = makeCtx();
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, ctx);
-    expect(deps.runtime.lastKnownActiveAgentName).toBeNull();
+    expect(deps.session.lastKnownActiveAgentName).toBeNull();
   });
 
   it("starts forwarded permission polling", async () => {
@@ -213,20 +203,17 @@ describe("handleSessionStart", () => {
     const ctx = makeCtx({ cwd: "/proj" });
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "reload" }, ctx);
-    expect(deps.runtime.writeDebugLog).toHaveBeenCalledWith(
-      "lifecycle.reload",
-      {
-        triggeredBy: "session_start",
-        reason: "reload",
-        cwd: "/proj",
-      },
-    );
+    expect(deps.writeDebugLog).toHaveBeenCalledWith("lifecycle.reload", {
+      triggeredBy: "session_start",
+      reason: "reload",
+      cwd: "/proj",
+    });
   });
 
   it("does not write lifecycle.reload debug log for non-reload reasons", async () => {
     const deps = makeDeps();
     await handleSessionStart(deps, { reason: "startup" }, makeCtx());
-    expect(deps.runtime.writeDebugLog).not.toHaveBeenCalled();
+    expect(deps.writeDebugLog).not.toHaveBeenCalled();
   });
 });
 
@@ -237,21 +224,21 @@ describe("handleResourcesDiscover", () => {
     const deps = makeDeps();
     await handleResourcesDiscover(deps, { reason: "startup" });
     expect(deps.createPermissionManagerForCwd).not.toHaveBeenCalled();
-    expect(deps.runtime.writeDebugLog).not.toHaveBeenCalled();
+    expect(deps.writeDebugLog).not.toHaveBeenCalled();
   });
 
   it("creates and stores a new PM using runtimeContext.cwd on reload", async () => {
     const ctx = makeCtx({ cwd: "/runtime/cwd" });
     const newPm = makePermissionManager();
     const deps = makeDeps({
-      runtime: makeRuntime({ runtimeContext: ctx }),
+      session: makeSession({ runtimeContext: ctx }),
       createPermissionManagerForCwd: vi.fn().mockReturnValue(newPm),
     });
     await handleResourcesDiscover(deps, { reason: "reload" });
     expect(deps.createPermissionManagerForCwd).toHaveBeenCalledWith(
       "/runtime/cwd",
     );
-    expect(deps.runtime.permissionManager).toBe(newPm);
+    expect(deps.session.permissionManager).toBe(newPm);
   });
 
   it("uses undefined cwd when runtimeContext is null on reload", async () => {
@@ -263,36 +250,30 @@ describe("handleResourcesDiscover", () => {
   it("clears the before_agent_start cache on reload", async () => {
     const deps = makeDeps();
     await handleResourcesDiscover(deps, { reason: "reload" });
-    expect(deps.runtime.activeSkillEntries).toEqual([]);
-    expect(deps.runtime.lastActiveToolsCacheKey).toBeNull();
-    expect(deps.runtime.lastPromptStateCacheKey).toBeNull();
+    expect(deps.session.activeSkillEntries).toEqual([]);
+    expect(deps.session.lastActiveToolsCacheKey).toBeNull();
+    expect(deps.session.lastPromptStateCacheKey).toBeNull();
   });
 
   it("writes lifecycle.reload debug log on reload", async () => {
     const ctx = makeCtx({ cwd: "/proj" });
-    const deps = makeDeps({ runtime: makeRuntime({ runtimeContext: ctx }) });
+    const deps = makeDeps({ session: makeSession({ runtimeContext: ctx }) });
     await handleResourcesDiscover(deps, { reason: "reload" });
-    expect(deps.runtime.writeDebugLog).toHaveBeenCalledWith(
-      "lifecycle.reload",
-      {
-        triggeredBy: "resources_discover",
-        reason: "reload",
-        cwd: "/proj",
-      },
-    );
+    expect(deps.writeDebugLog).toHaveBeenCalledWith("lifecycle.reload", {
+      triggeredBy: "resources_discover",
+      reason: "reload",
+      cwd: "/proj",
+    });
   });
 
   it("logs cwd as null when runtimeContext is null on reload", async () => {
     const deps = makeDeps();
     await handleResourcesDiscover(deps, { reason: "reload" });
-    expect(deps.runtime.writeDebugLog).toHaveBeenCalledWith(
-      "lifecycle.reload",
-      {
-        triggeredBy: "resources_discover",
-        reason: "reload",
-        cwd: null,
-      },
-    );
+    expect(deps.writeDebugLog).toHaveBeenCalledWith("lifecycle.reload", {
+      triggeredBy: "resources_discover",
+      reason: "reload",
+      cwd: null,
+    });
   });
 });
 
@@ -302,7 +283,7 @@ describe("handleSessionShutdown", () => {
   it("clears the UI status when a runtime context is present", async () => {
     const ctx = makeCtx();
     const deps = makeDeps({
-      runtime: makeRuntime({ runtimeContext: ctx }),
+      session: makeSession({ runtimeContext: ctx }),
     });
     await handleSessionShutdown(deps);
     expect(ctx.ui.setStatus).toHaveBeenCalledWith(
@@ -318,23 +299,23 @@ describe("handleSessionShutdown", () => {
 
   it("sets runtime context to null", async () => {
     const ctx = makeCtx();
-    const deps = makeDeps({ runtime: makeRuntime({ runtimeContext: ctx }) });
+    const deps = makeDeps({ session: makeSession({ runtimeContext: ctx }) });
     await handleSessionShutdown(deps);
-    expect(deps.runtime.runtimeContext).toBeNull();
+    expect(deps.session.runtimeContext).toBeNull();
   });
 
   it("clears the before_agent_start cache", async () => {
     const deps = makeDeps();
     await handleSessionShutdown(deps);
-    expect(deps.runtime.activeSkillEntries).toEqual([]);
-    expect(deps.runtime.lastActiveToolsCacheKey).toBeNull();
-    expect(deps.runtime.lastPromptStateCacheKey).toBeNull();
+    expect(deps.session.activeSkillEntries).toEqual([]);
+    expect(deps.session.lastActiveToolsCacheKey).toBeNull();
+    expect(deps.session.lastPromptStateCacheKey).toBeNull();
   });
 
   it("clears the session rules", async () => {
     const deps = makeDeps();
     await handleSessionShutdown(deps);
-    expect(deps.runtime.sessionRules.clear).toHaveBeenCalledOnce();
+    expect(deps.session.sessionRules.clear).toHaveBeenCalledOnce();
   });
 
   it("stops forwarded permission polling", async () => {
@@ -351,9 +332,9 @@ describe("handleSessionShutdown", () => {
 
   it("does not reset lastKnownActiveAgentName", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({ lastKnownActiveAgentName: "remembered" }),
+      session: makeSession({ lastKnownActiveAgentName: "remembered" }),
     });
     await handleSessionShutdown(deps);
-    expect(deps.runtime.lastKnownActiveAgentName).toBe("remembered");
+    expect(deps.session.lastKnownActiveAgentName).toBe("remembered");
   });
 });

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

@@ -9,7 +9,7 @@ import { handleToolCall } from "../../src/handlers/tool-call";
 import type { HandlerDeps } from "../../src/handlers/types";
 import type { PermissionDecisionEvent } from "../../src/permission-events";
 import { PERMISSIONS_DECISION_CHANNEL } from "../../src/permission-events";
-import type { ExtensionRuntime } from "../../src/runtime";
+import type { SessionState } from "../../src/runtime";
 import type { PermissionCheckResult } from "../../src/types";
 
 // ── helpers ────────────────────────────────────────────────────────────────
@@ -67,43 +67,32 @@ function makeCheckResult(
   };
 }
 
-function makeRuntime(
-  overrides: Partial<ExtensionRuntime> = {},
-): ExtensionRuntime {
+function makeSession(overrides: Partial<SessionState> = {}): SessionState {
   return {
-    agentDir: "/test/agent",
-    sessionsDir: "/test/agent/sessions",
-    subagentSessionsDir: "/test/agent/subagent-sessions",
-    forwardingDir: "/test/agent/sessions/permission-forwarding",
-    globalLogsDir: "/test/agent/extensions/pi-permission-system/logs",
-    piInfrastructureDirs: ["/test/agent", "/test/agent/git"],
-    config: { debugLog: false, permissionReviewLog: true, yoloMode: false },
     runtimeContext: null,
     permissionManager: {
       checkPermission: vi.fn().mockReturnValue(makeCheckResult("allow")),
-    } as unknown as ExtensionRuntime["permissionManager"],
+    } as unknown as SessionState["permissionManager"],
     activeSkillEntries: [],
     lastKnownActiveAgentName: null,
     lastActiveToolsCacheKey: null,
     lastPromptStateCacheKey: null,
-    lastConfigWarning: null,
     sessionRules: {
       approve: vi.fn(),
       getRuleset: vi.fn().mockReturnValue([]),
       clear: vi.fn(),
-    } as unknown as ExtensionRuntime["sessionRules"],
-    permissionForwardingContext: null,
-    permissionForwardingTimer: null,
-    isProcessingForwardedRequests: false,
-    writeDebugLog: vi.fn(),
-    writeReviewLog: vi.fn(),
+    } as unknown as SessionState["sessionRules"],
     ...overrides,
-  } as ExtensionRuntime;
+  };
 }
 
 function makeDeps(overrides: Partial<HandlerDeps> = {}): HandlerDeps {
   return {
-    runtime: makeRuntime(),
+    session: makeSession(),
+    writeDebugLog: vi.fn(),
+    writeReviewLog: vi.fn(),
+    piInfrastructureDirs: ["/test/agent", "/test/agent/git"],
+    getPiInfrastructureReadPaths: vi.fn().mockReturnValue([]),
     events: makeEvents(),
     createPermissionManagerForCwd: vi.fn(),
     refreshExtensionConfig: vi.fn(),
@@ -137,7 +126,7 @@ function getDecisionEvents(deps: HandlerDeps): PermissionDecisionEvent[] {
 describe("handleToolCall decision events — policy_allow", () => {
   it("emits allow with policy_allow when checkPermission returns allow", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(
             makeCheckResult("allow", {
@@ -145,7 +134,7 @@ describe("handleToolCall decision events — policy_allow", () => {
               matchedPattern: "*",
             }),
           ),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
     });
 
@@ -168,7 +157,7 @@ describe("handleToolCall decision events — policy_allow", () => {
 describe("handleToolCall decision events — policy_deny", () => {
   it("emits deny with policy_deny when checkPermission returns deny", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(
             makeCheckResult("deny", {
@@ -176,7 +165,7 @@ describe("handleToolCall decision events — policy_deny", () => {
               matchedPattern: "read",
             }),
           ),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
     });
 
@@ -197,7 +186,7 @@ describe("handleToolCall decision events — policy_deny", () => {
 describe("handleToolCall decision events — session_approved", () => {
   it("emits allow with session_approved when checkPermission returns source:session", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(
             makeCheckResult("allow", {
@@ -205,7 +194,7 @@ describe("handleToolCall decision events — session_approved", () => {
               matchedPattern: "git *",
             }),
           ),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
     });
 
@@ -230,10 +219,10 @@ describe("handleToolCall decision events — session_approved", () => {
 describe("handleToolCall decision events — user_approved", () => {
   it("emits allow with user_approved when state=ask and user approves once", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("ask")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
       promptPermission: vi
         .fn()
@@ -252,10 +241,10 @@ describe("handleToolCall decision events — user_approved", () => {
 
   it("emits allow with user_approved_for_session when user approves for session", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("ask")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
       promptPermission: vi
         .fn()
@@ -278,10 +267,10 @@ describe("handleToolCall decision events — user_approved", () => {
 describe("handleToolCall decision events — user_denied", () => {
   it("emits deny with user_denied when state=ask and user denies", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("ask")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
       promptPermission: vi
         .fn()
@@ -304,10 +293,10 @@ describe("handleToolCall decision events — user_denied", () => {
 describe("handleToolCall decision events — confirmation_unavailable", () => {
   it("emits deny with confirmation_unavailable when state=ask but no UI", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("ask")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
       canRequestPermissionConfirmation: vi.fn().mockReturnValue(false),
     });
@@ -333,11 +322,11 @@ describe("handleToolCall decision events — infrastructure_auto_allowed", () =>
   it("emits allow with infrastructure_auto_allowed for Pi infra reads", async () => {
     const infraDir = "/test/agent";
     const deps = makeDeps({
-      runtime: makeRuntime({
-        piInfrastructureDirs: [infraDir],
+      piInfrastructureDirs: [infraDir],
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("allow")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
     });
 
@@ -364,10 +353,10 @@ describe("handleToolCall decision events — infrastructure_auto_allowed", () =>
 describe("handleToolCall decision events — auto_approved", () => {
   it("emits allow with auto_approved when promptPermission returns autoApproved:true", async () => {
     const deps = makeDeps({
-      runtime: makeRuntime({
+      session: makeSession({
         permissionManager: {
           checkPermission: vi.fn().mockReturnValue(makeCheckResult("ask")),
-        } as unknown as ExtensionRuntime["permissionManager"],
+        } as unknown as SessionState["permissionManager"],
       }),
       // Simulate what PermissionPrompter returns in yolo mode
       promptPermission: vi.fn().mockResolvedValue({