@gotgenes/pi-permission-system 5.9.0 → 5.11.0

package/src/permission-session.ts

@@ -0,0 +1,281 @@
+import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+
+import {
+  getActiveAgentName,
+  getActiveAgentNameFromSystemPrompt,
+} from "./active-agent";
+import type { PermissionSystemExtensionConfig } from "./extension-config";
+import type { ExtensionPaths } from "./extension-paths";
+import type { ForwardingController } from "./forwarding-manager";
+import type { PermissionPromptDecision } from "./permission-dialog";
+import type { PermissionManager } from "./permission-manager";
+import type { PromptPermissionDetails } from "./permission-prompter";
+import type { Rule } from "./rule";
+import { createPermissionManagerForCwd } from "./runtime";
+import type { SessionLogger } from "./session-logger";
+import { SessionRules } from "./session-rules";
+import type { SkillPromptEntry } from "./skill-prompt-sanitizer";
+import type { PermissionCheckResult, PermissionState } from "./types";
+
+/**
+ * Runtime operations that `PermissionSession` delegates to but does not own.
+ *
+ * Injected at construction time from the composition root (`index.ts`),
+ * where the `ExtensionRuntime` is available.
+ */
+export interface PermissionSessionRuntimeDeps {
+  /** Reload merged config from disk; optionally update the stored runtime context. */
+  refreshExtensionConfig(ctx?: ExtensionContext): void;
+  /** Write the resolved config path set to the review and debug logs. */
+  logResolvedConfigPaths(): void;
+  /** Read current extension config (called at query time). */
+  getConfig(): PermissionSystemExtensionConfig;
+  /** Whether the current context can show an interactive permission prompt. */
+  canRequestPermissionConfirmation(ctx: ExtensionContext): boolean;
+  /** Prompt the user for a permission decision, log the outcome, and return it. */
+  promptPermission(
+    ctx: ExtensionContext,
+    details: PromptPermissionDetails,
+  ): Promise<PermissionPromptDecision>;
+}
+
+/**
+ * Encapsulates all mutable session state and exposes operations instead of
+ * fields.
+ *
+ * Replaces the `SessionState` interface + scattered handler field mutations
+ * with a single class that owns the `PermissionManager`, `SessionRules`,
+ * cache keys, skill entries, and runtime context.
+ *
+ * Constructor deps:
+ * - `ExtensionPaths` — immutable path constants
+ * - `SessionLogger` — debug + review + warn
+ * - `ForwardingController` — polling lifecycle
+ * - `PermissionSessionRuntimeDeps` — config refresh + log delegates
+ */
+export class PermissionSession {
+  private context: ExtensionContext | null = null;
+  private permissionManager: PermissionManager;
+  private readonly sessionRules = new SessionRules();
+  private skillEntries: SkillPromptEntry[] = [];
+  private knownAgentName: string | null = null;
+  private toolsCacheKey: string | null = null;
+  private promptCacheKey: string | null = null;
+
+  constructor(
+    private readonly paths: ExtensionPaths,
+    readonly logger: SessionLogger,
+    private readonly forwarding: ForwardingController,
+    private readonly runtimeDeps: PermissionSessionRuntimeDeps,
+  ) {
+    this.permissionManager = createPermissionManagerForCwd(
+      paths.agentDir,
+      undefined,
+    );
+  }
+
+  // ── Context lifecycle ──────────────────────────────────────────────────
+
+  /** Store the current extension context and start forwarding. */
+  activate(ctx: ExtensionContext): void {
+    this.context = ctx;
+    this.forwarding.start(ctx);
+  }
+
+  /** Clear the context and stop forwarding. */
+  deactivate(): void {
+    this.context = null;
+    this.forwarding.stop();
+  }
+
+  /** Return the current runtime context, or null if not activated. */
+  getRuntimeContext(): ExtensionContext | null {
+    return this.context;
+  }
+
+  // ── Permission checking (delegates to PermissionManager) ───────────────
+
+  checkPermission(
+    surface: string,
+    input: unknown,
+    agentName?: string,
+    sessionRules?: Rule[],
+  ): PermissionCheckResult {
+    return this.permissionManager.checkPermission(
+      surface,
+      input,
+      agentName,
+      sessionRules,
+    );
+  }
+
+  getToolPermission(toolName: string, agentName?: string): PermissionState {
+    return this.permissionManager.getToolPermission(toolName, agentName);
+  }
+
+  getConfigIssues(agentName?: string): string[] {
+    return this.permissionManager.getConfigIssues(agentName);
+  }
+
+  getPolicyCacheStamp(agentName?: string): string {
+    return this.permissionManager.getPolicyCacheStamp(agentName);
+  }
+
+  // ── Session rules (delegates to SessionRules) ──────────────────────────
+
+  getSessionRuleset(): Rule[] {
+    return this.sessionRules.getRuleset();
+  }
+
+  approveSessionRule(surface: string, pattern: string): void {
+    this.sessionRules.approve(surface, pattern);
+  }
+
+  // ── Session lifecycle ────────────────────────────────────────────────────
+
+  /**
+   * Reset all mutable state for a new session.
+   *
+   * Creates a fresh PermissionManager scoped to `ctx.cwd`, clears caches,
+   * skill entries, and activates the new context.
+   */
+  resetForNewSession(ctx: ExtensionContext): void {
+    this.permissionManager = createPermissionManagerForCwd(
+      this.paths.agentDir,
+      ctx.cwd,
+    );
+    this.skillEntries = [];
+    this.toolsCacheKey = null;
+    this.promptCacheKey = null;
+    this.activate(ctx);
+  }
+
+  /**
+   * Shut down the session: clear rules, caches, skill entries, and
+   * deactivate context + forwarding.
+   */
+  shutdown(): void {
+    this.sessionRules.clear();
+    this.skillEntries = [];
+    this.toolsCacheKey = null;
+    this.promptCacheKey = null;
+    this.deactivate();
+  }
+
+  /**
+   * Reload permission manager and clear caches for the current context.
+   * Used on config reload (e.g. `resources_discover` with reason "reload").
+   */
+  reload(): void {
+    this.permissionManager = createPermissionManagerForCwd(
+      this.paths.agentDir,
+      this.context?.cwd,
+    );
+    this.skillEntries = [];
+    this.toolsCacheKey = null;
+    this.promptCacheKey = null;
+  }
+
+  // ── Agent-start caching ────────────────────────────────────────────────
+
+  shouldUpdateActiveTools(cacheKey: string): boolean {
+    return this.toolsCacheKey !== cacheKey;
+  }
+
+  commitActiveToolsCacheKey(cacheKey: string): void {
+    this.toolsCacheKey = cacheKey;
+  }
+
+  shouldUpdatePromptState(cacheKey: string): boolean {
+    return this.promptCacheKey !== cacheKey;
+  }
+
+  commitPromptStateCacheKey(cacheKey: string): void {
+    this.promptCacheKey = cacheKey;
+  }
+
+  // ── Skill entries ──────────────────────────────────────────────────────
+
+  getActiveSkillEntries(): SkillPromptEntry[] {
+    return this.skillEntries;
+  }
+
+  setActiveSkillEntries(entries: SkillPromptEntry[]): void {
+    this.skillEntries = entries;
+  }
+
+  // ── Agent name ─────────────────────────────────────────────────────────
+
+  /**
+   * Resolve the active agent name from the session context, system prompt,
+   * or last known name. Updates lastKnownActiveAgentName as a side effect.
+   */
+  resolveAgentName(
+    ctx: ExtensionContext,
+    systemPrompt?: string,
+  ): string | null {
+    const fromSession = getActiveAgentName(ctx);
+    if (fromSession) {
+      this.knownAgentName = fromSession;
+      return fromSession;
+    }
+    const fromSystemPrompt = getActiveAgentNameFromSystemPrompt(systemPrompt);
+    if (fromSystemPrompt) {
+      this.knownAgentName = fromSystemPrompt;
+      return fromSystemPrompt;
+    }
+    return this.knownAgentName;
+  }
+
+  get lastKnownActiveAgentName(): string | null {
+    return this.knownAgentName;
+  }
+
+  // ── Config ─────────────────────────────────────────────────────────────
+
+  /** Reload merged config from disk; optionally update the stored runtime context. */
+  refreshConfig(ctx?: ExtensionContext): void {
+    this.runtimeDeps.refreshExtensionConfig(ctx);
+  }
+
+  /** Write the resolved config path set to the review and debug logs. */
+  logResolvedConfigPaths(): void {
+    this.runtimeDeps.logResolvedConfigPaths();
+  }
+
+  /** Read current extension config. */
+  get config(): PermissionSystemExtensionConfig {
+    return this.runtimeDeps.getConfig();
+  }
+
+  // ── Infrastructure paths ───────────────────────────────────────────────
+
+  getInfrastructureDirs(): readonly string[] {
+    return this.paths.piInfrastructureDirs;
+  }
+
+  /** Config-derived infrastructure read paths (current at call time). */
+  getInfrastructureReadPaths(): string[] {
+    return this.config.piInfrastructureReadPaths ?? [];
+  }
+
+  // ── Prompting ──────────────────────────────────────────────────────────
+
+  /** Whether the current context can show an interactive permission prompt. */
+  canPrompt(ctx: ExtensionContext): boolean {
+    return this.runtimeDeps.canRequestPermissionConfirmation(ctx);
+  }
+
+  /** Prompt the user for a permission decision, log the outcome, and return it. */
+  prompt(
+    ctx: ExtensionContext,
+    details: PromptPermissionDetails,
+  ): Promise<PermissionPromptDecision> {
+    return this.runtimeDeps.promptPermission(ctx, details);
+  }
+
+  /** Generate a unique ID for a permission request. */
+  createPermissionRequestId(prefix: string): string {
+    return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}-${process.pid}`;
+  }
+}

package/src/runtime.ts

@@ -12,10 +12,6 @@ import {
   getAgentDir,
 } from "@mariozechner/pi-coding-agent";
 
-import {
-  getActiveAgentName,
-  getActiveAgentNameFromSystemPrompt,
-} from "./active-agent";
 import { loadAndMergeConfigs, loadUnifiedConfig } from "./config-loader";
 import {
   DEBUG_LOG_FILENAME,
@@ -45,11 +41,12 @@ import type { SkillPromptEntry } from "./skill-prompt-sanitizer";
 import { syncPermissionSystemStatus } from "./status";
 
 /**
- * Mutable session state — the subset of ExtensionRuntime that handlers
- * read and write. Lifecycle handlers reset fields here on session
- * start/shutdown; gate adapters read permissionManager and sessionRules.
+ * Mutable session state — the subset of ExtensionRuntime that holds
+ * per-session fields. `PermissionSession` now owns these for handler
+ * use; this interface remains so `ExtensionRuntime` can still serve
+ * as the internal composition root (config-modal, RPC handlers).
  */
-export interface SessionState {
+interface SessionState {
   runtimeContext: ExtensionContext | null;
   permissionManager: PermissionManager;
   readonly sessionRules: SessionRules;
@@ -209,28 +206,6 @@ export function saveExtensionConfig(
   });
 }
 
-/**
- * Resolve the active agent name from the Pi session, system prompt, or last
- * known name. Updates `runtime.lastKnownActiveAgentName` as a side effect.
- */
-export function resolveAgentName(
-  runtime: ExtensionRuntime,
-  ctx: ExtensionContext,
-  systemPrompt?: string,
-): string | null {
-  const fromSession = getActiveAgentName(ctx);
-  if (fromSession) {
-    runtime.lastKnownActiveAgentName = fromSession;
-    return fromSession;
-  }
-  const fromSystemPrompt = getActiveAgentNameFromSystemPrompt(systemPrompt);
-  if (fromSystemPrompt) {
-    runtime.lastKnownActiveAgentName = fromSystemPrompt;
-    return fromSystemPrompt;
-  }
-  return runtime.lastKnownActiveAgentName;
-}
-
 /**
  * Write the resolved config path set (global, project, legacy) to the review
  * and debug logs.

package/src/session-logger.ts

@@ -3,7 +3,7 @@ import type { ExtensionRuntime } from "./runtime";
 /**
  * Unified logging + notification surface for handler deps.
  *
- * Replaces three separate HandlerDeps fields (`writeDebugLog`,
+ * Replaces three separate logging fields (`writeDebugLog`,
  * `writeReviewLog`, `notifyWarning`) with a single typed collaborator.
  * This is an intermediate abstraction on the path to PermissionSession (#129).
  */

package/src/skill-prompt-sanitizer.ts

@@ -4,8 +4,19 @@ import {
   isPathWithinDirectory,
   normalizePathForComparison,
 } from "./path-utils";
-import type { PermissionManager } from "./permission-manager";
-import type { PermissionState } from "./types";
+import type { PermissionCheckResult, PermissionState } from "./types";
+
+/**
+ * Narrow interface for the permission checker used by skill prompt resolution.
+ * Both `PermissionManager` and `PermissionSession` satisfy this structurally.
+ */
+export interface SkillPermissionChecker {
+  checkPermission(
+    surface: string,
+    input: unknown,
+    agentName?: string,
+  ): PermissionCheckResult;
+}
 
 const AVAILABLE_SKILLS_OPEN_TAG = "<available_skills>";
 const AVAILABLE_SKILLS_CLOSE_TAG = "</available_skills>";
@@ -148,7 +159,7 @@ export function parseAllSkillPromptSections(
 
 function resolvePermissionState(
   skillName: string,
-  permissionManager: PermissionManager,
+  permissionManager: SkillPermissionChecker,
   agentName: string | null,
   cache: Map<string, PermissionState>,
 ): PermissionState {
@@ -205,7 +216,7 @@ function removePromptRange(prompt: string, start: number, end: number): string {
 
 export function resolveSkillPromptEntries(
   prompt: string,
-  permissionManager: PermissionManager,
+  permissionManager: SkillPermissionChecker,
   agentName: string | null,
   cwd: string,
 ): { prompt: string; entries: SkillPromptEntry[] } {

package/src/tool-registry.ts

@@ -1,5 +1,11 @@
 import { getNonEmptyString, toRecord } from "./common";
 
+/** Narrow interface for the Pi tool API subset used by handler classes. */
+export interface ToolRegistry {
+  getAll(): unknown[];
+  setActive(names: string[]): void;
+}
+
 export type ToolRegistrationCheckResult =
   | {
       status: "missing-tool-name";