@oh-my-pi/pi-coding-agent 13.3.6 → 13.3.8

package/src/lsp/render.ts

@@ -15,6 +15,7 @@ import {
 	formatExpandHint,
 	formatMoreItems,
 	formatStatusIcon,
+	replaceTabs,
 	shortenPath,
 	TRUNCATE_LENGTHS,
 	truncateToWidth,
@@ -31,9 +32,16 @@ import type { LspParams, LspToolDetails } from "./types";
  * Render the LSP tool call in the TUI.
  * Shows: "lsp <operation> <file/filecount>"
  */
+function sanitizeInlineText(value: string): string {
+	return replaceTabs(value).replaceAll(/\r?\n/g, " ");
+}
+
 export function renderCall(args: LspParams, _options: RenderResultOptions, theme: Theme): Text {
 	const actionLabel = (args.action ?? "request").replace(/_/g, " ");
 	const queryPreview = args.query ? truncateToWidth(args.query, TRUNCATE_LENGTHS.SHORT) : undefined;
+	const symbolPreview = args.symbol
+		? truncateToWidth(sanitizeInlineText(args.symbol), TRUNCATE_LENGTHS.SHORT)
+		: undefined;
 
 	let target: string | undefined;
 	let hasFileTarget = false;
@@ -41,26 +49,17 @@ export function renderCall(args: LspParams, _options: RenderResultOptions, theme
 	if (args.file) {
 		target = shortenPath(args.file);
 		hasFileTarget = true;
-	} else if (args.files?.length === 1) {
-		target = shortenPath(args.files[0]);
-		hasFileTarget = true;
-	} else if (args.files?.length) {
-		target = `${args.files.length} files`;
 	}
 
 	if (hasFileTarget && args.line !== undefined) {
-		const col = args.column !== undefined ? `:${args.column}` : "";
-		target += `:${args.line}${col}`;
-		if (args.end_line !== undefined) {
-			const endCol = args.end_character !== undefined ? `:${args.end_character}` : "";
-			target += `-${args.end_line}${endCol}`;
+		target += `:${args.line}`;
+		if (symbolPreview) {
+			target += ` (${symbolPreview})`;
 		}
 	} else if (!target && args.line !== undefined) {
-		const col = args.column !== undefined ? `:${args.column}` : "";
-		target = `line ${args.line}${col}`;
-		if (args.end_line !== undefined) {
-			const endCol = args.end_character !== undefined ? `:${args.end_character}` : "";
-			target += `-${args.end_line}${endCol}`;
+		target = `line ${args.line}`;
+		if (symbolPreview) {
+			target += ` (${symbolPreview})`;
 		}
 	}
 
@@ -68,9 +67,6 @@ export function renderCall(args: LspParams, _options: RenderResultOptions, theme
 	if (queryPreview && target) meta.push(`query:${queryPreview}`);
 	if (args.new_name) meta.push(`new:${args.new_name}`);
 	if (args.apply !== undefined) meta.push(`apply:${args.apply ? "true" : "false"}`);
-	if (args.include_declaration !== undefined) {
-		meta.push(`include_decl:${args.include_declaration ? "true" : "false"}`);
-	}
 
 	const descriptionParts = [actionLabel];
 	if (target) {
@@ -104,7 +100,7 @@ export function renderResult(
 	result: { content: Array<{ type: string; text?: string }>; details?: LspToolDetails; isError?: boolean },
 	options: RenderResultOptions,
 	theme: Theme,
-	args?: LspParams & { file?: string; files?: string[] },
+	args?: LspParams,
 ): Component {
 	const content = result.content?.[0];
 	if (!content || content.type !== "text" || !("text" in content) || !content.text) {
@@ -129,25 +125,19 @@ export function renderResult(
 	const requestLines: string[] = [];
 	if (request?.file) {
 		requestLines.push(theme.fg("toolOutput", request.file));
-	} else if (request?.files?.length === 1) {
-		requestLines.push(theme.fg("toolOutput", request.files[0]));
-	} else if (request?.files?.length) {
-		requestLines.push(theme.fg("dim", `${request.files.length} file(s)`));
 	}
 	if (request?.line !== undefined) {
-		const col = request.column !== undefined ? `:${request.column}` : "";
-		requestLines.push(theme.fg("dim", `line ${request.line}${col}`));
+		requestLines.push(theme.fg("dim", `line ${request.line}`));
 	}
-	if (request?.end_line !== undefined) {
-		const endCol = request.end_character !== undefined ? `:${request.end_character}` : "";
-		requestLines.push(theme.fg("dim", `end ${request.end_line}${endCol}`));
+	if (request?.symbol) {
+		requestLines.push(theme.fg("dim", `symbol: ${sanitizeInlineText(request.symbol)}`));
+		if (request.occurrence !== undefined) {
+			requestLines.push(theme.fg("dim", `occurrence: ${request.occurrence}`));
+		}
 	}
 	if (request?.query) requestLines.push(theme.fg("dim", `query: ${request.query}`));
 	if (request?.new_name) requestLines.push(theme.fg("dim", `new name: ${request.new_name}`));
 	if (request?.apply !== undefined) requestLines.push(theme.fg("dim", `apply: ${request.apply ? "true" : "false"}`));
-	if (request?.include_declaration !== undefined) {
-		requestLines.push(theme.fg("dim", `include declaration: ${request.include_declaration ? "true" : "false"}`));
-	}
 
 	const outputBlock = new CachedOutputBlock();
 

package/src/lsp/types.ts

@@ -7,19 +7,32 @@ import { type Static, Type } from "@sinclair/typebox";
 // =============================================================================
 
 export const lspSchema = Type.Object({
-	action: StringEnum(["diagnostics", "definition", "references", "hover", "symbols", "rename", "status", "reload"], {
-		description: "LSP operation",
-	}),
-	files: Type.Optional(Type.Array(Type.String({ description: "File path" }))),
+	action: StringEnum(
+		[
+			"diagnostics",
+			"definition",
+			"references",
+			"hover",
+			"symbols",
+			"rename",
+			"code_actions",
+			"type_definition",
+			"implementation",
+			"status",
+			"reload",
+		],
+		{ description: "LSP operation" },
+	),
 	file: Type.Optional(Type.String({ description: "File path" })),
 	line: Type.Optional(Type.Number({ description: "Line number (1-indexed)" })),
-	column: Type.Optional(Type.Number({ description: "Column number (1-indexed)" })),
-	end_line: Type.Optional(Type.Number({ description: "End line for range (1-indexed)" })),
-	end_character: Type.Optional(Type.Number({ description: "End column for range (1-indexed)" })),
+	symbol: Type.Optional(
+		Type.String({ description: "Symbol/substring to locate on the line (used to compute column)" }),
+	),
+	occurrence: Type.Optional(Type.Number({ description: "Symbol occurrence on line (1-indexed, default: 1)" })),
 	query: Type.Optional(Type.String({ description: "Search query or SSR pattern" })),
 	new_name: Type.Optional(Type.String({ description: "New name for rename" })),
 	apply: Type.Optional(Type.Boolean({ description: "Apply edits (default: true)" })),
-	include_declaration: Type.Optional(Type.Boolean({ description: "Include declaration in refs (default: true)" })),
+	timeout: Type.Optional(Type.Number({ description: "Request timeout in seconds" })),
 });
 
 export type LspParams = Static<typeof lspSchema>;

package/src/lsp/utils.ts

@@ -1,8 +1,11 @@
 export { truncate } from "@oh-my-pi/pi-utils";
 
 import path from "node:path";
+import { isEnoent } from "@oh-my-pi/pi-utils";
 import { type Theme, theme } from "../modes/theme/theme";
 import type {
+	CodeAction,
+	Command,
 	Diagnostic,
 	DiagnosticSeverity,
 	DocumentSymbol,
@@ -475,7 +478,8 @@ export function formatDocumentSymbol(symbol: DocumentSymbol, indent = 0): string
 	const prefix = "  ".repeat(indent);
 	const icon = symbolKindToIcon(symbol.kind);
 	const line = symbol.range.start.line + 1;
-	const results = [`${prefix}${icon} ${symbol.name} @ line ${line}`];
+	const detail = symbol.detail ? ` ${symbol.detail}` : "";
+	const results = [`${prefix}${icon} ${symbol.name}${detail} @ line ${line}`];
 
 	if (symbol.children) {
 		for (const child of symbol.children) {
@@ -496,6 +500,110 @@ export function formatSymbolInformation(symbol: SymbolInformation, cwd: string):
 	return `${icon} ${symbol.name}${container} @ ${location}`;
 }
 
+export function filterWorkspaceSymbols(symbols: SymbolInformation[], query: string): SymbolInformation[] {
+	const needle = query.trim().toLowerCase();
+	if (!needle) return symbols;
+	return symbols.filter(symbol => {
+		const fields = [symbol.name, symbol.containerName ?? "", uriToFile(symbol.location.uri)];
+		return fields.some(field => field.toLowerCase().includes(needle));
+	});
+}
+
+export function dedupeWorkspaceSymbols(symbols: SymbolInformation[]): SymbolInformation[] {
+	const seen = new Set<string>();
+	const unique: SymbolInformation[] = [];
+	for (const symbol of symbols) {
+		const key = [
+			symbol.name,
+			symbol.containerName ?? "",
+			symbol.kind,
+			symbol.location.uri,
+			symbol.location.range.start.line,
+			symbol.location.range.start.character,
+		].join(":");
+		if (seen.has(key)) continue;
+		seen.add(key);
+		unique.push(symbol);
+	}
+	return unique;
+}
+
+export function formatCodeAction(action: CodeAction | Command, index: number): string {
+	const kind = "kind" in action && action.kind ? action.kind : "action";
+	const preferred = "isPreferred" in action && action.isPreferred ? " (preferred)" : "";
+	const disabled = "disabled" in action && action.disabled ? ` (disabled: ${action.disabled.reason})` : "";
+	return `${index}: [${kind}] ${action.title}${preferred}${disabled}`;
+}
+
+export interface CodeActionApplyDependencies {
+	resolveCodeAction?: (action: CodeAction) => Promise<CodeAction>;
+	applyWorkspaceEdit: (edit: WorkspaceEdit) => Promise<string[]>;
+	executeCommand: (command: Command) => Promise<void>;
+}
+
+export interface AppliedCodeActionResult {
+	title: string;
+	edits: string[];
+	executedCommands: string[];
+}
+
+function isCommandItem(action: CodeAction | Command): action is Command {
+	return typeof action.command === "string";
+}
+
+export async function applyCodeAction(
+	action: CodeAction | Command,
+	dependencies: CodeActionApplyDependencies,
+): Promise<AppliedCodeActionResult | null> {
+	if (isCommandItem(action)) {
+		await dependencies.executeCommand(action);
+		return { title: action.title, edits: [], executedCommands: [action.command] };
+	}
+
+	let resolvedAction = action;
+	if (!resolvedAction.edit && dependencies.resolveCodeAction) {
+		try {
+			resolvedAction = await dependencies.resolveCodeAction(resolvedAction);
+		} catch {
+			// Resolve is optional; continue with unresolved action.
+		}
+	}
+
+	const edits = resolvedAction.edit ? await dependencies.applyWorkspaceEdit(resolvedAction.edit) : [];
+	const executedCommands: string[] = [];
+	if (resolvedAction.command) {
+		await dependencies.executeCommand(resolvedAction.command);
+		executedCommands.push(resolvedAction.command.command);
+	}
+
+	if (edits.length === 0 && executedCommands.length === 0) {
+		return null;
+	}
+
+	return { title: resolvedAction.title, edits, executedCommands };
+}
+
+const GLOB_PATTERN_CHARS = /[*?[{]/;
+
+export function hasGlobPattern(value: string): boolean {
+	return GLOB_PATTERN_CHARS.test(value);
+}
+
+export async function collectGlobMatches(
+	pattern: string,
+	cwd: string,
+	maxMatches: number,
+): Promise<{ matches: string[]; truncated: boolean }> {
+	const normalizedLimit = Number.isFinite(maxMatches) ? Math.max(1, Math.trunc(maxMatches)) : 1;
+	const matches: string[] = [];
+	for await (const match of new Bun.Glob(pattern).scan({ cwd })) {
+		if (matches.length >= normalizedLimit) {
+			return { matches, truncated: true };
+		}
+		matches.push(match);
+	}
+	return { matches, truncated: false };
+}
 // =============================================================================
 // Hover Content Extraction
 // =============================================================================
@@ -525,3 +633,87 @@ export function extractHoverText(
 
 // =============================================================================
 // General Utilities
+
+function firstNonWhitespaceColumn(lineText: string): number {
+	const match = lineText.match(/\S/);
+	return match ? (match.index ?? 0) : 0;
+}
+
+function findSymbolMatchIndexes(lineText: string, symbol: string, caseInsensitive = false): number[] {
+	if (symbol.length === 0) return [];
+	const haystack = caseInsensitive ? lineText.toLowerCase() : lineText;
+	const needle = caseInsensitive ? symbol.toLowerCase() : symbol;
+	const indexes: number[] = [];
+	let fromIndex = 0;
+	while (fromIndex <= haystack.length - needle.length) {
+		const matchIndex = haystack.indexOf(needle, fromIndex);
+		if (matchIndex === -1) break;
+		indexes.push(matchIndex);
+		fromIndex = matchIndex + needle.length;
+	}
+	return indexes;
+}
+
+function normalizeOccurrence(occurrence?: number): number {
+	if (occurrence === undefined || !Number.isFinite(occurrence)) return 1;
+	return Math.max(1, Math.trunc(occurrence));
+}
+
+export async function resolveSymbolColumn(
+	filePath: string,
+	line: number,
+	symbol?: string,
+	occurrence?: number,
+): Promise<number> {
+	const lineNumber = Math.max(1, line);
+	const matchOccurrence = normalizeOccurrence(occurrence);
+	try {
+		const fileText = await Bun.file(filePath).text();
+		const lines = fileText.split("\n");
+		const targetLine = lines[lineNumber - 1] ?? "";
+		if (!symbol) {
+			return firstNonWhitespaceColumn(targetLine);
+		}
+
+		const exactIndexes = findSymbolMatchIndexes(targetLine, symbol);
+		const fallbackIndexes = exactIndexes.length > 0 ? exactIndexes : findSymbolMatchIndexes(targetLine, symbol, true);
+		if (fallbackIndexes.length === 0) {
+			throw new Error(`Symbol "${symbol}" not found on line ${lineNumber}`);
+		}
+		if (matchOccurrence > fallbackIndexes.length) {
+			throw new Error(
+				`Symbol "${symbol}" occurrence ${matchOccurrence} is out of bounds on line ${lineNumber} (found ${fallbackIndexes.length})`,
+			);
+		}
+		return fallbackIndexes[matchOccurrence - 1];
+	} catch (error) {
+		if (isEnoent(error)) {
+			throw new Error(`File not found: ${filePath}`);
+		}
+		throw error;
+	}
+}
+
+export async function readLocationContext(filePath: string, line: number, contextLines = 1): Promise<string[]> {
+	const targetLine = Math.max(1, line);
+	const surrounding = Math.max(0, contextLines);
+	try {
+		const fileText = await Bun.file(filePath).text();
+		const lines = fileText.split("\n");
+		if (lines.length === 0) return [];
+
+		const startLine = Math.max(1, targetLine - surrounding);
+		const endLine = Math.min(lines.length, targetLine + surrounding);
+		const context: string[] = [];
+		for (let currentLine = startLine; currentLine <= endLine; currentLine++) {
+			const content = lines[currentLine - 1] ?? "";
+			context.push(`${currentLine}: ${content}`);
+		}
+		return context;
+	} catch (error) {
+		if (isEnoent(error)) {
+			return [];
+		}
+		throw error;
+	}
+}

package/src/mcp/config-writer.ts

@@ -6,6 +6,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
+import { invalidate as invalidateFsCache } from "../capability/fs";
 
 import { validateServerConfig } from "./config";
 import type { MCPConfigFile, MCPServerConfig } from "./types";
@@ -44,6 +45,8 @@ export async function writeMCPConfigFile(filePath: string, config: MCPConfigFile
 
 	// Rename to final path (atomic on most systems)
 	await fs.promises.rename(tmpPath, filePath);
+	// Invalidate the capability fs cache so subsequent reads see the new content
+	invalidateFsCache(filePath);
 }
 
 /**

package/src/mcp/config.ts

@@ -42,6 +42,7 @@ function convertToLegacyConfig(server: MCPServer): MCPServerConfig {
 		enabled: server.enabled,
 		timeout: server.timeout,
 		auth: server.auth,
+		oauth: server.oauth,
 	};
 
 	if (transport === "stdio") {

package/src/mcp/oauth-flow.ts

@@ -22,6 +22,8 @@ export interface MCPOAuthConfig {
 	clientSecret?: string;
 	/** OAuth scopes (space-separated) */
 	scopes?: string;
+	/** Custom callback port (default: 3000) */
+	callbackPort?: number;
 }
 
 /**
@@ -37,7 +39,7 @@ export class MCPOAuthFlow extends OAuthCallbackFlow {
 		private config: MCPOAuthConfig,
 		ctrl: OAuthController,
 	) {
-		super(ctrl, DEFAULT_PORT, CALLBACK_PATH);
+		super(ctrl, config.callbackPort ?? DEFAULT_PORT, CALLBACK_PATH);
 		this.#resolvedClientId = this.#resolveClientId(config);
 	}
 

package/src/mcp/types.ts

@@ -59,6 +59,11 @@ interface MCPServerConfigBase {
 	timeout?: number;
 	/** Authentication configuration (optional) */
 	auth?: MCPAuthConfig;
+	/** OAuth configuration for servers requiring explicit client credentials */
+	oauth?: {
+		clientId?: string;
+		callbackPort?: number;
+	};
 }
 
 /** Stdio server configuration */

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

@@ -149,6 +149,15 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "60", label: "60 seconds" },
 		{ value: "120", label: "120 seconds" },
 	],
+	// Global tool timeout ceiling
+	"tools.maxTimeout": [
+		{ value: "0", label: "No limit" },
+		{ value: "30", label: "30 seconds" },
+		{ value: "60", label: "60 seconds" },
+		{ value: "120", label: "120 seconds" },
+		{ value: "300", label: "5 minutes" },
+		{ value: "600", label: "10 minutes" },
+	],
 	// Edit fuzzy threshold
 	"edit.fuzzyThreshold": [
 		{ value: "0.85", label: "0.85", description: "Lenient" },

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

@@ -163,7 +163,7 @@ export class StatusLineComponent implements Component {
 		// Fire async fetch, return cached value
 		(async () => {
 			try {
-				const result = await $`git status --porcelain`.quiet().nothrow();
+				const result = await $`git --no-optional-locks status --porcelain`.quiet().nothrow();
 
 				if (result.exitCode !== 0) {
 					this.#cachedGitStatus = null;

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

@@ -282,9 +282,10 @@ export class MCPCommandController {
 							const credentialId = await this.#handleOAuthFlow(
 								oauth.authorizationUrl,
 								oauth.tokenUrl,
-								oauth.clientId ?? "",
+								oauth.clientId ?? finalConfig.oauth?.clientId ?? "",
 								"",
 								oauth.scopes ?? "",
+								finalConfig.oauth?.callbackPort,
 							);
 							finalConfig = {
 								...finalConfig,
@@ -352,6 +353,7 @@ export class MCPCommandController {
 		clientId: string,
 		clientSecret: string,
 		scopes: string,
+		callbackPort?: number,
 	): Promise<string> {
 		const authStorage = this.ctx.session.modelRegistry.authStorage;
 		let parsedAuthUrl: URL;
@@ -377,6 +379,7 @@ export class MCPCommandController {
 					clientId: resolvedClientId,
 					clientSecret: clientSecret || undefined,
 					scopes: scopes || undefined,
+					callbackPort,
 				},
 				{
 					onAuth: (info: { url: string; instructions?: string }) => {
@@ -1198,9 +1201,10 @@ export class MCPCommandController {
 			const credentialId = await this.#handleOAuthFlow(
 				oauth.authorizationUrl,
 				oauth.tokenUrl,
-				oauth.clientId ?? "",
+				oauth.clientId ?? found.config.oauth?.clientId ?? "",
 				"",
 				oauth.scopes ?? "",
+				found.config.oauth?.callbackPort,
 			);
 
 			const updated: MCPServerConfig = {

package/src/modes/interactive-mode.ts

@@ -54,7 +54,7 @@ import { SSHCommandController } from "./controllers/ssh-command-controller";
 import { OAuthManualInputManager } from "./oauth-manual-input";
 import { setMermaidRenderCallback } from "./theme/mermaid-cache";
 import type { Theme } from "./theme/theme";
-import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
+import { getEditorTheme, getMarkdownTheme, onTerminalAppearanceChange, onThemeChange, theme } from "./theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem, TodoPhase } from "./types";
 import { UiHelpers } from "./utils/ui-helpers";
 
@@ -363,6 +363,13 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.ui.requestRender();
 		});
 
+		// Subscribe to terminal Mode 2031 dark/light appearance change notifications.
+		// When the OS or terminal switches between dark and light mode, the terminal
+		// sends a DSR and we re-evaluate which theme to use.
+		this.ui.terminal.onAppearanceChange(mode => {
+			onTerminalAppearanceChange(mode);
+		});
+
 		// Set up git branch watcher
 		this.statusLine.watchBranch(() => {
 			this.updateEditorTopBorder();

package/src/modes/theme/mermaid-cache.ts

@@ -6,9 +6,9 @@ import {
 } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
 
-const cache = new Map<string, MermaidImage>();
-const pending = new Map<string, Promise<MermaidImage | null>>();
-const failed = new Set<string>();
+const cache = new Map<bigint, MermaidImage>();
+const pending = new Map<bigint, Promise<MermaidImage | null>>();
+const failed = new Set<bigint>();
 
 const defaultOptions: MermaidRenderOptions = {
 	theme: "dark",
@@ -28,7 +28,7 @@ export function setMermaidRenderCallback(callback: (() => void) | null): void {
  * Get a pre-rendered mermaid image by hash.
  * Returns null if not cached or rendering failed.
  */
-export function getMermaidImage(hash: string): MermaidImage | null {
+export function getMermaidImage(hash: bigint): MermaidImage | null {
 	return cache.get(hash) ?? null;
 }
 

package/src/modes/theme/theme.ts

@@ -1616,7 +1616,15 @@ export async function getThemeByName(name: string): Promise<Theme | undefined> {
 	}
 }
 
+/** Appearance reported by Mode 2031 (terminal DSR), or undefined if not (yet) available. */
+var terminalReportedAppearance: "dark" | "light" | undefined;
+
 function detectTerminalBackground(): "dark" | "light" {
+	// Prefer terminal-reported appearance from Mode 2031 (CSI ? 997 ; {1,2} n)
+	if (terminalReportedAppearance) {
+		return terminalReportedAppearance;
+	}
+	// Fallback: COLORFGBG environment variable (static, set once at terminal launch)
 	const colorfgbg = Bun.env.COLORFGBG || "";
 	if (colorfgbg) {
 		const parts = colorfgbg.split(";");
@@ -1793,6 +1801,31 @@ export function setAutoThemeMapping(mode: "dark" | "light", themeName: string):
 		});
 }
 
+/**
+ * Called when the terminal reports a dark/light appearance change via Mode 2031.
+ * Updates the cached appearance and triggers auto-theme re-evaluation.
+ * This is the cross-platform mechanism supported by Ghostty, Kitty, Contour,
+ * VTE (GNOME Terminal), and tmux 3.6+.
+ */
+export function onTerminalAppearanceChange(mode: "dark" | "light"): void {
+	if (terminalReportedAppearance === mode) return;
+	terminalReportedAppearance = mode;
+	if (!autoDetectedTheme) return;
+	const resolved = getDefaultTheme();
+	if (resolved === currentThemeName) return;
+	currentThemeName = resolved;
+	loadTheme(resolved, getCurrentThemeOptions())
+		.then(loadedTheme => {
+			theme = loadedTheme;
+			if (onThemeChangeCallback) {
+				onThemeChangeCallback();
+			}
+		})
+		.catch(err => {
+			logger.debug("Mode 2031 appearance switch failed", { error: String(err) });
+		});
+}
+
 export function setThemeInstance(themeInstance: Theme): void {
 	autoDetectedTheme = false;
 	theme = themeInstance;

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

@@ -40,16 +40,6 @@ If a skill covers your output, you **MUST** read `skill://<name>` before proceed
 {{/list}}
 </skills>
 {{/if}}
-{{#if preloadedSkills.length}}
-Following skills are preloaded in full; you **MUST** apply instructions directly.
-<preloaded-skills>
-{{#list preloadedSkills join="\n"}}
-<skill name="{{name}}">
-{{content}}
-</skill>
-{{/list}}
-</preloaded-skills>
-{{/if}}
 {{#if rules.length}}
 Rules are local constraints.
 You **MUST** read `rule://<name>` when working in that domain.

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

@@ -1,6 +1,8 @@
 {{#if context}}
 {{SECTION_SEPERATOR "Background"}}
+<context>
 {{context}}
+</context>
 {{/if}}
 
 {{SECTION_SEPERATOR "Task"}}

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

@@ -93,14 +93,6 @@ You **MUST** use the following skills, to save you time, when working in their d
 {{/each}}
 {{/if}}
 
-{{#if preloadedSkills.length}}
-Preloaded skills:
-{{#each preloadedSkills}}
-## {{name}}
-{{content}}
-{{/each}}
-{{/if}}
-
 {{#if rules.length}}
 # Rules
 Domain-specific rules from past experience. **MUST** read `rule://<name>` when working in their territory.
@@ -114,7 +106,7 @@ Domain-specific rules from past experience. **MUST** read `rule://<name>` when w
 You **MUST** use tools to complete the task.
 
 {{#if intentTracing}}
-Every tool call **MUST** include the `{{intentField}}` parameter: one sentence in present participle form (e.g., Inserting comment before the function), no trailing period. This is a contract-level requirement, not optional metadata.
+Every tool call **MUST** include the `{{intentField}}` parameter: one concise sentence in present participle form (e.g., Updating imports), ideally 2-6 words, with no trailing period. This is a contract-level requirement, not optional metadata.
 {{/if}}
 
 You **MUST** use the following tools, as effectively as possible, to complete the task:
@@ -155,10 +147,21 @@ You **MUST NOT** use Python or Bash when a specialized tool exists.
 
 Semantic questions **MUST** be answered with semantic tools.
 - Where is this thing defined? → `lsp definition`
+- What type does this thing resolve to? → `lsp type_definition`
+- What concrete implementations exist? → `lsp implementation`
 - What uses this thing I'm about to change? → `lsp references`
 - What is this thing? → `lsp hover`
+- Can the server propose fixes/imports/refactors? → `lsp code_actions` (list first, then apply with `apply: true` + `query`)
 {{/has}}
 
+{{#ifAny (includes tools "ast_find") (includes tools "ast_replace")}}
+### AST tools for structural code work
+
+When AST tools are available, syntax-aware operations take priority over text hacks.
+{{#has tools "ast_find"}}- Use `ast_find` for structural discovery (call shapes, declarations, syntax patterns) before text grep when code structure matters{{/has}}
+{{#has tools "ast_replace"}}- Use `ast_replace` for structural codemods/replacements; do not use bash `sed`/`perl`/`awk` for syntax-level rewrites{{/has}}
+- Use `grep` for plain text/regex lookup only when AST shape is irrelevant
+{{/ifAny}}
 {{#if eagerTasks}}
 <eager-tasks>
 You **SHOULD** delegate work to subagents by default. Working alone is the exception, not the rule.