@oh-my-pi/pi-coding-agent 15.2.3 → 15.2.4

package/src/modes/theme/shimmer.ts

@@ -24,14 +24,20 @@ const BOLD_CLOSE = "\x1b[22m";
 type ShimmerTheme = Pick<Theme, "bold" | "fg" | "getFgAnsi">;
 type ShimmerMode = "classic" | "kitt" | "disabled";
 
+type ShimmerPaletteTier = ThemeColor | { ansi: string };
+
+function resolveTierAnsi(theme: ShimmerTheme, tier: ShimmerPaletteTier): string {
+	return typeof tier === "string" ? theme.getFgAnsi(tier) : tier.ansi;
+}
+
 /** Three-tier color stack a shimmer character cycles through as the band sweeps. */
 export interface ShimmerPalette {
 	/** Color for chars outside / at the edge of the band (intensity < ~0.22). */
-	low: ThemeColor;
+	low: ShimmerPaletteTier;
 	/** Color for chars approaching the crest (~0.22 ≤ intensity < ~0.65). */
-	mid: ThemeColor;
+	mid: ShimmerPaletteTier;
 	/** Color at the band's crest (intensity ≥ ~0.65). */
-	high: ThemeColor;
+	high: ShimmerPaletteTier;
 	/** Whether to bold the crest tier. Default `false`. */
 	bold?: boolean;
 }
@@ -78,11 +84,14 @@ function compile(theme: ShimmerTheme, palette: ShimmerPalette): CompiledPalette
 	const p = palette as ShimmerPalette & PaletteCache;
 	const cached = p[kCompiled];
 	if (cached && p[kCompiledFor] === theme) return cached;
-	const highOpen = palette.bold ? `${BOLD_OPEN}${theme.getFgAnsi(palette.high)}` : theme.getFgAnsi(palette.high);
+	const lowOpen = resolveTierAnsi(theme, palette.low);
+	const midOpen = resolveTierAnsi(theme, palette.mid);
+	const highColorOpen = resolveTierAnsi(theme, palette.high);
+	const highOpen = palette.bold ? `${BOLD_OPEN}${highColorOpen}` : highColorOpen;
 	const highClose = palette.bold ? `${BOLD_CLOSE}${FG_RESET}` : FG_RESET;
 	const out: CompiledPalette = {
-		low: { open: theme.getFgAnsi(palette.low), close: FG_RESET },
-		mid: { open: theme.getFgAnsi(palette.mid), close: FG_RESET },
+		low: { open: lowOpen, close: FG_RESET },
+		mid: { open: midOpen, close: FG_RESET },
 		high: { open: highOpen, close: highClose },
 	};
 	p[kCompiledFor] = theme;

package/src/prompts/tools/hashline.md

@@ -1,58 +1,36 @@
 Your patch language is a compact, line-anchored edit format.
 
-A patch contains one or more file sections. The first non-blank line of every edit section MUST be `@@ PATH`.
+A patch contains one or more file sections. The first non-blank line of every edit section MUST be `§PATH`.
 Operations reference lines in the file by their line number and hash, called "Anchors", e.g. `5th`, `123ab`.
 You MUST copy them verbatim from the latest output for the file you're editing.
 
 Purely textual format. The tool has NO awareness of language, indentation, brackets, fences, or table widths. You MUST emit valid syntax in replacements/insertions.
 
 <ops>
-@@ PATH          header: subsequent ops apply to PATH
+§PATH           header: subsequent ops apply to PATH
 Each op line is ONE of:
-+ ANCHOR         insert lines AFTER  the anchored line (or EOF); payload follows as `{{hsep}}TEXT` lines
-< ANCHOR         insert lines BEFORE the anchored line (or BOF); payload follows as `{{hsep}}TEXT` lines
-- A..B           delete the line range (inclusive).
-= A..B           replace the range with payload `{{hsep}}TEXT` lines, or with one blank line if no payload follows.
+»ANCHOR         insert lines AFTER  the anchored line (or EOF); payload follows on subsequent lines
+«ANCHOR         insert lines BEFORE the anchored line (or BOF); payload follows on subsequent lines
+≔A..B           replace the inclusive range A..B with payload; delete the range if no payload follows
+≔A              shorthand for ≔A..A
 </ops>
 
