@oh-my-pi/pi-coding-agent 14.6.3 → 14.6.5

package/src/session/agent-session.ts

@@ -102,6 +102,7 @@ import { ExtensionToolWrapper } from "../extensibility/extensions/wrapper";
 import type { HookCommandContext } from "../extensibility/hooks/types";
 import type { Skill, SkillWarning } from "../extensibility/skills";
 import { expandSlashCommand, type FileSlashCommand } from "../extensibility/slash-commands";
+import type { HindsightSessionState } from "../hindsight/state";
 import { type LocalProtocolOptions, resolveLocalUrlToPath } from "../internal-urls";
 import {
 	buildDiscoverableMCPSearchIndex,
@@ -563,6 +564,7 @@ export class AgentSession {
 	#lastSuccessfulYieldToolCallId: string | undefined = undefined;
 	#promptGeneration = 0;
 	#providerSessionState = new Map<string, ProviderSessionState>();
+	#hindsightSessionState: HindsightSessionState | undefined = undefined;
 
 	#startPowerAssertion(): void {
 		if (process.platform !== "darwin") {
@@ -702,6 +704,16 @@ export class AgentSession {
 		return this.#providerSessionState;
 	}
 
+	getHindsightSessionState(): HindsightSessionState | undefined {
+		return this.#hindsightSessionState;
+	}
+
+	setHindsightSessionState(state: HindsightSessionState | undefined): HindsightSessionState | undefined {
+		const previous = this.#hindsightSessionState;
+		this.#hindsightSessionState = state;
+		return previous;
+	}
+
 	/** TTSR manager for time-traveling stream rules */
 	get ttsrManager(): TtsrManager | undefined {
 		return this.#ttsrManager;
@@ -1964,6 +1976,22 @@ export class AgentSession {
 		this.#unsubscribeAgent = this.agent.subscribe(this.#handleAgentEvent);
 	}
 
+	/** Keep Hindsight metadata aligned when the underlying agent session id changes. */
+	#rekeyHindsightMemoryForCurrentSessionId(): void {
+		if (resolveMemoryBackend(this.settings).id !== "hindsight") return;
+		const sid = this.agent.sessionId;
+		if (!sid) return;
+		this.getHindsightSessionState()?.setSessionId(sid);
+	}
+
+	/** New session file: reset auto-recall / retain-threshold counters for the new transcript. */
+	#resetHindsightConversationTrackingIfHindsight(): void {
+		if (resolveMemoryBackend(this.settings).id !== "hindsight") return;
+		const state = this.getHindsightSessionState();
+		if (!state || state.aliasOf) return;
+		state.resetConversationTracking();
+	}
+
 	/**
 	 * Remove all listeners, flush pending writes, and disconnect from agent.
 	 * Call this when completely done with the session.
@@ -1994,6 +2022,9 @@ export class AgentSession {
 		this.#stopPowerAssertion();
 		await this.sessionManager.close();
 		this.#closeAllProviderSessions("dispose");
+		const hindsightState = this.setHindsightSessionState(undefined);
+		await hindsightState?.flushRetainQueue();
+		hindsightState?.dispose();
 		this.#disconnectFromAgent();
 		this.#eventListeners = [];
 	}
@@ -3626,6 +3657,8 @@ export class AgentSession {
 		await this.sessionManager.newSession(options);
 		this.setTodoPhases([]);
 		this.agent.sessionId = this.sessionManager.getSessionId();
+		this.#rekeyHindsightMemoryForCurrentSessionId();
+		this.#resetHindsightConversationTrackingIfHindsight();
 		this.#steeringMessages = [];
 		this.#followUpMessages = [];
 		this.#pendingNextTurnMessages = [];
@@ -3719,6 +3752,7 @@ export class AgentSession {
 
 		// Update agent session ID
 		this.agent.sessionId = this.sessionManager.getSessionId();
+		this.#rekeyHindsightMemoryForCurrentSessionId();
 
 		// Emit session_switch event with reason "fork" to hooks
 		if (this.#extensionRunner) {
@@ -4261,7 +4295,7 @@ export class AgentSession {
 		if (!backend.preCompactionContext) return undefined;
 		const messages = preparation.messagesToSummarize.concat(preparation.turnPrefixMessages);
 		try {
-			return await backend.preCompactionContext(messages, this.settings);
+			return await backend.preCompactionContext(messages, this.settings, this);
 		} catch (err) {
 			logger.debug("Memory backend preCompactionContext failed", {
 				backend: backend.id,
@@ -4425,6 +4459,8 @@ export class AgentSession {
 			await this.sessionManager.newSession(previousSessionFile ? { parentSession: previousSessionFile } : undefined);
 			this.agent.reset();
 			this.agent.sessionId = this.sessionManager.getSessionId();
+			this.#rekeyHindsightMemoryForCurrentSessionId();
+			this.#resetHindsightConversationTrackingIfHindsight();
 			this.#steeringMessages = [];
 			this.#followUpMessages = [];
 			this.#pendingNextTurnMessages = [];
@@ -6571,6 +6607,7 @@ export class AgentSession {
 		try {
 			await this.sessionManager.setSessionFile(sessionPath);
 			this.agent.sessionId = this.sessionManager.getSessionId();
+			this.#rekeyHindsightMemoryForCurrentSessionId();
 
 			const sessionContext = this.buildDisplaySessionContext();
 			const didReloadConversationChange =
@@ -6640,11 +6677,15 @@ export class AgentSession {
 					? undefined
 					: configuredServiceTier;
 
+			if (switchingToDifferentSession) {
+				this.#resetHindsightConversationTrackingIfHindsight();
+			}
 			this.#reconnectToAgent();
 			return true;
 		} catch (error) {
 			this.sessionManager.restoreState(previousSessionState);
 			this.agent.sessionId = previousSessionState.sessionId;
+			this.#rekeyHindsightMemoryForCurrentSessionId();
 			let restoreMcpError: unknown;
 			try {
 				await this.#restoreMCPSelectionsForSessionContext(previousSessionContext, {
@@ -6736,6 +6777,8 @@ export class AgentSession {
 		}
 		this.#syncTodoPhasesFromBranch();
 		this.agent.sessionId = this.sessionManager.getSessionId();
+		this.#rekeyHindsightMemoryForCurrentSessionId();
+		this.#resetHindsightConversationTrackingIfHindsight();
 
 		// Reload messages from entries (works for both file and in-memory mode)
 		const sessionContext = this.buildDisplaySessionContext();

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

@@ -598,6 +598,16 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 			{ name: "reset", description: "Alias for clear" },
 			{ name: "enqueue", description: "Enqueue memory consolidation maintenance" },
 			{ name: "rebuild", description: "Alias for enqueue" },
+			{ name: "mm list", description: "List mental models on the active bank" },
+			{ name: "mm show", description: "Show one mental model (id required)" },
+			{
+				name: "mm refresh",
+				description: "Refresh auto-refresh models bank-wide, or one model by id",
+			},
+			{ name: "mm history", description: "Diff the change history of a mental model" },
+			{ name: "mm seed", description: "Create any built-in mental models that are missing" },
+			{ name: "mm delete", description: "Delete a mental model from the bank (id required)" },
+			{ name: "mm reload", description: "Re-pull the cached <mental_models> block" },
 		],
 		allowArgs: true,
 		handle: async (command, runtime) => {

package/src/task/executor.ts

@@ -17,6 +17,7 @@ import { SETTINGS_SCHEMA, type SettingPath } from "../config/settings-schema";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import { runExtensionCompact, runExtensionSetModel } from "../extensibility/extensions/compact-handler";
 import type { Skill } from "../extensibility/skills";
+import type { HindsightSessionState } from "../hindsight/state";
 import type { LocalProtocolOptions } from "../internal-urls";
 import { callTool } from "../mcp/client";
 import type { MCPManager } from "../mcp/manager";
@@ -163,6 +164,7 @@ export interface ExecutorOptions {
 	settings?: Settings;
 	/** Override local:// protocol options so subagent shares parent's local:// root */
 	localProtocolOptions?: LocalProtocolOptions;
+	parentHindsightSessionState?: HindsightSessionState;
 }
 
 function parseStringifiedJson(value: unknown): unknown {
@@ -979,6 +981,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				hasUI: false,
 				spawns: spawnsEnv,
 				taskDepth: childDepth,
+				parentHindsightSessionState: options.parentHindsightSessionState,
 				parentTaskPrefix: id,
 				agentId: id,
 				agentDisplayName: agent.name,

package/src/task/index.ts

@@ -864,6 +864,7 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 						skills: availableSkills,
 						promptTemplates,
 						localProtocolOptions,
+						parentHindsightSessionState: this.session.getHindsightSessionState?.(),
 					});
 				}
 
