@oh-my-pi/pi-coding-agent 13.6.2 → 13.7.1

package/src/modes/components/status-line.ts

@@ -18,6 +18,7 @@ import {
 import { getPreset } from "./status-line/presets";
 import { renderSegment, type SegmentContext } from "./status-line/segments";
 import { getSeparator } from "./status-line/separators";
+import { calculateTokensPerSecond } from "./status-line/token-rate";
 
 export interface StatusLineSegmentOptions {
 	model?: { showThinkingLevel?: boolean };
@@ -65,6 +66,8 @@ export class StatusLineComponent implements Component {
 	#cachedPrContext: PrCacheContext | undefined = undefined;
 	#prLookupInFlight = false;
 	#defaultBranch?: string;
+	#lastTokensPerSecond: number | null = null;
+	#lastTokensPerSecondTimestamp: number | null = null;
 
 	constructor(private readonly session: AgentSession) {
 		this.#settings = {
@@ -309,11 +312,41 @@ export class StatusLineComponent implements Component {
 		return null;
 	}
 
+	#getTokensPerSecond(): number | null {
+		let lastAssistantTimestamp: number | null = null;
+		for (let i = this.session.state.messages.length - 1; i >= 0; i--) {
+			const message = this.session.state.messages[i];
+			if (message?.role === "assistant") {
+				lastAssistantTimestamp = message.timestamp;
+				break;
+			}
+		}
+
+		if (lastAssistantTimestamp === null) {
+			this.#lastTokensPerSecond = null;
+			this.#lastTokensPerSecondTimestamp = null;
+			return null;
+		}
+
+		const rate = calculateTokensPerSecond(this.session.state.messages, this.session.isStreaming);
+		if (rate !== null) {
+			this.#lastTokensPerSecond = rate;
+			this.#lastTokensPerSecondTimestamp = lastAssistantTimestamp;
+			return rate;
+		}
+
+		if (this.#lastTokensPerSecondTimestamp === lastAssistantTimestamp) {
+			return this.#lastTokensPerSecond;
+		}
+
+		return null;
+	}
+
 	#buildSegmentContext(width: number): SegmentContext {
 		const state = this.session.state;
 
 		// Get usage statistics
-		const usageStats = this.session.sessionManager?.getUsageStatistics() ?? {
+		const aggregateUsageStats = this.session.sessionManager?.getUsageStatistics() ?? {
 			input: 0,
 			output: 0,
 			cacheRead: 0,
@@ -321,6 +354,10 @@ export class StatusLineComponent implements Component {
 			premiumRequests: 0,
 			cost: 0,
 		};
+		const usageStats = {
+			...aggregateUsageStats,
+			tokensPerSecond: this.#getTokensPerSecond(),
+		};
 
 		// Get context percentage
 		const lastAssistantMessage = state.messages

package/src/modes/controllers/extension-ui-controller.ts

@@ -577,8 +577,24 @@ export class ExtensionUiController {
 				finish(undefined);
 			},
 			{
+				onLeft: dialogOptions?.onLeft
+					? () => {
+							this.hideHookSelector();
+							dialogOptions.onLeft?.();
+							finish(undefined);
+						}
+					: undefined,
+				onRight: dialogOptions?.onRight
+					? () => {
+							this.hideHookSelector();
+							dialogOptions.onRight?.();
+							finish(undefined);
+						}
+					: undefined,
+				helpText: dialogOptions?.helpText,
 				initialIndex: dialogOptions?.initialIndex,
 				timeout: dialogOptions?.timeout,
+				onTimeout: dialogOptions?.onTimeout,
 				tui: this.ctx.ui,
 				outline: dialogOptions?.outline,
 				maxVisible,
@@ -651,6 +667,11 @@ export class ExtensionUiController {
 				this.hideHookInput();
 				finish(undefined);
 			},
+			{
+				timeout: dialogOptions?.timeout,
+				onTimeout: dialogOptions?.onTimeout,
+				tui: this.ctx.ui,
+			},
 		);
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(this.ctx.hookInput);

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

@@ -839,6 +839,8 @@ export class MCPCommandController {
 			const userPath = getMCPConfigPath("user", cwd);
 			const projectPath = getMCPConfigPath("project", cwd);
 
+			const userPathLabel = shortenPath(userPath);
+			const projectPathLabel = shortenPath(projectPath);
 			const [userConfig, projectConfig] = await Promise.all([
 				readMCPConfigFile(userPath),
 				readMCPConfigFile(projectPath),
@@ -884,7 +886,7 @@ export class MCPCommandController {
 
 			// Show user-level servers
 			if (userServers.length > 0) {
-				lines.push(theme.fg("accent", "User level") + theme.fg("muted", ` (~/.omp/mcp.json):`));
+				lines.push(theme.fg("accent", "User level") + theme.fg("muted", ` (${userPathLabel}):`));
 				for (const name of userServers) {
 					const config = userConfig.mcpServers![name];
 					const type = config.type ?? "stdio";
@@ -907,7 +909,7 @@ export class MCPCommandController {
 
 			// Show project-level servers
 			if (projectServers.length > 0) {
-				lines.push(theme.fg("accent", "Project level") + theme.fg("muted", ` (.omp/mcp.json):`));
+				lines.push(theme.fg("accent", "Project level") + theme.fg("muted", ` (${projectPathLabel}):`));
 				for (const name of projectServers) {
 					const config = projectConfig.mcpServers![name];
 					const type = config.type ?? "stdio";

package/src/modes/rpc/rpc-mode.ts

@@ -98,6 +98,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 
 			if (opts?.timeout !== undefined) {
 				timeoutId = setTimeout(() => {
+					opts.onTimeout?.();
 					cleanup();
 					resolve(defaultValue);
 				}, opts.timeout);
@@ -119,12 +120,14 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 				dialogOptions,
 				undefined,
 				{ method: "select", title, options, timeout: dialogOptions?.timeout },
-				response =>
-					"cancelled" in response && response.cancelled
-						? undefined
-						: "value" in response
-							? response.value
-							: undefined,
+				response => {
+					if ("cancelled" in response && response.cancelled) {
+						if (response.timedOut) dialogOptions?.onTimeout?.();
+						return undefined;
+					}
+					if ("value" in response) return response.value;
+					return undefined;
+				},
 			);
 		}
 
@@ -133,12 +136,14 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 				dialogOptions,
 				false,
 				{ method: "confirm", title, message, timeout: dialogOptions?.timeout },
-				response =>
-					"cancelled" in response && response.cancelled
-						? false
-						: "confirmed" in response
-							? response.confirmed
-							: false,
+				response => {
+					if ("cancelled" in response && response.cancelled) {
+						if (response.timedOut) dialogOptions?.onTimeout?.();
+						return false;
+					}
+					if ("confirmed" in response) return response.confirmed;
+					return false;
+				},
 			);
 		}
 
@@ -151,12 +156,14 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 				dialogOptions,
 				undefined,
 				{ method: "input", title, placeholder, timeout: dialogOptions?.timeout },
-				response =>
-					"cancelled" in response && response.cancelled
-						? undefined
-						: "value" in response
-							? response.value
-							: undefined,
+				response => {
+					if ("cancelled" in response && response.cancelled) {
+						if (response.timedOut) dialogOptions?.onTimeout?.();
+						return undefined;
+					}
+					if ("value" in response) return response.value;
+					return undefined;
+				},
 			);
 		}
 

package/src/modes/rpc/rpc-types.ts

@@ -227,7 +227,7 @@ export type RpcExtensionUIRequest =
 export type RpcExtensionUIResponse =
 	| { type: "extension_ui_response"; id: string; value: string }
 	| { type: "extension_ui_response"; id: string; confirmed: boolean }
-	| { type: "extension_ui_response"; id: string; cancelled: true };
+	| { type: "extension_ui_response"; id: string; cancelled: true; timedOut?: boolean };
 
 // ============================================================================
 // Helper type for extracting command types

package/src/prompts/tools/grep.md

@@ -3,6 +3,7 @@ Searches files using powerful regex matching built on ripgrep.
 <instruction>
 - Supports full regex syntax (e.g., `log.*Error`, `function\\s+\\w+`); literal braces need escaping (`interface\\{\\}` for `interface{}` in Go)
 - Filter files with `glob` (e.g., `*.js`, `**/*.tsx`) or `type` (e.g., `js`, `py`, `rust`)
+- Respects `.gitignore` by default; set `gitignore: false` to include ignored files
 - For cross-line patterns like `struct \\{[\\s\\S]*?field`, set `multiline: true` if needed
 - If the pattern contains a literal `\n`, multiline defaults to true
 </instruction>

package/src/prompts/tools/hashline.md

@@ -43,13 +43,12 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
 
 <rules>
 1. **Minimize scope:** You **MUST** use one logical mutation per operation.
-2. **Prefer insertion over neighbor rewrites:** You **SHOULD** anchor on structural boundaries (`}`, `]`, `},`), not interior lines.
-3. **Range end tag (inclusive):** `end` is inclusive and **MUST** point to the final line being replaced.
-   - If `lines` includes a closing boundary token (`}`, `]`, `)`, `);`, `},`), `end` **MUST** include the original boundary line.
-   - You **MUST NOT** set `end` to an interior line and then re-add the boundary token in `lines`; that duplicates the next surviving line.
-   - To remove a line while keeping its neighbors, **delete** it (`lines: null`). You **MUST NOT** replace it with the content of an adjacent line — that line still exists and will be duplicated.
-4. **Match surrounding indentation:** Leading whitespace in `lines` **MUST** be copied verbatim from adjacent lines in the `read` output. Do not infer or reconstruct indentation from memory — count the actual leading spaces on the lines immediately above and below the insertion or replacement point.
-5. **Preserve idiomatic sibling spacing:** When inserting declarations between top-level siblings, you **MUST** preserve existing blank-line separators. If siblings are separated by one blank line, include a trailing `""` in `lines` so inserted code keeps the same spacing.
+2. **`end` is inclusive:** If `lines` includes a closing token (`}`, `]`, `)`, `);`, `},`), `end` **MUST** include the original boundary line. To delete a line while keeping neighbors, use `lines: null` — do not replace it with an adjacent line's content.
+3. **Copy indentation from `read` output:** Leading whitespace in `lines` **MUST** follow adjacent lines exactly. Do not reconstruct from memory.
+4. **Verify the splice before submitting:** For each edit op, mentally read the result:
+   - Does the last `lines` entry duplicate the line surviving after `end`? → extend `end` or remove the duplicate.
+   - Does the first `lines` entry duplicate the line before `pos`? → the edit is wrong.
+   - For `prepend`/`append`: does new code land inside or outside the enclosing block? Trace the braces.
 </rules>
 
 <recovery>
@@ -62,56 +61,18 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
 {{hlinefull 23 "  const timeout: number = 5000;"}}
 ```
 ```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 23 "  const timeout: number = 5000;"}},
-    lines: ["  const timeout: number = 30_000;"]
-  }]
-}
+{ op: "replace", pos: {{hlinejsonref 23 "  const timeout: number = 5000;"}}, lines: ["  const timeout: number = 30_000;"] }
 ```
 </example>
 
 <example name="delete lines">
 Single line — `lines: null` deletes entirely:
 ```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 7 "// @ts-ignore"}},
-    lines: null
-  }]
-}
+{ op: "replace", pos: {{hlinejsonref 7 "// @ts-ignore"}}, lines: null }
 ```
 Range — add `end`:
 ```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 80 "  // TODO: remove after migration"}},
