@oh-my-pi/pi-coding-agent 15.5.2 → 15.5.3

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [15.5.3] - 2026-05-27
+### Breaking Changes
+
+- Disallowed inline payload on hashline `↑`, `↓`, and `:` operations (including BOF/EOF inserts), requiring payload text to be supplied on standalone `+` continuation rows
+
+### Changed
+
+- Warned when legacy inline `LINE:TEXT` lines are accepted as payload continuations only when inside a pending multi-line `A-B:` replacement
+
 ## [15.5.2] - 2026-05-26
 ### Breaking Changes
 

package/dist/types/hashline/constants.d.ts

@@ -37,4 +37,12 @@ export declare const IMPLICIT_CONTINUATION_WARNING = "Accepted continuation line
  * `LINE:` prefix and append the body to the pending payload, but warn so the
  * canonical `+`-continuation form remains preferred.
  */
-export declare const PAYLOAD_LINE_PREFIX_DEMOTED_WARNING = "Detected one or more `LINE:TEXT` lines whose anchors fell inside a pending replace range; treated them as payload-continuation lines and stripped the `LINE:` prefix. Inside a multi-line `A-B:` block, payload lines after the first should be prefixed with `+` \u2014 never reuse the read-output gutter format.";
+export declare const PAYLOAD_LINE_PREFIX_DEMOTED_WARNING = "Detected one or more `LINE:TEXT` lines whose anchors fell inside a pending replace range; treated them as payload-continuation lines and stripped the `LINE:` prefix. Inside an `A-B:` block, every payload line must be on its own row prefixed with `+` \u2014 never reuse the read-output gutter format.";
+/**
+ * Warning text appended when an op carries an inline payload (`LINE:TEXT`,
+ * `A-B:TEXT`, `LINE↑TEXT`, `LINE↓TEXT`). Canonical syntax is bare op +
+ * `+`-prefixed continuation rows; we accept the inline form leniently so the
+ * model's first-attempt edit still lands, but warn so the canonical form
+ * remains preferred.
+ */
+export declare const INLINE_PAYLOAD_ACCEPTED_WARNING = "Accepted inline payload on the op line (e.g. `LINE:CONTENT`, `LINE\u2191CONTENT`). Canonical syntax is the bare op followed by `+`-prefixed payload rows on the next line(s). Prefer the explicit form.";

package/dist/types/tools/bash.d.ts