@@ -918,6 +919,7 @@ export class TaskTool implements AgentTool<TSchema, TaskToolDetails, Theme> {
 						skills: availableSkills,
 						promptTemplates,
 						localProtocolOptions,
+						parentHindsightSessionState: this.session.getHindsightSessionState?.(),
 					});
 					if (mergeMode === "branch" && result.exitCode === 0) {
 						try {

package/src/tools/hindsight-recall.ts

@@ -1,7 +1,6 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { logger, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { getHindsightSessionState } from "../hindsight/backend";
 import { formatCurrentTime, formatMemories } from "../hindsight/content";
 import recallDescription from "../prompts/tools/recall.md" with { type: "text" };
 import type { ToolSession } from ".";
@@ -30,8 +29,7 @@ export class HindsightRecallTool implements AgentTool<typeof hindsightRecallSche
 
 	async execute(_id: string, params: HindsightRecallParams, signal?: AbortSignal): Promise<AgentToolResult> {
 		return untilAborted(signal, async () => {
-			const sessionId = this.session.getSessionId?.();
-			const state = sessionId ? getHindsightSessionState(sessionId) : undefined;
+			const state = this.session.getHindsightSessionState?.();
 			if (!state) {
 				throw new Error("Hindsight backend is not initialised for this session.");
 			}

package/src/tools/hindsight-reflect.ts

@@ -1,7 +1,6 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { logger, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { getHindsightSessionState } from "../hindsight/backend";
 import { ensureBankMission } from "../hindsight/bank";
 import reflectDescription from "../prompts/tools/reflect.md" with { type: "text" };
 import type { ToolSession } from ".";
@@ -29,8 +28,7 @@ export class HindsightReflectTool implements AgentTool<typeof hindsightReflectSc
 
 	async execute(_id: string, params: HindsightReflectParams, signal?: AbortSignal): Promise<AgentToolResult> {
 		return untilAborted(signal, async () => {
-			const sessionId = this.session.getSessionId?.();
-			const state = sessionId ? getHindsightSessionState(sessionId) : undefined;
+			const state = this.session.getHindsightSessionState?.();
 			if (!state) {
 				throw new Error("Hindsight backend is not initialised for this session.");
 			}

package/src/tools/hindsight-retain.ts

@@ -1,7 +1,5 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { type Static, Type } from "@sinclair/typebox";
-import { getHindsightSessionState } from "../hindsight/backend";
-import { enqueueRetain } from "../hindsight/retain-queue";
 import retainDescription from "../prompts/tools/retain.md" with { type: "text" };
 import type { ToolSession } from ".";
 
@@ -39,18 +37,17 @@ export class HindsightRetainTool implements AgentTool<typeof hindsightRetainSche
 	}
 
 	async execute(_id: string, params: HindsightRetainParams): Promise<AgentToolResult> {
-		const sessionId = this.session.getSessionId?.();
-		const state = sessionId ? getHindsightSessionState(sessionId) : undefined;
-		if (!state || !sessionId) {
+		const state = this.session.getHindsightSessionState?.();
+		if (!state) {
 			throw new Error("Hindsight backend is not initialised for this session.");
 		}
 
-		// Push every item onto the global queue and return immediately. The
-		// queue flushes either when it reaches its batch threshold or when its
-		// debounce timer fires. If the eventual batch fails, the queue
+		// Push every item onto the session-owned queue and return immediately.
+		// The queue flushes either when it reaches its batch threshold or when
+		// its debounce timer fires. If the eventual batch fails, the queue
 		// surfaces a UI-only warning notice — the LLM is not informed.
 		for (const item of params.items) {
-			enqueueRetain(sessionId, item.content, item.context);
+			state.enqueueRetain(item.content, item.context);
 		}
 
 		const count = params.items.length;

package/src/tools/index.ts

@@ -7,6 +7,7 @@ import type { Settings } from "../config/settings";
 import { EditTool } from "../edit";
 import { checkPythonKernelAvailability } from "../eval/py/kernel";
 import type { Skill } from "../extensibility/skills";
+import type { HindsightSessionState } from "../hindsight/state";
 import type { InternalUrlRouter } from "../internal-urls";
 import { LspTool } from "../lsp";
 import type { DiscoverableMCPSearchIndex, DiscoverableMCPTool } from "../mcp/discoverable-tool-metadata";
@@ -141,6 +142,8 @@ export interface ToolSession {
 	trackEvalExecution?<T>(execution: Promise<T>, abortController: AbortController): Promise<T>;
 	/** Get session ID */
 	getSessionId?: () => string | null;
+	/** Get Hindsight runtime state for this agent session. */
+	getHindsightSessionState?: () => HindsightSessionState | undefined;
 	/** Agent identity used for IRC routing. Returns the registry id (e.g. "0-Main", "0-AuthLoader"). */
 	getAgentId?: () => string | null;
 	/** Look up a registered tool by name (used by the eval js backend's tool bridge). */

package/src/hindsight/retain-queue.ts

@@ -1,166 +0,0 @@
-/**
- * Global, debounced batch queue for tool-initiated `retain` calls.
- *
- * The `retain` tool used to block on a single-item HTTP round trip per
- * invocation. Now it pushes onto a per-session queue and returns immediately;
- * a flush fires when:
- *   1. the queue reaches `FLUSH_BATCH_SIZE`, or
- *   2. `FLUSH_INTERVAL_MS` elapses since the queue first became non-empty.
- *
- * On batch failure we surface a UI-only notice via `session.emitNotice` —
- * a single yellow "Hindsight: memory retention failed …" line in the TUI.
- * The LLM is NOT told; the agent already received "Memory queued" and has
- * moved on. This is purely so the user knows their facts didn't persist.
- *
- * Auto-retain (`retainSession` in backend.ts) is intentionally NOT routed
- * through this queue — it submits a full transcript as one large item and
- * already runs `async: true` server-side.
- */
-
-import { logger } from "@oh-my-pi/pi-utils";
-import { getHindsightSessionState, type HindsightSessionState } from "./backend";
-import { ensureBankMission } from "./bank";
-import type { MemoryItemInput } from "./client";
-
-const FLUSH_BATCH_SIZE = 16;
-const FLUSH_INTERVAL_MS = 5_000;
-
-interface PendingItem {
-	content: string;
-	context?: string;
-}
-
-interface SessionQueue {
-	items: PendingItem[];
-	timer?: NodeJS.Timeout;
-	/** Currently in-flight flush; subsequent flushes await it before running. */
-	flushing?: Promise<void>;
-}
-
-const QUEUES = new Map<string, SessionQueue>();
-
-/** Push a memory item onto the session's retain queue. Returns immediately. */
-export function enqueueRetain(sessionId: string, content: string, context?: string): void {
-	const queue = QUEUES.get(sessionId) ?? createQueue(sessionId);
-	queue.items.push({ content, context });
-
-	if (queue.items.length >= FLUSH_BATCH_SIZE) {
-		void flushSessionQueue(sessionId);
-		return;
-	}
-	if (!queue.timer) {
-		queue.timer = setTimeout(() => {
-			void flushSessionQueue(sessionId);
-		}, FLUSH_INTERVAL_MS);
-		// Don't pin the event loop alive just for a pending retain flush.
-		queue.timer.unref?.();
-	}
-}
-
-/** Flush a single session's queue. Safe to call when empty or already in flight. */
-export async function flushSessionQueue(sessionId: string): Promise<void> {
-	const queue = QUEUES.get(sessionId);
-	if (!queue) return;
-
-	if (queue.timer) {
-		clearTimeout(queue.timer);
-		queue.timer = undefined;
-	}
-
-	if (queue.flushing) {
-		// Coalesce: wait for the in-flight flush, then drain anything that
-		// landed after it started so we don't strand items.
-		await queue.flushing;
-		if (queue.items.length > 0) {
-			await flushSessionQueue(sessionId);
-		}
-		return;
-	}
-
-	if (queue.items.length === 0) {
-		QUEUES.delete(sessionId);
-		return;
-	}
-
-	const items = queue.items.splice(0);
-	const flushPromise = doFlush(sessionId, items);
-	queue.flushing = flushPromise;
-	try {
-		await flushPromise;
-	} finally {
-		queue.flushing = undefined;
-		if (queue.items.length === 0 && !queue.timer) {
-			QUEUES.delete(sessionId);
-		}
-	}
-}
-
-/** Flush every pending session queue. Called from `clear`/`enqueue` backend hooks. */
-export async function flushAllRetainQueues(): Promise<void> {
-	const ids = [...QUEUES.keys()];
-	await Promise.all(ids.map(id => flushSessionQueue(id)));
-}
-
-/** Test helper: clear timers and pending items without triggering flushes. */
-export function clearRetainQueueForTest(): void {
-	for (const queue of QUEUES.values()) {
-		if (queue.timer) clearTimeout(queue.timer);
-	}
-	QUEUES.clear();
-}
-
-/** Test helper: peek at queued count for a session. */
-export function getRetainQueueDepthForTest(sessionId: string): number {
-	return QUEUES.get(sessionId)?.items.length ?? 0;
-}
-
-async function doFlush(sessionId: string, items: PendingItem[]): Promise<void> {
-	const state = getHindsightSessionState(sessionId);
-	if (!state) {
-		// Session went away before we could flush. We can't notify anyone, so
-		// log and drop — these are best-effort facts, not transactional writes.
-		logger.warn("Hindsight retain queue: session vanished, dropping batch", {
-			sessionId,
-			items: items.length,
-		});
-		return;
-	}
-
-	try {
-		await ensureBankMission(state.client, state.bankId, state.config, state.missionsSet);
-		const batch: MemoryItemInput[] = items.map(item => ({
-			content: item.content,
-			context: item.context ?? state.config.retainContext,
-			metadata: { session_id: sessionId },
-			tags: state.retainTags,
-		}));
-		await state.client.retainBatch(state.bankId, batch, { async: true });
-		if (state.config.debug) {
-			logger.debug("Hindsight retain queue: batch flushed", {
-				sessionId,
-				bankId: state.bankId,
-				items: items.length,
-			});
-		}
-	} catch (err) {
-		const errorText = err instanceof Error ? err.message : String(err);
-		logger.warn("Hindsight retain queue: batch flush failed", {
-			sessionId,
-			bankId: state.bankId,
-			items: items.length,
-			error: errorText,
-		});
-		notifyRetainFailure(state, items.length, errorText);
-	}
-}
-
-function notifyRetainFailure(state: HindsightSessionState, count: number, errorText: string): void {
-	const noun = count === 1 ? "memory" : "memories";
-	state.session.emitNotice("warning", `Memory retention failed for ${count} ${noun}: ${errorText}`, "Hindsight");
-}
-
-function createQueue(sessionId: string): SessionQueue {
-	const queue: SessionQueue = { items: [] };
-	QUEUES.set(sessionId, queue);
-	return queue;
-}