@oh-my-pi/pi-coding-agent 15.13.1 → 15.13.2

package/src/modes/components/welcome.ts

@@ -70,8 +70,7 @@ export interface LspServerInfo {
 export class WelcomeComponent implements Component {
 	#animStart: number | null = null;
 	#animTimer: ReturnType<typeof setInterval> | null = null;
-	/** Tip chosen once per instance so re-renders (intro, LSP updates) don't shuffle it. */
-	readonly #tip: string | undefined = TIPS.length > 0 ? TIPS[Math.floor(Math.random() * TIPS.length)] : undefined;
+	#selectedTip: string | undefined;
 	// Render cache: the welcome box is the first transcript-area component, so
 	// returning a stable array reference keeps the whole frame prefix stable.
 	// Bypassed while the intro animation runs (every frame differs).
@@ -85,6 +84,16 @@ export class WelcomeComponent implements Component {
 		private recentSessions: RecentSession[] = [],
 		private lspServers: LspServerInfo[] = [],
 	) {}
+	get tip(): string | undefined {
+		if (this.#selectedTip === undefined) {
+			if (theme.getSymbolPreset() === "unicode" && Math.random() < 0.1) {
+				this.#selectedTip = "Please use nerdfont 😭.";
+			} else {
+				this.#selectedTip = TIPS.length > 0 ? TIPS[Math.floor(Math.random() * TIPS.length)] : "";
+			}
+		}
+		return this.#selectedTip || undefined;
+	}
 
 	invalidate(): void {
 		this.#cachedWidth = -1;
@@ -316,8 +325,9 @@ export class WelcomeComponent implements Component {
 	 * when no tip is available or the box is too narrow to be useful.
 	 */
 	#renderTip(boxWidth: number): string[] {
-		if (!this.#tip) return [];
-		return renderWelcomeTip(this.#tip, boxWidth);
+		const tip = this.tip;
+		if (!tip) return [];
+		return renderWelcomeTip(tip, boxWidth);
 	}
 
 	/** Center text within a given width */

package/src/modes/controllers/input-controller.ts

@@ -44,26 +44,9 @@ function hasPasteText(value: unknown): value is PasteTarget {
 	return typeof value === "object" && value !== null && typeof (value as PasteTarget).pasteText === "function";
 }
 
-/** Wrap pasted text in a fenced code block, using a backtick fence longer than any run of
- *  backticks already in the content so an embedded fence cannot terminate the block early. */
-function wrapPasteInCodeBlock(content: string): string {
-	let longestRun = 0;
-	let run = 0;
-	for (let i = 0; i < content.length; i++) {
-		if (content.charCodeAt(i) === 96 /* backtick */) {
-			run++;
-			if (run > longestRun) longestRun = run;
-		} else {
-			run = 0;
-		}
-	}
-	const fence = "`".repeat(Math.max(3, longestRun + 1));
-	return `${fence}\n${content}\n${fence}`;
-}
-
-/** Wrap pasted text in `<pasted_text>` tags so the model treats it as one quoted block. */
-function wrapPasteInXml(content: string): string {
-	return `<pasted_text>\n${content}\n</pasted_text>`;
+/** Wrap pasted text in `<attachment>` tags so the model treats it as one quoted block. */
+function wrapPasteInAttachmentBlock(content: string): string {
+	return `<attachment>\n${content}\n</attachment>`;
 }
 
 const TINY_TITLE_PROGRESS_DONE_TTL_MS = 3_000;
@@ -99,8 +82,8 @@ export class InputController {
 	// (>= LEFT_DOUBLE_TAP_MAX_GAP_MS) starts a fresh sequence. See
 	// #detectLeftDoubleTap.
 	#leftTapCount = 0;
-	// Sequential index for `local://attachment-N` references created by the large-paste "attach as
-	// file" action. Seeded from 0 and bumped past any existing attachment files in #attachPasteAsFile.
+	// Sequential index for `local://attachment-N` references created by the large-paste local-file
+	// action. Seeded from 0 and bumped past any existing attachment files in #attachPasteAsFile.
 	#attachmentCounter = 0;
 
 	#showTinyTitleDownloadProgress(modelKey: string): void {
@@ -1282,24 +1265,24 @@ export class InputController {
 	}
 
 	/**
-	 * Present the large-paste menu and apply the chosen action: wrap in a code block or in XML tags
-	 * (both collapse to a `[Paste]` marker that expands on submit), or save the text to a file and
-	 * reference its path so the agent can `read` it on demand. Cancelling (Esc) falls back to the
-	 * default inline paste marker, so the pasted content is never lost.
+	 * Present the large-paste menu and apply the chosen action: wrap in `<attachment>` tags (collapsed
+	 * to a `[Paste]` marker that expands on submit), save the text to a file and reference its path so
+	 * the agent can `read` it on demand, or paste inline. Cancelling (Esc) falls back to the default
+	 * inline paste marker, so the pasted content is never lost.
 	 */
 	async presentLargePasteMenu(text: string, lineCount: number): Promise<void> {
-		const CODE_BLOCK = "Wrap in a code block";
-		const XML = "Wrap in XML tags";
-		const FILE = "Attach as a file";
+		const WRAPPED_BLOCK = "Attach as a wrapped block";
+		const LOCAL_FILE = "Attach as local file";
+		const INLINE = "Paste inline";
 
 		let choice: string | undefined;
 		try {
 			choice = await this.ctx.showHookSelector(
 				`Pasted ${lineCount} lines`,
 				[
-					{ label: CODE_BLOCK, description: "Fence the text in a ``` block, collapsed to a marker" },
-					{ label: XML, description: "Wrap the text in <pasted_text> tags, collapsed to a marker" },
-					{ label: FILE, description: "Save the text to a file and reference its path" },
+					{ label: WRAPPED_BLOCK, description: "Wrap the text in <attachment> tags, collapsed to a marker" },
+					{ label: LOCAL_FILE, description: "Save the text to a local://attachment file" },
+					{ label: INLINE, description: "Collapse the text to an inline paste marker" },
 				],
 				{ helpText: "Esc to paste inline" },
 			);
@@ -1309,15 +1292,15 @@ export class InputController {
 		}
 
 		switch (choice) {
-			case CODE_BLOCK:
-				this.ctx.editor.insertPaste(wrapPasteInCodeBlock(text));
-				break;
-			case XML:
-				this.ctx.editor.insertPaste(wrapPasteInXml(text));
+			case WRAPPED_BLOCK:
+				this.ctx.editor.insertPaste(wrapPasteInAttachmentBlock(text));
 				break;
-			case FILE:
+			case LOCAL_FILE:
 				await this.#attachPasteAsFile(text, lineCount);
 				break;
+			case INLINE:
+				this.ctx.editor.insertPaste(text);
+				break;
 			default:
 				// Esc / cancel: keep the original behavior — collapse to an inline paste marker.
 				this.ctx.editor.insertPaste(text);

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

@@ -796,6 +796,7 @@ export async function runRpcMode(
 						name: tool.name,
 						description: tool.description,
 						parameters: isZodSchema(tool.parameters) ? zodToWireSchema(tool.parameters) : tool.parameters,
+						examples: tool.examples,
 					})),
 					contextUsage: session.getContextUsage(),
 				};

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

@@ -6,7 +6,7 @@
  */
 import type { AgentMessage, AgentToolResult, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { CompactionResult } from "@oh-my-pi/pi-agent-core/compaction";
-import type { Effort, ImageContent, Model } from "@oh-my-pi/pi-ai";
+import type { Effort, ImageContent, Model, ToolExample } from "@oh-my-pi/pi-ai";
 import type { BashResult } from "../../exec/bash-executor";
 import type { ContextUsage } from "../../extensibility/extensions/types";
 import type { AgentSessionEvent, SessionStats } from "../../session/agent-session";
@@ -107,7 +107,7 @@ export interface RpcSessionState {
 	todoPhases: TodoPhase[];
 	/** For session dump / export (plain-text parity with /dump). */
 	systemPrompt?: string[];
-	dumpTools?: Array<{ name: string; description: string; parameters: unknown }>;
+	dumpTools?: Array<{ name: string; description: string; parameters: unknown; examples?: readonly ToolExample[] }>;
 	/** Current context window usage. Null tokens/percent when unknown (e.g. right after compaction). */
 	contextUsage?: ContextUsage;
 }

package/src/prompts/system/system-prompt.md

@@ -24,27 +24,6 @@ Use tools whenever they materially improve correctness, completeness, or groundi
 - SHOULD parallelize calls when possible.
 {{#has tools "task"}}- User says `parallel`/`parallelize` → MUST use `{{toolRefs.task}}` subagents; parallel tool calls alone do not satisfy.{{/has}}
 
-{{#if toolInfo.length}}
-# Inventory
-{{#if mcpDiscoveryMode}}
-<discovery-notice>
-{{#if hasMCPDiscoveryServers}}Discoverable MCP servers in this session: {{#list mcpDiscoveryServerSummaries join=", "}}{{this}}{{/list}}.{{/if}}
-If the task may involve external systems, SaaS APIs, chat, tickets, databases, deployments, or other non-local integrations, you SHOULD call `{{toolRefs.search_tool_bm25}}` before concluding no such tool exists.
-</discovery-notice>
-{{/if}}
-{{#if repeatToolDescriptions}}
-{{#each toolInfo}}
-<tool name={{name}}>
-{{description}}
-</tool>
-{{/each}}
-{{else}}
-{{#each toolInfo}}
-- {{#if label}}{{label}}: `{{name}}`{{else}}`{{name}}`{{/if}}
-{{/each}}
-{{/if}}
-{{/if}}
-
 # I/O
 - For tools taking `path` or path-like fields, prefer relative paths.
 {{#if intentTracing}}- Most tools have a `{{intentField}}` parameter. Fill it with a concise intent in present participle form, 2-6 words, no period, capitalized.{{/if}}
@@ -115,6 +94,23 @@ Delegation is preferred here. Once the design is settled, you SHOULD fan substan
 {{/has}}
 {{/if}}
 
+{{#if toolInfo.length}}
+# Inventory
+{{#if mcpDiscoveryMode}}
+<discovery-notice>
+{{#if hasMCPDiscoveryServers}}Discoverable MCP servers in this session: {{#list mcpDiscoveryServerSummaries join=", "}}{{this}}{{/list}}.{{/if}}
+If the task may involve external systems, SaaS APIs, chat, tickets, databases, deployments, or other non-local integrations, you SHOULD call `{{toolRefs.search_tool_bm25}}` before concluding no such tool exists.
+</discovery-notice>
+{{/if}}
+{{#if toolListMode}}
+{{#each toolInfo}}
+- {{#if label}}{{label}}: `{{name}}`{{else}}`{{name}}`{{/if}}
+{{/each}}
+{{else}}
+{{toolInventory}}
+{{/if}}
+{{/if}}
+
 ENV
 ===================================
 

package/src/prompts/tools/ask.md

@@ -20,11 +20,3 @@ Asks user when you need clarification or input during task execution.
 - **If multiple choices are acceptable**, pick the most conservative/standard option and proceed; state the choice.
 - **Do NOT include "Other" option** — UI automatically adds "Other (type your own)" to every question.
 </critical>
-
-<examples>
-# Single question
-questions: [{"id": "auth_method", "question": "Which authentication method should this API use?", "options": [{"label": "JWT", "description": "Bearer tokens for stateless API clients."}, {"label": "OAuth2", "description": "Delegated authorization with external identity providers."}, {"label": "Session cookies", "description": "Browser-first authentication backed by server-side sessions."}], "recommended": 0}]
-
-# Multiple questions
-questions: [{"id": "storage_type", "question": "Which storage backend?", "options": [{"label": "SQLite"}, {"label": "PostgreSQL"}]}, {"id": "auth_method", "question": "Which auth method?", "options": [{"label": "JWT"}, {"label": "Session cookies"}]}]
-</examples>

package/src/prompts/tools/ast-edit.md

@@ -18,21 +18,6 @@ Performs structural AST-aware rewrites via native ast-grep.
 - Parse issues when files cannot be processed
 </output>
 
-<examples>
-# Rename a call site across TypeScript files
-`{"ops":[{"pat":"oldApi($$$ARGS)","out":"newApi($$$ARGS)"}],"paths":["src/**/*.ts"]}`
-# Delete matching calls
-`{"ops":[{"pat":"console.log($$$ARGS)","out":""}],"paths":["src/**/*.ts"]}`
-# Rewrite import source path
-`{"ops":[{"pat":"import { $$$IMPORTS } from \"old-package\"","out":"import { $$$IMPORTS } from \"new-package\""}],"paths":["src/**/*.ts"]}`
-# Modernize to optional chaining (same metavariable enforces identity)
-`{"ops":[{"pat":"$A && $A()","out":"$A?.()"}],"paths":["src/**/*.ts"]}`
-# Swap two arguments using captures
-`{"ops":[{"pat":"assertEqual($A, $B)","out":"assertEqual($B, $A)"}],"paths":["tests/**/*.ts"]}`
-# Python — convert print calls to logging
-`{"ops":[{"pat":"print($$$ARGS)","out":"logger.info($$$ARGS)"}],"paths":["src/**/*.py"]}`
-</examples>
-
 <critical>
 - Parse issues mean the rewrite is malformed or mis-scoped — fix the pattern before assuming a clean no-op
 - For one-off local text edits, you SHOULD prefer the Edit tool

package/src/prompts/tools/ast-grep.md

@@ -22,19 +22,6 @@ Performs structural code search using AST matching via native ast-grep.
 - Summary counts (`totalMatches`, `filesWithMatches`, `filesSearched`) and parse issues when present
 </output>
 
-<examples>
-# Search TypeScript files under src
-`{"pat":"console.log($$$)","paths":["src/**/*.ts"]}`
-# Named imports from a specific package
-`{"pat":"import { $$$IMPORTS } from \"react\"","paths":["src/**/*.ts"]}`
-# Arrow functions assigned to a const
-`{"pat":"const $NAME = ($$$ARGS) => $BODY","paths":["src/utils/**/*.ts"]}`
-# Method call on any object, ignoring method name with `$_`
-`{"pat":"logger.$_($$$ARGS)","paths":["src/**/*.ts"]}`
-# Loosest existence check for a symbol in one file
-`{"pat":"processItems","paths":["src/worker.ts"]}`
-</examples>
-
 <critical>
 - AVOID repo-root scans — narrow `paths` first
 - Parse issues are query failure, not evidence of absence: repair the pattern or tighten `paths` before concluding "no matches"

package/src/prompts/tools/browser.md

@@ -37,27 +37,6 @@ Drives real Chromium tab; full puppeteer access via JS execution.
 - `code` runs with full Node access. Treat as your code, not sandboxed code.
 </critical>
 
-<examples>
-# Open a tab and read structured page data
-`{"action":"open","name":"docs","url":"https://example.com"}`
-`{"action":"run","name":"docs","code":"const obs = await tab.observe(); display(obs); return obs.elements.length;"}`
-
-# Click an observed element by id
-`{"action":"run","name":"docs","code":"const obs = await tab.observe(); const link = obs.elements.find(e => e.role === 'link' && e.name === 'Sign in'); assert(link, 'Sign in link missing'); await (await tab.id(link.id)).click();"}`
-
-# Fill and submit a form via selectors
-`{"action":"run","name":"docs","code":"await tab.fill('input[name=email]', 'me@example.com'); await tab.click('text/Continue');"}`
-
-# Screenshot to look at the page — no save path
-`{"action":"run","name":"docs","code":"await tab.screenshot();"}`
-
-# Attach to an existing Electron app
-`{"action":"open","name":"cursor","app":{"path":"/Applications/Cursor.app/Contents/MacOS/Cursor"}}`
-
-# Close every tab and kill spawned-app processes
-`{"action":"close","all":true,"kill":true}`
-</examples>
-
 <output>
 Per call: `display(value)` outputs (text/images), then the JSON-stringified return value of `code`. `run` always produces at least a status line.
 </output>

package/src/prompts/tools/debug.md

@@ -19,16 +19,3 @@ Use for launching or attaching debuggers, setting breakpoints, stepping through
 - `program` must be an executable file or debug target, not a directory or interpreter name that resolves to a workspace directory.
 - Python debugging requires `debugpy`; install with `pip install debugpy` if the adapter is unavailable.
 </caution>
-
-<examples>
-# Launch and inspect hang
-1. `debug(action: "launch", program: "./my_app")`
-2. `debug(action: "set_breakpoint", file: "src/main.c", line: 42)`
-3. `debug(action: "continue")`
-4. If the program appears hung: `debug(action: "pause")`
-5. Inspect state with `threads`, `stack_trace`, `scopes`, and `variables`
-# Launch a Python script with debugpy
-`debug(action: "launch", adapter: "debugpy", program: "scripts/job.py", args: ["--flag"])`
-# Raw debugger command through repl
-`debug(action: "evaluate", expression: "info registers", context: "repl")`
-</examples>

package/src/prompts/tools/eval.md

@@ -58,12 +58,3 @@ budget → per-turn token budget
     {{#if py}}`budget.total` (ceiling or None), `budget.spent()`, `budget.remaining()` (math.inf when no ceiling), `budget.hard` (bool).{{/if}}{{#if js}}`await budget.total()` (ceiling or null), `await budget.spent()`, `await budget.remaining()` (Infinity when no ceiling), `await budget.hard()`.{{/if}} Ceiling comes from a `+Nk` directive (advisory) or `+Nk!`/Goal Mode (hard — `agent()` refuses to spawn past it); otherwise None/null, spend still tracked across the turn.
 ```
 </prelude>
-
-<example>
-{
-  "cells": [
-    { "language": "py", "title": "imports", "timeout": 10, "code": "import json\nfrom pathlib import Path" },
-    { "language": "py", "title": "load config", "code": "data = json.loads(read('package.json'))\ndisplay(data)" }
-  ]
-}
-</example>

package/src/prompts/tools/find.md

@@ -14,19 +14,6 @@ Finds files and directories using fast pattern matching that works with any code
 Matching file and directory paths sorted by modification time (most recent first), grouped by directory to reduce token usage. Each group starts with `# <dir>/` followed by basenames (one per line); directory entries get a trailing `/`. Root-level entries have no header. Truncated at 200 entries or 50KB.
 </output>
 
-<examples>
-# Find files
-`{"paths": ["src/**/*.ts"]}`
-# Multiple targets — separate array elements
-`{"paths": ["src/**/*.ts", "test/**/*.ts"]}`
-# Find gitignored files like .env
-`{"paths": [".env*"], "gitignore": false}`
-# Find directories matching a name (returns both files and dirs; directories are suffixed with `/`)
-`{"paths": ["**/tests"]}`
-# Long-running search on a slow volume
-`{"paths": ["/Volumes/Storage/**/*.py"], "timeout": 30}`
-</examples>
-
 <avoid>
 For open-ended searches requiring multiple rounds of globbing and searching, you MUST use Task tool instead.
 </avoid>

package/src/prompts/tools/inspect-image.md

@@ -11,15 +11,6 @@ Inspects an image file with a vision-capable model and returns compact text anal
 - Use this tool over `read` when the goal is image analysis
 </instruction>
 
-<examples>
-# OCR with strict formatting
-`{"path":"screenshots/error.png","question":"Extract all visible text verbatim. Return as bullet list in reading order."}`
-# Screenshot debugging
-`{"path":"screenshots/settings.png","question":"Identify the likely cause of the disabled Save button. Return: (1) observations, (2) likely cause, (3) confidence."}`
-# Scene/object question
-`{"path":"photos/shelf.jpg","question":"List all clearly visible product labels and their shelf positions (top/middle/bottom). If unreadable, say unreadable."}`
-</examples>
-
 <output>
 - Returns text-only analysis from the vision model
 - No image content blocks are returned in tool output

package/src/prompts/tools/irc.md

@@ -40,18 +40,3 @@ Applies to sending and replying.
 - `inbox`: pending messages, oldest first.
 - `list`: peers with status, unread count, parent, last activity.
 </output>
-
-<examples>
-# List peers
-`{"op": "list"}`
-# Fire-and-forget DM — same send wakes idle/parked peers
-`{"op": "send", "to": "AuthLoader", "message": "Still touching src/server/auth.ts? I need to add a 401 path."}`
-# Round-trip when you cannot proceed without the answer
-`{"op": "send", "to": "Main", "message": "JWT or session cookies for the auth flow?", "await": true}`
-# Block until a specific peer answers
-`{"op": "wait", "from": "AuthLoader", "timeoutMs": 60000}`
-# Drain pending messages
-`{"op": "inbox"}`
-# Broadcast to live peers (no replies expected)
-`{"op": "send", "to": "all", "message": "About to refactor src/server/middleware/*. Anyone already in there?"}`
-</examples>

package/src/prompts/tools/patch.md

@@ -50,19 +50,6 @@ Returns success/failure; on failure, error message indicates:
 - NEVER use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier --write`, etc.) — not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.
 </critical>
 
-<examples>
-# Create
-`edit {"path":"hello.txt","edits":[{"op":"create","diff":"Hello\n"}]}`
-# Update
-`edit {"path":"src/app.py","edits":[{"op":"update","diff":"@@ def greet():\n def greet():\n-print('Hi')\n+print('Hello')\n"}]}`
-# Rename
-`edit {"path":"src/app.py","edits":[{"op":"update","rename":"src/main.py","diff":"@@\n …\n"}]}`
-# Delete
-`edit {"path":"obsolete.txt","edits":[{"op":"delete"}]}`
-# Multiple entries
-All entries in one call apply to the top-level `path`; use separate calls for different files.
-</examples>
-
 <avoid>
 - Generic anchors: `import`, `export`, `describe`, `function`, `const`
 - Repeating same addition in multiple hunks (duplicate blocks)

package/src/prompts/tools/ssh.md

@@ -20,12 +20,3 @@ Runs commands on remote hosts.
 <critical>
 You MUST verify the shell type from "Available hosts" and use matching commands.
 </critical>
-
-<examples>
-# List files: Linux
-Host: server1 (10.0.0.1) | linux/bash. Command: `ls -la /home/user`
-# Show running processes: Windows cmd
-Host: winbox (192.168.1.5) | windows/cmd. Command: `tasklist /v`
-# Get system info: macOS
-Host: macbook (10.0.0.20) | macos/zsh. Command: `uname -a && sw_vers`
-</examples>

package/src/prompts/tools/todo.md

@@ -9,6 +9,7 @@ Allowed `op` values are only `init`, `start`, `done`, `drop`, `rm`, `append`, an
 |`op`|Required fields|Effect|
 |---|---|---|
 |`init`|`list: [{phase, items: string[]}]`|Initialize the full list (replaces any existing list)|
+|`init`|`items: string[]`|Flattened single-phase init|
 |`start`|`task`|Mark in progress|
 |`done`|`task` or `phase`|Mark completed|
 |`drop`|`task` or `phase`|Mark abandoned|
@@ -33,25 +34,6 @@ Allowed `op` values are only `init`, `start`, `done`, `drop`, `rm`, `append`, an
 - User provides a set of tasks to complete
 - New instructions arrive mid-task — capture before proceeding
 
-<examples>
-# Initial setup (multi-phase)
-`{"ops":[{"op":"init","list":[{"phase":"Foundation","items":["Scaffold crate","Wire workspace"]},{"phase":"Auth","items":["Port credential store","Wire OAuth providers"]},{"phase":"Verification","items":["Run cargo test"]}]}]}`
-# View current state (read-only)
-`{"ops":[{"op":"view"}]}`
-# Initial setup (single phase)
-`{"ops":[{"op":"init","list":[{"phase":"Implementation","items":["Apply fix","Run tests"]}]}]}`
-# Complete one task
-`{"ops":[{"op":"done","task":"Wire workspace"}]}`
-# Complete a whole phase
-`{"ops":[{"op":"done","phase":"Auth"}]}`
-# Remove all tasks
-`{"ops":[{"op":"rm"}]}`
-# Drop one task
-`{"ops":[{"op":"drop","task":"Run cargo test"}]}`
-# Append tasks to a phase
-`{"ops":[{"op":"append","phase":"Auth","items":["Handle retries","Run tests"]}]}`
-</examples>
-
 <critical>
 When the user hands you a multi-step plan — a phased todo, a numbered or bulleted checklist, or "N bugs/items/tasks" to work through:
 - You MUST `init` the list with EVERY item as its own task before doing the work.

package/src/sdk.ts

@@ -16,6 +16,7 @@ import {
 	type SimpleStreamOptions,
 	streamSimple,
 } from "@oh-my-pi/pi-ai";
+import type { ToolCallSyntax } from "@oh-my-pi/pi-ai/grammar";
 import {
 	getOpenAICodexTransportDetails,
 	prewarmOpenAICodexResponses,
@@ -550,6 +551,17 @@ export interface CreateAgentSessionResult {
 	eventBus: EventBus;
 }
 
+export type ToolCallFormat = "auto" | "native" | ToolCallSyntax;
+
+export function resolveToolCallSyntax(
+	format: ToolCallFormat,
+	model: Pick<Model, "supportsTools"> | undefined,
+): ToolCallSyntax | undefined {
+	if (format === "native") return undefined;
+	if (format === "auto") return model?.supportsTools === false ? "glm" : undefined;
+	return format;
+}
+
 // Re-exports
 
 export type { PromptTemplate } from "./config/prompt-templates";
@@ -2149,6 +2161,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				}
 				appendPrompt = parts.join("\n\n");
 			}
+			// Owned/in-band tool syntax (non-native) repeats the catalog as `# Tool:`
+			// sections; native tool calling lets the compact name list suffice.
+			const nativeTools =
+				resolveToolCallSyntax(settings.get("tools.format"), agent?.state.model ?? model) === undefined;
 			const defaultPrompt = await buildSystemPromptInternal({
 				cwd,
 				skills,
@@ -2160,6 +2176,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				skillsSettings: settings.getGroup("skills"),
 				appendSystemPrompt: appendPrompt,
 				repeatToolDescriptions,
+				nativeTools,
 				intentField,
 				mcpDiscoveryMode: hasDiscoverableTools,
 				mcpDiscoveryServerSummaries: discoverableToolSummary.servers.map(formatDiscoverableToolServerSummary),
@@ -2489,6 +2506,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				return result;
 			},
 			intentTracing: !!intentField,
+			toolCallSyntax: resolveToolCallSyntax(settings.get("tools.format"), model),
+			abortOnFabricatedToolResult: settings.get("tools.abortOnFabricatedResult"),
 			getToolChoice: () => session?.nextToolChoice(),
 			telemetry: options.telemetry,
 			appendOnlyContext: model