gsd-pi 2.80.0-dev.4ea7d80e7 → 2.80.0-dev.7582bf37a

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

@@ -102,6 +102,7 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
     });
     it("newSession() invokes abort() before _disconnectFromAgent()", async () => {
         const session = await createSession();
+        session.agent.state.isStreaming = true;
         const order = recordCallOrder(session, ["abort", "_disconnectFromAgent"]);
         const ok = await session.newSession();
         assert.equal(ok, true);
@@ -111,6 +112,36 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
         assert.ok(disconnectIdx >= 0, `newSession should call _disconnectFromAgent(); order=${order.join(",")}`);
         assert.ok(abortIdx < disconnectIdx, `abort() must run before _disconnectFromAgent(); order=${order.join(",")}`);
     });
+    it("newSession() waits instead of aborting when the prior turn is idle but not settled", async () => {
+        const session = await createSession();
+        const order = [];
+        let releaseIdle;
+        const idle = new Promise((resolve) => {
+            releaseIdle = resolve;
+        });
+        session.agent.state.isStreaming = false;
+        session.agent.waitForIdle = () => {
+            order.push("waitForIdle");
+            return idle;
+        };
+        session.abort = async () => {
+            order.push("abort");
+        };
+        const originalDisconnect = session._disconnectFromAgent.bind(session);
+        session._disconnectFromAgent = () => {
+            order.push("_disconnectFromAgent");
+            originalDisconnect();
+        };
+        const pendingNewSession = session.newSession();
+        await Promise.resolve();
+        assert.deepEqual(order, ["waitForIdle"]);
+        assert.equal(order.includes("abort"), false);
+        releaseIdle();
+        const ok = await pendingNewSession;
+        assert.equal(ok, true);
+        assert.deepEqual(order, ["waitForIdle", "_disconnectFromAgent"]);
+        assert.equal(order.includes("abort"), false);
+    });
     it("newSession() waits instead of aborting while agent_end processing is still streaming", async () => {
         const session = await createSession();
         const order = [];
@@ -368,6 +399,7 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
         await session.newSession();
         const sessionFile = session.sessionFile;
         assert.ok(typeof sessionFile === "string" && sessionFile.length > 0, "need a session file to switch to");
+        session.agent.state.isStreaming = true;
         const order = recordCallOrder(session, ["abort", "_disconnectFromAgent"]);
         const ok = await session.switchSession(sessionFile);
         assert.equal(ok, true);

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":"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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\nfunction makeAssistantMessage(text: string) {\n\treturn {\n\t\trole: \"assistant\",\n\t\tcontent: [{ type: \"text\", text }],\n\t\tusage: {\n\t\t\tinput: 1,\n\t\t\toutput: 1,\n\t\t\tcacheRead: 0,\n\t\t\tcacheWrite: 0,\n\t\t\ttotal: 2,\n\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t},\n\t\tstopReason: \"stop\",\n\t\ttimestamp: Date.now(),\n\t} as any;\n}\n\nfunction installAgentEndSessionTransition(\n\tsession: AgentSession,\n\ttransition: () => Promise<unknown>,\n): void {\n\t(session as any)._extensionRunner = {\n\t\thasHandlers: () => false,\n\t\temit: async (event: any) => {\n\t\t\tif (event.type === \"agent_end\") {\n\t\t\t\tawait transition();\n\t\t\t}\n\t\t},\n\t\temitStop: async () => {},\n\t};\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(\"newSession() waits instead of aborting while agent_end processing is still streaming\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order: string[] = [];\n\t\tlet releaseIdle!: () => void;\n\t\tconst idle = new Promise<void>((resolve) => {\n\t\t\treleaseIdle = resolve;\n\t\t});\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = true;\n\t\t(session as any).agent.waitForIdle = () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t\treturn idle;\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst pendingNewSession = session.newSession();\n\t\tawait Promise.resolve();\n\t\tassert.deepEqual(order, [\"waitForIdle\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\n\t\treleaseIdle();\n\t\tconst ok = await pendingNewSession;\n\t\tassert.equal(ok, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t});\n\n\tit(\"newSession() waits during agent_end processing even once already idle\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order: string[] = [];\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = false;\n\t\t(session as any).agent.waitForIdle = async () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t});\n\n\tit(\"abort() marks synthetic agent_end processing while extension handlers run\", async () => {\n\t\tconst session = await createSession();\n\t\tconst observedProcessingStates: boolean[] = [];\n\n\t\t(session as any).agent.abort = () => {};\n\t\t(session as any).agent.waitForIdle = async () => {};\n\t\t(session as any)._extensionRunner = {\n\t\t\temit: async (event: any) => {\n\t\t\t\tif (event.type === \"agent_end\") {\n\t\t\t\t\tobservedProcessingStates.push((session as any)._processingAgentEnd);\n\t\t\t\t}\n\t\t\t},\n\t\t\temitStop: async () => {\n\t\t\t\tobservedProcessingStates.push((session as any)._processingAgentEnd);\n\t\t\t},\n\t\t};\n\n\t\tawait session.abort();\n\n\t\tassert.deepEqual(observedProcessingStates, [true, true]);\n\t\tassert.equal((session as any)._processingAgentEnd, false);\n\t});\n\n\tit(\"newSession() during agent_end preserves the previous session for resume\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"user\",\n\t\t\tcontent: [{ type: \"text\", text: \"persisted prompt\" }],\n\t\t} as any);\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"assistant\",\n\t\t\tcontent: [{ type: \"text\", text: \"persisted response\" }],\n\t\t\tusage: {\n\t\t\t\tinput: 1,\n\t\t\t\toutput: 1,\n\t\t\t\tcacheRead: 0,\n\t\t\t\tcacheWrite: 0,\n\t\t\t\ttotal: 2,\n\t\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t\t},\n\t\t\tstopReason: \"stop\",\n\t\t\ttimestamp: Date.now(),\n\t\t} as any);\n\t\tsession.agent.replaceMessages(session.sessionManager.buildSessionContext().messages);\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.waitForIdle = async () => {};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.notEqual(session.sessionFile, previousSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\t(session as any)._processingAgentEnd = false;\n\t\tconst switched = await session.switchSession(previousSessionFile);\n\t\tassert.equal(switched, true);\n\n\t\tconst restoredText = session.messages\n\t\t\t.flatMap((message: any) => message.content ?? [])\n\t\t\t.filter((part: any) => part.type === \"text\")\n\t\t\t.map((part: any) => part.text);\n\t\tassert.deepEqual(restoredText, [\"persisted prompt\", \"persisted response\"]);\n\t});\n\n\tit(\"switchSession() waits instead of aborting while agent_end processing is still streaming\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"user\",\n\t\t\tcontent: [{ type: \"text\", text: \"switch persisted prompt\" }],\n\t\t} as any);\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"assistant\",\n\t\t\tcontent: [{ type: \"text\", text: \"switch persisted response\" }],\n\t\t\tusage: {\n\t\t\t\tinput: 1,\n\t\t\t\toutput: 1,\n\t\t\t\tcacheRead: 0,\n\t\t\t\tcacheWrite: 0,\n\t\t\t\ttotal: 2,\n\t\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t\t},\n\t\t\tstopReason: \"stop\",\n\t\t\ttimestamp: Date.now(),\n\t\t} as any);\n\t\tsession.agent.replaceMessages(session.sessionManager.buildSessionContext().messages);\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tconst activeSessionFile = session.sessionFile;\n\t\tassert.ok(activeSessionFile, \"need an active session file\");\n\t\tassert.notEqual(activeSessionFile, previousSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\tconst order: string[] = [];\n\t\tlet releaseIdle!: () => void;\n\t\tconst idle = new Promise<void>((resolve) => {\n\t\t\treleaseIdle = resolve;\n\t\t});\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = true;\n\t\t(session as any).agent.waitForIdle = () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t\treturn idle;\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst pendingSwitch = session.switchSession(previousSessionFile);\n\t\tawait Promise.resolve();\n\t\tassert.deepEqual(order, [\"waitForIdle\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t\tassert.equal(session.sessionFile, activeSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\treleaseIdle();\n\t\tconst switched = await pendingSwitch;\n\t\tassert.equal(switched, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t\tassert.equal(session.sessionFile, previousSessionFile);\n\n\t\tconst restoredText = session.messages\n\t\t\t.flatMap((message: any) => message.content ?? [])\n\t\t\t.filter((part: any) => part.type === \"text\")\n\t\t\t.map((part: any) => part.text);\n\t\tassert.deepEqual(restoredText, [\"switch persisted prompt\", \"switch persisted response\"]);\n\t});\n\n\tit(\"newSession() during agent_end skips stale post-handlers after the transition starts\", async () => {\n\t\tconst session = await createSession();\n\t\tconst assistantMessage = makeAssistantMessage(\"old response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\t\tinstallAgentEndSessionTransition(session, () => session.newSession());\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 0);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\n\t\tassert.equal((session as any)._sessionSwitchPending, false);\n\t\tassert.equal((session as any)._sessionTransitionStartedDuringAgentEnd, false);\n\t});\n\n\tit(\"switchSession() during agent_end skips stale post-handlers after the transition starts\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.notEqual(session.sessionFile, previousSessionFile);\n\n\t\tconst assistantMessage = makeAssistantMessage(\"old switch response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\t\tinstallAgentEndSessionTransition(session, () => session.switchSession(previousSessionFile));\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(session.sessionFile, previousSessionFile);\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 0);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\n\t\tassert.equal((session as any)._sessionSwitchPending, false);\n\t\tassert.equal((session as any)._sessionTransitionStartedDuringAgentEnd, false);\n\t});\n\n\tit(\"agent_end post-handlers bail while a session switch is pending\", async () => {\n\t\tconst session = await createSession();\n\t\tconst assistantMessage = makeAssistantMessage(\"old pending response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._sessionSwitchPending = true;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 1);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\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"]}
+{"version":3,"file":"agent-session-abort-order.test.js","sourceRoot":"","sources":["../../src/core/agent-session-abort-order.test.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,yEAAyE;AACzE,sEAAsE;AACtE,4CAA4C;AAC5C,EAAE;AACF,yEAAyE;AACzE,qEAAqE;AACrE,iEAAiE;AAEjE,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEhE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,IAAI,OAAe,CAAC;AAEpB,KAAK,UAAU,aAAa,CAAC,OAAsC,EAAE;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IACpF,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,IAAI,qBAAqB,CAAC;QAChD,GAAG,EAAE,OAAO;QACZ,QAAQ;QACR,eAAe;QACf,YAAY,EAAE,IAAI;QAClB,iBAAiB,EAAE,IAAI;QACvB,QAAQ,EAAE,IAAI;KACd,CAAC,CAAC;IACH,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC;IAE9B,4EAA4E;IAC5E,yDAAyD;IACzD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe;QAC1C,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO,IAAI,YAAY,CAAC;QACvB,KAAK,EAAE,IAAI,KAAK,EAAE;QAClB,cAAc;QACd,eAAe;QACf,GAAG,EAAE,OAAO;QACZ,cAAc;QACd,aAAa;KACb,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CACvB,MAAS,EACT,OAAuB;IAEvB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,MAAM,QAAQ,GAAI,MAAc,CAAC,IAAI,CAAoC,CAAC;QAC1E,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,8BAA8B,CAAC,CAAC;QACzE,CAAC;QACA,MAAc,CAAC,IAAI,CAAC,GAAG,UAAmB,GAAG,IAAe;YAC5D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACzC,OAAO;QACN,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,KAAK,EAAE;YACN,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;SACpE;QACD,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACd,CAAC;AACV,CAAC;AAED,SAAS,gCAAgC,CACxC,OAAqB,EACrB,UAAkC;IAEjC,OAAe,CAAC,gBAAgB,GAAG;QACnC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;QACxB,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChC,MAAM,UAAU,EAAE,CAAC;YACpB,CAAC;QACF,CAAC;QACD,QAAQ,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;KACxB,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,wDAAwD,EAAE,GAAG,EAAE;IACvE,UAAU,CAAC,GAAG,EAAE;QACf,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACrC,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAChD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAc,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAEjF,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAEvB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAC5D,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,EAAE,yCAAyC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,CAAC,EAAE,CACR,aAAa,IAAI,CAAC,EAClB,wDAAwD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACzE,CAAC;QACF,MAAM,CAAC,EAAE,CACR,QAAQ,GAAG,aAAa,EACxB,yDAAyD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC1E,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QACnG,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,WAAwB,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC1C,WAAW,GAAG,OAAO,CAAC;QACvB,CAAC,CAAC,CAAC;QAEF,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAChD,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,EAAE;YACzC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;QACD,OAAe,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAI,OAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9E,OAAe,CAAC,oBAAoB,GAAG,GAAG,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACnC,kBAAkB,EAAE,CAAC;QACtB,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7C,WAAW,EAAE,CAAC;QACd,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;QACrG,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,WAAwB,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC1C,WAAW,GAAG,OAAO,CAAC;QACvB,CAAC,CAAC,CAAC;QAEF,OAAe,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC3C,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC/C,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,EAAE;YACzC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;QACD,OAAe,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAI,OAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9E,OAAe,CAAC,oBAAoB,GAAG,GAAG,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACnC,kBAAkB,EAAE,CAAC;QACtB,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7C,WAAW,EAAE,CAAC;QACd,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,KAAK,GAAa,EAAE,CAAC;QAE1B,OAAe,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC3C,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAChD,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,IAAI,EAAE;YAC/C,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,CAAC,CAAC;QACD,OAAe,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAI,OAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9E,OAAe,CAAC,oBAAoB,GAAG,GAAG,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACnC,kBAAkB,EAAE,CAAC;QACtB,CAAC,CAAC;QAEF,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,wBAAwB,GAAc,EAAE,CAAC;QAE9C,OAAe,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QACvC,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QACnD,OAAe,CAAC,gBAAgB,GAAG;YACnC,IAAI,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;gBAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAChC,wBAAwB,CAAC,IAAI,CAAE,OAAe,CAAC,mBAAmB,CAAC,CAAC;gBACrE,CAAC;YACF,CAAC;YACD,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACpB,wBAAwB,CAAC,IAAI,CAAE,OAAe,CAAC,mBAAmB,CAAC,CAAC;YACrE,CAAC;SACD,CAAC;QAEF,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QAEtB,MAAM,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACxF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;QAChD,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;QAEhE,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC;YACpC,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;SAC9C,CAAC,CAAC;QACV,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC;YACpC,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;YACvD,KAAK,EAAE;gBACN,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,CAAC;gBACb,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;aACpE;YACD,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACd,CAAC,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAEpF,OAAe,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC3C,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAEpD,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAC1D,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEtC,OAAe,CAAC,mBAAmB,GAAG,KAAK,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE7B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ;aACnC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;aAChD,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;aAC3C,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yFAAyF,EAAE,KAAK,IAAI,EAAE;QACxG,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;QAChD,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;QAEhE,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC;YACpC,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC;SACrD,CAAC,CAAC;QACV,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC;YACpC,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC;YAC9D,KAAK,EAAE;gBACN,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,CAAC;gBACT,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,CAAC;gBACb,KAAK,EAAE,CAAC;gBACR,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;aACpE;YACD,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACd,CAAC,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAErF,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;QAC9C,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,6BAA6B,CAAC,CAAC;QAC5D,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QACxD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEvC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,WAAwB,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC1C,WAAW,GAAG,OAAO,CAAC;QACvB,CAAC,CAAC,CAAC;QAEF,OAAe,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC3C,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC/C,OAAe,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,EAAE;YACzC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;QACD,OAAe,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAI,OAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9E,OAAe,CAAC,oBAAoB,GAAG,GAAG,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACnC,kBAAkB,EAAE,CAAC;QACtB,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;QACjE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACrD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEvC,WAAW,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAEvD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ;aACnC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;aAChD,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;aAC3C,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,yBAAyB,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,KAAK,IAAI,EAAE;QACpG,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAEzB,OAAe,CAAC,qBAAqB,GAAG,gBAAgB,CAAC;QACzD,OAAe,CAAC,uBAAuB,CAAC,eAAe,GAAG,KAAK,IAAI,EAAE;YACrE,gBAAgB,EAAE,CAAC;QACpB,CAAC,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,CAAC,KAAU,EAAE,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,iBAAiB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,gCAAgC,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAEtE,MAAO,OAAe,CAAC,kBAAkB,CAAC;YACzC,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;SAC5B,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,KAAK,IAAI,EAAE;QACvG,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;QAChD,MAAM,CAAC,EAAE,CAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;QAEhE,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAE1D,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;QACrE,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAEzB,OAAe,CAAC,qBAAqB,GAAG,gBAAgB,CAAC;QACzD,OAAe,CAAC,uBAAuB,CAAC,eAAe,GAAG,KAAK,IAAI,EAAE;YACrE,gBAAgB,EAAE,CAAC;QACpB,CAAC,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,CAAC,KAAU,EAAE,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,iBAAiB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,gCAAgC,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE5F,MAAO,OAAe,CAAC,kBAAkB,CAAC;YACzC,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;SAC5B,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;QACtE,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAEzB,OAAe,CAAC,qBAAqB,GAAG,gBAAgB,CAAC;QACzD,OAAe,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAC7C,OAAe,CAAC,uBAAuB,CAAC,eAAe,GAAG,KAAK,IAAI,EAAE;YACrE,gBAAgB,EAAE,CAAC;QACpB,CAAC,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,CAAC,KAAU,EAAE,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;gBAAE,iBAAiB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,MAAO,OAAe,CAAC,kBAAkB,CAAC;YACzC,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;SAC5B,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAE,OAAe,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,mFAAmF;QACnF,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,MAAM,CAAC,EAAE,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAExG,OAAe,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAChD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAc,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAEjF,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAEvB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAC5D,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,EAAE,4CAA4C,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,MAAM,CAAC,EAAE,CACR,aAAa,IAAI,CAAC,EAClB,2DAA2D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC5E,CAAC;QACF,MAAM,CAAC,EAAE,CACR,QAAQ,GAAG,aAAa,EACxB,0EAA0E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC3F,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","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\nfunction makeAssistantMessage(text: string) {\n\treturn {\n\t\trole: \"assistant\",\n\t\tcontent: [{ type: \"text\", text }],\n\t\tusage: {\n\t\t\tinput: 1,\n\t\t\toutput: 1,\n\t\t\tcacheRead: 0,\n\t\t\tcacheWrite: 0,\n\t\t\ttotal: 2,\n\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t},\n\t\tstopReason: \"stop\",\n\t\ttimestamp: Date.now(),\n\t} as any;\n}\n\nfunction installAgentEndSessionTransition(\n\tsession: AgentSession,\n\ttransition: () => Promise<unknown>,\n): void {\n\t(session as any)._extensionRunner = {\n\t\thasHandlers: () => false,\n\t\temit: async (event: any) => {\n\t\t\tif (event.type === \"agent_end\") {\n\t\t\t\tawait transition();\n\t\t\t}\n\t\t},\n\t\temitStop: async () => {},\n\t};\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\t(session as any).agent.state.isStreaming = true;\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(\"newSession() waits instead of aborting when the prior turn is idle but not settled\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order: string[] = [];\n\t\tlet releaseIdle!: () => void;\n\t\tconst idle = new Promise<void>((resolve) => {\n\t\t\treleaseIdle = resolve;\n\t\t});\n\n\t\t(session as any).agent.state.isStreaming = false;\n\t\t(session as any).agent.waitForIdle = () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t\treturn idle;\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst pendingNewSession = session.newSession();\n\t\tawait Promise.resolve();\n\t\tassert.deepEqual(order, [\"waitForIdle\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\n\t\treleaseIdle();\n\t\tconst ok = await pendingNewSession;\n\t\tassert.equal(ok, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t});\n\n\tit(\"newSession() waits instead of aborting while agent_end processing is still streaming\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order: string[] = [];\n\t\tlet releaseIdle!: () => void;\n\t\tconst idle = new Promise<void>((resolve) => {\n\t\t\treleaseIdle = resolve;\n\t\t});\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = true;\n\t\t(session as any).agent.waitForIdle = () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t\treturn idle;\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst pendingNewSession = session.newSession();\n\t\tawait Promise.resolve();\n\t\tassert.deepEqual(order, [\"waitForIdle\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\n\t\treleaseIdle();\n\t\tconst ok = await pendingNewSession;\n\t\tassert.equal(ok, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t});\n\n\tit(\"newSession() waits during agent_end processing even once already idle\", async () => {\n\t\tconst session = await createSession();\n\t\tconst order: string[] = [];\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = false;\n\t\t(session as any).agent.waitForIdle = async () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t});\n\n\tit(\"abort() marks synthetic agent_end processing while extension handlers run\", async () => {\n\t\tconst session = await createSession();\n\t\tconst observedProcessingStates: boolean[] = [];\n\n\t\t(session as any).agent.abort = () => {};\n\t\t(session as any).agent.waitForIdle = async () => {};\n\t\t(session as any)._extensionRunner = {\n\t\t\temit: async (event: any) => {\n\t\t\t\tif (event.type === \"agent_end\") {\n\t\t\t\t\tobservedProcessingStates.push((session as any)._processingAgentEnd);\n\t\t\t\t}\n\t\t\t},\n\t\t\temitStop: async () => {\n\t\t\t\tobservedProcessingStates.push((session as any)._processingAgentEnd);\n\t\t\t},\n\t\t};\n\n\t\tawait session.abort();\n\n\t\tassert.deepEqual(observedProcessingStates, [true, true]);\n\t\tassert.equal((session as any)._processingAgentEnd, false);\n\t});\n\n\tit(\"newSession() during agent_end preserves the previous session for resume\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"user\",\n\t\t\tcontent: [{ type: \"text\", text: \"persisted prompt\" }],\n\t\t} as any);\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"assistant\",\n\t\t\tcontent: [{ type: \"text\", text: \"persisted response\" }],\n\t\t\tusage: {\n\t\t\t\tinput: 1,\n\t\t\t\toutput: 1,\n\t\t\t\tcacheRead: 0,\n\t\t\t\tcacheWrite: 0,\n\t\t\t\ttotal: 2,\n\t\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t\t},\n\t\t\tstopReason: \"stop\",\n\t\t\ttimestamp: Date.now(),\n\t\t} as any);\n\t\tsession.agent.replaceMessages(session.sessionManager.buildSessionContext().messages);\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.waitForIdle = async () => {};\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.notEqual(session.sessionFile, previousSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\t(session as any)._processingAgentEnd = false;\n\t\tconst switched = await session.switchSession(previousSessionFile);\n\t\tassert.equal(switched, true);\n\n\t\tconst restoredText = session.messages\n\t\t\t.flatMap((message: any) => message.content ?? [])\n\t\t\t.filter((part: any) => part.type === \"text\")\n\t\t\t.map((part: any) => part.text);\n\t\tassert.deepEqual(restoredText, [\"persisted prompt\", \"persisted response\"]);\n\t});\n\n\tit(\"switchSession() waits instead of aborting while agent_end processing is still streaming\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"user\",\n\t\t\tcontent: [{ type: \"text\", text: \"switch persisted prompt\" }],\n\t\t} as any);\n\t\tsession.sessionManager.appendMessage({\n\t\t\trole: \"assistant\",\n\t\t\tcontent: [{ type: \"text\", text: \"switch persisted response\" }],\n\t\t\tusage: {\n\t\t\t\tinput: 1,\n\t\t\t\toutput: 1,\n\t\t\t\tcacheRead: 0,\n\t\t\t\tcacheWrite: 0,\n\t\t\t\ttotal: 2,\n\t\t\t\tcost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },\n\t\t\t},\n\t\t\tstopReason: \"stop\",\n\t\t\ttimestamp: Date.now(),\n\t\t} as any);\n\t\tsession.agent.replaceMessages(session.sessionManager.buildSessionContext().messages);\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tconst activeSessionFile = session.sessionFile;\n\t\tassert.ok(activeSessionFile, \"need an active session file\");\n\t\tassert.notEqual(activeSessionFile, previousSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\tconst order: string[] = [];\n\t\tlet releaseIdle!: () => void;\n\t\tconst idle = new Promise<void>((resolve) => {\n\t\t\treleaseIdle = resolve;\n\t\t});\n\n\t\t(session as any)._processingAgentEnd = true;\n\t\t(session as any).agent.state.isStreaming = true;\n\t\t(session as any).agent.waitForIdle = () => {\n\t\t\torder.push(\"waitForIdle\");\n\t\t\treturn idle;\n\t\t};\n\t\t(session as any).abort = async () => {\n\t\t\torder.push(\"abort\");\n\t\t};\n\t\tconst originalDisconnect = (session as any)._disconnectFromAgent.bind(session);\n\t\t(session as any)._disconnectFromAgent = () => {\n\t\t\torder.push(\"_disconnectFromAgent\");\n\t\t\toriginalDisconnect();\n\t\t};\n\n\t\tconst pendingSwitch = session.switchSession(previousSessionFile);\n\t\tawait Promise.resolve();\n\t\tassert.deepEqual(order, [\"waitForIdle\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t\tassert.equal(session.sessionFile, activeSessionFile);\n\t\tassert.deepEqual(session.messages, []);\n\n\t\treleaseIdle();\n\t\tconst switched = await pendingSwitch;\n\t\tassert.equal(switched, true);\n\t\tassert.deepEqual(order, [\"waitForIdle\", \"_disconnectFromAgent\"]);\n\t\tassert.equal(order.includes(\"abort\"), false);\n\t\tassert.equal(session.sessionFile, previousSessionFile);\n\n\t\tconst restoredText = session.messages\n\t\t\t.flatMap((message: any) => message.content ?? [])\n\t\t\t.filter((part: any) => part.type === \"text\")\n\t\t\t.map((part: any) => part.text);\n\t\tassert.deepEqual(restoredText, [\"switch persisted prompt\", \"switch persisted response\"]);\n\t});\n\n\tit(\"newSession() during agent_end skips stale post-handlers after the transition starts\", async () => {\n\t\tconst session = await createSession();\n\t\tconst assistantMessage = makeAssistantMessage(\"old response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\t\tinstallAgentEndSessionTransition(session, () => session.newSession());\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 0);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\n\t\tassert.equal((session as any)._sessionSwitchPending, false);\n\t\tassert.equal((session as any)._sessionTransitionStartedDuringAgentEnd, false);\n\t});\n\n\tit(\"switchSession() during agent_end skips stale post-handlers after the transition starts\", async () => {\n\t\tconst session = await createSession({ persistSessions: true });\n\t\tconst previousSessionFile = session.sessionFile;\n\t\tassert.ok(previousSessionFile, \"need a persisted session file\");\n\n\t\tconst ok = await session.newSession();\n\t\tassert.equal(ok, true);\n\t\tassert.notEqual(session.sessionFile, previousSessionFile);\n\n\t\tconst assistantMessage = makeAssistantMessage(\"old switch response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\t\tinstallAgentEndSessionTransition(session, () => session.switchSession(previousSessionFile));\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(session.sessionFile, previousSessionFile);\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 0);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\n\t\tassert.equal((session as any)._sessionSwitchPending, false);\n\t\tassert.equal((session as any)._sessionTransitionStartedDuringAgentEnd, false);\n\t});\n\n\tit(\"agent_end post-handlers bail while a session switch is pending\", async () => {\n\t\tconst session = await createSession();\n\t\tconst assistantMessage = makeAssistantMessage(\"old pending response\");\n\t\tlet compactionChecks = 0;\n\t\tlet listenerAgentEnds = 0;\n\n\t\t(session as any)._lastAssistantMessage = assistantMessage;\n\t\t(session as any)._sessionSwitchPending = true;\n\t\t(session as any)._compactionOrchestrator.checkCompaction = async () => {\n\t\t\tcompactionChecks++;\n\t\t};\n\t\tsession.subscribe((event: any) => {\n\t\t\tif (event.type === \"agent_end\") listenerAgentEnds++;\n\t\t});\n\n\t\tawait (session as any)._processAgentEvent({\n\t\t\ttype: \"agent_end\",\n\t\t\tmessages: [assistantMessage],\n\t\t});\n\n\t\tassert.equal(compactionChecks, 0);\n\t\tassert.equal(listenerAgentEnds, 1);\n\t\tassert.equal((session as any)._lastAssistantMessage, undefined);\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\t(session as any).agent.state.isStreaming = true;\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-tool-refresh.test.js

@@ -1,3 +1,4 @@
+// GSD2 - Agent session workspace-root refresh regression tests
 // Regression test for #3616: newSession() must restore the full tool set
 // when cwd is unchanged.
 //
@@ -22,7 +23,7 @@ import { DefaultResourceLoader } from "./resource-loader.js";
 import { SessionManager } from "./session-manager.js";
 import { SettingsManager } from "./settings-manager.js";
 let testDir;
-async function createSession() {
+async function createSession(options = {}) {
     const agentDir = join(testDir, "agent-home");
     const authStorage = AuthStorage.inMemory({});
     const modelRegistry = new ModelRegistry(authStorage, join(agentDir, "models.json"));
@@ -43,6 +44,7 @@ async function createSession() {
         cwd: testDir,
         resourceLoader,
         modelRegistry,
+        workspaceRootRef: options.workspaceRootRef,
     });
 }
 describe("#3616 — newSession() restores narrowed tool set when cwd unchanged", () => {
@@ -102,5 +104,32 @@ describe("#3616 — newSession() restores narrowed tool set when cwd unchanged",
         assert.ok(buildRuntimeCalled, "cwd-changed branch must rebuild the tool runtime");
         assert.ok(buildRuntimeIncludedAll, "cwd-changed branch must rebuild with includeAllExtensionTools: true");
     });
+    it("uses explicit workspaceRoot option instead of process.cwd() when rebuilding runtime", async () => {
+        const session = await createSession();
+        const explicitWorkspaceRoot = mkdtempSync(join(testDir, "explicit-workspace-"));
+        session._cwd = process.cwd();
+        let buildRuntimeCalled = false;
+        let capturedBuildOptions;
+        const originalBuild = session._buildRuntime.bind(session);
+        session._buildRuntime = (options) => {
+            buildRuntimeCalled = true;
+            capturedBuildOptions = options;
+            return originalBuild(options);
+        };
+        const ok = await session.newSession({ workspaceRoot: explicitWorkspaceRoot });
+        assert.equal(ok, true);
+        assert.equal(session._cwd, explicitWorkspaceRoot);
+        assert.ok(buildRuntimeCalled, "explicit workspace root differing from prior root must rebuild runtime");
+        assert.strictEqual(capturedBuildOptions?.includeAllExtensionTools, true, "explicit workspaceRoot rebuild must pass includeAllExtensionTools: true");
+    });
+    it("updates provider workspace root ref when newSession uses explicit workspaceRoot", async () => {
+        const workspaceRootRef = { current: "" };
+        const session = await createSession({ workspaceRootRef });
+        const explicitWorkspaceRoot = mkdtempSync(join(testDir, "provider-workspace-"));
+        assert.equal(workspaceRootRef.current, testDir);
+        const ok = await session.newSession({ workspaceRoot: explicitWorkspaceRoot });
+        assert.equal(ok, true);
+        assert.equal(workspaceRootRef.current, explicitWorkspaceRoot);
+    });
 });
 //# 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":"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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"]}
+{"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":["// GSD2 - Agent session workspace-root refresh regression tests\n// 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(options: { workspaceRootRef?: { current: string } } = {}): 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\tworkspaceRootRef: options.workspaceRootRef,\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\tit(\"uses explicit workspaceRoot option instead of process.cwd() when rebuilding runtime\", async () => {\n\t\tconst session = await createSession();\n\t\tconst explicitWorkspaceRoot = mkdtempSync(join(testDir, \"explicit-workspace-\"));\n\t\t(session as any)._cwd = process.cwd();\n\n\t\tlet buildRuntimeCalled = false;\n\t\tlet capturedBuildOptions: { includeAllExtensionTools?: boolean } | undefined;\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\tcapturedBuildOptions = options;\n\t\t\treturn originalBuild(options);\n\t\t};\n\n\t\tconst ok = await session.newSession({ workspaceRoot: explicitWorkspaceRoot });\n\t\tassert.equal(ok, true);\n\t\tassert.equal((session as any)._cwd, explicitWorkspaceRoot);\n\t\tassert.ok(buildRuntimeCalled, \"explicit workspace root differing from prior root must rebuild runtime\");\n\t\tassert.strictEqual(\n\t\t\tcapturedBuildOptions?.includeAllExtensionTools,\n\t\t\ttrue,\n\t\t\t\"explicit workspaceRoot rebuild must pass includeAllExtensionTools: true\",\n\t\t);\n\t});\n\n\tit(\"updates provider workspace root ref when newSession uses explicit workspaceRoot\", async () => {\n\t\tconst workspaceRootRef = { current: \"\" };\n\t\tconst session = await createSession({ workspaceRootRef });\n\t\tconst explicitWorkspaceRoot = mkdtempSync(join(testDir, \"provider-workspace-\"));\n\n\t\tassert.equal(workspaceRootRef.current, testDir);\n\n\t\tconst ok = await session.newSession({ workspaceRoot: explicitWorkspaceRoot });\n\t\tassert.equal(ok, true);\n\t\tassert.equal(workspaceRootRef.current, explicitWorkspaceRoot);\n\t});\n});\n"]}

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

@@ -105,6 +105,10 @@ export interface AgentSessionConfig {
     extensionRunnerRef?: {
         current?: ExtensionRunner;
     };
+    /** Mutable ref used by providers to access the current workspace root. */
+    workspaceRootRef?: {
+        current: string;
+    };
     /** Optional: check if the claude-code CLI provider is ready (installed + authed).
      * Passed through to RetryHandler for third-party block recovery (#3772). */
     isClaudeCodeReady?: () => boolean;
@@ -188,6 +192,7 @@ export declare class AgentSession {
     private _baseToolRegistry;
     private _cwd;
     private _extensionRunnerRef?;
+    private _workspaceRootRef?;
     private _initialActiveToolNames?;
     private _baseToolsOverride?;
     private _extensionUIContext?;
@@ -201,6 +206,7 @@ export declare class AgentSession {
     private _toolPromptSnippets;
     private _toolPromptGuidelines;
     private _baseSystemPrompt;
+    private _visibleSkillNames;
     constructor(config: AgentSessionConfig);
     /** Model registry for API key resolution and model discovery */
     get modelRegistry(): ModelRegistry;
@@ -280,6 +286,15 @@ export declare class AgentSession {
      * Changes take effect on the next agent turn.
      */
     setActiveToolsByName(toolNames: string[]): void;
+    /**
+     * Set or clear a prompt-only filter for the <available_skills> catalog.
+     *
+     * This does not unload skills or disable the Skill tool. It only controls
+     * which loaded skills are advertised in the system prompt on rebuild.
+     */
+    setVisibleSkillsByName(skillNames: string[] | undefined): void;
+    /** Get the current prompt-only skill catalog filter, if one is active. */
+    getVisibleSkillNames(): string[] | undefined;
     /** Whether compaction or branch summarization is currently running */
     get isCompacting(): boolean;
     /**
@@ -434,6 +449,8 @@ export declare class AgentSession {
     newSession(options?: {
         parentSession?: string;
         setup?: (sessionManager: SessionManager) => Promise<void>;
+        /** Explicit workspace root for the new session/tool runtime. */
+        workspaceRoot?: string;
         /** See ExtensionCommandContext.newSession for docs (#3731). */
         abortSignal?: AbortSignal;
     }): Promise<boolean>;

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

@@ -1 +1 @@
-{"version":3,"file":"agent-session.d.ts","sourceRoot":"","sources":["../../src/core/agent-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-session.d.ts","sourceRoot":"","sources":["../../src/core/agent-session.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EACX,KAAK,EACL,UAAU,EACV,YAAY,EACZ,UAAU,EACV,SAAS,EACT,aAAa,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAoB,YAAY,EAAW,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9F,OAAO,EAAE,KAAK,UAAU,EAAgE,MAAM,oBAAoB,CAAC;AACnH,OAAO,EACN,KAAK,gBAAgB,EAKrB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAOhB,KAAK,eAAe,EACpB,KAAK,cAAc,EAInB,KAAK,QAAQ,EAKb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAwB,aAAa,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,KAAK,EAA0B,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAOtD,6CAA6C;AAC7C,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CASrE;AAED,8DAA8D;AAC9D,MAAM,MAAM,wBAAwB,GACjC,WAAW,GACX,oBAAoB,GACpB,mBAAmB,GACnB,oBAAoB,GACpB,qBAAqB,GACrB,gBAAgB,GAChB,aAAa,GACb,aAAa,GACb,gBAAgB,GAChB,kBAAkB,GAClB,MAAM,CAAC;AAEV,MAAM,MAAM,iBAAiB,GAC1B,UAAU,GACV;IAAE,IAAI,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,wBAAwB,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAAA;CAAE,GACnE;IACA,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACzG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAClF;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,4BAA4B,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxE;IAAE,IAAI,EAAE,0BAA0B,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,IAAI,EAAE,yBAAyB,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAElF,iDAAiD;AACjD,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;AAM3E,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAC3E,gFAAgF;IAChF,cAAc,EAAE,cAAc,CAAC;IAC/B,qDAAqD;IACrD,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,gEAAgE;IAChE,aAAa,EAAE,aAAa,CAAC;IAC7B,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,wDAAwD;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC9C,sEAAsE;IACtE,kBAAkB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,eAAe,CAAA;KAAE,CAAC;IACnD,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC;gFAC4E;IAC5E,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,iBAAiB;IACjC,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,qBAAqB,CAAC,EAAE,8BAA8B,CAAC;IACvD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,sBAAsB,CAAC;CACjC;AAED,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC7B,oEAAoE;IACpE,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,wBAAwB;IACxB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,iHAAiH;IACjH,iBAAiB,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACzC,qFAAqF;IACrF,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAED,+BAA+B;AAC/B,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,6EAA6E;IAC7E,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,8CAA8C;AAC9C,MAAM,WAAW,YAAY;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE;QACP,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;KACd,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;CACb;AAgBD,qBAAa,YAAY;IACxB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAE1C,OAAO,CAAC,aAAa,CAA8D;IAGnF,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,gBAAgB,CAAoC;IAE5D,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB,CAAgB;IACzC,gFAAgF;IAChF,OAAO,CAAC,iBAAiB,CAAgB;IACzC,sFAAsF;IACtF,OAAO,CAAC,wBAAwB,CAAuB;IAGvD,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,uBAAuB,CAAyB;IAGxD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,uBAAuB,CAAK;IACpC,OAAO,CAAC,oBAAoB,CAAK;IAEjC,2EAA2E;IAC3E,OAAO,CAAC,aAAa,CAAK;IAI1B,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,oBAAoB,CAA8B;IAG1D,OAAO,CAAC,gBAAgB,CAA0C;IAClE,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,mBAAmB,CAAS;IACpC;sEACkE;IAClE,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,uCAAuC,CAAS;IAExD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,iBAAiB,CAAqC;IAC9D,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAC5D,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,OAAO,CAAC,uBAAuB,CAAC,CAAW;IAC3C,OAAO,CAAC,kBAAkB,CAAC,CAA4B;IACvD,OAAO,CAAC,mBAAmB,CAAC,CAAqB;IACjD,OAAO,CAAC,+BAA+B,CAAC,CAAiC;IACzE,OAAO,CAAC,yBAAyB,CAAC,CAAkB;IACpD,OAAO,CAAC,uBAAuB,CAAC,CAAyB;IACzD,OAAO,CAAC,2BAA2B,CAAC,CAAa;IAGjD,OAAO,CAAC,cAAc,CAAgB;IAGtC,OAAO,CAAC,iBAAiB,CAAmB;IAG5C,OAAO,CAAC,aAAa,CAAqC;IAC1D,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,qBAAqB,CAAoC;IAGjE,OAAO,CAAC,iBAAiB,CAAM;IAE/B,OAAO,CAAC,kBAAkB,CAAsC;gBAEpD,MAAM,EAAE,kBAAkB;IAgEtC,gEAAgE;IAChE,IAAI,aAAa,IAAI,aAAa,CAEjC;IAED,oDAAoD;IACpD,IAAI,gBAAgB,IAAI,gBAAgB,CAEvC;IAMD,qCAAqC;IACrC,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,qBAAqB,CAA2C;IAExE,4EAA4E;IAC5E,OAAO,CAAC,iBAAiB,CAevB;IAEF,OAAO,CAAC,8BAA8B;YAKxB,kBAAkB;IAkJhC;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAuD9B,0CAA0C;IAC1C,OAAO,CAAC,mBAAmB;IAQ3B,8EAA8E;IAC9E,OAAO,CAAC,yBAAyB;IAWjC,kDAAkD;YACpC,mBAAmB;IA2FjC;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,yBAAyB,GAAG,MAAM,IAAI;IAY1D;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAO5B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;;OAGG;IACH,OAAO,IAAI,IAAI;IAWf,uBAAuB;IACvB,IAAI,KAAK,IAAI,UAAU,CAEtB;IAED,2DAA2D;IAC3D,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAElC;IAED,6BAA6B;IAC7B,IAAI,aAAa,IAAI,aAAa,CAEjC;IAED,sDAAsD;IACtD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,sFAAsF;IACtF,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,gDAAgD;IAChD,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;OAGG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAI9B;;OAEG;IACH,WAAW,IAAI,QAAQ,EAAE;IAQzB;;;;;OAKG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAmB/C;;;;;OAKG;IACH,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAQ9D,0EAA0E;IAC1E,oBAAoB,IAAI,MAAM,EAAE,GAAG,SAAS;IAI5C,sEAAsE;IACtE,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;IA2BhD,wBAAwB;IACxB,IAAI,QAAQ,IAAI,UAAU,GAAG,UAAU,CAEtC;IAED,oEAAoE;IACpE,IAAI,QAAQ,IAAI,YAAY,EAAE,CAE7B;IAED,4BAA4B;IAC5B,IAAI,YAAY,IAAI,KAAK,GAAG,eAAe,CAE1C;IAED,6BAA6B;IAC7B,IAAI,YAAY,IAAI,KAAK,GAAG,eAAe,CAE1C;IAED,uEAAuE;IACvE,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,yBAAyB;IACzB,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,2CAA2C;IAC3C,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,qDAAqD;IACrD,IAAI,YAAY,IAAI,aAAa,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAEtF;IAED,uCAAuC;IACvC,eAAe,CAAC,YAAY,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,IAAI;IAIhG,kCAAkC;IAClC,IAAI,eAAe,IAAI,aAAa,CAAC,cAAc,CAAC,CAEnD;IAED,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,0BAA0B;IAKlC,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,oBAAoB;IA0C5B;;;;;;;;OAQG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAyJlE;;OAEG;YACW,2BAA2B;IA4BzC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,uBAAuB;IAkC/B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,6BAA6B;IAKrC,OAAO,CAAC,0BAA0B;IAUlC,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAOzE;;;;;;OAMG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE;;;;;;OAMG;IACG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAapE;;OAEG;YACW,WAAW;IAgBzB;;OAEG;YACW,cAAc;IAgB5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;;;;;;;;;OAWG;IACG,iBAAiB,CAAC,CAAC,GAAG,OAAO,EAClC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC,EACjF,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,CAAA;KAAE,GAChF,OAAO,CAAC,IAAI,CAAC;IAgChB;;;;;;OAMG;IACG,eAAe,CACpB,OAAO,EAAE,MAAM,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,EAChD,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,GAAG,UAAU,CAAA;KAAE,GAC5C,OAAO,CAAC,IAAI,CAAC;IA8BhB;;;;OAIG;IACH,UAAU,IAAI;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE;IA2BxD,wEAAwE;IACxE,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,gDAAgD;IAChD,mBAAmB,IAAI,SAAS,MAAM,EAAE;IAIxC,iDAAiD;IACjD,mBAAmB,IAAI,SAAS,MAAM,EAAE;IAIxC,IAAI,cAAc,IAAI,cAAc,CAEnC;IAED;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAiCd,sCAAsC;IA6BpD;;;;;;;OAOG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE;QAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,KAAK,CAAC,EAAE,CAAC,cAAc,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1D,gEAAgE;QAChE,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,+DAA+D;QAC/D,WAAW,CAAC,EAAE,WAAW,CAAC;KAC1B,GAAG,OAAO,CAAC,OAAO,CAAC;YAmGN,gBAAgB;IAe9B;;;OAGG;YACW,iBAAiB;IAqB/B;;;;OAIG;IACG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjF;;;;;OAKG;IACG,UAAU,CAAC,SAAS,GAAE,SAAS,GAAG,UAAsB,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAOvI,OAAO,CAAC,qBAAqB;YAMf,iBAAiB;YAoBjB,oBAAoB;IAsBlC;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAkB5C;;;OAGG;IACH,kBAAkB,IAAI,aAAa,GAAG,SAAS;IAY/C;;;OAGG;IACH,0BAA0B,IAAI,aAAa,EAAE;IAK7C;;OAEG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAI3B,OAAO,CAAC,+BAA+B;IAUvC,OAAO,CAAC,mBAAmB;IAsB3B;;;OAGG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,eAAe,GAAG,IAAI;IAMpD;;;OAGG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,eAAe,GAAG,IAAI;IAUpD;;;;OAIG;IACG,OAAO,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIrE,qDAAqD;IACrD,eAAe,IAAI,IAAI;IAIvB,8CAA8C;IAC9C,kBAAkB,IAAI,IAAI;IAI1B,qCAAqC;IACrC,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKhD,yCAAyC;IACzC,IAAI,qBAAqB,IAAI,OAAO,CAEnC;IAEK,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YAqBlD,6BAA6B;IAyB3C,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,kBAAkB;IAsI1B,OAAO,CAAC,oBAAoB;IAgE5B,OAAO,CAAC,aAAa;IA4Df,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA4B7B,+BAA+B;IAC/B,UAAU,IAAI,IAAI;IAQlB,kDAAkD;IAClD,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,oCAAoC;IACpC,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,gCAAgC;IAChC,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAS3C;;;;;;;OAOG;IACG,WAAW,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EACjC,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,cAAc,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3F,OAAO,CAAC,UAAU,CAAC;IA0BtB;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;QAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IA0BvG;;OAEG;IACH,SAAS,IAAI,IAAI;IAIjB,kDAAkD;IAClD,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,oEAAoE;IACpE,IAAI,sBAAsB,IAAI,OAAO,CAEpC;IAED;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;;;OAKG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiF1D;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKlC;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;IA4DlF;;;;;;;;;;OAUG;IACG,YAAY,CACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAC/G,OAAO,CAAC;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC;IAmL7G;;OAEG;IACH,yBAAyB,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAiBrE,OAAO,CAAC,uBAAuB;IAW/B;;OAEG;IACH,eAAe,IAAI,YAAY;IA4C/B;;;OAGG;IACH,eAAe,IAAI,MAAM;IAIzB,eAAe,IAAI,YAAY,GAAG,SAAS;IA8C3C;;;;OAIG;IACG,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBxD;;;;OAIG;IACH,oBAAoB,IAAI,MAAM,GAAG,SAAS;IA4B1C;;OAEG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIhD;;OAEG;IACH,IAAI,eAAe,IAAI,eAAe,GAAG,SAAS,CAEjD;CACD"}

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

@@ -1,3 +1,4 @@
+// GSD2 - Agent session lifecycle and workspace runtime coordination
 /**
  * AgentSession - Core abstraction for agent lifecycle and session management.
  *
@@ -97,6 +98,8 @@ export class AgentSession {
         this._toolPromptGuidelines = new Map();
         // Base system prompt (without extension appends) - used to apply fresh appends each turn
         this._baseSystemPrompt = "";
+        // Optional prompt-only skill catalog filter. Skills remain loaded and invocable by name.
+        this._visibleSkillNames = undefined;
         // Track last assistant message for auto-compaction check
         this._lastAssistantMessage = undefined;
         /** Internal handler for agent events - shared by subscribe and reconnect */
@@ -121,6 +124,10 @@ export class AgentSession {
         this._modelRegistry = config.modelRegistry;
         this._fallbackResolver = new FallbackResolver(this.settingsManager, this._modelRegistry.authStorage, this._modelRegistry);
         this._extensionRunnerRef = config.extensionRunnerRef;
+        this._workspaceRootRef = config.workspaceRootRef;
+        if (this._workspaceRootRef) {
+            this._workspaceRootRef.current = this._cwd;
+        }
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._baseToolsOverride = config.baseToolsOverride;
         // Initialize delegated subsystems
@@ -599,6 +606,23 @@ export class AgentSession {
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
         this.agent.setSystemPrompt(this._baseSystemPrompt);
     }
+    /**
+     * Set or clear a prompt-only filter for the <available_skills> catalog.
+     *
+     * This does not unload skills or disable the Skill tool. It only controls
+     * which loaded skills are advertised in the system prompt on rebuild.
+     */
+    setVisibleSkillsByName(skillNames) {
+        this._visibleSkillNames = skillNames === undefined
+            ? undefined
+            : new Set(skillNames.map((name) => name.trim().toLowerCase()).filter(Boolean));
+        this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+        this.agent.setSystemPrompt(this._baseSystemPrompt);
+    }
+    /** Get the current prompt-only skill catalog filter, if one is active. */
+    getVisibleSkillNames() {
+        return this._visibleSkillNames ? [...this._visibleSkillNames] : undefined;
+    }
     /** Whether compaction or branch summarization is currently running */
     get isCompacting() {
         return this._compactionOrchestrator.isCompacting;
@@ -751,6 +775,9 @@ export class AgentSession {
         return buildSystemPrompt({
             cwd: this._cwd,
             skills: loadedSkills,
+            skillFilter: this._visibleSkillNames
+                ? (skill) => this._visibleSkillNames.has(skill.name.trim().toLowerCase())
+                : undefined,
             contextFiles: loadedContextFiles,
             customPrompt: loaderSystemPrompt,
             appendSystemPrompt,
@@ -1253,6 +1280,11 @@ export class AgentSession {
         // message_end/agent_end events fire while listeners are still connected.
         // During agent_end handling the turn is already ending; aborting there can
         // convert a successful auto-mode handoff into an aborted provider message.
+        if (!this.agent.state.isStreaming) {
+            this._retryHandler.abortRetry();
+            await this.agent.waitForIdle();
+            return;
+        }
         await this.abort();
     }
     /**
@@ -1278,10 +1310,10 @@ export class AgentSession {
         this._sessionSwitchPending = true;
         try {
             await this._settleCurrentTurnForSessionTransition();
-            // #3731: If the caller aborted (e.g. runUnit() timed out and restored cwd to
-            // project root), discard this session before capturing process.cwd() and
-            // rebuilding the tool runtime. Without this check, the late newSession()
-            // would rebuild tools with root cwd, breaking worktree isolation.
+            // #3731: If the caller aborted (e.g. runUnit() timed out while the
+            // worktree was being torn down), discard this session before rebuilding
+            // the tool runtime. Without this check, the late newSession() could
+            // rebuild tools with a stale workspace root.
             if (options?.abortSignal?.aborted) {
                 return false;
             }
@@ -1291,15 +1323,21 @@ export class AgentSession {
         finally {
             this._sessionSwitchPending = false;
         }
-        // Update cwd to current process directory — auto-mode may have chdir'd
-        // into a worktree since the original session was created.
+        // Update the workspace root for the new tool runtime. Auto-mode passes
+        // this explicitly so session routing does not depend on global
+        // process.cwd() after worktree merge/teardown. Other callers keep the
+        // historical default.
         const previousCwd = this._cwd;
-        this._cwd = process.cwd();
+        this._cwd = options?.workspaceRoot ?? process.cwd();
+        if (this._workspaceRootRef) {
+            this._workspaceRootRef.current = this._cwd;
+        }
         this.sessionManager.newSession({ parentSession: options?.parentSession });
         this.agent.sessionId = this.sessionManager.getSessionId();
         this._steeringMessages = [];
         this._followUpMessages = [];
         this._pendingNextTurnMessages = [];
+        this._visibleSkillNames = undefined;
         this.sessionManager.appendThinkingLevelChange(this.thinkingLevel);
         // Rebuild tools when cwd changed (e.g., auto-mode entered a worktree).
         // Tools capture cwd at creation time for path resolution — without
@@ -1728,6 +1766,8 @@ export class AgentSession {
             getActiveTools: () => this.getActiveToolNames(),
             getAllTools: () => this.getAllTools(),
             setActiveTools: (toolNames) => this.setActiveToolsByName(toolNames),
+            getVisibleSkills: () => this.getVisibleSkillNames(),
+            setVisibleSkills: (skillNames) => this.setVisibleSkillsByName(skillNames),
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model, options) => {
@@ -1760,6 +1800,9 @@ export class AgentSession {
                 })();
             },
             getSystemPrompt: () => this.systemPrompt,
+            setCompactionThresholdOverride: (percent) => {
+                this.settingsManager.setCompactionThresholdOverride(percent);
+            },
         });
     }
     _refreshToolRegistry(options) {
@@ -1865,6 +1908,7 @@ export class AgentSession {
         this.settingsManager.reload();
         resetApiProviders();
         await this._resourceLoader.reload();
+        this._visibleSkillNames = undefined;
         this._buildRuntime({
             activeToolNames: this.getActiveToolNames(),
             flagValues: previousFlagValues,
@@ -2027,6 +2071,7 @@ export class AgentSession {
         this._steeringMessages = [];
         this._followUpMessages = [];
         this._pendingNextTurnMessages = [];
+        this._visibleSkillNames = undefined;
         // Set new session
         this.sessionManager.setSessionFile(sessionPath);
         this.agent.sessionId = this.sessionManager.getSessionId();