@gotgenes/pi-permission-system 20.3.0 → 20.4.0

package/src/rule.ts

@@ -1,6 +1,8 @@
+import type { PathFlavor } from "#src/path/path-flavor";
+
 import { PATH_SURFACES } from "./path-surfaces";
 import type { PermissionState } from "./types";
-import { wildcardMatch } from "./wildcard-matcher";
+import { type WildcardMatchOptions, wildcardMatch } from "./wildcard-matcher";
 
 /**
  * Provenance of a rule — which source contributed it.
@@ -74,12 +76,10 @@ export function evaluate(
   surface: string,
   pattern: string,
   rules: Ruleset,
-  platform: NodeJS.Platform,
+  flavor: PathFlavor,
   defaultAction?: PermissionState,
 ): Rule {
-  const rule = rules.findLast((r) =>
-    ruleMatches(r, surface, pattern, platform),
-  );
+  const rule = rules.findLast((r) => ruleMatches(r, surface, pattern, flavor));
   if (rule !== undefined) return rule;
   return {
     surface,
@@ -96,20 +96,18 @@ export function evaluate(
  */
 export function pathMatchOptions(
   surface: string,
-  platform: NodeJS.Platform,
-): { caseInsensitive: true; windowsSeparators: true } | undefined {
-  return platform === "win32" && PATH_SURFACES.has(surface)
-    ? { caseInsensitive: true, windowsSeparators: true }
-    : undefined;
+  flavor: PathFlavor,
+): WildcardMatchOptions | undefined {
+  return PATH_SURFACES.has(surface) ? flavor.matchOptions : undefined;
 }
 
 function ruleMatches(
   rule: Rule,
   surface: string,
   value: string,
-  platform: NodeJS.Platform,
+  flavor: PathFlavor,
 ): boolean {
-  const matchOptions = pathMatchOptions(surface, platform);
+  const matchOptions = pathMatchOptions(surface, flavor);
   return (
     wildcardMatch(rule.surface, surface) &&
     wildcardMatch(rule.pattern, value, matchOptions)
@@ -144,11 +142,11 @@ export function evaluateMostRestrictive(
   surface: string,
   values: string[],
   rules: Ruleset,
-  platform: NodeJS.Platform,
+  flavor: PathFlavor,
 ): { rule: Rule; value: string } | null {
   let worst: { rule: Rule; value: string } | null = null;
   for (const value of values) {
-    const rule = evaluate(surface, value, rules, platform);
+    const rule = evaluate(surface, value, rules, flavor);
     if (rule.action === "deny") return { rule, value };
     if (rule.action === "ask" && worst?.rule.action !== "ask") {
       worst = { rule, value };
@@ -161,10 +159,10 @@ export function evaluateFirst(
   surface: string,
   values: string[],
   rules: Ruleset,
-  platform: NodeJS.Platform,
+  flavor: PathFlavor,
 ): { rule: Rule; value: string } {
   for (const value of values) {
-    const rule = evaluate(surface, value, rules, platform);
+    const rule = evaluate(surface, value, rules, flavor);
     if (rule.layer !== "default") {
       return { rule, value };
     }
@@ -172,7 +170,7 @@ export function evaluateFirst(
   // All candidates matched only the synthesized default — use the first.
   const fallbackValue = values[0] ?? "*";
   return {
-    rule: evaluate(surface, fallbackValue, rules, platform),
+    rule: evaluate(surface, fallbackValue, rules, flavor),
     value: fallbackValue,
   };
 }
@@ -189,22 +187,22 @@ export function evaluateAnyValue(
   surface: string,
   values: string[],
   rules: Ruleset,
-  platform: NodeJS.Platform,
+  flavor: PathFlavor,
 ): { rule: Rule; value: string } {
   const fallbackValue = values[0] ?? "*";
   const rule = rules.findLast((r) =>
-    values.some((value) => ruleMatches(r, surface, value, platform)),
+    values.some((value) => ruleMatches(r, surface, value, flavor)),
   );
   if (rule !== undefined) {
     return {
       rule,
       value:
-        values.find((value) => ruleMatches(rule, surface, value, platform)) ??
+        values.find((value) => ruleMatches(rule, surface, value, flavor)) ??
         fallbackValue,
     };
   }
   return {
-    rule: evaluate(surface, fallbackValue, rules, platform),
+    rule: evaluate(surface, fallbackValue, rules, flavor),
     value: fallbackValue,
   };
 }

package/src/session-approval.ts

@@ -1,4 +1,4 @@
-import type { ForwardedSessionApproval } from "./permission-forwarding";
+import type { ForwardedSessionApproval } from "#src/authority/permission-forwarding";
 
 /**
  * Value object for a session-scoped approval: one surface, one-or-more patterns.

package/src/tool-input-path.ts

@@ -1,4 +1,4 @@
-import { PATH_BEARING_TOOLS } from "./path-surfaces";
+import { classifyToolKind } from "./access-intent/tool-kind";
 import type { ToolAccessExtractorLookup } from "./tool-access-extractor-registry";
 import { getNonEmptyString, toRecord } from "./value-guards";
 
@@ -6,7 +6,7 @@ export function getPathBearingToolPath(
   toolName: string,
   input: unknown,
 ): string | null {
-  if (!PATH_BEARING_TOOLS.has(toolName)) {
+  if (classifyToolKind(toolName) !== "path") {
     return null;
   }
 
@@ -31,24 +31,22 @@ export function getToolInputPath(
   input: unknown,
   extractors?: ToolAccessExtractorLookup,
 ): string | null {
-  if (toolName === "bash") {
-    return null;
-  }
-
   const record = toRecord(input);
 
-  if (PATH_BEARING_TOOLS.has(toolName)) {
-    return getNonEmptyString(record.path);
-  }
-
-  if (toolName === "mcp") {
-    return getNonEmptyString(toRecord(record.arguments).path);
-  }
-
-  const custom = extractors?.get(toolName);
-  if (custom) {
-    return getNonEmptyString(custom(record));
+  switch (classifyToolKind(toolName)) {
+    case "bash":
+      return null;
+    case "path":
+      return getNonEmptyString(record.path);
+    case "mcp":
+      return getNonEmptyString(toRecord(record.arguments).path);
+    case "skill":
+    case "extension": {
+      const custom = extractors?.get(toolName);
+      if (custom) {
+        return getNonEmptyString(custom(record));
+      }
+      return getNonEmptyString(record.path);
+    }
   }
-
-  return getNonEmptyString(record.path);
 }

package/src/tool-preview-formatter.ts

@@ -1,3 +1,4 @@
+import { classifyToolKind, isMcpCheck } from "./access-intent/tool-kind";
 import type { PermissionSystemExtensionConfig } from "./extension-config";
 import type { ToolInputFormatterLookup } from "./tool-input-formatter-registry";
 import {
@@ -158,11 +159,7 @@ export class ToolPreviewFormatter {
     input: unknown,
     pathBearingTools: ReadonlySet<string>,
   ): string | undefined {
-    if (
-      result.toolName === "bash" ||
-      result.toolName === "mcp" ||
-      result.source === "mcp"
-    ) {
+    if (classifyToolKind(result.toolName) === "bash" || isMcpCheck(result)) {
       return undefined;
     }
 

package/src/path-containment.ts

@@ -1,56 +0,0 @@
-import { posix as posixPath, win32 as winPath } from "node:path";
-
-import { isSafeSystemPath } from "./safe-system-paths";
-
-/**
- * Returns true when `pathValue` is `directory` itself or nested inside it.
- *
- * Containment is decided with Node's platform-native `path.relative` rather
- * than a hand-rolled prefix check: on `win32` the comparison folds case (and
- * tolerates either separator), matching the case-insensitive filesystem.
- * `platform` is injected from the composition root so Windows behavior is
- * testable on a POSIX CI.
- */
-export function isPathWithinDirectory(
-  pathValue: string,
-  directory: string,
-  platform: NodeJS.Platform,
-): boolean {
-  if (!pathValue || !directory) {
-    return false;
-  }
-
-  if (pathValue === directory) {
-    return true;
-  }
-
-  const impl = platform === "win32" ? winPath : posixPath;
-  const rel = impl.relative(directory, pathValue);
-  return (
-    rel !== "" &&
-    rel !== ".." &&
-    !rel.startsWith(`..${impl.sep}`) &&
-    !impl.isAbsolute(rel)
-  );
-}
-
-/**
- * Pure geometry: is `canonicalPath` outside `canonicalCwd`?
- *
- * Both operands must already be canonical (symlink-resolved, win32-lowercased)
- * — the caller prepares them (see {@link PathNormalizer.isOutsideWorkingDirectory}).
- * This predicate touches no filesystem and does no derivation.
- */
-export function isPathOutsideWorkingDirectory(
-  canonicalPath: string,
-  canonicalCwd: string,
-  platform: NodeJS.Platform,
-): boolean {
-  if (!canonicalCwd || !canonicalPath) {
-    return false;
-  }
-  if (isSafeSystemPath(canonicalPath)) {
-    return false;
-  }
-  return !isPathWithinDirectory(canonicalPath, canonicalCwd, platform);
-}