gsd-pi 2.77.0-dev.eaa4973bc → 2.78.0

package/packages/pi-coding-agent/dist/core/agent-session-abort-order.test.js

@@ -1,39 +1,103 @@
-import test, { describe } from "node:test";
+// Regression test for #4243 — abort() must be called BEFORE
+// _disconnectFromAgent() inside newSession() and switchSession() so that
+// message_end/agent_end events (and the #4216 finalization code) fire
+// before we unsubscribe from the event bus.
+//
+// Verified behaviourally: we construct a real AgentSession, wrap `abort`
+// and `_disconnectFromAgent` with call-order recording, trigger each
+// session-transition method, and assert the observed call order.
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
-const source = readFileSync(join(process.cwd(), "packages/pi-coding-agent/src/core/agent-session.ts"), "utf-8");
-describe("#4243 — abort() must be called before _disconnectFromAgent()", () => {
-    test("newSession() calls abort() before _disconnectFromAgent()", () => {
-        // Find the newSession method body where the fix was applied
-        const newSessionStart = source.indexOf("async newSession(options?:");
-        assert.ok(newSessionStart >= 0, "should find newSession method");
-        // Get a window that includes the abort/disconnect section.
-        // Use 2000 chars to accommodate guard checks inserted between the two calls.
-        const window = source.slice(newSessionStart, newSessionStart + 2000);
-        // Find the abort and _disconnectFromAgent calls
-        const abortIdx = window.indexOf("await this.abort();");
-        const disconnectIdx = window.indexOf("this._disconnectFromAgent();");
-        assert.ok(abortIdx >= 0, "newSession should call await this.abort()");
-        assert.ok(disconnectIdx >= 0, "newSession should call this._disconnectFromAgent()");
-        assert.ok(abortIdx < disconnectIdx, "abort() must be called BEFORE _disconnectFromAgent() so that message_end/agent_end events fire before unsubscribing from the event bus");
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { Agent } from "@gsd/pi-agent-core";
+import { AgentSession } from "./agent-session.js";
+import { AuthStorage } from "./auth-storage.js";
+import { ModelRegistry } from "./model-registry.js";
+import { DefaultResourceLoader } from "./resource-loader.js";
+import { SessionManager } from "./session-manager.js";
+import { SettingsManager } from "./settings-manager.js";
+let testDir;
+async function createSession(opts = {}) {
+    const agentDir = join(testDir, "agent-home");
+    const authStorage = AuthStorage.inMemory({});
+    const modelRegistry = new ModelRegistry(authStorage, join(agentDir, "models.json"));
+    const settingsManager = SettingsManager.inMemory();
+    const resourceLoader = new DefaultResourceLoader({
+        cwd: testDir,
+        agentDir,
+        settingsManager,
+        noExtensions: true,
+        noPromptTemplates: true,
+        noThemes: true,
     });
-    test("newSession() references #4243 in the abort/disconnect comment", () => {
-        const idx = source.indexOf("#4243");
-        assert.ok(idx >= 0, "source should reference issue #4243 for the abort-order fix");
+    await resourceLoader.reload();
+    // switchSession() needs a sessionFile; in-memory manager returns undefined.
+    // Use file-backed manager when the test needs to resume.
+    const sessionManager = opts.persistSessions
+        ? SessionManager.create(testDir, join(testDir, "sessions"))
+        : SessionManager.inMemory(testDir);
+    return new AgentSession({
+        agent: new Agent(),
+        sessionManager,
+        settingsManager,
+        cwd: testDir,
+        resourceLoader,
+        modelRegistry,
     });
-    test("switchSession() calls abort() before _disconnectFromAgent()", () => {
-        // Find the switchSession method body
-        const switchStart = source.indexOf("async switchSession(sessionPath:");
-        assert.ok(switchStart >= 0, "should find switchSession method");
-        // Get a window that includes the abort/disconnect section
-        const window = source.slice(switchStart, switchStart + 800);
-        // Find the abort and _disconnectFromAgent calls
-        const abortIdx = window.indexOf("await this.abort();");
-        const disconnectIdx = window.indexOf("this._disconnectFromAgent();");
-        assert.ok(abortIdx >= 0, "switchSession should call await this.abort()");
-        assert.ok(disconnectIdx >= 0, "switchSession should call this._disconnectFromAgent()");
-        assert.ok(abortIdx < disconnectIdx, "abort() must be called BEFORE _disconnectFromAgent() in switchSession so that events fire before unsubscribing");
+}
+/**
+ * Wrap two methods on the same object so their call order is recorded.
+ * Returns the recording array — assertions use index lookups.
+ */
+function recordCallOrder(target, methods) {
+    const order = [];
+    for (const method of methods) {
+        const name = String(method);
+        const original = target[name];
+        if (typeof original !== "function") {
+            throw new Error(`recordCallOrder: ${name} is not a function on target`);
+        }
+        target[name] = function (...args) {
+            order.push(name);
+            return original.apply(this, args);
+        };
+    }
+    return order;
+}
+describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
+    beforeEach(() => {
+        testDir = mkdtempSync(join(tmpdir(), "agent-session-abort-"));
+    });
+    afterEach(() => {
+        rmSync(testDir, { recursive: true, force: true });
+    });
+    it("newSession() invokes abort() before _disconnectFromAgent()", async () => {
+        const session = await createSession();
+        const order = recordCallOrder(session, ["abort", "_disconnectFromAgent"]);
+        const ok = await session.newSession();
+        assert.equal(ok, true);
+        const abortIdx = order.indexOf("abort");
+        const disconnectIdx = order.indexOf("_disconnectFromAgent");
+        assert.ok(abortIdx >= 0, `newSession should call abort(); order=${order.join(",")}`);
+        assert.ok(disconnectIdx >= 0, `newSession should call _disconnectFromAgent(); order=${order.join(",")}`);
+        assert.ok(abortIdx < disconnectIdx, `abort() must run before _disconnectFromAgent(); order=${order.join(",")}`);
+    });
+    it("switchSession() invokes abort() before _disconnectFromAgent()", async () => {
+        const session = await createSession({ persistSessions: true });
+        // Seed a session file to switch to (switchSession reads from the session manager).
+        await session.newSession();
+        const sessionFile = session.sessionFile;
+        assert.ok(typeof sessionFile === "string" && sessionFile.length > 0, "need a session file to switch to");
+        const order = recordCallOrder(session, ["abort", "_disconnectFromAgent"]);
+        const ok = await session.switchSession(sessionFile);
+        assert.equal(ok, true);
+        const abortIdx = order.indexOf("abort");
+        const disconnectIdx = order.indexOf("_disconnectFromAgent");
+        assert.ok(abortIdx >= 0, `switchSession should call abort(); order=${order.join(",")}`);
+        assert.ok(disconnectIdx >= 0, `switchSession should call _disconnectFromAgent(); order=${order.join(",")}`);
+        assert.ok(abortIdx < disconnectIdx, `abort() must run before _disconnectFromAgent() in switchSession; order=${order.join(",")}`);
     });
 });
 //# sourceMappingURL=agent-session-abort-order.test.js.map

package/packages/pi-coding-agent/dist/core/agent-session-abort-order.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-abort-order.test.js","sourceRoot":"","sources":["../../src/core/agent-session-abort-order.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oDAAoD,CAAC,EACzE,OAAO,CACP,CAAC;AAEF,QAAQ,CAAC,8DAA8D,EAAE,GAAG,EAAE;IAC7E,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;QACrE,4DAA4D;QAC5D,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QACrE,MAAM,CAAC,EAAE,CAAC,eAAe,IAAI,CAAC,EAAE,+BAA+B,CAAC,CAAC;QAEjE,2DAA2D;QAC3D,6EAA6E;QAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC,CAAC;QAErE,gDAAgD;QAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;QAErE,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,EAAE,2CAA2C,CAAC,CAAC;QACtE,MAAM,CAAC,EAAE,CAAC,aAAa,IAAI,CAAC,EAAE,oDAAoD,CAAC,CAAC;QACpF,MAAM,CAAC,EAAE,CACR,QAAQ,GAAG,aAAa,EACxB,wIAAwI,CACxI,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+DAA+D,EAAE,GAAG,EAAE;QAC1E,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,6DAA6D,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACxE,qCAAqC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QACvE,MAAM,CAAC,EAAE,CAAC,WAAW,IAAI,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAEhE,0DAA0D;QAC1D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG,CAAC,CAAC;QAE5D,gDAAgD;QAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;QAErE,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,EAAE,8CAA8C,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE,CAAC,aAAa,IAAI,CAAC,EAAE,uDAAuD,CAAC,CAAC;QACvF,MAAM,CAAC,EAAE,CACR,QAAQ,GAAG,aAAa,EACxB,gHAAgH,CAChH,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["import test, { describe } from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nconst source = readFileSync(\n\tjoin(process.cwd(), \"packages/pi-coding-agent/src/core/agent-session.ts\"),\n\t\"utf-8\",\n);\n\ndescribe(\"#4243 — abort() must be called before _disconnectFromAgent()\", () => {\n\ttest(\"newSession() calls abort() before _disconnectFromAgent()\", () => {\n\t\t// Find the newSession method body where the fix was applied\n\t\tconst newSessionStart = source.indexOf(\"async newSession(options?:\");\n\t\tassert.ok(newSessionStart >= 0, \"should find newSession method\");\n\n\t\t// Get a window that includes the abort/disconnect section.\n\t\t// Use 2000 chars to accommodate guard checks inserted between the two calls.\n\t\tconst window = source.slice(newSessionStart, newSessionStart + 2000);\n\n\t\t// Find the abort and _disconnectFromAgent calls\n\t\tconst abortIdx = window.indexOf(\"await this.abort();\");\n\t\tconst disconnectIdx = window.indexOf(\"this._disconnectFromAgent();\");\n\n\t\tassert.ok(abortIdx >= 0, \"newSession should call await this.abort()\");\n\t\tassert.ok(disconnectIdx >= 0, \"newSession should call this._disconnectFromAgent()\");\n\t\tassert.ok(\n\t\t\tabortIdx < disconnectIdx,\n\t\t\t\"abort() must be called BEFORE _disconnectFromAgent() so that message_end/agent_end events fire before unsubscribing from the event bus\",\n\t\t);\n\t});\n\n\ttest(\"newSession() references #4243 in the abort/disconnect comment\", () => {\n\t\tconst idx = source.indexOf(\"#4243\");\n\t\tassert.ok(idx >= 0, \"source should reference issue #4243 for the abort-order fix\");\n\t});\n\n\ttest(\"switchSession() calls abort() before _disconnectFromAgent()\", () => {\n\t\t// Find the switchSession method body\n\t\tconst switchStart = source.indexOf(\"async switchSession(sessionPath:\");\n\t\tassert.ok(switchStart >= 0, \"should find switchSession method\");\n\n\t\t// Get a window that includes the abort/disconnect section\n\t\tconst window = source.slice(switchStart, switchStart + 800);\n\n\t\t// Find the abort and _disconnectFromAgent calls\n\t\tconst abortIdx = window.indexOf(\"await this.abort();\");\n\t\tconst disconnectIdx = window.indexOf(\"this._disconnectFromAgent();\");\n\n\t\tassert.ok(abortIdx >= 0, \"switchSession should call await this.abort()\");\n\t\tassert.ok(disconnectIdx >= 0, \"switchSession should call this._disconnectFromAgent()\");\n\t\tassert.ok(\n\t\t\tabortIdx < disconnectIdx,\n\t\t\t\"abort() must be called BEFORE _disconnectFromAgent() in switchSession so that events fire before unsubscribing\",\n\t\t);\n\t});\n});\n"]}
+{"version":3,"file":"agent-session-abort-order.test.js","sourceRoot":"","sources":["../../src/core/agent-session-abort-order.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Regression test for #4243 — abort() must be called BEFORE\n// _disconnectFromAgent() inside newSession() and switchSession() so that\n// message_end/agent_end events (and the #4216 finalization code) fire\n// before we unsubscribe from the event bus.\n//\n// Verified behaviourally: we construct a real AgentSession, wrap `abort`\n// and `_disconnectFromAgent` with call-order recording, trigger each\n// session-transition method, and assert the observed call order.\n\nimport assert from \"node:assert/strict\";\nimport { mkdtempSync, rmSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { afterEach, beforeEach, describe, it } from \"node:test\";\n\nimport { Agent } from \"@gsd/pi-agent-core\";\nimport { AgentSession } from \"./agent-session.js\";\nimport { AuthStorage } from \"./auth-storage.js\";\nimport { ModelRegistry } from \"./model-registry.js\";\nimport { DefaultResourceLoader } from \"./resource-loader.js\";\nimport { SessionManager } from \"./session-manager.js\";\nimport { SettingsManager } from \"./settings-manager.js\";\n\nlet testDir: string;\n\nasync function createSession(opts: { persistSessions?: boolean } = {}): Promise<AgentSession> {\n\tconst agentDir = join(testDir, \"agent-home\");\n\tconst authStorage = AuthStorage.inMemory({});\n\tconst modelRegistry = new ModelRegistry(authStorage, join(agentDir, \"models.json\"));\n\tconst settingsManager = SettingsManager.inMemory();\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\tcwd: testDir,\n\t\tagentDir,\n\t\tsettingsManager,\n\t\tnoExtensions: true,\n\t\tnoPromptTemplates: true,\n\t\tnoThemes: true,\n\t});\n\tawait resourceLoader.reload();\n\n\t// switchSession() needs a sessionFile; in-memory manager returns undefined.\n\t// Use file-backed manager when the test needs to resume.\n\tconst sessionManager = opts.persistSessions\n\t\t? SessionManager.create(testDir, join(testDir, \"sessions\"))\n\t\t: SessionManager.inMemory(testDir);\n\n\treturn new AgentSession({\n\t\tagent: new Agent(),\n\t\tsessionManager,\n\t\tsettingsManager,\n\t\tcwd: testDir,\n\t\tresourceLoader,\n\t\tmodelRegistry,\n\t});\n}\n\n/**\n * Wrap two methods on the same object so their call order is recorded.\n * Returns the recording array — assertions use index lookups.\n */\nfunction recordCallOrder<O extends object>(\n\ttarget: O,\n\tmethods: Array<keyof O>,\n): string[] {\n\tconst order: string[] = [];\n\tfor (const method of methods) {\n\t\tconst name = String(method);\n\t\tconst original = (target as any)[name] as (...args: unknown[]) => unknown;\n\t\tif (typeof original !== \"function\") {\n\t\t\tthrow new Error(`recordCallOrder: ${name} is not a function on target`);\n\t\t}\n\t\t(target as any)[name] = function (this: O, ...args: unknown[]) {\n\t\t\torder.push(name);\n\t\t\treturn original.apply(this, args);\n\t\t};\n\t}\n\treturn order;\n}\n\ndescribe(\"#4243 — abort() must run before _disconnectFromAgent()\", () => {\n\tbeforeEach(() => {\n\t\ttestDir = mkdtempSync(join(tmpdir(), \"agent-session-abort-\"));\n\t});\n\n\tafterEach(() => {\n\t\trmSync(testDir, { recursive: true, force: true });\n\t});\n\n\tit(\"newSession() invokes abort() before _disconnectFromAgent()\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order = recordCallOrder(session as any, [\"abort\", \"_disconnectFromAgent\"]);\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\n\t\tconst abortIdx = order.indexOf(\"abort\");\n\t\tconst disconnectIdx = order.indexOf(\"_disconnectFromAgent\");\n\t\tassert.ok(abortIdx >= 0, `newSession should call abort(); order=${order.join(\",\")}`);\n\t\tassert.ok(\n\t\t\tdisconnectIdx >= 0,\n\t\t\t`newSession should call _disconnectFromAgent(); order=${order.join(\",\")}`,\n\t\t);\n\t\tassert.ok(\n\t\t\tabortIdx < disconnectIdx,\n\t\t\t`abort() must run before _disconnectFromAgent(); order=${order.join(\",\")}`,\n\t\t);\n\t});\n\n\tit(\"switchSession() invokes abort() before _disconnectFromAgent()\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\t// Seed a session file to switch to (switchSession reads from the session manager).\n\t\tawait session.newSession();\n\t\tconst sessionFile = session.sessionFile;\n\t\tassert.ok(typeof sessionFile === \"string\" && sessionFile.length > 0, \"need a session file to switch to\");\n\n\t\tconst order = recordCallOrder(session as any, [\"abort\", \"_disconnectFromAgent\"]);\n\n\t\tconst ok = await session.switchSession(sessionFile);\n\t\tassert.equal(ok, true);\n\n\t\tconst abortIdx = order.indexOf(\"abort\");\n\t\tconst disconnectIdx = order.indexOf(\"_disconnectFromAgent\");\n\t\tassert.ok(abortIdx >= 0, `switchSession should call abort(); order=${order.join(\",\")}`);\n\t\tassert.ok(\n\t\t\tdisconnectIdx >= 0,\n\t\t\t`switchSession should call _disconnectFromAgent(); order=${order.join(\",\")}`,\n\t\t);\n\t\tassert.ok(\n\t\t\tabortIdx < disconnectIdx,\n\t\t\t`abort() must run before _disconnectFromAgent() in switchSession; order=${order.join(\",\")}`,\n\t\t);\n\t});\n});\n"]}

package/packages/pi-coding-agent/dist/core/agent-session-model-switch.test.js

@@ -1,16 +1,79 @@
-import test from "node:test";
+// Regression test: explicit model switches must cancel any in-flight retry
+// BEFORE applying the new model. Otherwise stale provider backoff errors
+// from the previous model can continue to land after the switch.
+//
+// Verified behaviourally: construct a real AgentSession, wrap
+// `_retryHandler.abortRetry` and `agent.setModel` to record call order,
+// invoke setModel(), and assert the observed order.
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
-const source = readFileSync(join(process.cwd(), "packages/pi-coding-agent/src/core/agent-session.ts"), "utf-8");
-test("agent-session: explicit model switches cancel retry before applying new model", () => {
-    const start = source.indexOf("private async _applyModelChange(");
-    assert.ok(start >= 0, "missing _applyModelChange");
-    const window = source.slice(start, start + 900);
-    const abortIdx = window.indexOf("this._retryHandler.abortRetry();");
-    const setModelIdx = window.indexOf("this.agent.setModel(model);");
-    assert.ok(abortIdx >= 0, "_applyModelChange should cancel any in-flight retry");
-    assert.ok(setModelIdx >= 0, "_applyModelChange should set the new model");
-    assert.ok(abortIdx < setModelIdx, "retry cancellation must happen before applying the new model to prevent stale provider retries");
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { Agent } from "@gsd/pi-agent-core";
+import { getModel } from "@gsd/pi-ai";
+import { AgentSession } from "./agent-session.js";
+import { AuthStorage } from "./auth-storage.js";
+import { ModelRegistry } from "./model-registry.js";
+import { DefaultResourceLoader } from "./resource-loader.js";
+import { SessionManager } from "./session-manager.js";
+import { SettingsManager } from "./settings-manager.js";
+let testDir;
+async function createSession() {
+    const agentDir = join(testDir, "agent-home");
+    const authStorage = AuthStorage.inMemory({});
+    // Seed a runtime anthropic API key so modelRegistry.isProviderRequestReady()
+    // returns true and setModel() doesn't throw on missing credentials.
+    authStorage.setRuntimeApiKey("anthropic", "sk-test-not-used");
+    const modelRegistry = new ModelRegistry(authStorage, join(agentDir, "models.json"));
+    const settingsManager = SettingsManager.inMemory();
+    const resourceLoader = new DefaultResourceLoader({
+        cwd: testDir,
+        agentDir,
+        settingsManager,
+        noExtensions: true,
+        noPromptTemplates: true,
+        noThemes: true,
+    });
+    await resourceLoader.reload();
+    return new AgentSession({
+        agent: new Agent(),
+        sessionManager: SessionManager.inMemory(testDir),
+        settingsManager,
+        cwd: testDir,
+        resourceLoader,
+        modelRegistry,
+    });
+}
+describe("AgentSession — explicit model switch cancels retry before applying new model", () => {
+    beforeEach(() => {
+        testDir = mkdtempSync(join(tmpdir(), "agent-session-model-switch-"));
+    });
+    afterEach(() => {
+        rmSync(testDir, { recursive: true, force: true });
+    });
+    it("setModel() calls _retryHandler.abortRetry() before agent.setModel()", async () => {
+        const session = await createSession();
+        const order = [];
+        const retryHandler = session._retryHandler;
+        const originalAbortRetry = retryHandler.abortRetry.bind(retryHandler);
+        retryHandler.abortRetry = () => {
+            order.push("abortRetry");
+            return originalAbortRetry();
+        };
+        const agent = session.agent;
+        const originalSetModel = agent.setModel.bind(agent);
+        agent.setModel = (model) => {
+            order.push("setModel");
+            return originalSetModel(model);
+        };
+        const newModel = getModel("anthropic", "claude-3-5-sonnet-20241022");
+        await session.setModel(newModel, { persist: false });
+        const abortIdx = order.indexOf("abortRetry");
+        const setIdx = order.indexOf("setModel");
+        assert.ok(abortIdx >= 0, `setModel should cancel in-flight retry; order=${order.join(",")}`);
+        assert.ok(setIdx >= 0, `setModel should call agent.setModel; order=${order.join(",")}`);
+        assert.ok(abortIdx < setIdx, `retry cancellation must happen before applying the new model; order=${order.join(",")}`);
+    });
 });
 //# sourceMappingURL=agent-session-model-switch.test.js.map

package/packages/pi-coding-agent/dist/core/agent-session-model-switch.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-model-switch.test.js","sourceRoot":"","sources":["../../src/core/agent-session-model-switch.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oDAAoD,CAAC,EAAE,OAAO,CAAC,CAAC;AAEhH,IAAI,CAAC,+EAA+E,EAAE,GAAG,EAAE;IAC1F,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IACjE,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,EAAE,2BAA2B,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAElE,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,EAAE,qDAAqD,CAAC,CAAC;IAChF,MAAM,CAAC,EAAE,CAAC,WAAW,IAAI,CAAC,EAAE,4CAA4C,CAAC,CAAC;IAC1E,MAAM,CAAC,EAAE,CACR,QAAQ,GAAG,WAAW,EACtB,gGAAgG,CAChG,CAAC;AACH,CAAC,CAAC,CAAC","sourcesContent":["import test from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nconst source = readFileSync(join(process.cwd(), \"packages/pi-coding-agent/src/core/agent-session.ts\"), \"utf-8\");\n\ntest(\"agent-session: explicit model switches cancel retry before applying new model\", () => {\n\tconst start = source.indexOf(\"private async _applyModelChange(\");\n\tassert.ok(start >= 0, \"missing _applyModelChange\");\n\tconst window = source.slice(start, start + 900);\n\tconst abortIdx = window.indexOf(\"this._retryHandler.abortRetry();\");\n\tconst setModelIdx = window.indexOf(\"this.agent.setModel(model);\");\n\n\tassert.ok(abortIdx >= 0, \"_applyModelChange should cancel any in-flight retry\");\n\tassert.ok(setModelIdx >= 0, \"_applyModelChange should set the new model\");\n\tassert.ok(\n\t\tabortIdx < setModelIdx,\n\t\t\"retry cancellation must happen before applying the new model to prevent stale provider retries\",\n\t);\n});\n"]}
+{"version":3,"file":"agent-session-model-switch.test.js","sourceRoot":"","sources":["../../src/core/agent-session-model-switch.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Regression test: explicit model switches must cancel any in-flight retry\n// BEFORE applying the new model. Otherwise stale provider backoff errors\n// from the previous model can continue to land after the switch.\n//\n// Verified behaviourally: construct a real AgentSession, wrap\n// `_retryHandler.abortRetry` and `agent.setModel` to record call order,\n// invoke setModel(), and assert the observed order.\n\nimport assert from \"node:assert/strict\";\nimport { mkdtempSync, rmSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { afterEach, beforeEach, describe, it } from \"node:test\";\n\nimport { Agent } from \"@gsd/pi-agent-core\";\nimport { getModel } from \"@gsd/pi-ai\";\nimport { AgentSession } from \"./agent-session.js\";\nimport { AuthStorage } from \"./auth-storage.js\";\nimport { ModelRegistry } from \"./model-registry.js\";\nimport { DefaultResourceLoader } from \"./resource-loader.js\";\nimport { SessionManager } from \"./session-manager.js\";\nimport { SettingsManager } from \"./settings-manager.js\";\n\nlet testDir: string;\n\nasync function createSession(): Promise<AgentSession> {\n\tconst agentDir = join(testDir, \"agent-home\");\n\tconst authStorage = AuthStorage.inMemory({});\n\t// Seed a runtime anthropic API key so modelRegistry.isProviderRequestReady()\n\t// returns true and setModel() doesn't throw on missing credentials.\n\tauthStorage.setRuntimeApiKey(\"anthropic\", \"sk-test-not-used\");\n\tconst modelRegistry = new ModelRegistry(authStorage, join(agentDir, \"models.json\"));\n\tconst settingsManager = SettingsManager.inMemory();\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\tcwd: testDir,\n\t\tagentDir,\n\t\tsettingsManager,\n\t\tnoExtensions: true,\n\t\tnoPromptTemplates: true,\n\t\tnoThemes: true,\n\t});\n\tawait resourceLoader.reload();\n\n\treturn new AgentSession({\n\t\tagent: new Agent(),\n\t\tsessionManager: SessionManager.inMemory(testDir),\n\t\tsettingsManager,\n\t\tcwd: testDir,\n\t\tresourceLoader,\n\t\tmodelRegistry,\n\t});\n}\n\ndescribe(\"AgentSession — explicit model switch cancels retry before applying new model\", () => {\n\tbeforeEach(() => {\n\t\ttestDir = mkdtempSync(join(tmpdir(), \"agent-session-model-switch-\"));\n\t});\n\n\tafterEach(() => {\n\t\trmSync(testDir, { recursive: true, force: true });\n\t});\n\n\tit(\"setModel() calls _retryHandler.abortRetry() before agent.setModel()\", async () => {\n\t\tconst session = await createSession();\n\n\t\tconst order: string[] = [];\n\t\tconst retryHandler = (session as any)._retryHandler;\n\t\tconst originalAbortRetry = retryHandler.abortRetry.bind(retryHandler);\n\t\tretryHandler.abortRetry = () => {\n\t\t\torder.push(\"abortRetry\");\n\t\t\treturn originalAbortRetry();\n\t\t};\n\n\t\tconst agent = (session as any).agent;\n\t\tconst originalSetModel = agent.setModel.bind(agent);\n\t\tagent.setModel = (model: unknown) => {\n\t\t\torder.push(\"setModel\");\n\t\t\treturn originalSetModel(model);\n\t\t};\n\n\t\tconst newModel = getModel(\"anthropic\", \"claude-3-5-sonnet-20241022\");\n\t\tawait session.setModel(newModel, { persist: false });\n\n\t\tconst abortIdx = order.indexOf(\"abortRetry\");\n\t\tconst setIdx = order.indexOf(\"setModel\");\n\t\tassert.ok(abortIdx >= 0, `setModel should cancel in-flight retry; order=${order.join(\",\")}`);\n\t\tassert.ok(setIdx >= 0, `setModel should call agent.setModel; order=${order.join(\",\")}`);\n\t\tassert.ok(\n\t\t\tabortIdx < setIdx,\n\t\t\t`retry cancellation must happen before applying the new model; order=${order.join(\",\")}`,\n\t\t);\n\t});\n});\n"]}

package/packages/pi-coding-agent/dist/core/agent-session-tool-refresh.test.js

@@ -1,38 +1,106 @@
-// GSD-2 — Regression tests for #3616: tool list persistence across newSession() calls
-// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
-import test, { describe } from "node:test";
+// Regression test for #3616: newSession() must restore the full tool set
+// when cwd is unchanged.
+//
+// The bug: extensions may narrow the active tool list via setActiveTools()
+// during a session. Without a refresh in the else branch of newSession(),
+// the narrowed set persists into the next session — breaking auto-mode
+// subagent sessions that expect a full tool palette.
+//
+// Verified behaviourally: construct an AgentSession, wrap _refreshToolRegistry
+// to record its args, call newSession() with cwd unchanged, and assert that
+// a refresh was requested with includeAllExtensionTools: true.
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
-const source = readFileSync(join(process.cwd(), "packages/pi-coding-agent/src/core/agent-session.ts"), "utf-8");
-describe("#3616 — newSession() must restore full tool set", () => {
-    test("newSession() calls _refreshToolRegistry with includeAllExtensionTools when cwd is unchanged", () => {
-        // Find the newSession method
-        const newSessionStart = source.indexOf("async newSession(options?:");
-        assert.ok(newSessionStart >= 0, "should find newSession method");
-        // Get the method body (up to the next top-level method)
-        const methodBody = source.slice(newSessionStart, newSessionStart + 3000);
-        // Verify the cwd-changed branch rebuilds tools
-        assert.ok(methodBody.includes("if (this._cwd !== previousCwd)"), "should have cwd-change guard");
-        // Verify the else branch exists and refreshes tools with includeAllExtensionTools
-        const elseIdx = methodBody.indexOf("} else {");
-        assert.ok(elseIdx >= 0, "should have else branch for cwd-unchanged case");
-        const elseBranch = methodBody.slice(elseIdx, elseIdx + 800);
-        assert.ok(elseBranch.includes("_refreshToolRegistry"), "else branch should call _refreshToolRegistry");
-        assert.ok(elseBranch.includes("includeAllExtensionTools: true"), "else branch should pass includeAllExtensionTools: true to restore narrowed tools");
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { Agent } from "@gsd/pi-agent-core";
+import { AgentSession } from "./agent-session.js";
+import { AuthStorage } from "./auth-storage.js";
+import { ModelRegistry } from "./model-registry.js";
+import { DefaultResourceLoader } from "./resource-loader.js";
+import { SessionManager } from "./session-manager.js";
+import { SettingsManager } from "./settings-manager.js";
+let testDir;
+async function createSession() {
+    const agentDir = join(testDir, "agent-home");
+    const authStorage = AuthStorage.inMemory({});
+    const modelRegistry = new ModelRegistry(authStorage, join(agentDir, "models.json"));
+    const settingsManager = SettingsManager.inMemory();
+    const resourceLoader = new DefaultResourceLoader({
+        cwd: testDir,
+        agentDir,
+        settingsManager,
+        noExtensions: true,
+        noPromptTemplates: true,
+        noThemes: true,
     });
-    test("newSession() references #3616 in the else-branch comment", () => {
-        const idx = source.indexOf("#3616");
-        assert.ok(idx >= 0, "source should reference issue #3616 for the tool restore fix");
+    await resourceLoader.reload();
+    return new AgentSession({
+        agent: new Agent(),
+        sessionManager: SessionManager.inMemory(testDir),
+        settingsManager,
+        cwd: testDir,
+        resourceLoader,
+        modelRegistry,
     });
-    test("agent.reset() does not clear _state.tools (tools persist across reset)", () => {
-        // This is a structural invariant — if reset() starts clearing tools,
-        // the newSession() refresh becomes the only defense against tool loss.
-        const agentSource = readFileSync(join(process.cwd(), "packages/pi-agent-core/src/agent.ts"), "utf-8");
-        const resetStart = agentSource.indexOf("reset()");
-        assert.ok(resetStart >= 0, "should find reset() method");
-        const resetBody = agentSource.slice(resetStart, resetStart + 400);
-        assert.ok(!resetBody.includes("tools"), "reset() should NOT touch _state.tools — tools are managed by agent-session");
+}
+describe("#3616 — newSession() restores narrowed tool set when cwd unchanged", () => {
+    beforeEach(() => {
+        testDir = mkdtempSync(join(tmpdir(), "agent-session-tool-refresh-"));
+    });
+    afterEach(() => {
+        rmSync(testDir, { recursive: true, force: true });
+    });
+    it("calls _refreshToolRegistry with includeAllExtensionTools: true when cwd unchanged", async () => {
+        const session = await createSession();
+        // Pin _cwd so newSession()'s `process.cwd()` branch takes the
+        // cwd-unchanged path. The production code compares `this._cwd !==
+        // previousCwd`; we force equality by setting _cwd to current cwd.
+        session._cwd = process.cwd();
+        const refreshCalls = [];
+        const originalRefresh = session._refreshToolRegistry.bind(session);
+        session._refreshToolRegistry = (options) => {
+            refreshCalls.push(options ?? {});
+            return originalRefresh(options);
+        };
+        const ok = await session.newSession();
+        assert.equal(ok, true);
+        assert.ok(refreshCalls.length > 0, "newSession() should invoke _refreshToolRegistry in the cwd-unchanged branch");
+        assert.ok(refreshCalls.some((o) => o.includeAllExtensionTools === true), `at least one _refreshToolRegistry call must pass includeAllExtensionTools: true; observed=${JSON.stringify(refreshCalls)}`);
+    });
+    it("agent.reset() does not clear _state.tools (tools persist across reset)", () => {
+        // Structural invariant protecting #3616: if reset() starts clearing
+        // tools, newSession()'s refresh becomes the only defense against loss.
+        // Assertion is behavioural — seed tools, call reset(), observe survival.
+        const agent = new Agent();
+        const tool = {
+            name: "test_tool",
+            description: "x",
+            schema: { type: "object", properties: {}, additionalProperties: false },
+            execute: async () => ({ content: [] }),
+        };
+        agent._state.tools = [tool];
+        agent.reset();
+        assert.deepEqual(agent._state.tools, [tool], "Agent.reset() must preserve _state.tools");
+    });
+    it("takes the cwd-changed branch (rebuilds runtime) when cwd differs", async () => {
+        const session = await createSession();
+        // Force the cwd-changed branch: set _cwd to something that won't equal process.cwd().
+        session._cwd = join(testDir, "some", "other", "cwd");
+        let buildRuntimeCalled = false;
+        let buildRuntimeIncludedAll = false;
+        const originalBuild = session._buildRuntime.bind(session);
+        session._buildRuntime = (options) => {
+            buildRuntimeCalled = true;
+            if (options?.includeAllExtensionTools === true)
+                buildRuntimeIncludedAll = true;
+            return originalBuild(options);
+        };
+        const ok = await session.newSession();
+        assert.equal(ok, true);
+        assert.ok(buildRuntimeCalled, "cwd-changed branch must rebuild the tool runtime");
+        assert.ok(buildRuntimeIncludedAll, "cwd-changed branch must rebuild with includeAllExtensionTools: true");
     });
 });
 //# sourceMappingURL=agent-session-tool-refresh.test.js.map

package/packages/pi-coding-agent/dist/core/agent-session-tool-refresh.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-tool-refresh.test.js","sourceRoot":"","sources":["../../src/core/agent-session-tool-refresh.test.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,4DAA4D;AAE5D,OAAO,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,oDAAoD,CAAC,EACzE,OAAO,CACP,CAAC;AAEF,QAAQ,CAAC,iDAAiD,EAAE,GAAG,EAAE;IAChE,IAAI,CAAC,6FAA6F,EAAE,GAAG,EAAE;QACxG,6BAA6B;QAC7B,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QACrE,MAAM,CAAC,EAAE,CAAC,eAAe,IAAI,CAAC,EAAE,+BAA+B,CAAC,CAAC;QAEjE,wDAAwD;QACxD,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC,CAAC;QAEzE,+CAA+C;QAC/C,MAAM,CAAC,EAAE,CACR,UAAU,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EACrD,8BAA8B,CAC9B,CAAC;QAEF,kFAAkF;QAClF,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,EAAE,gDAAgD,CAAC,CAAC;QAE1E,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;QAC5D,MAAM,CAAC,EAAE,CACR,UAAU,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAC3C,8CAA8C,CAC9C,CAAC;QACF,MAAM,CAAC,EAAE,CACR,UAAU,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EACrD,kFAAkF,CAClF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;QACrE,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,8DAA8D,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wEAAwE,EAAE,GAAG,EAAE;QACnF,qEAAqE;QACrE,uEAAuE;QACvE,MAAM,WAAW,GAAG,YAAY,CAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,qCAAqC,CAAC,EAC1D,OAAO,CACP,CAAC;QACF,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,GAAG,CAAC,CAAC;QAClE,MAAM,CAAC,EAAE,CACR,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC5B,4EAA4E,CAC5E,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["// GSD-2 — Regression tests for #3616: tool list persistence across newSession() calls\n// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>\n\nimport test, { describe } from \"node:test\";\nimport assert from \"node:assert/strict\";\nimport { readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nconst source = readFileSync(\n\tjoin(process.cwd(), \"packages/pi-coding-agent/src/core/agent-session.ts\"),\n\t\"utf-8\",\n);\n\ndescribe(\"#3616 — newSession() must restore full tool set\", () => {\n\ttest(\"newSession() calls _refreshToolRegistry with includeAllExtensionTools when cwd is unchanged\", () => {\n\t\t// Find the newSession method\n\t\tconst newSessionStart = source.indexOf(\"async newSession(options?:\");\n\t\tassert.ok(newSessionStart >= 0, \"should find newSession method\");\n\n\t\t// Get the method body (up to the next top-level method)\n\t\tconst methodBody = source.slice(newSessionStart, newSessionStart + 3000);\n\n\t\t// Verify the cwd-changed branch rebuilds tools\n\t\tassert.ok(\n\t\t\tmethodBody.includes(\"if (this._cwd !== previousCwd)\"),\n\t\t\t\"should have cwd-change guard\",\n\t\t);\n\n\t\t// Verify the else branch exists and refreshes tools with includeAllExtensionTools\n\t\tconst elseIdx = methodBody.indexOf(\"} else {\");\n\t\tassert.ok(elseIdx >= 0, \"should have else branch for cwd-unchanged case\");\n\n\t\tconst elseBranch = methodBody.slice(elseIdx, elseIdx + 800);\n\t\tassert.ok(\n\t\t\telseBranch.includes(\"_refreshToolRegistry\"),\n\t\t\t\"else branch should call _refreshToolRegistry\",\n\t\t);\n\t\tassert.ok(\n\t\t\telseBranch.includes(\"includeAllExtensionTools: true\"),\n\t\t\t\"else branch should pass includeAllExtensionTools: true to restore narrowed tools\",\n\t\t);\n\t});\n\n\ttest(\"newSession() references #3616 in the else-branch comment\", () => {\n\t\tconst idx = source.indexOf(\"#3616\");\n\t\tassert.ok(idx >= 0, \"source should reference issue #3616 for the tool restore fix\");\n\t});\n\n\ttest(\"agent.reset() does not clear _state.tools (tools persist across reset)\", () => {\n\t\t// This is a structural invariant — if reset() starts clearing tools,\n\t\t// the newSession() refresh becomes the only defense against tool loss.\n\t\tconst agentSource = readFileSync(\n\t\t\tjoin(process.cwd(), \"packages/pi-agent-core/src/agent.ts\"),\n\t\t\t\"utf-8\",\n\t\t);\n\t\tconst resetStart = agentSource.indexOf(\"reset()\");\n\t\tassert.ok(resetStart >= 0, \"should find reset() method\");\n\t\tconst resetBody = agentSource.slice(resetStart, resetStart + 400);\n\t\tassert.ok(\n\t\t\t!resetBody.includes(\"tools\"),\n\t\t\t\"reset() should NOT touch _state.tools — tools are managed by agent-session\",\n\t\t);\n\t});\n});\n"]}
+{"version":3,"file":"agent-session-tool-refresh.test.js","sourceRoot":"","sources":["../../src/core/agent-session-tool-refresh.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Regression test for #3616: newSession() must restore the full tool set\n// when cwd is unchanged.\n//\n// The bug: extensions may narrow the active tool list via setActiveTools()\n// during a session. Without a refresh in the else branch of newSession(),\n// the narrowed set persists into the next session — breaking auto-mode\n// subagent sessions that expect a full tool palette.\n//\n// Verified behaviourally: construct an AgentSession, wrap _refreshToolRegistry\n// to record its args, call newSession() with cwd unchanged, and assert that\n// a refresh was requested with includeAllExtensionTools: true.\n\nimport assert from \"node:assert/strict\";\nimport { mkdtempSync, rmSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { afterEach, beforeEach, describe, it } from \"node:test\";\n\nimport { Agent } from \"@gsd/pi-agent-core\";\nimport { AgentSession } from \"./agent-session.js\";\nimport { AuthStorage } from \"./auth-storage.js\";\nimport { ModelRegistry } from \"./model-registry.js\";\nimport { DefaultResourceLoader } from \"./resource-loader.js\";\nimport { SessionManager } from \"./session-manager.js\";\nimport { SettingsManager } from \"./settings-manager.js\";\n\nlet testDir: string;\n\nasync function createSession(): Promise<AgentSession> {\n\tconst agentDir = join(testDir, \"agent-home\");\n\tconst authStorage = AuthStorage.inMemory({});\n\tconst modelRegistry = new ModelRegistry(authStorage, join(agentDir, \"models.json\"));\n\tconst settingsManager = SettingsManager.inMemory();\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\tcwd: testDir,\n\t\tagentDir,\n\t\tsettingsManager,\n\t\tnoExtensions: true,\n\t\tnoPromptTemplates: true,\n\t\tnoThemes: true,\n\t});\n\tawait resourceLoader.reload();\n\n\treturn new AgentSession({\n\t\tagent: new Agent(),\n\t\tsessionManager: SessionManager.inMemory(testDir),\n\t\tsettingsManager,\n\t\tcwd: testDir,\n\t\tresourceLoader,\n\t\tmodelRegistry,\n\t});\n}\n\ndescribe(\"#3616 — newSession() restores narrowed tool set when cwd unchanged\", () => {\n\tbeforeEach(() => {\n\t\ttestDir = mkdtempSync(join(tmpdir(), \"agent-session-tool-refresh-\"));\n\t});\n\n\tafterEach(() => {\n\t\trmSync(testDir, { recursive: true, force: true });\n\t});\n\n\tit(\"calls _refreshToolRegistry with includeAllExtensionTools: true when cwd unchanged\", async () => {\n\t\tconst session = await createSession();\n\t\t// Pin _cwd so newSession()'s `process.cwd()` branch takes the\n\t\t// cwd-unchanged path. The production code compares `this._cwd !==\n\t\t// previousCwd`; we force equality by setting _cwd to current cwd.\n\t\t(session as any)._cwd = process.cwd();\n\n\t\tconst refreshCalls: Array<{ includeAllExtensionTools?: boolean }> = [];\n\t\tconst originalRefresh = (session as any)._refreshToolRegistry.bind(session);\n\t\t(session as any)._refreshToolRegistry = (options?: { includeAllExtensionTools?: boolean }) => {\n\t\t\trefreshCalls.push(options ?? {});\n\t\t\treturn originalRefresh(options);\n\t\t};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\n\t\tassert.ok(\n\t\t\trefreshCalls.length > 0,\n\t\t\t\"newSession() should invoke _refreshToolRegistry in the cwd-unchanged branch\",\n\t\t);\n\t\tassert.ok(\n\t\t\trefreshCalls.some((o) => o.includeAllExtensionTools === true),\n\t\t\t`at least one _refreshToolRegistry call must pass includeAllExtensionTools: true; observed=${JSON.stringify(refreshCalls)}`,\n\t\t);\n\t});\n\n\tit(\"agent.reset() does not clear _state.tools (tools persist across reset)\", () => {\n\t\t// Structural invariant protecting #3616: if reset() starts clearing\n\t\t// tools, newSession()'s refresh becomes the only defense against loss.\n\t\t// Assertion is behavioural — seed tools, call reset(), observe survival.\n\t\tconst agent = new Agent();\n\t\tconst tool = {\n\t\t\tname: \"test_tool\",\n\t\t\tdescription: \"x\",\n\t\t\tschema: { type: \"object\", properties: {}, additionalProperties: false } as any,\n\t\t\texecute: async () => ({ content: [] }),\n\t\t};\n\t\t(agent as any)._state.tools = [tool];\n\t\tagent.reset();\n\t\tassert.deepEqual(\n\t\t\t(agent as any)._state.tools,\n\t\t\t[tool],\n\t\t\t\"Agent.reset() must preserve _state.tools\",\n\t\t);\n\t});\n\n\tit(\"takes the cwd-changed branch (rebuilds runtime) when cwd differs\", async () => {\n\t\tconst session = await createSession();\n\t\t// Force the cwd-changed branch: set _cwd to something that won't equal process.cwd().\n\t\t(session as any)._cwd = join(testDir, \"some\", \"other\", \"cwd\");\n\n\t\tlet buildRuntimeCalled = false;\n\t\tlet buildRuntimeIncludedAll = false;\n\t\tconst originalBuild = (session as any)._buildRuntime.bind(session);\n\t\t(session as any)._buildRuntime = (options?: { includeAllExtensionTools?: boolean }) => {\n\t\t\tbuildRuntimeCalled = true;\n\t\t\tif (options?.includeAllExtensionTools === true) buildRuntimeIncludedAll = true;\n\t\t\treturn originalBuild(options);\n\t\t};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\n\t\tassert.ok(buildRuntimeCalled, \"cwd-changed branch must rebuild the tool runtime\");\n\t\tassert.ok(\n\t\t\tbuildRuntimeIncludedAll,\n\t\t\t\"cwd-changed branch must rebuild with includeAllExtensionTools: true\",\n\t\t);\n\t});\n});\n"]}

package/packages/pi-coding-agent/dist/core/extensions/loader.d.ts

@@ -23,6 +23,11 @@ export declare function containsTypeScriptSyntax(source: string): boolean;
  * creates a fresh instance.  This prevents memory leaks in long-running daemon
  * processes (every loaded module stays cached forever) and ensures stale modules
  * are not returned when extension source changes on disk.
+ *
+ * #3616: resetting the singleton alone is insufficient — jiti stores compiled
+ * modules in Node's global require.cache when `moduleCache: true`, which is
+ * shared across singletons. We also evict cached entries for every extension
+ * path we've previously loaded so the next import recompiles from disk.
  */
 export declare function resetExtensionLoaderCache(): void;
 /**

package/packages/pi-coding-agent/dist/core/extensions/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA+BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAIhG,OAAO,KAAK,EACX,SAAS,EAET,gBAAgB,EAEhB,gBAAgB,EAChB,oBAAoB,EAKpB,MAAM,YAAY,CAAC;AAsTpB,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAI/G;AA6BD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAuCzD;AAkMD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAeD;;;;;GAKG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAwKD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAKpB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAsBrH;AAmHD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CAiE/B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA+BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAIhG,OAAO,KAAK,EACX,SAAS,EAET,gBAAgB,EAEhB,gBAAgB,EAChB,oBAAoB,EAKpB,MAAM,YAAY,CAAC;AAsTpB,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAI/G;AA6BD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAuCzD;AAkMD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAsBD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CA+ChD;AAyKD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAKpB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAsBrH;AAmHD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CAiE/B"}