-<format-reminder>
-Op lines carry no content — payload goes on the next line.
-
-WRONG: + 5pg| some code
-WRONG: {{hsep}} some code
-RIGHT: + 5pg
-{{hsep}}some code
-
-A single `+`/`<`/`=` op accepts MANY `{{hsep}}` payload lines. To insert N consecutive lines, write ONE op followed by N payload lines — NEVER N ops with one payload each.
-
-WRONG (one op per inserted line, with fabricated anchors):
-  + 5pg
-  {{hsep}}first new line
-  + 6xx    ← FABRICATED
-  {{hsep}}second new line
-
-RIGHT (one op, many payload lines):
-  + 5pg
-  {{hsep}}first new line
-  {{hsep}}second new line
-</format-reminder>
-
 <rules>
-- Every payload line MUST start with `{{hsep}}` immediately followed by payload text. Do NOT add a readability space after `{{hsep}}`.
-- Every character after `{{hsep}}` is file content. If the target line intentionally starts with one space, write exactly one space after `{{hsep}}`; otherwise write none.
 - Payload text is verbatim — NEVER escape unicode.
+- Payload ends at the next `»`, `«`, `≔`, `§`, envelope marker, or EOF.
+- `≔A..B` with no payload deletes the range. To keep a blank line, include one explicit empty payload line.
 - **Payload is only what's NEW relative to your range:**
-  - `=` replaces inside; NEVER include lines outside.
-  - `+`/`<` adds at the anchor; NEVER repeat line A or neighbors.
+  - `≔` replaces inside; NEVER include lines outside.
+  - `»`/`«` adds at the anchor; NEVER repeat line A or neighbors.
   - Payload matching nearby content duplicates — drop it or widen.
 - **Pick a self-contained unit first.** Touching a multiline construct? Widen to the whole thing.
-- Then smallest op: add → `+`/`<`; delete → `-`; `=` ONLY when modifying inside.
+- Then smallest op: add → `»`/`«`; delete/replace → `≔`.
 </rules>
 
 <brace-shapes>
 When braces bound your edit, you SHOULD prefer these shapes:
 - **Whole block**: range spans `{` through matching `}`.
-- **Signature only**: one-line `=` on the opener; body untouched.
+- **Signature only**: one-line `≔` on the opener; body untouched.
 - **Insert inside**: anchor on `{` or last interior line; NEVER repeat the braces.
 - **End on `}`**: only when that `}` is part of the change. Otherwise extend or stop earlier.
 </brace-shapes>
@@ -61,9 +39,9 @@ When braces bound your edit, you SHOULD prefer these shapes:
 - **NEVER replay past your range.** Stop before B+1; extend B if it must go.
 - **NEVER duplicate chunks inside one payload.** Caught re-emitting? Rewrite.
 - **Anchor only inside the visible region.** B+1 truncated? Re-`read` first.
-- **You SHOULD prefer the narrowest self-contained edit.** Small `+`/`-` beats wide `=`.
+- **You SHOULD prefer the narrowest self-contained edit.** Narrow range beats wide range.
 - **Anchors reference the file as last read.** NEVER shift for prior ops.
-- **One `+`/`<` op per block, NOT per line.** N lines = ONE op, N payloads. Collapse adjacent ops.
+- **One `»`/`«` op per block, NOT per line.** N lines = ONE op, N payloads. Collapse adjacent ops.
 - **NEVER fabricate anchor hashes.** Missing? Re-`read`.
 </common-failures>
 
@@ -79,71 +57,74 @@ When braces bound your edit, you SHOULD prefer these shapes:
 
 <examples>
 # Replace one line (the payload must re-emit the original indentation)
-@@ mod.ts
-= {{hrefr 1}}..{{hrefr 1}}
-{{hsep}}const TITLE = "Mrs";
+§mod.ts
+≔{{hrefr 1}}
+const TITLE = "Mrs";
 
 # Replace a full multiline statement (widen to a self-contained boundary)
-@@ mod.ts
-= {{hrefr 3}}..{{hrefr 6}}
-{{hsep}}	return [
-{{hsep}}		"Mrs",
-{{hsep}}		name?.trim() || "guest",
-{{hsep}}	].join(" ");
+§mod.ts
+≔{{hrefr 3}}..{{hrefr 6}}
+	return [
+		"Mrs",
+		name?.trim() || "guest",
+	].join(" ");
 
 # Insert AFTER/BEFORE a line
-@@ mod.ts
-+ {{hrefr 4}}
-{{hsep}}		"Dr",
-< {{hrefr 5}}
-{{hsep}}		"Dr",
+§mod.ts
+»{{hrefr 4}}
+		"Dr",
+«{{hrefr 5}}
+		"Dr",
 
 # Append to file
-@@ mod.ts
-+ EOF
-{{hsep}}export const done = true;
+§mod.ts
+»EOF
+export const done = true;
 
 # Delete a line