@@ -42,6 +42,7 @@ export interface BashToolDetails {
     meta?: OutputMeta;
     timeoutSeconds?: number;
     requestedTimeoutSeconds?: number;
+    wallTimeMs?: number;
     terminalId?: string;
     async?: {
         state: "running" | "completed" | "failed";

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.5.2",
+	"version": "15.5.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "15.5.2",
-		"@oh-my-pi/pi-agent-core": "15.5.2",
-		"@oh-my-pi/pi-ai": "15.5.2",
-		"@oh-my-pi/pi-natives": "15.5.2",
-		"@oh-my-pi/pi-tui": "15.5.2",
-		"@oh-my-pi/pi-utils": "15.5.2",
+		"@oh-my-pi/omp-stats": "15.5.3",
+		"@oh-my-pi/pi-agent-core": "15.5.3",
+		"@oh-my-pi/pi-ai": "15.5.3",
+		"@oh-my-pi/pi-natives": "15.5.3",
+		"@oh-my-pi/pi-tui": "15.5.3",
+		"@oh-my-pi/pi-utils": "15.5.3",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/hashline/constants.ts

@@ -48,4 +48,13 @@ export const IMPLICIT_CONTINUATION_WARNING =
  * canonical `+`-continuation form remains preferred.
  */
 export const PAYLOAD_LINE_PREFIX_DEMOTED_WARNING =
-	"Detected one or more `LINE:TEXT` lines whose anchors fell inside a pending replace range; treated them as payload-continuation lines and stripped the `LINE:` prefix. Inside a multi-line `A-B:` block, payload lines after the first should be prefixed with `+` — never reuse the read-output gutter format.";
+	"Detected one or more `LINE:TEXT` lines whose anchors fell inside a pending replace range; treated them as payload-continuation lines and stripped the `LINE:` prefix. Inside an `A-B:` block, every payload line must be on its own row prefixed with `+` — never reuse the read-output gutter format.";
+/**
+ * Warning text appended when an op carries an inline payload (`LINE:TEXT`,
+ * `A-B:TEXT`, `LINE↑TEXT`, `LINE↓TEXT`). Canonical syntax is bare op +
+ * `+`-prefixed continuation rows; we accept the inline form leniently so the
+ * model's first-attempt edit still lands, but warn so the canonical form
+ * remains preferred.
+ */
+export const INLINE_PAYLOAD_ACCEPTED_WARNING =
+	"Accepted inline payload on the op line (e.g. `LINE:CONTENT`, `LINE↑CONTENT`). Canonical syntax is the bare op followed by `+`-prefixed payload rows on the next line(s). Prefer the explicit form.";

package/src/hashline/executor.ts

@@ -1,6 +1,7 @@
 import {
 	ABORT_WARNING,
 	IMPLICIT_CONTINUATION_WARNING,
+	INLINE_PAYLOAD_ACCEPTED_WARNING,
 	PAYLOAD_LINE_PREFIX_DEMOTED_WARNING,
 	REPLACE_PAIR_COALESCED_WARNING,
 } from "./constants";
@@ -126,8 +127,14 @@ export class HashlineExecutor {
 				this.#flushPending();
 				this.#pending = {
 					op: { kind: "insert", cursor: token.cursor, lineNum: token.lineNum },
-					payload: token.inlineBody === undefined ? [] : [token.inlineBody],
+					payload: [],
 				};
+				if (token.inlineBody !== undefined) {
+					this.#pending.payload.push(token.inlineBody);
+					if (!this.#warnings.includes(INLINE_PAYLOAD_ACCEPTED_WARNING)) {
+						this.#warnings.push(INLINE_PAYLOAD_ACCEPTED_WARNING);
+					}
+				}
 				return;
 			case "op-replace":
 				validateRangeOrder(token.range, token.lineNum);
@@ -161,8 +168,14 @@ export class HashlineExecutor {
 				this.#flushPending();
 				this.#pending = {
 					op: { kind: "replace", range: token.range, lineNum: token.lineNum },
-					payload: token.inlineBody === undefined ? [] : [token.inlineBody],
+					payload: [],
 				};
+				if (token.inlineBody !== undefined) {
+					this.#pending.payload.push(token.inlineBody);
+					if (!this.#warnings.includes(INLINE_PAYLOAD_ACCEPTED_WARNING)) {
+						this.#warnings.push(INLINE_PAYLOAD_ACCEPTED_WARNING);
+					}
+				}
 				return;
 		}
 	}

package/src/hashline/grammar.lark

