@oh-my-pi/pi-coding-agent 13.9.16 → 13.10.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [13.10.1] - 2026-03-10
+### Added
+
+- Exported `submitInteractiveInput()` function for programmatic submission of user input in interactive mode
+- Added proactive OAuth token refresh for MCP server connections with 5-minute expiry buffer
+- Added reactive 401/403 retry with automatic token refresh on HTTP MCP transports
+- Added `refreshMCPOAuthToken()` for standard OAuth 2.0 refresh_token grants
+- Persisted `tokenUrl`, `clientId`, and `clientSecret` in MCP auth config for cross-session token refresh
+
+## [13.10.0] - 2026-03-10
+### Fixed
+
+- Preserved text signature metadata (id and phase) when building OpenAI native history during session compaction
+
 ## [13.9.16] - 2026-03-10
 ### Breaking Changes
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.9.16",
+	"version": "13.10.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.9.16",
-		"@oh-my-pi/pi-agent-core": "13.9.16",
-		"@oh-my-pi/pi-ai": "13.9.16",
-		"@oh-my-pi/pi-natives": "13.9.16",
-		"@oh-my-pi/pi-tui": "13.9.16",
-		"@oh-my-pi/pi-utils": "13.9.16",
+		"@oh-my-pi/omp-stats": "13.10.1",
+		"@oh-my-pi/pi-agent-core": "13.10.1",
+		"@oh-my-pi/pi-ai": "13.10.1",
+		"@oh-my-pi/pi-natives": "13.10.1",
+		"@oh-my-pi/pi-tui": "13.10.1",
+		"@oh-my-pi/pi-utils": "13.10.1",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/main.ts

@@ -26,6 +26,7 @@ import { exportFromFile } from "./export/html";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
 import { InteractiveMode, runPrintMode, runRpcMode } from "./modes";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
+import type { SubmittedUserInput } from "./modes/types";
 import { type CreateAgentSessionOptions, createAgentSession, discoverAuthStorage } from "./sdk";
 import type { AgentSession } from "./session/agent-session";
 import { resolveResumableSession, type SessionInfo, SessionManager } from "./session/session-manager";
@@ -66,6 +67,29 @@ export interface InteractiveModeNotify {
 	message: string;
 }
 
