@gotgenes/pi-permission-system 1.2.1 → 3.0.0

package/tests/permission-system.test.ts

@@ -5,11 +5,10 @@ import {
   mkdtempSync,
   readFileSync,
   rmSync,
-  unlinkSync,
   writeFileSync,
 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { test } from "vitest";
 import { BashFilter } from "../src/bash-filter.js";
 import {
@@ -17,8 +16,8 @@ import {
   createBeforeAgentStartPromptStateKey,
   shouldApplyCachedAgentStartState,
 } from "../src/before-agent-start-cache.js";
+import { getGlobalConfigPath } from "../src/config-paths.js";
 import {
-  CONFIG_PATH,
   DEFAULT_EXTENSION_CONFIG,
   loadPermissionSystemConfig,
   savePermissionSystemConfig,
@@ -156,20 +155,13 @@ function createToolCallHarness(
   const prompts: string[] = [];
   const handlers: Record<string, MockHandler> = {};
   const originalAgentDir = process.env.PI_CODING_AGENT_DIR;
-  const originalExtensionConfig = existsSync(CONFIG_PATH)
-    ? readFileSync(CONFIG_PATH, "utf8")
-    : null;
-
+  const globalConfigPath = getGlobalConfigPath(baseDir);
   mkdirSync(join(baseDir, "agents"), { recursive: true });
+  mkdirSync(dirname(globalConfigPath), { recursive: true });
   mkdirSync(cwd, { recursive: true });
   writeFileSync(
-    join(baseDir, "pi-permissions.jsonc"),
-    `${JSON.stringify(config, null, 2)}\n`,
-    "utf8",
-  );
-  writeFileSync(
-    CONFIG_PATH,
-    `${JSON.stringify(DEFAULT_EXTENSION_CONFIG, null, 2)}\n`,
+    globalConfigPath,
+    `${JSON.stringify({ ...DEFAULT_EXTENSION_CONFIG, ...config }, null, 2)}\n`,
     "utf8",
   );
 
@@ -208,13 +200,6 @@ function createToolCallHarness(
           createMockContext(cwd, prompts, options),
         ),
       );
-      if (originalExtensionConfig === null) {
-        if (existsSync(CONFIG_PATH)) {
-          unlinkSync(CONFIG_PATH);
-        }
-      } else {
-        writeFileSync(CONFIG_PATH, originalExtensionConfig, "utf8");
-      }
       rmSync(baseDir, { recursive: true, force: true });
     },
   };
@@ -1818,7 +1803,9 @@ permission:
 test("PermissionManager reads config from PI_CODING_AGENT_DIR when set", () => {
   const baseDir = mkdtempSync(join(tmpdir(), "pi-permission-system-envdir-"));
   const agentsDir = join(baseDir, "agents");
+  const newConfigPath = getGlobalConfigPath(baseDir);
   mkdirSync(agentsDir, { recursive: true });
+  mkdirSync(dirname(newConfigPath), { recursive: true });
 
   const config: GlobalPermissionConfig = {
     defaultPolicy: {
@@ -1834,11 +1821,7 @@ test("PermissionManager reads config from PI_CODING_AGENT_DIR when set", () => {
     skills: {},
     special: {},
   };
-  writeFileSync(
-    join(baseDir, "pi-permissions.jsonc"),
-    JSON.stringify(config),
-    "utf8",
-  );
+  writeFileSync(newConfigPath, JSON.stringify(config), "utf8");
 
   const original = process.env.PI_CODING_AGENT_DIR;
   process.env.PI_CODING_AGENT_DIR = baseDir;

package/tests/session-start.test.ts

@@ -1,19 +1,9 @@
-import {
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  unlinkSync,
-  writeFileSync,
-} from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
-import {
-  CONFIG_PATH,
-  DEFAULT_EXTENSION_CONFIG,
-} from "../src/extension-config.js";
+import { getGlobalConfigPath } from "../src/config-paths.js";
+import { DEFAULT_EXTENSION_CONFIG } from "../src/extension-config.js";
 import piPermissionSystemExtension from "../src/index.js";
 import type { GlobalPermissionConfig } from "../src/types.js";
 
@@ -28,16 +18,13 @@ type MockHandler = (
 describe("session_start handler consolidation", () => {
   let baseDir: string;
   let originalAgentDir: string | undefined;
-  let originalExtensionConfig: string | null;
-
   beforeEach(() => {
     baseDir = mkdtempSync(join(tmpdir(), "pi-permission-session-start-"));
     originalAgentDir = process.env.PI_CODING_AGENT_DIR;
-    originalExtensionConfig = existsSync(CONFIG_PATH)
-      ? readFileSync(CONFIG_PATH, "utf8")
-      : null;
 
+    const globalConfigPath = getGlobalConfigPath(baseDir);
     mkdirSync(join(baseDir, "agents"), { recursive: true });
+    mkdirSync(dirname(globalConfigPath), { recursive: true });
 
     const config: GlobalPermissionConfig = {
       defaultPolicy: {
@@ -49,13 +36,8 @@ describe("session_start handler consolidation", () => {
       },
     };
     writeFileSync(
-      join(baseDir, "pi-permissions.jsonc"),
-      `${JSON.stringify(config, null, 2)}\n`,
-      "utf8",
-    );
-    writeFileSync(
-      CONFIG_PATH,
-      `${JSON.stringify(DEFAULT_EXTENSION_CONFIG, null, 2)}\n`,
+      globalConfigPath,
+      `${JSON.stringify({ ...DEFAULT_EXTENSION_CONFIG, ...config }, null, 2)}\n`,
       "utf8",
     );
 
@@ -68,13 +50,6 @@ describe("session_start handler consolidation", () => {
     } else {
       process.env.PI_CODING_AGENT_DIR = originalAgentDir;
     }
-    if (originalExtensionConfig === null) {
-      if (existsSync(CONFIG_PATH)) {
-        unlinkSync(CONFIG_PATH);
-      }
-    } else {
-      writeFileSync(CONFIG_PATH, originalExtensionConfig, "utf8");
-    }
     rmSync(baseDir, { recursive: true, force: true });
   });