-@@ mod.ts
-- {{hrefr 5}}..{{hrefr 5}}
+§mod.ts
+≔{{hrefr 5}}
+
+# Blank a line (replace with LF: the empty payload is the blank line before `»EOF`)
+§mod.ts
+≔{{hrefr 5}}
 
-# Blank a line (replace with LF)
-@@ mod.ts
-= {{hrefr 5}}..{{hrefr 5}}
+»EOF
+export const done = true;
 </examples>
 
 <anti-pattern>
 # WRONG — replaces 2 lines just to add one.
-@@ mod.ts
-= {{hrefr 1}}..{{hrefr 2}}
-{{hsep}}const TITLE = "Mr";
-{{hsep}}const DEBUG = false;
-{{hsep}}export function greet(name) {
+§mod.ts
+≔{{hrefr 1}}..{{hrefr 2}}
+const TITLE = "Mr";
+const DEBUG = false;
+export function greet(name) {
 # RIGHT — same effect, one-line insert
-@@ mod.ts
-+ {{hrefr 1}}
-{{hsep}}const DEBUG = false;
+§mod.ts
+»{{hrefr 1}}
+const DEBUG = false;
 
 # WRONG — replace from the middle of a larger statement (error-prone)
-@@ mod.ts
-= {{hrefr 4}}..{{hrefr 5}}
-{{hsep}}		"Dr",
-{{hsep}}		name?.trim() || "guest",
+§mod.ts
+≔{{hrefr 4}}..{{hrefr 5}}
+		"Dr",
+		name?.trim() || "guest",
 # RIGHT — widen to the full statement
-@@ mod.ts
-= {{hrefr 3}}..{{hrefr 6}}
-{{hsep}}	return [
-{{hsep}}		"Dr",
-{{hsep}}		name?.trim() || "guest",
-{{hsep}}	].join(" ");
+§mod.ts
+≔{{hrefr 3}}..{{hrefr 6}}
+	return [
+		"Dr",
+		name?.trim() || "guest",
+	].join(" ");
 </anti-pattern>
 
 <critical>
 - Copy anchors verbatim (line number + 2-char hash); NEVER include the `|TEXT` body.
-- Every payload line MUST start with `{{hsep}}`; raw content is invalid.
-- NEVER write unified diff syntax. Header is `@@ PATH`; ops are `<`/`+`/`-`/`=`.
-- `= A..B` deletes the range; payload is what's written. Edge line matches just outside? Widen, or it duplicates.
-- Multiple ops are cheap. SHOULD prefer two narrow ops over one wide `=`.
-  - Before `= A..B`, mentally delete A..B. Splits an unclosed bracket/brace/string from above, or orphans a closer inside? You're bisecting a construct.
+- NEVER write unified diff syntax. Headers are `§PATH`; ops are `»`/`«`/`≔`.
+- `≔A..B` deletes the range when no payload follows. To keep a blank line, include one explicit empty payload line.
+- `≔A..B` with payload writes exactly that payload. Edge line matches just outside? Widen, or it duplicates.
+- Multiple ops are cheap. SHOULD prefer two narrow ops over one wide `≔`.
+  - Before `≔A..B`, mentally delete A..B. Splits an unclosed bracket/brace/string from above, or orphans a closer inside? You're bisecting a construct.
 - NEVER use this tool to reformat code (indentation, whitespace, line wrapping, style). Run the project's formatter instead.
 </critical>

package/src/utils/commit-message-generator.ts

@@ -15,6 +15,8 @@ import { toReasoningEffort } from "../thinking";
 
 const COMMIT_SYSTEM_PROMPT = prompt.render(commitSystemPrompt);
 const MAX_DIFF_CHARS = 4000;
+const COMMIT_MAX_TOKENS = 60;
+const REASONING_SAFE_MAX_TOKENS = 1024;
 
 /** File patterns that should be excluded from commit message generation diffs. */
 const NOISE_SUFFIXES = [".lock", ".lockb", "-lock.json", "-lock.yaml"];
@@ -99,13 +101,16 @@ export async function generateCommitMessage(
 		if (!apiKey) continue;
 
 		try {
+			const maxTokens = candidate.model.reasoning
+				? Math.max(COMMIT_MAX_TOKENS, REASONING_SAFE_MAX_TOKENS)
+				: COMMIT_MAX_TOKENS;
 			const response = await completeSimple(
 				candidate.model,
 				{
 					systemPrompt: [COMMIT_SYSTEM_PROMPT],
 					messages: [{ role: "user", content: userMessage, timestamp: Date.now() }],
 				},
-				{ apiKey, maxTokens: 60, reasoning: toReasoningEffort(candidate.thinkingLevel) },
+				{ apiKey, maxTokens, reasoning: toReasoningEffort(candidate.thinkingLevel) },
 			);
 
 			if (response.stopReason === "error") {

package/src/utils/title-generator.ts

@@ -3,7 +3,7 @@
  */
 import * as path from "node:path";
 
-import { type Api, completeSimple, type Model } from "@oh-my-pi/pi-ai";
+import { type Api, type AssistantMessage, completeSimple, type Model, type Tool } from "@oh-my-pi/pi-ai";
 import { logger, prompt } from "@oh-my-pi/pi-utils";
 import type { ModelRegistry } from "../config/model-registry";
 import { resolveRoleSelection } from "../config/model-resolver";
@@ -16,6 +16,25 @@ const DEFAULT_TERMINAL_TITLE = "π";
 const TERMINAL_TITLE_CONTROL_CHARS = /[\u0000-\u001f\u007f-\u009f]/g;
 
 const MAX_INPUT_CHARS = 2000;
+const TITLE_MAX_TOKENS = 30;
+const REASONING_SAFE_MAX_TOKENS = 1024;
+const SET_TITLE_TOOL_NAME = "set_title";
+
+const setTitleTool: Tool = {
+	name: SET_TITLE_TOOL_NAME,
+	description: "Set the generated session title.",
+	parameters: {
+		type: "object",
+		properties: {
+			title: {
+				type: "string",
+				description: "A concise 3-6 word title for the session.",
+			},
+		},
+		required: ["title"],
+		additionalProperties: false,
+	},
+};
 
 function getTitleModel(registry: ModelRegistry, settings: Settings, currentModel?: Model<Api>): Model<Api> | undefined {
 	const availableModels = registry.getAvailable();
@@ -76,14 +95,16 @@ ${truncatedMessage}
 	// account_uuid rather than the snapshot-at-call-site value.
 	const metadata = metadataResolver?.(model.provider);
 
-	// Title generation is a 3-6 word task; force reasoning off so reasoning models
-	// don't burn the entire output budget on internal thinking and return an empty
-	// string. With reasoning disabled, 30 tokens of output is plenty.
+	// Title generation is a 3-6 word task, but some reasoning backends ignore
+	// disableReasoning. Keep the normal cheap budget for non-reasoning models
+	// while reserving enough output room for reasoning models to still emit
+	// the forced tool call after any unavoidable thinking tokens.
+	const maxTokens = model.reasoning ? Math.max(TITLE_MAX_TOKENS, REASONING_SAFE_MAX_TOKENS) : TITLE_MAX_TOKENS;
 	const request = {
 		model: `${model.provider}/${model.id}`,
 		systemPrompt: TITLE_SYSTEM_PROMPT,
 		userMessage,
-		maxTokens: 30,
+		maxTokens,
 	};
 	logger.debug("title-generator: request", request);
 
@@ -93,11 +114,13 @@ ${truncatedMessage}
 			{
 				systemPrompt: [request.systemPrompt],
 				messages: [{ role: "user", content: request.userMessage, timestamp: Date.now() }],
+				tools: [setTitleTool],
 			},
 			{
 				apiKey,
-				maxTokens: 30,
+				maxTokens: request.maxTokens,
 				disableReasoning: true,
+				toolChoice: { type: "tool", name: SET_TITLE_TOOL_NAME },
 				metadata,
 			},
 		);
@@ -111,13 +134,7 @@ ${truncatedMessage}
 			return null;
 		}
 
-		let title = "";
-		for (const content of response.content) {
-			if (content.type === "text") {
-				title += content.text;
-			}
-		}
-		title = title.trim();
+		const title = extractGeneratedTitle(response.content);
 
 		logger.debug("title-generator: response", {
 			model: request.model,
@@ -140,6 +157,21 @@ ${truncatedMessage}
 	}
 }
 
+function extractGeneratedTitle(contentBlocks: AssistantMessage["content"]): string {
+	let textTitle = "";
+	for (const content of contentBlocks) {
+		if (content.type === "toolCall" && content.name === SET_TITLE_TOOL_NAME) {
+			const args = content.arguments as Record<string, unknown>;
+			const title = args.title;
+			return typeof title === "string" ? title.trim() : "";
+		}
+		if (content.type === "text") {
+			textTitle += content.text;
+		}
+	}
+	return textTitle.trim();
+}
+
 /**
  * Remove control characters so model-generated titles cannot inject terminal escapes.
  */