+export async function submitInteractiveInput(
+	mode: Pick<InteractiveMode, "markPendingSubmissionStarted" | "finishPendingSubmission" | "showError">,
+	session: Pick<AgentSession, "prompt">,
+	input: SubmittedUserInput,
+): Promise<void> {
+	if (input.cancelled) {
+		return;
+	}
+
+	try {
+		// Continue shortcuts submit an already-started empty prompt with no optimistic user message.
+		if (!input.started && !mode.markPendingSubmissionStarted(input)) {
+			return;
+		}
+		await session.prompt(input.text, { images: input.images });
+	} catch (error: unknown) {
+		const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+		mode.showError(errorMessage);
+	} finally {
+		mode.finishPendingSubmission(input);
+	}
+}
+
 async function runInteractiveMode(
 	session: AgentSession,
 	version: string,
@@ -126,20 +150,7 @@ async function runInteractiveMode(
 
 	while (true) {
 		const input = await mode.getUserInput();
-		if (input.cancelled) {
-			continue;
-		}
-		try {
-			if (!mode.markPendingSubmissionStarted(input)) {
-				continue;
-			}
-			await session.prompt(input.text, { images: input.images });
-		} catch (error: unknown) {
-			const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-			mode.showError(errorMessage);
-		} finally {
-			mode.finishPendingSubmission(input);
-		}
+		await submitInteractiveInput(mode, session, input);
 	}
 }
 

package/src/mcp/manager.ts

@@ -25,9 +25,11 @@ import {
 	unsubscribeFromResources,
 } from "./client";
 import { loadAllMCPConfigs, validateServerConfig } from "./config";
+import { refreshMCPOAuthToken } from "./oauth-flow";
 import type { MCPToolDetails } from "./tool-bridge";
 import { DeferredMCPTool, MCPTool } from "./tool-bridge";
 import type { MCPToolCache } from "./tool-cache";
+import { HttpTransport } from "./transports/http";
 import type {
 	MCPGetPromptResult,
 	MCPPrompt,
@@ -315,6 +317,18 @@ export class MCPManager {
 						this.#pendingConnections.delete(name);
 						this.#connections.set(name, connection);
 					}
+
+					// Wire auth refresh for HTTP transports so 401s trigger token refresh
+					if (connection.transport instanceof HttpTransport && config.auth?.type === "oauth") {
+						connection.transport.onAuthError = async () => {
+							const refreshed = await this.#resolveAuthConfig(config, true);
+							if (refreshed.type === "http" || refreshed.type === "sse") {
+								return refreshed.headers ?? null;
+							}
+							return null;
+						};
+					}
+
 					return connection;
 				},
 				error => {
@@ -814,15 +828,39 @@ export class MCPManager {
 	/**
 	 * Resolve OAuth credentials and shell commands in config.
 	 */
-	async #resolveAuthConfig(config: MCPServerConfig): Promise<MCPServerConfig> {
+	async #resolveAuthConfig(config: MCPServerConfig, forceRefresh = false): Promise<MCPServerConfig> {
 		let resolved: MCPServerConfig = { ...config };
 
 		const auth = config.auth;
 		if (auth?.type === "oauth" && auth.credentialId && this.#authStorage) {
 			const credentialId = auth.credentialId;
 			try {
-				const credential = this.#authStorage.get(credentialId);
+				let credential = this.#authStorage.get(credentialId);
 				if (credential?.type === "oauth") {
+					// Proactive refresh: 5-minute buffer before expiry
+					// Force refresh: on 401/403 auth errors (revoked tokens, clock skew, missing expires)
+					const REFRESH_BUFFER_MS = 5 * 60_000;
+					const shouldRefresh =
+						forceRefresh || (credential.expires && Date.now() >= credential.expires - REFRESH_BUFFER_MS);
+					if (shouldRefresh && credential.refresh && auth.tokenUrl) {
+						try {
+							const refreshed = await refreshMCPOAuthToken(
+								auth.tokenUrl,
+								credential.refresh,
+								auth.clientId,
+								auth.clientSecret,
+							);
+							const refreshedCredential = { type: "oauth" as const, ...refreshed };
+							await this.#authStorage.set(credentialId, refreshedCredential);
+							credential = refreshedCredential;
+						} catch (refreshError) {
+							logger.warn("MCP OAuth refresh failed, using existing token", {
+								credentialId,
+								error: refreshError,
+							});
+						}
+					}
+
 					if (resolved.type === "http" || resolved.type === "sse") {
 						resolved = {
 							...resolved,

package/src/mcp/oauth-flow.ts

@@ -254,3 +254,44 @@ export class MCPOAuthFlow extends OAuthCallbackFlow {
 		}
 	}
 }
+
+/**
+ * Refresh an MCP OAuth token using the standard refresh_token grant.
+ * Returns updated credentials; preserves the old refresh token if the server doesn't rotate it.
+ */
+export async function refreshMCPOAuthToken(
+	tokenUrl: string,
+	refreshToken: string,
+	clientId?: string,
+	clientSecret?: string,
+): Promise<OAuthCredentials> {
+	const params = new URLSearchParams({
+		grant_type: "refresh_token",
+		refresh_token: refreshToken,
+	});
+	if (clientId) params.set("client_id", clientId);
+	if (clientSecret) params.set("client_secret", clientSecret);
+
+	const response = await fetch(tokenUrl, {
+		method: "POST",
+		headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		body: params.toString(),
+	});
+
+	if (!response.ok) {
+		const text = await response.text();
+		throw new Error(`MCP OAuth refresh failed: ${response.status} ${text}`);
+	}
+
+	const data = (await response.json()) as {
+		access_token: string;
+		refresh_token?: string;
+		expires_in?: number;
+	};
+	const expiresIn = data.expires_in ?? 3600;
+	return {
+		access: data.access_token,
+		refresh: data.refresh_token ?? refreshToken,
+		expires: Date.now() + expiresIn * 1000,
+	};
+}

package/src/mcp/transports/http.ts

@@ -26,6 +26,8 @@ export class HttpTransport implements MCPTransport {
 	onClose?: () => void;
 	onError?: (error: Error) => void;
 	onNotification?: (method: string, params: unknown) => void;
+	/** Called on 401/403 to attempt token refresh. Returns updated headers or null. */
+	onAuthError?: () => Promise<Record<string, string> | null>;
 
 	constructor(private config: MCPHttpServerConfig | MCPSseServerConfig) {}
 
@@ -102,6 +104,27 @@ export class HttpTransport implements MCPTransport {
 		method: string,
 		params?: Record<string, unknown>,
 		options?: MCPRequestOptions,
+	): Promise<T> {
+		try {
+			return await this.#executeRequest<T>(method, params, options);
+		} catch (error) {
+			// Retry once on auth failure if onAuthError is wired
+			if (this.onAuthError && error instanceof Error && /^HTTP (401|403):/.test(error.message)) {
+				const newHeaders = await this.onAuthError();
+				if (newHeaders) {
+					// Persist refreshed headers so subsequent requests use them directly
+					this.config = { ...this.config, headers: newHeaders };
+					return this.#executeRequest<T>(method, params, options);
+				}
+			}
+			throw error;
+		}
+	}
+
+	async #executeRequest<T>(
+		method: string,
+		params: Record<string, unknown> | undefined,
+		options: MCPRequestOptions | undefined,
 	): Promise<T> {
 		if (!this.#connected) {
 			throw new Error("Transport not connected");

package/src/mcp/types.ts

@@ -49,6 +49,12 @@ export interface MCPAuthConfig {
 	type: "oauth" | "apikey";
 	/** Credential ID for OAuth (references agent.db) */
 	credentialId?: string;
+	/** Token endpoint URL — persisted for proactive token refresh */
+	tokenUrl?: string;
+	/** Client ID — persisted for token refresh */
+	clientId?: string;
+	/** Client secret — persisted for token refresh */
+	clientSecret?: string;
 }
 
 /** Base server config with shared options */

package/src/modes/components/mcp-add-wizard.ts

@@ -1030,6 +1030,9 @@ export class MCPAddWizard extends Container {
 				config.auth = {
 					type: "oauth",
 					credentialId: this.#state.oauthCredentialId,
+					tokenUrl: this.#state.oauthTokenUrl || undefined,
+					clientId: this.#state.oauthClientId || undefined,
+					clientSecret: this.#state.oauthClientSecret || undefined,
 				};
 			}
 
@@ -1054,6 +1057,9 @@ export class MCPAddWizard extends Container {
 			config.auth = {
 				type: "oauth",
 				credentialId: this.#state.oauthCredentialId,
+				tokenUrl: this.#state.oauthTokenUrl || undefined,
+				clientId: this.#state.oauthClientId || undefined,
+				clientSecret: this.#state.oauthClientSecret || undefined,
 			};
 		}
 
@@ -1250,6 +1256,9 @@ export class MCPAddWizard extends Container {
 				config.auth = {
 					type: "oauth",
 					credentialId: this.#state.oauthCredentialId,
+					tokenUrl: this.#state.oauthTokenUrl || undefined,
+					clientId: this.#state.oauthClientId || undefined,
+					clientSecret: this.#state.oauthClientSecret || undefined,
 				};
 			}
 
@@ -1275,6 +1284,9 @@ export class MCPAddWizard extends Container {
 			config.auth = {
 				type: "oauth",
 				credentialId: this.#state.oauthCredentialId,
+				tokenUrl: this.#state.oauthTokenUrl || undefined,
+				clientId: this.#state.oauthClientId || undefined,
+				clientSecret: this.#state.oauthClientSecret || undefined,
 			};
 		}
 

package/src/modes/components/settings-defs.ts

@@ -226,7 +226,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 			label: "Auto",
 			description: "Preferred web-search provider",
 		},
-		{ value: "exa", label: "Exa", description: "Requires EXA_API_KEY" },
+		{ value: "exa", label: "Exa", description: "Uses Exa API when EXA_API_KEY is set; falls back to Exa MCP" },
 		{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
 		{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
 		{ value: "kimi", label: "Kimi", description: "Requires MOONSHOT_SEARCH_API_KEY or MOONSHOT_API_KEY" },

package/src/modes/controllers/mcp-command-controller.ts

@@ -413,6 +413,9 @@ export class MCPCommandController {
 								auth: {
 									type: "oauth",
 									credentialId,
+									tokenUrl: oauth.tokenUrl,
+									clientId: oauth.clientId ?? finalConfig.oauth?.clientId,
+									clientSecret: undefined,
 								},
 							};
 						} catch (oauthError) {
@@ -1296,7 +1299,9 @@ export class MCPCommandController {
 			}
 
 			const currentAuth = (
-				found.config as MCPServerConfig & { auth?: { type: "oauth" | "apikey"; credentialId?: string } }
+				found.config as MCPServerConfig & {
+					auth?: { type: "oauth" | "apikey"; credentialId?: string; clientSecret?: string };
+				}
 			).auth;
 			if (currentAuth?.type === "oauth") {
 				await this.#removeManagedOAuthCredential(currentAuth.credentialId);
@@ -1321,6 +1326,9 @@ export class MCPCommandController {
 				auth: {
 					type: "oauth",
 					credentialId,
+					tokenUrl: oauth.tokenUrl,
+					clientId: oauth.clientId ?? found.config.oauth?.clientId,
+					clientSecret: currentAuth?.clientSecret,
 				},
 			};
 			await updateMCPServer(found.filePath, name, updated);

package/src/prompts/tools/hashline.md

@@ -1,14 +1,5 @@
 Applies precise, surgical file edits by referencing `LINE#ID` tags from `read` output. Each tag uniquely identifies a line, so edits remain stable even when lines shift.
 
-<critical>
-- Never anchor insertions on blank lines or lone closing delimiters like `}`, `]`, `)`, `};`, or `),` — they are mechanically valid tags but semantically unstable edit boundaries.
-- For `append`/`prepend`, `lines` **MUST** contain only the newly introduced content. Do not re-emit surrounding braces, brackets, parentheses, or sibling declarations that already exist in the file.
-- `append`/`prepend` are for self-contained new content only: sibling declarations, new object/list members, new test cases, or similar additions whose surrounding structure stays unchanged.
-- When changing existing code near a block tail or closing delimiter, default to `replace` over the owned span instead of inserting around the boundary.
-- When adding a sibling declaration, default to `prepend` on the next sibling declaration instead of `append` on the previous block's closing brace.
-- If any inserted line is just a closing delimiter, stop and re-check the edit shape. A closing line is only valid when it belongs to newly introduced structure; if it belongs to surrounding existing structure, your edit should be a `replace` that consumes the old boundary.
-</critical>
-
 <workflow>
 Follow these steps in order for every edit:
 1. You **SHOULD** issue a `read` call before editing to get fresh `LINE#ID` tags. Editing without current tags causes mismatches because other edits or external changes may have shifted line numbers since your last read.
@@ -21,15 +12,14 @@ Before choosing the payload, answer these questions in order:
 1. **Am I replacing existing lines or inserting new ones?** If any existing line changes, use `replace` for the full changed span.
 2. **What declaration or block owns this anchor line?** Prefer declaration/header lines over blank lines or delimiters.
 3. **Am I inserting self-contained new content, or changing an existing block?** Use `append`/`prepend` only for self-contained additions. If surrounding code, indentation, or closers also change, use `replace`.
-4. **Am I editing near a block tail or closing delimiter?** If yes, expand the edit to own that tail instead of patching just the last line or two.
-5. **Does `lines` contain only new content?** For `append`/`prepend`, do not include existing closing braces or other surrounding syntax from the file.
-6. **Would the replacement duplicate the line immediately after `end`?** If yes, extend the range to consume the old boundary.
+4. **Am I editing near a block tail or closing delimiter?** If yes, use shape (a) or (b) from the block-boundaries rule: either stay entirely inside the body, or own the full block including header and closer. Never set `end` at a closer without re-emitting it, and never re-emit a closer without including it in `end`.
 </checklist>
 
 <operations>
 **`path`** — the path to the file to edit.
 **`move`** — if set, move the file to the given path.
 **`delete`** — if true, delete the file.
+
 **`edits[n].pos`** — the anchor line. Meaning depends on `op`:
   - if `replace`: line to rewrite
   - if `prepend`: line to insert new lines **before**; omit for beginning of file
@@ -40,24 +30,16 @@ Before choosing the payload, answer these questions in order:
   - `[""]` — blank line
   - `null` or `[]` — delete if replace, no-op if append or prepend
 
-Tags are applied bottom-up: later edits (by position) are applied first, so earlier tags remain valid even when subsequent ops add or remove lines. Tags **MUST** be referenced from the most recent `read` output.
+Ops are applied bottom-up. Tags **MUST** be referenced from the most recent `read` output.
 </operations>
 
 <rules>
-1. **Anchor on unique declaration or header lines, not delimiters.** Safe anchors are lines like `function beta() {`, `if (…) {`, `const value =`, or other unique structural headers. Blank lines and lone closers like `}` are never good insertion anchors.
-2. **Use `prepend`/`append` only for self-contained additions whose surrounding structure stays unchanged.** If you are adding a sibling declaration, prefer `prepend` on the next sibling declaration instead of `append` on the previous block closer.
-3. **If the change touches existing code near a block tail, use range `replace` over the owned span.** Do not patch just the final line(s) before a closing delimiter when the surrounding structure, indentation, or control flow is also changing.
-4. **Match surrounding indentation for new lines.** When inserting via `prepend`/`append`, look at the anchor line and its neighbors in the `read` output. New `lines` entries **MUST** carry the same leading whitespace. If the context uses tabs at depth 1 (`\t`), your inserted declarations need `\t` and bodies need `\t\t`. Inserting at indent level 0 inside an indented block is always wrong.
-5. **Consume the old closing boundary when your replacement emits one.** If the replacement's final line is a closing delimiter like `}`, `]`, or `)`, the `end` line **MUST** include the original matching closer that would otherwise remain in the file. Before submitting, compare the replacement's last line with the line immediately after `end`; if they would be the same boundary, extend the range so the old closer is removed.
-6. **If you expect a second tiny cleanup edit for `}`, `};`, indentation, or a duplicated boundary, your first edit shape is wrong.** Expand the first `replace` so it owns the structural tail in one shot.
+1. **Use `prepend`/`append` only for self-contained additions whose surrounding structure stays unchanged.** If you are adding a sibling declaration, prefer `prepend` on the next sibling declaration instead of `append` on the previous block closer.
+2. **If the change touches existing code near a block tail, use range `replace` over the owned span.** Do not patch just the final line(s) before a closing delimiter when the surrounding structure, indentation, or control flow is also changing.
+3. **Match surrounding indentation for new lines.** When inserting via `prepend`/`append`, look at the anchor line and its neighbors in the `read` output. New `lines` entries **MUST** carry the same leading whitespace. If the context uses tabs at depth 1 (`\t`), your inserted declarations need `\t` and bodies need `\t\t`. Inserting at indent level 0 inside an indented block is always wrong.
+4. **Block boundaries travel together — never split them.** See the block-boundaries rule in `<critical>`. The two valid shapes are: replace only the body (leave header and closer untouched), or replace the whole block (header through closer, re-emit all in `lines`). Do not set `end` to a closer and omit it from `lines` (deletes it). Do not emit a closer in `lines` without including it in `end` (duplicates it).
 </rules>
 
-<recovery>
-Edits can fail in two ways. Here is exactly what to do for each:
-1. **Tag mismatch (`>>>`):** The file changed since your last read, so the tag no longer matches. You **MUST** retry using the fresh tags from the error snippet. If the snippet lacks enough context, or if you fail repeatedly, you **MUST** re-read the entire file and submit a simpler, single-op edit.
-2. **No-op (`identical`):** Your replacement is identical to the existing content — nothing changed. You **MUST NOT** resubmit the same edit. Re-read the target lines to understand what is actually there, then adjust your edit.
-</recovery>
-
 <examples>
 All examples below reference the same file, `util.ts`:
 ```ts
@@ -135,63 +117,61 @@ Blank out a line without removing it:
 ```
 </example>
 
-<example name="rewrite a block">
-Replace the catch body with smarter error handling:
+<example name="rewrite a block body — shape (a)">
+Replace the catch body with smarter error handling. Shape (a): `pos` is the first body line, `end` is the last body line. The catch header (line 14) and its closer (line 17) are outside the range and stay untouched.
 ```
 {
   path: "util.ts",
   edits: [{
     op: "replace",
     pos: {{hlineref 15 "\t\tconsole.error(err);"}},
-    end: {{hlineref 17 "\t}"}},
+    end: {{hlineref 16 "\t\treturn null;"}},
     lines: [
       "\t\tif (isEnoent(err)) return null;",
-      "\t\tthrow err;",
-      "\t}"
+      "\t\tthrow err;"
     ]
   }]
 }
 ```
 </example>
 
-<example name="own the block tail instead of patching around it">
-When changing the tail of an existing block, replace the owned span instead of appending just before the closer.
+<example name="span the full body, not a single line">
+When changing body content, replace the entire body span — not just one line inside it. Patching one line leaves the rest of the body stale.
 
-Bad — appending a new return before the existing closer leaves the old tail in place and often leads to a second cleanup edit:
+Bad — appends after one body line, leaving the original `return null` in place:
 ```
 {
   path: "util.ts",
   edits: [{
     op: "append",
-    pos: {{hlineref 16 "\t\treturn null;"}},
+    pos: {{hlineref 15 "\t\tconsole.error(err);"}},
     lines: [
       "\t\treturn fallback;"
     ]
   }]
 }
 ```
-Good — replace the block tail so the new logic and the closing boundary are owned by one edit:
+Good — shape (a): replace the full body span. Header and closer stay untouched:
 ```
 {
   path: "util.ts",
   edits: [{
     op: "replace",
     pos: {{hlineref 15 "\t\tconsole.error(err);"}},
-    end: {{hlineref 17 "\t}"}},
+    end: {{hlineref 16 "\t\treturn null;"}},
     lines: [
       "\t\tif (isEnoent(err)) return null;",
-      "\t\treturn fallback;",
-      "\t}"
+      "\t\treturn fallback;"
     ]
   }]
 }
 ```
 </example>
 
-<example name="inclusive end avoids duplicate boundary">
-Simplify `beta()` to a one-liner. `end` must include the original closing `}` when the replacement also ends with `}`.
+<example name="replace whole block — shape (b)">
+Simplify `beta()` to a one-liner. Shape (b): `pos`=header, `end`=closer, re-emit all in `lines`.
 
-Bad — `end` stops at line 17 (`\t}`), so the replacement adds `}` and the original function closer on line 18 survives. Result: two consecutive `}` lines.
+Bad — `end` stops at the inner `\t}` on line 17, so the outer `}` on line 18 survives. Result: two consecutive `}` lines.
 ```
 {
   path: "util.ts",
@@ -207,7 +187,7 @@ Bad — `end` stops at line 17 (`\t}`), so the replacement adds `}` and the orig
   }]
 }
 ```
-Good — include the function's own `}` on line 18 in the range, so the old closing boundary is consumed:
+Good — `end` includes the function's own `}` on line 18, so the old closer is consumed:
 ```
 {
   path: "util.ts",
@@ -284,11 +264,12 @@ Good — prepend before the next declaration so the new sibling is anchored on a
 </examples>
 
 <critical>
-- Edit payload: `{ path, edits[] }`. Each entry: `op`, `lines`, optional `pos`/`end`. No extra keys.
+- You **MUST NOT** use this tool to reformat, reindent, or adjust whitespace — run the project's formatter instead.
 - Every tag **MUST** be copied exactly from your most recent `read` output as `N#ID`. Stale or mistyped tags cause mismatches.
-- You **MUST** re-read the file after each edit call before issuing another on the same file. Tags shift after every edit, so reusing old tags produces mismatches.
-- You **MUST NOT** use this tool to reformat, reindent, or adjust whitespace — run the project's formatter instead. If the only difference is whitespace, it is formatting; leave it alone.
-- `lines` entries **MUST** be literal file content with indentation copied exactly from the `read` output. If the file uses tabs, use `\t` in JSON (a real tab character). Using `\\t` (backslash + t) writes the literal two-character string `\t` into the file.
-- For `append`/`prepend`, `lines` **MUST NOT** repeat surrounding delimiters or existing sibling code. Insert only the new content.
-- Before any range `replace`, you **MUST** check whether the replacement's last line duplicates the original line immediately after `end` (most often a closing `}`, `]`, or `)`). If it does, extend the range to consume that old boundary instead of leaving two closers behind.
+- Edit payload: `{ path, edits[] }`. Each entry: `op`, `lines`, optional `pos`/`end`. No extra keys.
+- For `append`/`prepend`, `lines` **MUST** contain only the newly introduced content. Do not re-emit surrounding content, or terminators that already exist.
+- When changing existing code near a block tail or closing delimiter, default to `replace` over the owned span instead of inserting around the boundary.
+- When adding a sibling declaration, default to `prepend` on the next sibling declaration instead of `append` on the previous block's closing brace.
+- **Block boundaries travel together.** For a block `{ header / body / closer }`, there are exactly two valid replace shapes: (a) replace only the body — `pos`=first body line, `end`=last body line, leave the header and closer untouched; or (b) replace the whole block — `pos`=header, `end`=closer, re-emit all three in `lines`. Never split them: do not set `end` to the closer while omitting it from `lines` (deletes it), and do not emit the closer in `lines` without including it in `end` (duplicates it). This applies to every block terminator: `}`, `continue`, `break`, `return`, `throw`.
+- `lines` entries **MUST** be literal file content with indentation copied exactly from the `read` output. If the file uses tabs, use a real tab character.
 </critical>

package/src/session/compaction/compaction.ts

@@ -12,6 +12,7 @@ import {
 	OPENAI_HEADER_VALUES,
 	OPENAI_HEADERS,
 } from "@oh-my-pi/pi-ai/providers/openai-codex/constants";
+import { parseTextSignature } from "@oh-my-pi/pi-ai/providers/openai-responses-shared";
 import { transformMessages } from "@oh-my-pi/pi-ai/providers/transform-messages";
 import {
 	getOpenAIResponsesHistoryItems,
@@ -739,7 +740,8 @@ function buildOpenAiNativeHistory(
 
 				if (block.type === "text") {
 					if (!block.text || block.text.trim().length === 0) continue;
-					let msgId = block.textSignature;
+					const parsedSignature = parseTextSignature(block.textSignature);
+					let msgId = parsedSignature?.id;
 					if (!msgId) {
 						msgId = `msg_${msgIndex}`;
 					} else if (msgId.length > 64) {
@@ -751,6 +753,7 @@ function buildOpenAiNativeHistory(
 						content: [{ type: "output_text", text: block.text.toWellFormed(), annotations: [] }],
 						status: "completed",
 						id: msgId,
+						phase: parsedSignature?.phase,
 					});
 					continue;
 				}

package/src/session/session-manager.ts

@@ -629,15 +629,11 @@ function writeTerminalBreadcrumb(cwd: string, sessionFile: string): void {
 	const terminalId = getTerminalId();
 	if (!terminalId) return;
 
-	try {
-		const breadcrumbDir = path.join(getDefaultAgentDir(), TERMINAL_SESSIONS_DIR);
-		const breadcrumbFile = path.join(breadcrumbDir, terminalId);
-		const content = `${cwd}\n${sessionFile}\n`;
-		// Bun.write auto-creates parent dirs
-		void Bun.write(breadcrumbFile, content);
-	} catch {
-		// Best-effort — don't break session creation if breadcrumb fails
-	}
+	const breadcrumbDir = path.join(getDefaultAgentDir(), TERMINAL_SESSIONS_DIR);
+	const breadcrumbFile = path.join(breadcrumbDir, terminalId);
+	const content = `${cwd}\n${sessionFile}\n`;
+	// Best-effort — don't break session creation if breadcrumb fails
+	Bun.write(breadcrumbFile, content).catch(() => {});
 }
 
 /**

package/src/tools/json-tree.ts

@@ -14,7 +14,7 @@ export const JSON_TREE_SCALAR_LEN_COLLAPSED = 60;
 export const JSON_TREE_SCALAR_LEN_EXPANDED = 2000;
 
 /** Keys injected by the harness that should not be displayed to users */
-const HIDDEN_ARG_KEYS = new Set([INTENT_FIELD]);
+const HIDDEN_ARG_KEYS = new Set([INTENT_FIELD, "__partialJson"]);
 
 /** Strip harness-internal keys from tool args for display */
 export function stripInternalArgs(args: Record<string, unknown>): Record<string, unknown> {