@@ -9,11 +9,10 @@ filename: /([^\s#]+)/
 file_hash: /[0-9a-f]{4}/
 
 line_op: insert_before | insert_after | replace | delete
-insert_before: anchor "$HOP_INSERT_BEFORE$" inline_body? LF payload*
-insert_after: anchor "$HOP_INSERT_AFTER$" inline_body? LF payload*
-replace: range "$HOP_REPLACE$" inline_body? LF payload*
+insert_before: anchor "$HOP_INSERT_BEFORE$" LF payload*
+insert_after: anchor "$HOP_INSERT_AFTER$" LF payload*
+replace: range "$HOP_REPLACE$" LF payload*
 delete: range "$HOP_DELETE$" LF
-inline_body: /[^\n]+/
 payload: "+" /[^\n]*/ LF
 
 anchor: LID | "EOF" | "BOF"

package/src/prompts/tools/hashline.md

@@ -4,60 +4,80 @@ Your patch language is a compact, line-anchored edit format.
 Patch payload is a series of hunks: `¶PATH#HASH` header followed by any number of operations. `HASH` should be copied as is from read/search. Missing? Re-`read`.
 - No context rows, no gutters.
 - NEVER restate unchanged lines "for context".
-- Inline payload after an op is literal. Additional payload lines MUST start with `+`; that delimiter is stripped.
-- Payload indentation after the op sigil or after `+` is literal.
+- Op lines carry NO payload. Every payload line lives on its own row and MUST start with `+`; that delimiter is stripped.
+- Payload indentation is literal.
 </payload>
 
 <ops>
-LINE↑PAYLOAD   insert before (or BOF↑)
-LINE↓PAYLOAD   insert after  (or EOF↓)
-A-B:PAYLOAD    replace A..B  (or A: == A..A)
-A-B!           delete A..B   (or A! == A..A)
-+PAYLOAD      continuation payload line; leading `+` is not written
+LINE↑    insert before (or BOF↑)
+LINE↓    insert after  (or EOF↓)
+A-B:     replace A..B  (or A: == A..A)
+A-B!     delete A..B   (or A! == A..A)
++PAYLOAD payload line for the preceding op
 </ops>
 
 <rules>
 - **Payload is only what's NEW.** `:` replaces inside; `↑`/`↓` add at anchor. NEVER repeat anchor lines or neighbors.
-- **Continuation lines require `+`.** Use `+` for a blank payload line; use `++text` to write a line starting with `+text`.
+- **Use `+` for a blank payload line; use `++text` to write a line starting with `+text`.**
+- **Inserts add ONLY the rows you list.** The file's existing newlines around the anchor stay. NEVER tack a trailing `+` blank "for spacing" — it writes a literal blank line into the file, doubling whatever is already there.
+- **A bare `LINE↑`/`LINE↓` with no payload still inserts ONE blank line.** Not a no-op. Omit the op if you want nothing there.
 - **Go small.** Add → `↑`/`↓`; replace → `:`; delete → `!`.
-- **Line numbers are frozen references to what you have seen.** Later ops still use original line numbers.
+- **Line numbers are frozen references to what you have seen.** Later ops in the same hunk still use original line numbers; they do NOT shift as earlier ops apply.
 </rules>
 
 <common-failures>
 - **NEVER replay past your range.** Stop before B+1; extend B if needed.
-- **Read lines look like replace ops.** `84:content` = "make line 84 content" — don't echo context before it.
+- **Read lines look like replace ops.** `84:content` = "make line 84 content" — and inline content is rejected. Don't echo read-style rows.
 - **NEVER fabricate file hashes.** Missing? Re-`read`.
 </common-failures>
 
 <example>
 ```a.ts#1a2b
 1:const X = "a";
-2:export function f() { return X; }
+2:
+3:export function f() { return X; }
+4:f();
 ```
 
-# replace with a continuation line, insert after, delete
+# replace one line, insert after, delete
 ```
 ¶a.ts#1a2b
-1:const X = "b";
+1:
++const X = "b";
 +export const Y = X;
-1↓const Z = Y;
-2!
+1↓
++const Z = Y;
+4!
 ```
 </example>
 
 <anti-pattern>
+# WRONG — inline payload after the sigil is rejected
+1:const X = "b";
+1↓const Z = Y;
+1-2:const X = "b";
++export const Y = X;
 # WRONG — INSERT used to change a line (old line survives)
-1↓const X = "b";
+1↓
++const X = "b";
 # WRONG — echoing read-style lines as context before the real op
 1:const X = "a";
-1-2:const X = "b";
-export const Y = X;  # raw continuation line missing required `+`
+1-2:
++const X = "b";
++export const Y = X;
+# WRONG — trailing `+` blank writes a literal empty line; the new blank lands right next to the orig blank at line 2, doubling it
+1↓
++const Y = X;
++
+# WRONG — `2↓` still anchors at PRE-EDIT line 2 (frozen), NOT at the line just inserted by `1↓`. Both inserts land at their own anchors, giving three consecutive blanks (new from `1↓`, orig blank line 2, new from `2↓`).
+1↓
+2↓
 </anti-pattern>
 
 <critical>
 - One op per range, ever.
 - Pick op precisely. Update: `:`, add: `↑`/`↓`, remove: `!`.
+- Payload always lives on its own `+`-prefixed line — never inline with the op.
 - Payload is only what's NEW; never repeat anchor lines or neighbors.
-- Continuation payload lines after the op line must start with `+`.
 - Anchor exactly; don't anchor neighbors.
 </critical>

package/src/tools/bash.ts

@@ -128,6 +128,7 @@ export interface BashToolDetails {
 	meta?: OutputMeta;
 	timeoutSeconds?: number;
 	requestedTimeoutSeconds?: number;
+	wallTimeMs?: number;
 	terminalId?: string;
 	async?: {
 		state: "running" | "completed" | "failed";
@@ -272,6 +273,34 @@ function formatTimeoutClampNotice(requestedTimeoutSec: number, effectiveTimeoutS
 		: undefined;
 }
 
+function formatWallTimeSeconds(wallTimeMs: number): string {
+	return (wallTimeMs / 1000).toFixed(2);
+}
+
+function formatWallTimeNotice(wallTimeMs: number): string {
+	return `Wall time: ${formatWallTimeSeconds(wallTimeMs)} seconds`;
+}
+
+/**
+ * Strip the trailing `Wall time: <secs> seconds` notice from text so the TUI
+ * can render the wall time via its styled `[Wall: …]` label without echoing
+ * the same value verbatim in the output pane.
+ */
+function stripWallTimeNotice(text: string, wallTimeMs: number | undefined): string {
+	if (wallTimeMs === undefined) return text;
+	// Reconstruct the notice from the same value the result was tagged with so
+	// a literal sub-string match never strips a coincidental in-output token —
+	// only the exact line we appended in #buildCompletedResult.
+	const notice = formatWallTimeNotice(wallTimeMs);
+	const idx = text.lastIndexOf(notice);
+	if (idx === -1) return text;
+	let start = idx;
+	let end = idx + notice.length;
+	if (text[start - 1] === "\n") start -= 1;
+	if (text[end] === "\n") end += 1;
+	return (text.slice(0, start) + text.slice(end)).trimEnd();
+}
+
 /**
  * Bash tool implementation.
  *
@@ -347,10 +376,23 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 	#buildCompletedResult(
 		result: BashResult | BashInteractiveResult,
 		timeoutSec: number,
-		options: { requestedTimeoutSec?: number; notices?: readonly string[]; terminalId?: string } = {},
+		options: {
+			requestedTimeoutSec?: number;
+			notices?: readonly string[];
+			terminalId?: string;
+			wallTimeMs?: number;
+		} = {},
 	): AgentToolResult<BashToolDetails> {
 		const outputLines = [this.#formatResultOutput(result)];
-		const notices = options.notices?.filter(Boolean) ?? [];
+		const notices: string[] = [];
+		if (options.wallTimeMs !== undefined) {
+			notices.push(formatWallTimeNotice(options.wallTimeMs));
+		}
+		if (options.notices) {
+			for (const notice of options.notices) {
+				if (notice) notices.push(notice);
+			}
+		}
 		if (notices.length > 0) outputLines.push("", ...notices);
 		const outputText = outputLines.join("\n");
 		const details: BashToolDetails = { timeoutSeconds: timeoutSec };
@@ -360,6 +402,9 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		if (options.terminalId !== undefined) {
 			details.terminalId = options.terminalId;
 		}
+		if (options.wallTimeMs !== undefined) {
+			details.wallTimeMs = options.wallTimeMs;
+		}
 		const resultBuilder = toolResult(details).text(outputText).truncationFromSummary(result, { direction: "tail" });
 		this.#buildResultText(result, timeoutSec, outputText);
 		return resultBuilder.done();
@@ -430,6 +475,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			async ({ jobId, signal: runSignal, reportProgress }) => {
 				const { path: artifactPath, id: artifactId } = (await this.session.allocateOutputArtifact?.("bash")) ?? {};
 				const tailBuffer = new TailBuffer(DEFAULT_MAX_BYTES);
+				const wallTimeStart = performance.now();
 				try {
 					const result = await executeBash(options.command, {
 						cwd: options.commandCwd,
@@ -446,9 +492,11 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 						},
 						onMinimizedSave: originalText => saveBashOriginalArtifact(this.session, originalText),
 					});
+					const wallTimeMs = performance.now() - wallTimeStart;
 					const finalResult = this.#buildCompletedResult(result, options.timeoutSec, {
 						requestedTimeoutSec: options.requestedTimeoutSec,
 						notices: options.notices ?? [],
+						wallTimeMs,
 					});
 					const finalText = this.#extractTextResult(finalResult);
 					latestText = finalText;
@@ -697,6 +745,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		// Skip when pty=true (PTY needs the local terminal UI).
 		const clientBridge = this.session.getClientBridge?.();
 		if (clientBridge?.capabilities.terminal && clientBridge.createTerminal && !pty) {
+			const bridgeWallTimeStart = performance.now();
 			const handle = await clientBridge.createTerminal({
 				command,
 				cwd: commandCwd,
@@ -792,6 +841,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 								requestedTimeoutSec,
 								notices: pendingNotices,
 								terminalId: handle.terminalId,
+								wallTimeMs: performance.now() - bridgeWallTimeStart,
 							});
 						}
 
@@ -852,6 +902,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					requestedTimeoutSec,
 					notices: bridgeNotices,
 					terminalId: handle.terminalId,
+					wallTimeMs: performance.now() - bridgeWallTimeStart,
 				});
 			} finally {
 				try {
@@ -869,6 +920,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		const { path: artifactPath, id: artifactId } = (await this.session.allocateOutputArtifact?.("bash")) ?? {};
 
 		const interactiveUi = canUseInteractiveBashPty(pty, ctx) ? ctx?.ui : undefined;
+		const wallTimeStart = performance.now();
 		const result: BashResult | BashInteractiveResult = interactiveUi
 			? await runInteractiveBashPty(interactiveUi, {
 					command,
@@ -890,6 +942,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					onChunk: streamTailUpdates(tailBuffer, onUpdate),
 					onMinimizedSave: originalText => saveBashOriginalArtifact(this.session, originalText),
 				});
+		const wallTimeMs = performance.now() - wallTimeStart;
 		if (result.cancelled) {
 			if (signal?.aborted) {
 				throw new ToolAbortError(normalizeResultOutput(result) || "Command aborted");
@@ -902,6 +955,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		return this.#buildCompletedResult(result, timeoutSec, {
 			requestedTimeoutSec,
 			notices: pendingNotices,
+			wallTimeMs,
 		});
 	}
 }
@@ -1032,22 +1086,32 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 					// Strip the LLM-facing notice appended by wrappedExecute so we don't
 					// double-print it alongside the styled warning line below.
 					const rawOutput = renderContext?.output ?? result.content?.find(c => c.type === "text")?.text ?? "";
-					const output = stripOutputNotice(rawOutput, details?.meta);
+					const strippedOutput = stripOutputNotice(rawOutput, details?.meta);
+					const output = stripWallTimeNotice(strippedOutput, details?.wallTimeMs);
 					const displayOutput = output.trimEnd();
 					const showingFullOutput = expanded && renderContext?.isFullOutput === true;
 
 					// Build truncation warning
 					const timeoutSeconds = details?.timeoutSeconds ?? renderContext?.timeout;
 					const requestedTimeoutSeconds = details?.requestedTimeoutSeconds;
-					const timeoutLabel =
-						typeof timeoutSeconds === "number"
-							? requestedTimeoutSeconds !== undefined && requestedTimeoutSeconds !== timeoutSeconds
+					const wallTimeMs = details?.wallTimeMs;
+					const statsParts: string[] = [];
+					if (wallTimeMs !== undefined) {
+						statsParts.push(`Wall: ${formatWallTimeSeconds(wallTimeMs)}s`);
+					}
+					if (typeof timeoutSeconds === "number") {
+						statsParts.push(
+							requestedTimeoutSeconds !== undefined && requestedTimeoutSeconds !== timeoutSeconds
 								? `Timeout: ${timeoutSeconds}s (requested ${requestedTimeoutSeconds}s clamped)`
-								: `Timeout: ${timeoutSeconds}s`
-							: undefined;
+								: `Timeout: ${timeoutSeconds}s`,
+						);
+					}
 					const timeoutLine =
-						timeoutLabel !== undefined
-							? uiTheme.fg("dim", `${uiTheme.format.bracketLeft}${timeoutLabel}${uiTheme.format.bracketRight}`)
+						statsParts.length > 0
+							? uiTheme.fg(
+									"dim",
+									`${uiTheme.format.bracketLeft}${statsParts.join(" | ")}${uiTheme.format.bracketRight}`,
+								)
 							: undefined;
 					let warningLine: string | undefined;
 					if (details?.meta?.truncation && !showingFullOutput) {