-    end: {{hlinejsonref 83 "  }"}},
-    lines: null
-  }]
-}
-```
-</example>
-
-<example name="clear text but keep the line break">
-```ts
-{{hlinefull 14 "  placeholder: \"DO NOT SHIP\","}}
-```
-```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 14 "  placeholder: \"DO NOT SHIP\","}},
-    lines: [""]
-  }]
-}
+{ op: "replace", pos: {{hlinejsonref 80 "  // TODO: remove after migration"}}, end: {{hlinejsonref 83 "  }"}}, lines: null }
 ```
 </example>
 
@@ -124,47 +85,35 @@ Range — add `end`:
 ```
 Include the closing `}` in the replaced range — stopping one line short orphans the brace or duplicates it.
 ```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 61 "      console.error(err);"}},
-    end: {{hlinejsonref 63 "    }"}},
-    lines: [
-      "      if (isEnoent(err)) return null;",
-      "      throw err;",
-      "    }"
-    ]
-  }]
-}
+{ op: "replace", pos: {{hlinejsonref 61 "      console.error(err);"}}, end: {{hlinejsonref 63 "    }"}}, lines: ["      if (isEnoent(err)) return null;", "      throw err;", "    }"] }
 ```
 </example>
 
-<example name="inclusive end avoids duplicate boundary">
+<example name="insert inside a block (good vs bad)">
+Adding a method inside a class — anchor on the **closing brace**, not after it.
 ```ts
-{{hlinefull 70 "\tif (user.isAdmin) {"}}
-{{hlinefull 71 "\t\tdeleteRecord(id);"}}
-{{hlinefull 72 "\t}"}}
-{{hlinefull 73 "\tafter();"}}
+{{hlinefull 20 "  greet() {"}}
+{{hlinefull 21 "    return \"hi\";"}}
+{{hlinefull 22 "  }"}}
+{{hlinefull 23 "}"}}
+{{hlinefull 24 ""}}
+{{hlinefull 25 "function other() {"}}
+```
+Bad — appends **after** closing `}` (method lands outside the class):
+```
+{ op: "append", pos: {{hlinejsonref 23 "}"}}, lines: ["  newMethod() {", "    return 1;", "  }"] }
 ```
