gsd-pi 2.80.0-dev.2be7caf18 → 2.80.0-dev.42bd34838

package/packages/pi-coding-agent/src/core/agent-session-abort-order.test.ts

@@ -120,6 +120,7 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
 
 	it("newSession() invokes abort() before _disconnectFromAgent()", async () => {
 		const session = await createSession();
+		(session as any).agent.state.isStreaming = true;
 		const order = recordCallOrder(session as any, ["abort", "_disconnectFromAgent"]);
 
 		const ok = await session.newSession();
@@ -138,6 +139,40 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
 		);
 	});
 
+	it("newSession() waits instead of aborting when the prior turn is idle but not settled", async () => {
+		const session = await createSession();
+		const order: string[] = [];
+		let releaseIdle!: () => void;
+		const idle = new Promise<void>((resolve) => {
+			releaseIdle = resolve;
+		});
+
+		(session as any).agent.state.isStreaming = false;
+		(session as any).agent.waitForIdle = () => {
+			order.push("waitForIdle");
+			return idle;
+		};
+		(session as any).abort = async () => {
+			order.push("abort");
+		};
+		const originalDisconnect = (session as any)._disconnectFromAgent.bind(session);
+		(session as any)._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: string[] = [];
@@ -432,6 +467,7 @@ describe("#4243 — abort() must run before _disconnectFromAgent()", () => {
 		const sessionFile = session.sessionFile;
 		assert.ok(typeof sessionFile === "string" && sessionFile.length > 0, "need a session file to switch to");
 
+		(session as any).agent.state.isStreaming = true;
 		const order = recordCallOrder(session as any, ["abort", "_disconnectFromAgent"]);
 
 		const ok = await session.switchSession(sessionFile);

package/packages/pi-coding-agent/src/core/agent-session.ts

@@ -1626,6 +1626,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();
 	}