pi-system-one 1.2.4 → 1.3.1

package/tests/commands.test.ts

@@ -1,18 +1,23 @@
 // pi-system-one/tests/commands.test.ts
 
 import assert from "node:assert/strict";
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { describe, it } from "node:test";
 import {
   registerSystemOneCommands,
   type SessionStore,
 } from "../src/commands.ts";
 import { createSessionConfig } from "../src/config.ts";
+import { resolveSessionProvider } from "../src/provider.ts";
 
 interface Captured {
   tools: string[];
   handler: ((args: string, ctx: never) => Promise<void>) | undefined;
   completions: ((prefix: string) => { value: string }[]) | undefined;
   notices: string[];
+  selections: { title: string; options: string[] }[];
 }
 
 function harness() {
@@ -21,6 +26,7 @@ function harness() {
     handler: undefined,
     completions: undefined,
     notices: [],
+    selections: [],
   };
   const pi = {
     registerTool: (t: { name: string }) => {
@@ -41,10 +47,23 @@ function harness() {
   return { pi: pi as never, cap };
 }
 
-function ctxFor(answers: (string | undefined)[], cap: Captured) {
+function ctxFor(
+  answers: (string | undefined)[],
+  cap: Captured,
+  defaults?: string[],
+) {
   return {
+    modelRegistry: { getApiKeyForProvider: async () => undefined },
     ui: {
-      input: async () => answers.shift(),
+      select: async (title: string, options: string[]) => {
+        cap.selections.push({ title, options });
+        const choice = answers.shift();
+        return options.find((option) => option.startsWith(choice ?? "\0"));
+      },
+      input: async (_prompt: string, initial?: string) => {
+        defaults?.push(initial ?? "");
+        return answers.shift();
+      },
       notify: (msg: string) => {
         cap.notices.push(msg);
       },
@@ -53,6 +72,202 @@ function ctxFor(answers: (string | undefined)[], cap: Captured) {
 }
 
 describe("so command", () => {
+  it("shows selectable provider modes for /so and /so config", async () => {
+    const { pi, cap } = harness();
+    const store: SessionStore = { session: createSessionConfig({}) };
+    registerSystemOneCommands(pi, store);
+    await cap.handler?.("", ctxFor(["native"], cap));
+    assert.equal(store.session?.mode, "native");
+    await cap.handler?.("config", ctxFor(["typesafe"], cap));
+    assert.equal(store.session?.mode, "typesafe");
+    assert.equal(cap.selections.length, 2);
+    assert.equal(cap.selections[0].options.length, 3);
+    assert.match(cap.selections[0].options[0], /typesafe.*current/i);
+    assert.match(cap.selections[1].options[0], /native.*current/i);
+  });
+
+  it("cancels selection without changing mode or saved settings", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-select-"));
+    try {
+      const path = join(dir, "pi-system-one.json");
+      const { pi, cap } = harness();
+      const store: SessionStore = { session: createSessionConfig({}) };
+      registerSystemOneCommands(pi, store, path);
+      await cap.handler?.("config", ctxFor([undefined], cap));
+      assert.equal(store.session?.mode, "typesafe");
+      assert.throws(() => readFileSync(path, "utf8"), /ENOENT/);
+      assert.match(cap.notices.at(-1) ?? "", /Cancelled/);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it("direct mode command bypasses selection", async () => {
+    const { pi, cap } = harness();
+    const store: SessionStore = { session: createSessionConfig({}) };
+    registerSystemOneCommands(pi, store);
+    await cap.handler?.("config native", ctxFor([], cap));
+    assert.equal(store.session?.mode, "native");
+    assert.equal(cap.selections.length, 0);
+  });
+  it("clears prior model on custom endpoint change with blank model", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-model-change-"));
+    const originalFetch = globalThis.fetch;
+    try {
+      const path = join(dir, "pi-system-one.json");
+      const { pi, cap } = harness();
+      const store: SessionStore = {
+        session: createSessionConfig({
+          SYSTEM_ONE_BASE_URL: "http://localhost:8008",
+          SYSTEM_ONE_MODEL: "reflex",
+        }),
+      };
+      registerSystemOneCommands(pi, store, path);
+      const defaults: string[] = [];
+      await cap.handler?.(
+        "config custom",
+        ctxFor(["http://localhost:8009", "", ""], cap, defaults),
+      );
+      assert.equal(defaults[1], "");
+      assert.equal(store.session?.current.model, undefined);
+      assert.equal(JSON.parse(readFileSync(path, "utf8")).model, undefined);
+      globalThis.fetch = (async (url, options) => {
+        assert.equal(url, "http://localhost:8009/v1/systemone");
+        assert.equal(JSON.parse(String(options?.body)).model, undefined);
+        return new Response(
+          JSON.stringify({ answers: { q: { type: "noul", noul: 0.6 } } }),
+          { status: 200 },
+        );
+      }) as typeof fetch;
+      const session = store.session;
+      assert.ok(session);
+      const provider = await resolveSessionProvider(session, {} as never);
+      await provider.evaluate({
+        state: "x",
+        questions: { q: { type: "noul", instructions: "Yes?" } },
+      });
+    } finally {
+      globalThis.fetch = originalFetch;
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  it("keeps model for same custom endpoint and accepts explicit replacement", async () => {
+    const { pi, cap } = harness();
+    const store: SessionStore = {
+      session: createSessionConfig({
+        SYSTEM_ONE_BASE_URL: "http://localhost:8008",
+        SYSTEM_ONE_MODEL: "reflex",
+      }),
+    };
+    registerSystemOneCommands(pi, store);
+    await cap.handler?.("config custom", ctxFor(["", "", ""], cap));
+    assert.equal(store.session?.current.model, "reflex");
+    await cap.handler?.(
+      "config custom",
+      ctxFor(["http://localhost:8009", "replacement", ""], cap),
+    );
+    assert.equal(store.session?.current.model, "replacement");
+  });
+
+  it("keeps explicit TypeSafe environment key after selecting TypeSafe", async () => {
+    const previousKey = process.env.SYSTEM_ONE_API_KEY;
+    const previousUrl = process.env.SYSTEM_ONE_BASE_URL;
+    const originalFetch = globalThis.fetch;
+    try {
+      process.env.SYSTEM_ONE_API_KEY = "test-key";
+      delete process.env.SYSTEM_ONE_BASE_URL;
+      const { pi, cap } = harness();
+      const store: SessionStore = { session: createSessionConfig(process.env) };
+      registerSystemOneCommands(pi, store);
+      await cap.handler?.("config typesafe", ctxFor([], cap));
+      globalThis.fetch = (async (_url, options) => {
+        assert.equal(
+          new Headers(options?.headers).get("authorization"),
+          "Bearer test-key",
+        );
+        return new Response(
+          JSON.stringify({ answers: { q: { type: "noul", noul: 0.7 } } }),
+          { status: 200 },
+        );
+      }) as typeof fetch;
+      const session = store.session;
+      assert.ok(session);
+      const provider = await resolveSessionProvider(session, {
+        modelRegistry: { getApiKeyForProvider: async () => undefined },
+      } as never);
+      await provider.evaluate({
+        state: "x",
+        questions: { q: { type: "noul", instructions: "Yes?" } },
+      });
+    } finally {
+      if (previousKey === undefined) delete process.env.SYSTEM_ONE_API_KEY;
+      else process.env.SYSTEM_ONE_API_KEY = previousKey;
+      if (previousUrl === undefined) delete process.env.SYSTEM_ONE_BASE_URL;
+      else process.env.SYSTEM_ONE_BASE_URL = previousUrl;
+      globalThis.fetch = originalFetch;
+    }
+  });
+  it("does not carry a custom endpoint environment key to TypeSafe", async () => {
+    const previousKey = process.env.SYSTEM_ONE_API_KEY;
+    const previousUrl = process.env.SYSTEM_ONE_BASE_URL;
+    try {
+      process.env.SYSTEM_ONE_API_KEY = "custom-key";
+      process.env.SYSTEM_ONE_BASE_URL = "https://custom.example";
+      const { pi, cap } = harness();
+      const store: SessionStore = { session: createSessionConfig(process.env) };
+      registerSystemOneCommands(pi, store);
+      await cap.handler?.("config typesafe", ctxFor([], cap));
+      assert.equal(store.session?.current.apiKey, undefined);
+    } finally {
+      if (previousKey === undefined) delete process.env.SYSTEM_ONE_API_KEY;
+      else process.env.SYSTEM_ONE_API_KEY = previousKey;
+      if (previousUrl === undefined) delete process.env.SYSTEM_ONE_BASE_URL;
+      else process.env.SYSTEM_ONE_BASE_URL = previousUrl;
+    }
+  });
+  it("does not save a URL containing a token or change the active session", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-command-"));
+    try {
+      const path = join(dir, "pi-system-one.json");
+      const { pi, cap } = harness();
+      const store: SessionStore = { session: createSessionConfig({}) };
+      registerSystemOneCommands(pi, store, path);
+      await cap.handler?.(
+        "config custom",
+        ctxFor(["https://example.com/?token=secret", "", ""], cap),
+      );
+      assert.equal(store.session?.mode, "typesafe");
+      assert.match(cap.notices.at(-1) ?? "", /Could not save settings/);
+      assert.doesNotMatch(cap.notices.join(" "), /secret/);
+      assert.throws(() => readFileSync(path, "utf8"), /ENOENT/);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+  it("persists custom settings without session key and switches back to native", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-command-"));
+    try {
+      const path = join(dir, "pi-system-one.json");
+      const { pi, cap } = harness();
+      const store: SessionStore = {};
+      registerSystemOneCommands(pi, store, path);
+      await cap.handler?.(
+        "config custom",
+        ctxFor(["http://localhost:8008", "reflex", "secret"], cap),
+      );
+      assert.equal(store.session?.current.apiKey, "secret");
+      const saved = readFileSync(path, "utf8");
+      assert.doesNotMatch(saved, /secret|apiKey/);
+      assert.match(saved, /localhost:8008/);
+      await cap.handler?.("config native", ctxFor([], cap));
+      assert.equal(store.session?.mode, "native");
+      assert.equal(store.session?.current.apiKey, undefined);
+      assert.match(readFileSync(path, "utf8"), /native/);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
   it("completes config + status, case-insensitively", () => {
     const { pi, cap } = harness();
     registerSystemOneCommands(pi, {});
@@ -66,13 +281,14 @@ describe("so command", () => {
     );
     assert.deepEqual(cap.completions?.("x"), []);
   });
-  it("bare /so configures from blank session and registers the tool", async () => {
+  it("registers the tool before config and switches to custom on request", async () => {
     const { pi, cap } = harness();
     const store: SessionStore = {};
-    registerSystemOneCommands(pi, store);
-    await cap.handler?.("", ctxFor(["http://x/", "", ""], cap));
+    registerSystemOneCommands(pi, store).applyProvider();
     assert.deepEqual(cap.tools, ["system_one"]);
+    await cap.handler?.("", ctxFor(["custom", "http://x/", "", ""], cap));
     assert.equal(store.session?.current.baseUrl, "http://x/");
+    assert.equal(store.session?.mode, "custom");
   });
   it("cancel (undefined) keeps everything and registers nothing", async () => {
     const { pi, cap } = harness();
@@ -89,15 +305,15 @@ describe("so command", () => {
       session: createSessionConfig({ SYSTEM_ONE_BASE_URL: "http://keep/" }),
     };
     registerSystemOneCommands(pi, store);
-    await cap.handler?.("", ctxFor(["", "", ""], cap));
+    await cap.handler?.("", ctxFor(["custom", "", "", ""], cap));
     assert.equal(store.session?.current.baseUrl, "http://keep/");
   });
   it("whitespace-only base URL is rejected", async () => {
     const { pi, cap } = harness();
-    const store: SessionStore = {};
+    const store: SessionStore = { session: createSessionConfig({}) };
     registerSystemOneCommands(pi, store);
-    await cap.handler?.("", ctxFor(["   ", "", ""], cap));
-    assert.equal(store.session, undefined);
+    await cap.handler?.("", ctxFor(["custom", "   ", "", ""], cap));
+    assert.equal(store.session?.mode, "typesafe");
     assert.match(cap.notices[0], /Cancelled/);
   });
   it("'-' forgets a memory key back to env", async () => {
@@ -106,15 +322,33 @@ describe("so command", () => {
       session: createSessionConfig({ SYSTEM_ONE_BASE_URL: "http://x/" }),
     };
     registerSystemOneCommands(pi, store);
-    await cap.handler?.("", ctxFor(["", "", "sk-mem", ""], cap));
+    await cap.handler?.("", ctxFor(["custom", "", "", "sk-mem"], cap));
     assert.equal(store.session?.keyInMemory, true);
-    await cap.handler?.("", ctxFor(["", "", "-", ""], cap));
-    // After forgetting the memory key, the API key should revert to the environment variable (if any).
-    // In the CI environment, SYSTEM_ONE_API_KEY may be set; otherwise it will be undefined.
+    await cap.handler?.("", ctxFor(["custom", "", "", "-"], cap));
+    // A key from another endpoint must never follow this configured URL.
     assert.equal(store.session?.keyInMemory, false);
     assert.equal(
       store.session?.current.apiKey,
-      process.env.SYSTEM_ONE_API_KEY || undefined,
+      process.env.SYSTEM_ONE_BASE_URL === "http://x/"
+        ? process.env.SYSTEM_ONE_API_KEY || undefined
+        : undefined,
+    );
+  });
+  it("native status reports Pi-managed credentials, not unused HTTP environment key", async () => {
+    const { pi, cap } = harness();
+    const store: SessionStore = {
+      session: createSessionConfig(
+        { SYSTEM_ONE_API_KEY: "test-env-key", SYSTEM_ONE_MODEL: "other-model" },
+        { mode: "native" },
+      ),
+    };
+    registerSystemOneCommands(pi, store);
+    await cap.handler?.("status", ctxFor([], cap));
+    assert.match(cap.notices[0], /api key: managed by Pi/);
+    assert.match(cap.notices[0], /model: jev-latest/);
+    assert.doesNotMatch(
+      cap.notices[0],
+      /from environment|test-env-key|other-model/,
     );
   });
   it("status shows current config; STATUS routes case-insensitively", async () => {
@@ -126,10 +360,11 @@ describe("so command", () => {
     await cap.handler?.("STATUS", ctxFor([], cap));
     assert.match(cap.notices[0], /http:\/\/x\//);
   });
-  it("status with no session explains how to configure", async () => {
+  it("status shows TypeSafe defaults and login guidance without auth", async () => {
     const { pi, cap } = harness();
-    registerSystemOneCommands(pi, {});
+    registerSystemOneCommands(pi, { session: createSessionConfig({}) });
     await cap.handler?.("status", ctxFor([], cap));
-    assert.match(cap.notices[0], /not configured/);
+    assert.match(cap.notices[0], /typesafe/);
+    assert.match(cap.notices[0], /login typesafe/);
   });
 });

package/tests/config.test.ts

@@ -11,6 +11,65 @@ import {
 } from "../src/config.ts";
 
 describe("config", () => {
+  it("native mode ignores HTTP environment key and model", () => {
+    const s = createSessionConfig(
+      { SYSTEM_ONE_API_KEY: "test-env-key", SYSTEM_ONE_MODEL: "other-model" },
+      { mode: "native", model: "stored-model", baseUrl: "http://stale/" },
+    );
+    assert.equal(s.mode, "native");
+    assert.equal(s.current.baseUrl, "");
+    assert.equal(s.current.apiKey, undefined);
+    assert.equal(s.current.model, "jev-latest");
+    assert.match(describeConfig(s), /api key: managed by Pi/);
+  });
+  it("defaults to TypeSafe Jev without environment configuration", () => {
+    const s = createSessionConfig({});
+    assert.equal(s.mode, "typesafe");
+    assert.equal(s.current.baseUrl, "https://api.typesafe.ai");
+    assert.equal(s.current.model, "jev-latest");
+    assert.equal(s.current.apiKey, undefined);
+  });
+  it("keeps environment endpoint ahead of saved custom config", () => {
+    const s = createSessionConfig(
+      { SYSTEM_ONE_BASE_URL: "http://existing/", SYSTEM_ONE_MODEL: "old" },
+      { mode: "native", model: "new", timeoutMs: 5000 },
+    );
+    assert.equal(s.mode, "custom");
+    assert.equal(s.current.baseUrl, "http://existing/");
+    assert.equal(s.current.model, "old");
+    assert.equal(s.current.timeoutMs, 5000);
+  });
+  it("does not carry a saved model to a different environment endpoint", () => {
+    const s = createSessionConfig(
+      { SYSTEM_ONE_BASE_URL: "http://new/" },
+      { mode: "custom", baseUrl: "http://old/", model: "old-model" },
+    );
+    assert.equal(s.current.model, undefined);
+    assert.equal(s.current.baseUrl, "http://new/");
+  });
+  it("keeps saved model when environment endpoint matches saved endpoint", () => {
+    const s = createSessionConfig(
+      { SYSTEM_ONE_BASE_URL: "http://same/" },
+      { mode: "custom", baseUrl: "http://same/", model: "saved-model" },
+    );
+    assert.equal(s.current.model, "saved-model");
+  });
+  it("does not forward an env key to a saved custom URL without an env endpoint", () => {
+    const s = createSessionConfig(
+      { SYSTEM_ONE_API_KEY: "key-for-other-endpoint" },
+      { mode: "custom", baseUrl: "https://other.example" },
+    );
+    assert.equal(s.current.apiKey, undefined);
+  });
+  it("loads saved custom config without an environment variable", () => {
+    const s = createSessionConfig(
+      {},
+      { mode: "custom", baseUrl: "http://localhost:8008", model: "reflex" },
+    );
+    assert.equal(s.mode, "custom");
+    assert.equal(s.current.model, "reflex");
+    assert.equal(s.current.baseUrl, "http://localhost:8008");
+  });
   it("loads from env", () => {
     const s = createSessionConfig({
       SYSTEM_ONE_BASE_URL: "http://localhost:8008",

package/tests/extension.test.ts

@@ -1,15 +1,174 @@
 // pi-system-one/tests/extension.test.ts
 
 import assert from "node:assert/strict";
-import { existsSync, readFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { describe, it } from "node:test";
 import piSystemOneExtension, {
   systemOnePromptsDir,
   systemOneSkillsDir,
 } from "../src/extension.ts";
+import type { buildSystemOneTool } from "../src/tool.ts";
 
 describe("extension resources", () => {
+  it("startup warning does not echo an untrusted settings field name", () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-extension-warning-"));
+    const previous = process.env.PI_CODING_AGENT_DIR;
+    try {
+      process.env.PI_CODING_AGENT_DIR = dir;
+      writeFileSync(
+        join(dir, "pi-system-one.json"),
+        JSON.stringify({ "Bearer secret-token": "ignored" }),
+      );
+      const handlers: Record<string, (event: never, ctx: never) => void> = {};
+      piSystemOneExtension({
+        registerTool: () => {},
+        registerCommand: () => {},
+        on: (name: string, handler: (event: never, ctx: never) => void) => {
+          handlers[name] = handler;
+        },
+      } as never);
+      let warning = "";
+      handlers.session_start(
+        { reason: "startup" } as never,
+        {
+          ui: {
+            notify: (message: string) => {
+              warning = message;
+            },
+          },
+        } as never,
+      );
+      assert.match(warning, /Ignoring saved settings/);
+      assert.doesNotMatch(warning, /Bearer|secret-token/);
+    } finally {
+      if (previous === undefined) delete process.env.PI_CODING_AGENT_DIR;
+      else process.env.PI_CODING_AGENT_DIR = previous;
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+  it("uses the registered tool after switching to native mode and rejects malformed success", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-extension-native-"));
+    const previous = {
+      dir: process.env.PI_CODING_AGENT_DIR,
+      base: process.env.SYSTEM_ONE_BASE_URL,
+    };
+    try {
+      process.env.PI_CODING_AGENT_DIR = dir;
+      delete process.env.SYSTEM_ONE_BASE_URL;
+      let tool: ReturnType<typeof buildSystemOneTool> | undefined;
+      let command: ((args: string, ctx: never) => Promise<void>) | undefined;
+      piSystemOneExtension({
+        registerTool: (value: ReturnType<typeof buildSystemOneTool>) => {
+          tool = value;
+        },
+        registerCommand: (
+          _name: string,
+          options: { handler: typeof command },
+        ) => {
+          command = options.handler;
+        },
+        on: () => {},
+      } as never);
+      await command?.("config native", { ui: { notify: () => {} } } as never);
+      assert.ok(tool);
+      let probability = 0.7;
+      const ctx = {
+        modelRegistry: {
+          findOfType: () => ({ id: "jev-latest" }),
+          classify: async () => ({
+            stopReason: "stop",
+            model: "jev-latest",
+            provider: "typesafe",
+            answers: { q: { type: "bool", probability } },
+          }),
+        },
+      } as never;
+      const args = {
+        state: "x",
+        questions: { q: { type: "noul" as const, instructions: "Yes?" } },
+      };
+      const result = await tool.execute(
+        "native-valid",
+        args,
+        undefined,
+        undefined,
+        ctx,
+      );
+      assert.deepEqual(result.details.answers.q, { type: "noul", noul: 0.7 });
+      probability = 2;
+      await assert.rejects(
+        tool.execute("native-invalid", args, undefined, undefined, ctx),
+        /Pi native classifier failed/,
+      );
+    } finally {
+      if (previous.dir === undefined) delete process.env.PI_CODING_AGENT_DIR;
+      else process.env.PI_CODING_AGENT_DIR = previous.dir;
+      if (previous.base === undefined) delete process.env.SYSTEM_ONE_BASE_URL;
+      else process.env.SYSTEM_ONE_BASE_URL = previous.base;
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+  it("reloads saved custom config across extension instances", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "so-extension-"));
+    const prev = {
+      base: process.env.SYSTEM_ONE_BASE_URL,
+      model: process.env.SYSTEM_ONE_MODEL,
+      agentDir: process.env.PI_CODING_AGENT_DIR,
+    };
+    try {
+      delete process.env.SYSTEM_ONE_BASE_URL;
+      delete process.env.SYSTEM_ONE_MODEL;
+      process.env.PI_CODING_AGENT_DIR = dir;
+      let command: ((args: string, ctx: never) => Promise<void>) | undefined;
+      const pi = {
+        registerTool: () => {},
+        registerCommand: (
+          _name: string,
+          options: { handler: typeof command },
+        ) => {
+          command = options.handler;
+        },
+        on: () => {},
+      };
+      piSystemOneExtension(pi as never);
+      const values = ["http://localhost:8008", "reflex", "temporary-key"];
+      await command?.("config custom", {
+        ui: { input: async () => values.shift(), notify: () => {} },
+      } as never);
+      const stored = readFileSync(join(dir, "pi-system-one.json"), "utf8");
+      assert.doesNotMatch(stored, /temporary-key|apiKey/);
+      piSystemOneExtension(pi as never);
+      let status = "";
+      await command?.("status", {
+        ui: {
+          notify: (value: string) => {
+            status = value;
+          },
+        },
+      } as never);
+      assert.match(status, /mode: custom/);
+      assert.match(status, /localhost:8008/);
+      assert.match(status, /model: reflex/);
+    } finally {
+      for (const [key, value] of Object.entries({
+        SYSTEM_ONE_BASE_URL: prev.base,
+        SYSTEM_ONE_MODEL: prev.model,
+        PI_CODING_AGENT_DIR: prev.agentDir,
+      })) {
+        if (value === undefined) delete process.env[key];
+        else process.env[key] = value;
+      }
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
   it("contributes a valid system-one skill directory", async () => {
     const prev = process.env.SYSTEM_ONE_BASE_URL;
     process.env.SYSTEM_ONE_BASE_URL = "http://localhost:8008";

package/tests/persistence.test.ts

@@ -0,0 +1,88 @@
+import assert from "node:assert/strict";
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { it } from "node:test";
+import { loadStoredConfig, saveStoredConfig } from "../src/persistence.ts";
+
+it("round-trips persistent settings without writing a key", () => {
+  const dir = mkdtempSync(join(tmpdir(), "so-config-"));
+  try {
+    const path = join(dir, "pi-system-one.json");
+    saveStoredConfig(path, {
+      mode: "custom",
+      baseUrl: "http://localhost:8008",
+      model: "reflex",
+      timeoutMs: 9000,
+    });
+    assert.deepEqual(loadStoredConfig(path), {
+      mode: "custom",
+      baseUrl: "http://localhost:8008",
+      model: "reflex",
+      timeoutMs: 9000,
+    });
+    assert.doesNotMatch(readFileSync(path, "utf8"), /apiKey/);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+it("rejects credential-bearing endpoint URLs without persisting them", () => {
+  const dir = mkdtempSync(join(tmpdir(), "so-config-"));
+  try {
+    const path = join(dir, "pi-system-one.json");
+    for (const baseUrl of [
+      "https://user:secret@example.com",
+      "https://example.com/?token=secret",
+      "https://example.com/#secret",
+    ]) {
+      assert.throws(
+        () => saveStoredConfig(path, { mode: "custom", baseUrl }),
+        (error: Error) =>
+          !error.message.includes("secret") && /baseUrl/.test(error.message),
+      );
+      assert.throws(() => readFileSync(path, "utf8"), /ENOENT/);
+    }
+    writeFileSync(
+      path,
+      JSON.stringify({
+        mode: "custom",
+        baseUrl: "https://example.com/?token=secret",
+      }),
+    );
+    assert.throws(() => loadStoredConfig(path), /baseUrl/);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+it("does not echo unknown JSON field names in diagnostics", () => {
+  const dir = mkdtempSync(join(tmpdir(), "so-config-"));
+  try {
+    const path = join(dir, "pi-system-one.json");
+    writeFileSync(path, JSON.stringify({ "Bearer secret-token": "ignored" }));
+    assert.throws(
+      () => loadStoredConfig(path),
+      (error: Error) => {
+        assert.match(error.message, /unknown field/);
+        assert.doesNotMatch(error.message, /Bearer|secret-token/);
+        return true;
+      },
+    );
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+it("rejects malformed settings and refuses stored secrets", () => {
+  const dir = mkdtempSync(join(tmpdir(), "so-config-"));
+  try {
+    const path = join(dir, "pi-system-one.json");
+    writeFileSync(path, JSON.stringify({ mode: "typesafe", apiKey: "secret" }));
+    assert.throws(() => loadStoredConfig(path), /apiKey/);
+    writeFileSync(path, "{");
+    assert.throws(() => loadStoredConfig(path), /pi-system-one.json/);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});