Skip to content

fix: close in-flight connects on session_shutdown #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levitte wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: close in-flight connects on session_shutdown #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc6afd
fix: close MCP client on session_shutdown so pi -p can exit
Aug 1, 2026
83e389a
Close in-flight connections on session_shutdown
levitte Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions extensions/codebase-memory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const HINT =

export default function codebaseMemoryExtension(pi: ExtensionAPI) {
let client: Client | undefined;
let shuttingDown = false;
const seen = new Set<string>();

async function getClient(reconnect = false): Promise<Client> {
Expand All @@ -38,6 +39,13 @@ export default function codebaseMemoryExtension(pi: ExtensionAPI) {
if (client) return client;
const c = new Client({ name: "pi-codebase-memory", version: "0.1.2" });
await c.connect(new StdioClientTransport({ command: BIN, args: [], env: process.env as Record<string, string> }));
if (shuttingDown) {
// Shutdown landed while connect() was in flight; don't adopt
// the freshly spawned server, or it leaks and holds the event
// loop open just the same.
await c.close().catch(() => {});
throw new Error("session is shutting down");
}
client = c;
return c;
}
Expand Down Expand Up @@ -97,5 +105,13 @@ export default function codebaseMemoryExtension(pi: ExtensionAPI) {
});
}

// Close the MCP child process so the parent event loop can drain
// (without this, pi -p hangs after answering because stdio pipes stay open).
pi.on("session_shutdown", async () => {
shuttingDown = true;
await client?.close().catch(() => undefined);
client = undefined;
});

void register().catch(() => undefined); // silent if binary not installed yet
}