@oh-my-pi/pi-coding-agent 13.12.8 → 13.12.9

package/src/session/session-manager.ts

@@ -150,6 +150,13 @@ export interface TtsrInjectionEntry extends SessionEntryBase {
 	injectedRules: string[];
 }
 
+/** Persisted MCP discovery selection state for a session branch. */
+export interface MCPToolSelectionEntry extends SessionEntryBase {
+	type: "mcp_tool_selection";
+	/** MCP tool names selected for visibility in discovery mode. */
+	selectedToolNames: string[];
+}
+
 /** Session init entry - captures initial context for subagent sessions (debugging/replay). */
 export interface SessionInitEntry extends SessionEntryBase {
 	type: "session_init";
@@ -206,6 +213,7 @@ export type SessionEntry =
 	| CustomMessageEntry
 	| LabelEntry
 	| TtsrInjectionEntry
+	| MCPToolSelectionEntry
 	| SessionInitEntry
 	| ModeChangeEntry;
 
@@ -228,6 +236,10 @@ export interface SessionContext {
 	models: Record<string, string>;
 	/** Names of TTSR rules that have been injected this session */
 	injectedTtsrRules: string[];
+	/** MCP tool names selected through discovery for this session branch. */
+	selectedMCPToolNames: string[];
+	/** Whether this branch contains an explicit persisted MCP selection entry. */
+	hasPersistedMCPToolSelection: boolean;
 	/** Active mode (e.g. "plan") or "none" if no special mode is active */
 	mode: string;
 	/** Mode-specific data from the last mode_change entry */
@@ -499,6 +511,8 @@ export function buildSessionContext(
 			serviceTier: undefined,
 			models: {},
 			injectedTtsrRules: [],
+			selectedMCPToolNames: [],
+			hasPersistedMCPToolSelection: false,
 			mode: "none",
 		};
 	}
@@ -517,6 +531,8 @@ export function buildSessionContext(
 			serviceTier: undefined,
 			models: {},
 			injectedTtsrRules: [],
+			selectedMCPToolNames: [],
+			hasPersistedMCPToolSelection: false,
 			mode: "none",
 		};
 	}
@@ -535,6 +551,8 @@ export function buildSessionContext(
 	const models: Record<string, string> = {};
 	let compaction: CompactionEntry | null = null;
 	const injectedTtsrRulesSet = new Set<string>();
+	let selectedMCPToolNames: string[] = [];
+	let hasPersistedMCPToolSelection = false;
 	let mode = "none";
 	let modeData: Record<string, unknown> | undefined;
 
@@ -559,6 +577,9 @@ export function buildSessionContext(
 			for (const ruleName of entry.injectedRules) {
 				injectedTtsrRulesSet.add(ruleName);
 			}
+		} else if (entry.type === "mcp_tool_selection") {
+			selectedMCPToolNames = [...entry.selectedToolNames];
+			hasPersistedMCPToolSelection = true;
 		} else if (entry.type === "mode_change") {
 			mode = entry.mode;
 			modeData = entry.data;
@@ -648,7 +669,17 @@ export function buildSessionContext(
 		}
 	}
 
-	return { messages, thinkingLevel, serviceTier, models, injectedTtsrRules, mode, modeData };
+	return {
+		messages,
+		thinkingLevel,
+		serviceTier,
+		models,
+		injectedTtsrRules,
+		selectedMCPToolNames,
+		hasPersistedMCPToolSelection,
+		mode,
+		modeData,
+	};
 }
 
 /**
@@ -2116,6 +2147,23 @@ export class SessionManager {
 	// TTSR (Time Traveling Stream Rules)
 	// =========================================================================
 
+	/**
+	 * Append an MCP tool selection entry recording the discovery-selected MCP tools.
+	 * @param selectedToolNames MCP tool names selected for this branch
+	 * @returns Entry id
+	 */
+	appendMCPToolSelection(selectedToolNames: string[]): string {
+		const entry: MCPToolSelectionEntry = {
+			type: "mcp_tool_selection",
+			id: generateId(this.#byId),
+			parentId: this.#leafId,
+			timestamp: new Date().toISOString(),
+			selectedToolNames: [...selectedToolNames],
+		};
+		this.#appendEntry(entry);
+		return entry.id;
+	}
+
 	/**
 	 * Append a TTSR injection entry recording which rules were injected.
 	 * @param ruleNames Names of rules that were injected

package/src/session/session-storage.ts

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import * as fsp from "node:fs/promises";
 import * as path from "node:path";
 import { isEnoent, toError } from "@oh-my-pi/pi-utils";
 
@@ -184,6 +185,32 @@ export class FileSessionStorage implements SessionStorage {
 	openWriter(path: string, options?: { flags?: "a" | "w"; onError?: (err: Error) => void }): SessionStorageWriter {
 		return new FileSessionStorageWriter(path, options);
 	}
+
+	/**
+	 * Delete a session file and its artifacts directory.
+	 * Artifacts are stored in a sibling directory with the same name minus .jsonl extension.
+	 */
+	async deleteSessionWithArtifacts(sessionPath: string): Promise<void> {
+		// Delete the session file itself
+		await this.unlink(sessionPath);
+
+		// Compute artifacts directory: /path/to/session.jsonl -> /path/to/session
+		const artifactsDir = sessionPath.slice(0, -6);
+
+		// Delete artifacts directory if it exists. Missing directories are fine, but
+		// surface real cleanup failures because the session file is already gone.
+		try {
+			await fsp.rm(artifactsDir, { recursive: true, force: true });
+		} catch (err) {
+			const error = toError(err);
+			throw new Error(
+				`Session file deleted but failed to remove artifacts directory ${artifactsDir}: ${error.message}`,
+				{
+					cause: error,
+				},
+			);
+		}
+	}
 }
 
 function matchesPattern(name: string, pattern: string): boolean {

package/src/slash-commands/builtin-registry.ts

@@ -229,8 +229,20 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	},
 	{
 		name: "session",
-		description: "Show session info and stats",
-		handle: async (_command, runtime) => {
+		description: "Session management commands",
+		subcommands: [
+			{ name: "info", description: "Show session info and stats" },
+			{ name: "delete", description: "Delete current session and return to selector" },
+		],
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			const sub = command.args.trim().toLowerCase() || "info";
+			if (sub === "delete") {
+				runtime.ctx.editor.setText("");
+				await runtime.ctx.handleSessionDeleteCommand();
+				return;
+			}
+			// Default: show session info
 			await runtime.ctx.handleSessionCommand();
 			runtime.ctx.editor.setText("");
 		},