-The block grows by one line and the condition changes — two single-line ops would be needed otherwise. Since `}` appears in `lines`, `end` must include `72`:
+Result — `newMethod` is a **top-level function**, not a class method:
 ```
-{
-  path: "…",
-  edits: [{
-    op: "replace",
-    pos: {{hlinejsonref 70 "\tif (user.isAdmin) {"}},
-    end: {{hlinejsonref 72 "\t}"}},
-    lines: [
-      "\tif (user.isAdmin && confirmed) {",
-      "\t\tauditLog(id);",
-      "\t\tdeleteRecord(id);",
-      "\t}"
-    ]
-  }]
-}
+}         ← class closes here
+  newMethod() {
+    return 1;
+  }
+```
+Good — prepends **before** closing `}` (method stays inside the class):
+```
+{ op: "prepend", pos: {{hlinejsonref 23 "}"}}, lines: ["  newMethod() {", "    return 1;", "  }"] }
 ```
-Also apply the same rule to `);`, `],`, and `},` closers: if replacement includes the closer token, `end` must include the original closer line.
 </example>
 
 <example name="insert between sibling declarations">
@@ -179,71 +128,24 @@ Also apply the same rule to `);`, `],`, and `},` closers: if replacement include
 ```
 Use a trailing `""` to preserve the blank line between top-level sibling declarations.
 ```
