refactor(permission): drop dead params and duplicate helpers

Author: TheGreatAxios

src/agent/tool-aliases.test.ts

@@ -13,7 +13,7 @@ import {
   withAuthzParityDefinitions,
   WIRE_TO_ENGINE,
 } from "./tool-aliases.js";
-import { evaluateApprovals } from "../permission/authz-grants.js";
+import { approvalCoversSubject } from "../permission/authz-grants.js";
 
 const noWorkspace = { resolvedCwd: "/repo", roots: ["/repo"] };
 
@@ -55,7 +55,7 @@ describe("one advertised posix set", () => {
 describe("grant aliases", () => {
   test("a grant stored as run_shell covers bash", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "bash",
         subject: "npm test",
         approvals: [{ tool: "run_shell", pattern: "npm *" }],
@@ -66,7 +66,7 @@ describe("grant aliases", () => {
 
   test("a grant stored as bash matches a run_shell request after canonicalize", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "npm test",
         approvals: [{ tool: "bash", pattern: "npm *" }],
@@ -77,15 +77,15 @@ describe("grant aliases", () => {
 
   test("pure renames stay bidirectional: read covers read_file and vice versa", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "read_file",
         subject: "src/a.ts",
         approvals: [{ tool: "read", pattern: "src/*" }],
         workspace: noWorkspace,
       }),
     ).toBe(true);
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "read",
         subject: "src/a.ts",
         approvals: [{ tool: "read_file", pattern: "src/*" }],
@@ -102,7 +102,7 @@ describe("grant aliases", () => {
   // update_plan keys, so that replay path is unreachable.
   test("a stored update_plan grant does not cover manage_tasks", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "manage_tasks",
         subject: "manage_tasks",
         approvals: [{ tool: "update_plan", pattern: "*" }],
@@ -113,7 +113,7 @@ describe("grant aliases", () => {
 
   test("a stored manage_tasks grant covers manage_tasks", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "manage_tasks",
         subject: "manage_tasks",
         approvals: [{ tool: "manage_tasks", pattern: "*" }],

src/agent/tools.ts

@@ -1527,7 +1527,7 @@ export async function createAgentToolset(
       const failures: unknown[] = [];
       // Kill live background process groups before the posix teardown so
       // reload/interrupt cannot leave orphans behind.
-      backgroundShells.disposeAll("session closed");
+      backgroundShells.disposeAll();
       try {
         await posixTools.dispose();
       } catch (err: unknown) {

src/permission/authz-grants.ts

@@ -84,7 +84,7 @@ export function normalizeSeededApprovals(
 }
 
 // Single owner for grant tool/providerModel/cwd scope coverage, independent
-// of pattern matching. Both live call sites (evaluateApprovals,
+// of pattern matching. Both live call sites (approvalCoversSubject,
 // isRequestCoveredByGrant) delegate here so a scoping-dimension change lands
 // in one place.
 export function grantScopeMatches(
@@ -113,7 +113,7 @@ export interface EvaluateApprovalsInput {
 
 // Grant-evaluation owner for the live decide() path (shell per-segment checks
 // and the path-arg check). The queued-reconciliation path
-// (isRequestCoveredByApprovals in gate.ts) matches inline against the same
+// (isRequestCoveredByGrant in gate.ts) matches inline against the same
 // helpers instead of calling here — keep the two in sync. Fail-closed:
 // unknown tools, unknown runners, and empty grant lists all refuse.
 export async function approvalCoversSubject(
@@ -165,10 +165,3 @@ export async function approvalCoversSubject(
   const decision = await evaluateGrants(grants, subject, action);
   return decision.effect === "allow";
 }
-
-// Grant-store evaluation entry point; delegates to approvalCoversSubject.
-export async function evaluateApprovals(
-  input: EvaluateApprovalsInput,
-): Promise<boolean> {
-  return approvalCoversSubject(input);
-}

src/permission/gate.ts

@@ -254,36 +254,17 @@ export function preGrantGuardReason(
 // is per-segment; whole-string chain patterns never cover.
 export function isRequestCoveredByGrant(
   request: PermissionRequest,
-  approval: Approval,
-  activeProviderModel: string | undefined,
-  isRestricted: (path: string, isWrite: boolean) => boolean,
-  workspace: GrantWorkspace,
-  rootsProvider?: RootsProvider,
-  isExtraDenied: (value: string) => boolean = () => false,
-): boolean {
-  return isRequestCoveredByApprovals(
-    request,
-    [approval],
-    activeProviderModel,
-    isRestricted,
-    workspace,
-    rootsProvider,
-    isExtraDenied,
-  );
-}
-
-// Coverage against the live approvals list; mintGrant hands this to onGrant
-// so a queued identical chain drains once every per-segment grant is in the
-// list.
-function isRequestCoveredByApprovals(
-  request: PermissionRequest,
-  approvals: readonly Approval[],
+  approval: Approval | readonly Approval[],
   activeProviderModel: string | undefined,
   isRestricted: (path: string, isWrite: boolean) => boolean,
   workspace: GrantWorkspace,
   rootsProvider?: RootsProvider,
   isExtraDenied: (value: string) => boolean = () => false,
 ): boolean {
+  // Coverage against one approval or the live approvals list; mintGrant
+  // hands the list to onGrant so a queued identical chain drains once every
+  // per-segment grant is in the list.
+  const approvals = Array.isArray(approval) ? approval : [approval];
   const scoped = approvals.filter((a) =>
     grantScopeMatches(
       a,
@@ -592,7 +573,7 @@ export function createPermissionGate(
         persist?.(approval, grant);
       }
       options.onGrant?.(approval, (request) =>
-        isRequestCoveredByApprovals(
+        isRequestCoveredByGrant(
           request,
           approvals,
           activeProviderModel,

src/permission/grant-scope.test.ts

@@ -3,7 +3,6 @@ import type { ToolCall } from "@intx/types/runtime";
 import type { Approval, PermissionRequest } from "./types.js";
 import {
   approvalCoversSubject,
-  evaluateApprovals,
   grantScopeMatches,
   normalizeSeededApprovals,
   cwdMatchesGrant,
@@ -13,10 +12,10 @@ import { createPermissionGate, isRequestCoveredByGrant } from "./gate.js";
 import { createPermissionRequestQueue } from "./queue.js";
 import { buildRequests } from "./classify.js";
 
-// approvalCoversSubject is the single grant-evaluation owner; evaluateApprovals
-// delegates to it and isRequestCoveredByGrant must agree on scope. Driving
-// the same grant+request pairs through all three catches a call site that
-// reimplements the check with subtly different semantics.
+// approvalCoversSubject is the single grant-evaluation owner;
+// isRequestCoveredByGrant must agree on scope. Driving the same grant+request
+// pairs through both catches a call site that reimplements the check with
+// subtly different semantics.
 describe("grant tool/providerModel/cwd scoping agrees across call sites", () => {
   const workspace: GrantWorkspace = { resolvedCwd: "/proj", roots: ["/proj"] };
   const noopRestricted = () => false;
@@ -429,9 +428,9 @@ describe("foreign grant cwd matching request cwd under a different workspace is
   });
 
   test("both live call sites refuse a foreign grant replaying into /proj's workspace", async () => {
-    // evaluateApprovals
+    // approvalCoversSubject
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "npm test",
         approvals: [foreignGrant],
@@ -461,7 +460,7 @@ describe("foreign grant cwd matching request cwd under a different workspace is
 
   test("the same grant with its own workspace still replays the session root", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "npm test",
         approvals: [ownGrant],

src/permission/path-restriction.ts

@@ -1,7 +1,7 @@
 import { lstatSync, readlinkSync, realpathSync } from "node:fs";
 import { dirname, join, resolve, sep } from "node:path";
 import { homedir } from "node:os";
-import type { RootsProvider } from "./worktree-roots.js";
+import { realpathOr, type RootsProvider } from "./worktree-roots.js";
 import { projectSessionsRoot } from "../session/project-key.js";
 
 // Paths the agent must not touch without explicit operator approval, even
@@ -26,14 +26,6 @@ export interface PathRestriction {
 
 const LEGACY_STATE_DIR = ".agent-state";
 
-function realpathOr(path: string): string {
-  try {
-    return realpathSync(path);
-  } catch {
-    return path;
-  }
-}
-
 // Sentinel from realpathNearestOr for a path that exists but cannot be
 // resolved (dangling symlink or loop). Contains a NUL byte, which can never
 // appear in a real path, so it cannot collide with a genuine result.

src/permission/permission.test.ts

@@ -19,7 +19,7 @@ import {
   stripCommentLines,
 } from "./command.js";
 import { matchesPattern, escapeGlobLiteral } from "./matcher.js";
-import { evaluateApprovals } from "./authz-grants.js";
+import { approvalCoversSubject } from "./authz-grants.js";
 import {
   classifyTool,
   buildRequests,
@@ -360,7 +360,7 @@ describe("matchesPattern directory-grant traversal (CL-8989)", () => {
   });
 });
 
-describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
+describe("approvalCoversSubject (@intx/authz evaluateGrants)", () => {
   const approvals: Approval[] = [
     { tool: "run_shell", pattern: "npm *" },
     { tool: "write_file", pattern: "src/*" },
@@ -374,23 +374,23 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
 
   test("allows package-compatible wildcard grants", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "npm test",
         approvals,
         workspace: noWorkspace,
       }),
     ).toBe(true);
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "curl x",
         approvals,
         workspace: noWorkspace,
       }),
     ).toBe(false);
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "write_file",
         subject: "src/a.ts",
         approvals,
@@ -407,7 +407,7 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
     ];
     const workspace = { resolvedCwd: "/proj", roots: [] as string[] };
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "write_file",
         subject: "/proj/sub/nested/file.txt",
         approvals: dirApprovals,
@@ -420,7 +420,7 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
       "/proj/sub//../evil",
     ]) {
       expect(
-        await evaluateApprovals({
+        await approvalCoversSubject({
           tool: "write_file",
           subject,
           approvals: dirApprovals,
@@ -432,7 +432,7 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
 
   test("a grant for read_file covers default.read_file", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "default.read_file",
         subject: "src/a.ts",
         approvals: [{ tool: "read_file", pattern: "src/*" }],
@@ -443,7 +443,7 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
 
   test("a grant for an MCP tool covers the default. prefixed name", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "default.mcp__linear__save_issue",
         subject: "mcp__linear__save_issue",
         approvals: [
@@ -459,15 +459,15 @@ describe("evaluateApprovals (@intx/authz evaluateGrants)", () => {
 
   test("allows exact-escaped grants without treating * as a wildcard", async () => {
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "rm -rf build/*",
         approvals,
         workspace: noWorkspace,
       }),
     ).toBe(true);
     expect(
-      await evaluateApprovals({
+      await approvalCoversSubject({
         tool: "run_shell",
         subject: "rm -rf build/../../etc",
         approvals,

src/permission/worktree-roots.ts

@@ -83,7 +83,7 @@ export function listWorktreeRootsSync(cwd: string): string[] {
 // re-lists when the debounce window has elapsed since the last one — so a
 // burst of refresh requests (e.g. several foreign-path checks in a row)
 // shells out to git at most once per window.
-export type RootsProvider = (forceRefresh?: boolean) => readonly string[];
+export type RootsProvider = (_forceRefresh?: boolean) => readonly string[];
 
 const DEFAULT_DEBOUNCE_MS = 3000;
 
@@ -99,20 +99,18 @@ export function createWorktreeRootsProvider(
   let roots: string[] | undefined;
   let lastRefreshAt = -Infinity;
 
-  return (forceRefresh = false): readonly string[] => {
+  return (_forceRefresh = false): readonly string[] => {
     if (roots === undefined) {
       roots = lister(cwd);
       lastRefreshAt = Date.now();
       return roots;
     }
     const now = Date.now();
     const due = now - lastRefreshAt >= debounceMs;
-    if (due || forceRefresh) {
-      if (due) {
-        lastRefreshAt = now;
-        // Replace the cache wholesale so roots git no longer lists are evicted.
-        roots = lister(cwd);
-      }
+    if (due) {
+      lastRefreshAt = now;
+      // Replace the cache wholesale so roots git no longer lists are evicted.
+      roots = lister(cwd);
     }
     return roots;
   };

src/plugins/shell-guard-plugin.test.ts

@@ -288,7 +288,7 @@ describe("background run_shell (shellGuardPlugin)", () => {
     // The START call resolved while the child was still sleeping.
     expect(Date.now() - start).toBeLessThan(400);
     await recorder.waitFor(parsed.shell_id);
-    registry.disposeAll("test done");
+    registry.disposeAll();
   });
 
   test("without a registry wired, background fails closed and spawns nothing", async () => {
@@ -320,7 +320,7 @@ describe("background run_shell (shellGuardPlugin)", () => {
       neverAbort(),
     );
     expect(String(after.content).trim()).toBe(process.cwd());
-    registry.disposeAll("test done");
+    registry.disposeAll();
   });
 
   test("foreground run_shell is unchanged when background is unset", async () => {
@@ -333,7 +333,7 @@ describe("background run_shell (shellGuardPlugin)", () => {
     expect(result.isError).toBeUndefined();
     expect(String(result.content)).toContain("direct");
     expect(registry.runningCount()).toBe(0);
-    registry.disposeAll("test done");
+    registry.disposeAll();
   });
 
   test("background omitted timeout skips the foreground default", async () => {
@@ -362,7 +362,7 @@ describe("background run_shell (shellGuardPlugin)", () => {
     const exit = await recorder.waitFor(parsed.shell_id);
     expect(exit.timedOut).toBe(false);
     expect(exit.output).toContain("survived");
-    registry.disposeAll("test done");
+    registry.disposeAll();
   });
 
   test("an unwired shell-output feed spawns fine and paints no tail", async () => {