-{
-  path: "…",
-  edits: [{
-    op: "prepend",
-    pos: {{hlinejsonref 48 "function y() {"}},
-    lines: [
-      "function z() {",
-      "  runZ();",
-      "}",
-      ""
-    ]
-  }]
-}
+{ op: "prepend", pos: {{hlinejsonref 48 "function y() {"}}, lines: ["function z() {", "  runZ();", "}", ""] }
 ```
 </example>
 
-<example name="anchor to structure, not whitespace">
-Trailing `""` in `lines` preserves blank-line separators. Anchor to the structural line, not the blank line above — blank lines are ambiguous and shift.
+<example name="disambiguate anchors">
+Blank lines and repeated patterns (`}`, `return null;`) appear many times — never anchor on them when a unique line exists nearby.
 ```ts
-{{hlinefull 101 "}"}}
-{{hlinefull 102 ""}}
-{{hlinefull 103 "export function serialize(data: unknown): string {"}}
-```
-Bad — append after "}"
-Good — anchors to structural line:
+{{hlinefull 46 "}"}}
+{{hlinefull 47 ""}}
+{{hlinefull 48 "function processItem(item: Item) {"}}
 ```
-{
-  path: "…",
-  edits: [{
-    op: "prepend",
-    pos: {{hlinejsonref 103 "export function serialize(data: unknown): string {"}},
-    lines: [
-      "function validate(data: unknown): boolean {",
-      "  return data != null && typeof data === \"object\";",
-      "}",
-      ""
-    ]
-  }]
-}
+Bad — anchoring on the blank line (ambiguous, may shift):
 ```
-</example>
-
-<example name="indentation must match context">
-Leading whitespace in `lines` **MUST** be copied from the `read` output, not reconstructed from memory. If the file uses tabs, use `\t` in JSON — you **MUST NOT** use `\\t`, which produces a literal backslash-t in the file.
-```ts
-{{hlinefull 10 "class Foo {"}}
-{{hlinefull 11 "\tbar() {"}}
-{{hlinefull 12 "\t\treturn 1;"}}
-{{hlinefull 13 "\t}"}}
-{{hlinefull 14 "}"}}
+{ op: "append", pos: {{hlinejsonref 47 ""}}, lines: ["function helper() { }"] }
 ```
-Good — `\t` in JSON is a real tab, matching the file's indentation:
+Good — anchor on the unique declaration line:
 ```
-{
-  path: "…",
-  edits: [{
-    op: "prepend",
-    pos: {{hlinejsonref 14 "}"}},
-    lines: [
-      "\tbaz() {",
-      "\t\treturn 2;",
-      "\t}"
-    ]
-  }]
-}
+{ op: "prepend", pos: {{hlinejsonref 48 "function processItem(item: Item) {"}}, lines: ["function helper() { }", ""] }
 ```
 </example>
 

package/src/session/session-manager.ts

@@ -1137,6 +1137,56 @@ async function collectSessionsFromFiles(files: string[], storage: SessionStorage
 	return sessions;
 }
 
+export interface ResolvedSessionMatch {
+	session: SessionInfo;
+	scope: "local" | "global";
+}
+
+function sessionMatchesResumeArg(session: SessionInfo, sessionArg: string): boolean {
+	const normalizedArg = sessionArg.toLowerCase();
+	const normalizedId = session.id.toLowerCase();
+	if (normalizedId.startsWith(normalizedArg)) {
+		return true;
+	}
+
+	const fileName = path.basename(session.path, ".jsonl").toLowerCase();
+	if (fileName.startsWith(normalizedArg)) {
+		return true;
+	}
+
+	const separator = fileName.lastIndexOf("_");
+	if (separator < 0) {
+		return false;
+	}
+
+	const fileSessionId = fileName.slice(separator + 1);
+	return fileSessionId.startsWith(normalizedArg);
+}
+
+export async function resolveResumableSession(
+	sessionArg: string,
+	cwd: string,
+	sessionDir?: string,
+	storage: SessionStorage = new FileSessionStorage(),
+): Promise<ResolvedSessionMatch | undefined> {
+	const localSessions = await SessionManager.list(cwd, sessionDir, storage);
+	const localMatch = localSessions.find(session => sessionMatchesResumeArg(session, sessionArg));
+	if (localMatch) {
+		return { session: localMatch, scope: "local" };
+	}
+
+	if (sessionDir) {
+		return undefined;
+	}
+
+	const globalSessions = await SessionManager.listAll(storage);
+	const globalMatch = globalSessions.find(session => sessionMatchesResumeArg(session, sessionArg));
+	if (!globalMatch) {
+		return undefined;
+	}
+
+	return { session: globalMatch, scope: "global" };
+}
 export class SessionManager {
 	#sessionId: string = "";
 	#sessionName: string | undefined;