@oh-my-pi/pi-coding-agent 14.0.3 → 14.0.4

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## [Unreleased]
 
+## [14.0.4] - 2026-04-10
+### Added
+
+- Added `PI_CHUNK_AUTOINDENT` environment variable to control whether chunk read/edit tools normalize indentation to canonical tabs or preserve literal file whitespace
+- Added dynamic chunk tool prompts that automatically adjust guidance based on `PI_CHUNK_AUTOINDENT` setting without exposing a tool parameter
+- Added `<instruction-priority>`, `<output-contract>`, `<default-follow-through>`, `<tool-persistence>`, and `<completeness-contract>` sections to system prompt for improved long-horizon agent workflows
+
+### Changed
+
+- Updated chunk edit tool to apply `normalizeIndent` setting during edit operations, enabling literal whitespace preservation when `PI_CHUNK_AUTOINDENT=0`
+- Refactored environment variable parsing to use `$flag()` and `$envpos()` utilities from pi-utils for consistent boolean and integer handling across codebase
+- Updated system prompt communication guidelines to emphasize conciseness and information density, and added guidance on avoiding repetition of user requests
+- Enhanced system prompt with explicit rules for design integrity, verification before yielding, and handling of missing context via tool-based retrieval
+- Added `PI_CHUNK_AUTOINDENT` to control whether chunk read/edit tools normalize indentation, and updated chunk prompts to switch guidance automatically based on that setting
+- Refined the default system prompt with explicit instruction-priority, output-contract, tool-persistence, completeness, and verification rules for long-horizon GPT-5.4-style agent workflows
+
+### Fixed
+
+- Fixed typo in system prompt: 'backwards compatibiltity' → 'backwards compatibility'
+
 ## [14.0.3] - 2026-04-09
 
 ### Fixed
@@ -6900,4 +6920,4 @@ Initial public release.
 - Git branch display in footer
 - Message queueing during streaming responses
 - OAuth integration for Gmail and Google Calendar access
-- HTML export with syntax highlighting and collapsible sections
+- HTML export with syntax highlighting and collapsible sections

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.0.3",
+	"version": "14.0.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "14.0.3",
-		"@oh-my-pi/pi-agent-core": "14.0.3",
-		"@oh-my-pi/pi-ai": "14.0.3",
-		"@oh-my-pi/pi-natives": "14.0.3",
-		"@oh-my-pi/pi-tui": "14.0.3",
-		"@oh-my-pi/pi-utils": "14.0.3",
+		"@oh-my-pi/omp-stats": "14.0.4",
+		"@oh-my-pi/pi-agent-core": "14.0.4",
+		"@oh-my-pi/pi-ai": "14.0.4",
+		"@oh-my-pi/pi-natives": "14.0.4",
+		"@oh-my-pi/pi-tui": "14.0.4",
+		"@oh-my-pi/pi-utils": "14.0.4",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/edit/index.ts

@@ -19,6 +19,7 @@ import {
 	executeChunkMode,
 	isChunkParams,
 	resolveAnchorStyle,
+	resolveChunkAutoIndent,
 } from "./modes/chunk";
 import { executeHashlineMode, type HashlineParams, hashlineEditParamsSchema, isHashlineParams } from "./modes/hashline";
 import { executePatchMode, isPatchParams, type PatchParams, patchEditSchema } from "./modes/patch";
@@ -197,6 +198,7 @@ export class EditTool implements AgentTool<TInput> {
 				description: (session: ToolSession) =>
 					prompt.render(chunkEditDescription, {
 						anchorStyle: resolveAnchorStyle(session.settings),
+						chunkAutoIndent: resolveChunkAutoIndent(),
 					}),
 				parameters: chunkEditParamsSchema,
 				invalidParamsMessage: "Invalid edit parameters for chunk mode.",

package/src/edit/modes/chunk.ts

@@ -11,6 +11,7 @@ import {
 	ChunkState,
 	type EditOperation as NativeEditOperation,
 } from "@oh-my-pi/pi-natives";
+import { $envpos } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import type { BunFile } from "bun";
 import { LRUCache } from "lru-cache";
@@ -63,6 +64,34 @@ const validAnchorStyles: Record<string, ChunkAnchorStyle> = {
 	bare: ChunkAnchorStyle.Bare,
 };
 
+export function resolveChunkAutoIndent(rawValue = Bun.env.PI_CHUNK_AUTOINDENT): boolean {
+	if (!rawValue) return true;
+	const normalized = rawValue.trim().toLowerCase();
+	switch (normalized) {
+		case "1":
+		case "true":
+		case "yes":
+		case "on":
+			return true;
+		case "0":
+		case "false":
+		case "no":
+		case "off":
+			return false;
+		default:
+			throw new Error(`Invalid PI_CHUNK_AUTOINDENT: ${rawValue}`);
+	}
+}
+
+function getChunkRenderIndentOptions(): {
+	normalizeIndent: boolean;
+	tabReplacement: string;
+} {
+	return resolveChunkAutoIndent()
+		? { normalizeIndent: true, tabReplacement: "    " }
+		: { normalizeIndent: false, tabReplacement: "\t" };
+}
+
 export function resolveAnchorStyle(settings?: Settings): ChunkAnchorStyle {
 	const envStyle = Bun.env.PI_ANCHOR_STYLE;
 	return (
@@ -72,16 +101,8 @@ export function resolveAnchorStyle(settings?: Settings): ChunkAnchorStyle {
 	);
 }
 
-const readEnvInt = (name: string, defaultValue: number): number => {
-	const value = Bun.env[name];
-	if (!value) return defaultValue;
-	const parsed = Number.parseInt(value, 10);
-	if (Number.isNaN(parsed) || parsed <= 0) return defaultValue;
-	return parsed;
-};
-
 const chunkStateCache = new LRUCache<string, ChunkCacheEntry>({
-	max: readEnvInt("PI_CHUNK_CACHE_MAX_ENTRIES", 200),
+	max: $envpos("PI_CHUNK_CACHE_MAX_ENTRIES", 200),
 });
 
 export function invalidateChunkCache(filePath: string): void {
@@ -215,6 +236,7 @@ export async function formatChunkedRead(params: {
 	const normalizedLanguage = normalizeLanguage(language);
 	const { state } = await loadChunkStateForFile(filePath, normalizedLanguage);
 	const displayPath = displayPathForFile(filePath, cwd);
+	const renderIndentOptions = getChunkRenderIndentOptions();
 	const result = state.renderRead({
 		readPath,
 		displayPath,
@@ -224,8 +246,8 @@ export async function formatChunkedRead(params: {
 		absoluteLineRange: absoluteLineRange
 			? { startLine: absoluteLineRange.startLine, endLine: absoluteLineRange.endLine ?? absoluteLineRange.startLine }
 			: undefined,
-		tabReplacement: "    ",
-		normalizeIndent: true,
+		tabReplacement: renderIndentOptions.tabReplacement,
+		normalizeIndent: renderIndentOptions.normalizeIndent,
 	});
 	return { text: result.text, resolvedPath: filePath, chunk: result.chunk };
 }
@@ -280,6 +302,7 @@ export function applyChunkEdits(params: {
 	const state = ChunkState.parse(normalizedSource, normalizeLanguage(params.language));
 	const result = state.applyEdits({
 		operations: nativeOperations,
+		normalizeIndent: resolveChunkAutoIndent(),
 		defaultSelector: params.defaultSelector,
 		defaultCrc: params.defaultCrc,
 		anchorStyle: params.anchorStyle,
@@ -312,7 +335,8 @@ export const chunkToolEditSchema = Type.Object({
 			"Chunk selector. Format: 'path@region' for insertions, 'path#CRC@region' for replace. Omit @region to target the full chunk. Valid regions: head, body, tail, decl.",
 	}),
 	content: Type.String({
-		description: "New content. Use \\t for indentation. Do NOT include the chunk's base padding.",
+		description:
+			"New content. Write indentation relative to the targeted region as described in the tool prompt. Do NOT include the chunk's base padding.",
 	}),
 });
 export const chunkEditParamsSchema = Type.Object(
@@ -387,7 +411,7 @@ async function writeChunkResult(params: {
 	invalidateFsScanAfterWrite(resolvedPath);
 
 	const diffResult = generateUnifiedDiffString(result.diffSourceBefore, result.diffSourceAfter);
-	const warningsBlock = result.warnings.length > 0 ? `\n\n${result.warnings.join("\n")}` : "";
+	const warningsBlock = result.warnings.length > 0 ? `\n\nWarnings:\n${result.warnings.join("\n")}` : "";
 	const meta = outputMeta()
 		.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
 		.get();

package/src/edit/modes/hashline.ts

@@ -156,8 +156,8 @@ interface ExecuteHashlineModeOptions {
 	beginDeferredDiagnosticsForPath: (path: string) => WritethroughDeferredHandle;
 }
 
-export function hashlineParseText(edit: string[] | string | null): string[] {
-	if (edit === null) return [];
+export function hashlineParseText(edit: string[] | string | null | undefined): string[] {
+	if (edit == null) return [];
 	if (typeof edit === "string") {
 		const normalizedEdit = edit.endsWith("\n") ? edit.slice(0, -1) : edit;
 		edit = normalizedEdit.replaceAll("\r", "").split("\n");

package/src/ipy/executor.ts

@@ -1,5 +1,5 @@
 import * as path from "node:path";
-import { getAgentDir, getProjectDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
+import { getAgentDir, getProjectDir, isBunTestRuntime, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { OutputSink } from "../session/streaming-output";
 import { shutdownSharedGateway } from "./gateway-coordinator";
 import {
@@ -299,10 +299,6 @@ async function writePreludeCache(state: PreludeCacheState, helpers: PreludeHelpe
 	}
 }
 
-function isPythonTestEnvironment(): boolean {
-	return Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test";
-}
-
 function getPreludeIntrospectionOptions(
 	options: KernelSessionExecutionOptions = {},
 ): Pick<KernelExecuteOptions, "signal" | "timeoutMs"> {
@@ -318,7 +314,7 @@ async function cachePreludeDocs(
 	cacheState?: PreludeCacheState | null,
 ): Promise<PreludeHelper[]> {
 	cachedPreludeDocs = docs;
-	if (!isPythonTestEnvironment() && docs.length > 0) {
+	if (!isBunTestRuntime() && docs.length > 0) {
 		const state = cacheState ?? (await buildPreludeCacheState(cwd));
 		await writePreludeCache(state, docs);
 	}
@@ -416,7 +412,7 @@ export async function warmPythonEnvironment(
 		cachedPreludeDocs = [];
 		return { ok: false, reason, docs: [] };
 	}
-	if (!isPythonTestEnvironment()) {
+	if (!isBunTestRuntime()) {
 		try {
 			cacheState = await buildPreludeCacheState(cwd);
 			const cached = await readPreludeCache(cacheState);

package/src/ipy/kernel.ts

@@ -1,4 +1,4 @@
-import { $env, logger, Snowflake } from "@oh-my-pi/pi-utils";
+import { $env, $flag, isBunTestRuntime, logger, Snowflake } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { Settings } from "../config/settings";
 import { htmlToBasicMarkdown } from "../web/scrapers/types";
@@ -10,7 +10,7 @@ import { filterEnv, resolvePythonRuntime } from "./runtime";
 
 const TEXT_ENCODER = new TextEncoder();
 const TEXT_DECODER = new TextDecoder();
-const TRACE_IPC = $env.PI_PYTHON_IPC_TRACE === "1";
+const TRACE_IPC = $flag("PI_PYTHON_IPC_TRACE");
 const PRELUDE_INTROSPECTION_SNIPPET = "import json\nprint(json.dumps(__omp_prelude_docs__()))";
 
 class SharedGatewayCreateError extends Error {
@@ -195,7 +195,7 @@ export interface PythonKernelAvailability {
 }
 
 export async function checkPythonKernelAvailability(cwd: string): Promise<PythonKernelAvailability> {
-	if (Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test" || $env.PI_PYTHON_SKIP_CHECK === "1") {
+	if (isBunTestRuntime() || $flag("PI_PYTHON_SKIP_CHECK")) {
 		return { ok: true };
 	}
 

package/src/lsp/lspmux.ts

@@ -1,6 +1,6 @@
 import * as os from "node:os";
 import * as path from "node:path";
-import { $env, $which, logger } from "@oh-my-pi/pi-utils";
+import { $flag, $which, logger } from "@oh-my-pi/pi-utils";
 import { TOML } from "bun";
 
 /**
@@ -135,7 +135,7 @@ export async function detectLspmux(): Promise<LspmuxState> {
 		return cachedState;
 	}
 
-	if ($env.PI_DISABLE_LSPMUX === "1") {
+	if ($flag("PI_DISABLE_LSPMUX")) {
 		cachedState = { available: false, running: false, binaryPath: null, config: null };
 		cacheTimestamp = now;
 		return cachedState;

package/src/lsp/utils.ts

@@ -16,149 +16,7 @@ import type {
 	WorkspaceEdit,
 } from "./types";
 
-// =============================================================================
-// Language Detection
-// =============================================================================
-
-const LANGUAGE_MAP: Record<string, string> = {
-	// TypeScript/JavaScript
-	".ts": "typescript",
-	".tsx": "typescriptreact",
-	".js": "javascript",
-	".jsx": "javascriptreact",
-	".mjs": "javascript",
-	".cjs": "javascript",
-	".mts": "typescript",
-	".cts": "typescript",
-
-	// Systems languages
-	".rs": "rust",
-	".go": "go",
-	".c": "c",
-	".h": "c",
-	".cpp": "cpp",
-	".cc": "cpp",
-	".cxx": "cpp",
-	".hpp": "cpp",
-	".hxx": "cpp",
-	".zig": "zig",
-
-	// Scripting languages
-	".py": "python",
-	".rb": "ruby",
-	".lua": "lua",
-	".sh": "shellscript",
-	".bash": "shellscript",
-	".zsh": "shellscript",
-	".fish": "fish",
-	".pl": "perl",
-	".pm": "perl",
-	".php": "php",
-
-	// JVM languages
-	".java": "java",
-	".kt": "kotlin",
-	".kts": "kotlin",
-	".scala": "scala",
-	".groovy": "groovy",
-	".clj": "clojure",
-
-	// .NET languages
-	".cs": "csharp",
-	".fs": "fsharp",
-	".vb": "vb",
-
-	// Web
-	".html": "html",
-	".htm": "html",
-	".css": "css",
-	".scss": "scss",
-	".sass": "sass",
-	".less": "less",
-	".vue": "vue",
-	".svelte": "svelte",
-	".astro": "astro",
-
-	// Data formats
-	".json": "json",
-	".jsonc": "jsonc",
-	".yaml": "yaml",
-	".yml": "yaml",
-	".toml": "toml",
-	".xml": "xml",
-	".ini": "ini",
-
-	// Documentation
-	".md": "markdown",
-	".markdown": "markdown",
-	".rst": "restructuredtext",
-	".adoc": "asciidoc",
-	".tex": "latex",
-
-	// Other
-	".sql": "sql",
-	".graphql": "graphql",
-	".gql": "graphql",
-	".proto": "protobuf",
-	".dockerfile": "dockerfile",
-	".tf": "terraform",
-	".hcl": "hcl",
-	".nix": "nix",
-	".ex": "elixir",
-	".exs": "elixir",
-	".erl": "erlang",
-	".hrl": "erlang",
-	".hs": "haskell",
-	".ml": "ocaml",
-	".mli": "ocaml",
-	".swift": "swift",
-	".r": "r",
-	".R": "r",
-	".jl": "julia",
-	".dart": "dart",
-	".elm": "elm",
-	".v": "v",
-	".nim": "nim",
-	".cr": "crystal",
-	".d": "d",
-	".pas": "pascal",
-	".pp": "pascal",
-	".lisp": "lisp",
-	".lsp": "lisp",
-	".rkt": "racket",
-	".scm": "scheme",
-	".ps1": "powershell",
-	".psm1": "powershell",
-	".bat": "bat",
-	".cmd": "bat",
-	".tla": "tlaplus",
-	".tlaplus": "tlaplus",
-};
-
-/**
- * Detect language ID from file path.
- * Returns the LSP language identifier for the file type.
- */
-export function detectLanguageId(filePath: string): string {
-	const ext = path.extname(filePath).toLowerCase();
-	const basename = path.basename(filePath).toLowerCase();
-
-	// Handle special filenames
-	if (basename === "dockerfile" || basename.startsWith("dockerfile.") || basename === "containerfile") {
-		return "dockerfile";
-	}
-	if (basename === "makefile" || basename === "gnumakefile") {
-		return "makefile";
-	}
-	if (basename === "justfile") {
-		return "just";
-	}
-	if (basename === "cmakelists.txt" || ext === ".cmake") {
-		return "cmake";
-	}
-
-	return LANGUAGE_MAP[ext] ?? "plaintext";
-}
+export { detectLanguageId } from "../utils/lang-from-path";
 
 // =============================================================================
 // URI Handling (Cross-Platform)

package/src/modes/theme/theme.ts

@@ -20,6 +20,8 @@ import { defaultThemes } from "./defaults";
 import lightThemeJson from "./light.json" with { type: "json" };
 import { getMermaidAscii } from "./mermaid-cache";
 
+export { getLanguageFromPath } from "../../utils/lang-from-path";
+
 // ============================================================================
 // Symbol Presets
 // ============================================================================
@@ -2305,167 +2307,6 @@ export function highlightCode(code: string, lang?: string): string[] {
 	}
 }
 
-/**
- * Get language identifier from file path extension.
- */
-export function getLanguageFromPath(filePath: string): string | undefined {
-	const baseName = path.basename(filePath).toLowerCase();
-	if (baseName === ".env" || baseName.startsWith(".env.")) return "env";
-	if (
-		baseName === ".gitignore" ||
-		baseName === ".gitattributes" ||
-		baseName === ".gitmodules" ||
-		baseName === ".editorconfig" ||
-		baseName === ".npmrc" ||
-		baseName === ".prettierrc" ||
-		baseName === ".eslintrc"
-	) {
-		return "conf";
-	}
-	if (baseName === "dockerfile" || baseName.startsWith("dockerfile.") || baseName === "containerfile") {
-		return "dockerfile";
-	}
-	if (baseName === "justfile") return "just";
-	if (baseName === "cmakelists.txt") return "cmake";
-
-	const ext = filePath.split(".").pop()?.toLowerCase();
-	if (!ext) return undefined;
-
-	const extToLang: Record<string, string> = {
-		ts: "typescript",
-		cts: "typescript",
-		mts: "typescript",
-		tsx: "tsx",
-		js: "javascript",
-		jsx: "javascript",
-		mjs: "javascript",
-		cjs: "javascript",
-		py: "python",
-		pyi: "python",
-		rb: "ruby",
-		rbw: "ruby",
-		gemspec: "ruby",
-		rs: "rust",
-		go: "go",
-		java: "java",
-		kt: "kotlin",
-		ktm: "kotlin",
-		kts: "kotlin",
-		swift: "swift",
-		c: "c",
-		h: "c",
-		cpp: "cpp",
-		cc: "cpp",
-		cxx: "cpp",
-		hh: "cpp",
-		hpp: "cpp",
-		cu: "cpp",
-		ino: "cpp",
-		cs: "csharp",
-		clj: "clojure",
-		cljc: "clojure",
-		cljs: "clojure",
-		edn: "clojure",
-		php: "php",
-		sh: "bash",
-		bash: "bash",
-		zsh: "bash",
-		ksh: "bash",
-		bats: "bash",
-		tmux: "bash",
-		cgi: "bash",
-		fcgi: "bash",
-		command: "bash",
-		tool: "bash",
-		fish: "fish",
-		ps1: "powershell",
-		psm1: "powershell",
-		sql: "sql",
-		html: "html",
-		htm: "html",
-		xhtml: "html",
-		astro: "astro",
-		vue: "vue",
-		svelte: "svelte",
-		css: "css",
-		scss: "scss",
-		sass: "sass",
-		less: "less",
-		json: "json",
-		ipynb: "ipynb",
-		hbs: "handlebars",
-		hsb: "handlebars",
-		handlebars: "handlebars",
-		yaml: "yaml",
-		yml: "yaml",
-		toml: "toml",
-		xml: "xml",
-		xsl: "xml",
-		xslt: "xml",
-		svg: "xml",
-		plist: "xml",
-		md: "markdown",
-		markdown: "markdown",
-		mdx: "markdown",
-		diff: "diff",
-		patch: "diff",
-		dockerfile: "dockerfile",
-		containerfile: "dockerfile",
-		makefile: "make",
-		justfile: "just",
-		mk: "make",
-		mak: "make",
-		cmake: "cmake",
-		lua: "lua",
-		jl: "julia",
-		pl: "perl",
-		pm: "perl",
-		perl: "perl",
-		r: "r",
-		scala: "scala",
-		sc: "scala",
-		sbt: "scala",
-		ex: "elixir",
-		exs: "elixir",
-		erl: "erlang",
-		hs: "haskell",
-		nix: "nix",
-		odin: "odin",
-		zig: "zig",
-		star: "starlark",
-		bzl: "starlark",
-		sol: "solidity",
-		v: "verilog",
-		sv: "verilog",
-		svh: "verilog",
-		vh: "verilog",
-		m: "objc",
-		mm: "objc",
-		ml: "ocaml",
-		vim: "vim",
-		graphql: "graphql",
-		proto: "protobuf",
-		tf: "hcl",
-		hcl: "hcl",
-		tfvars: "hcl",
-		txt: "text",
-		text: "text",
-		log: "log",
-		csv: "csv",
-		tsv: "tsv",
-		ini: "ini",
-		cfg: "conf",
-		conf: "conf",
-		config: "conf",
-		properties: "conf",
-		tla: "tlaplus",
-		tlaplus: "tlaplus",
-		env: "env",
-	};
-
-	return extToLang[ext];
-}
-
 export function getSymbolTheme(): SymbolTheme {
 	const preset = theme.getSymbolPreset();
 

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

@@ -52,9 +52,29 @@ Push back when warranted: state the downside, propose an alternative, but **MUST
 <communication>
 - No emojis, filler, or ceremony.
 - (1) Correctness first, (2) Brevity second, (3) Politeness third.
-- User-supplied content **MUST** override any other guidelines.
+- Prefer concise, information-dense writing.
+- Avoid repeating the user's request or narrating routine tool calls.
 </communication>
 
+<instruction-priority>
+- User instructions override default style, tone, formatting, and initiative preferences.
+- Higher-priority system constraints about safety, permissions, tool boundaries, and task completion do not yield.
+- If a newer user instruction conflicts with an earlier user instruction, follow the newer one.
+- Preserve earlier instructions that do not conflict.
+</instruction-priority>
+
+<output-contract>
+- Brief preambles are allowed when they improve orientation, but they **MUST** stay short and **MUST NOT** be treated as completion.
+- Claims about code, tools, tests, docs, or external sources **MUST** be grounded in what you actually observed. If a statement is an inference, say so.
+- Apply brevity to prose, not to evidence, verification, or blocking details.
+</output-contract>
+
+<default-follow-through>
+- If the user's intent is clear and the next step is reversible and low-risk, proceed without asking.
+- Ask only when the next step is irreversible, has external side effects, or requires a missing choice that would materially change the outcome.
+- If you proceed, state what you did, what you verified, and what remains optional.
+</default-follow-through>
+
 <behavior>
 You **MUST** guard against the completion reflex — the urge to ship something that compiles before you've understood the problem:
 - Compiling ≠ Correctness. "It works" ≠ "Works in all cases".
@@ -248,6 +268,15 @@ Don't open a file hoping. Hope is not a strategy.
 {{#has tools "task"}}- `task` for investigate+edit in one pass — prefer this over a separate explore→task chain{{/has}}
 {{/ifAny}}
 
+<tool-persistence>
+- Use tools whenever they materially improve correctness, completeness, or grounding.
+- Do not stop at the first plausible answer if another tool call would materially reduce uncertainty, verify a dependency, or improve coverage.
+- Before taking an action, check whether prerequisite discovery, lookup, or memory retrieval is required. Resolve prerequisites first.
+- If a lookup is empty, partial, or suspiciously narrow, retry with a different strategy before concluding nothing exists.
+- When multiple retrieval steps are independent, parallelize them. When one result determines the next step, keep the workflow sequential.
+- After parallel retrieval, pause to synthesize before making more calls.
+</tool-persistence>
+
 {{#if (includes tools "inspect_image")}}
 ### Image inspection
 - For image understanding tasks: **MUST** use `inspect_image` over `read` to avoid overloading main session context.
@@ -262,7 +291,14 @@ These are inviolable. Violation is system failure.
 - You **MUST NOT** suppress tests to make code pass. You **MUST NOT** fabricate outputs not observed.
 - You **MUST NOT** solve the wished-for problem instead of the actual problem.
 - You **MUST NOT** ask for information obtainable from tools, repo context, or files.
-- You **MUST** always design a clean solution. You **MUST NOT** introduce unnecessary backwards compatibiltity layers, no shims, no gradual migration, no bridges to old code unless user explicitly asks for it. Let the errors guide you on what to include in the refactoring. **ALWAYS default to performing full CUTOVER!**
+- You **MUST** always design a clean solution. You **MUST NOT** introduce unnecessary backwards compatibility layers, no shims, no gradual migration, no bridges to old code unless user explicitly asks for it. Let the errors guide you on what to include in the refactoring. **ALWAYS default to performing full CUTOVER!**
+
+<completeness-contract>
+- Treat the task as incomplete until every requested deliverable is done or explicitly marked [blocked].
+- Keep an internal checklist of requested outcomes, implied cleanup, affected callsites, tests, docs, and follow-on edits.
+- For lists, batches, paginated results, or multi-file migrations, determine expected scope when possible and confirm coverage before yielding.
+- If something is blocked, label it [blocked], say exactly what is missing, and distinguish it from work that is complete.
+</completeness-contract>
 
 # Design Integrity
 
@@ -280,6 +316,7 @@ Design integrity means the code tells the truth about what the system currently
 {{#has tools "task"}}- You **MUST** determine if the task is parallelizable via `task` tool.{{/has}}
 - If multi-file or imprecisely scoped, you **MUST** write out a step-by-step plan, phased if it warrants, before touching any file.
 - For new work, you **MUST**: (1) think about architecture, (2) search official docs/papers on best practices, (3) review existing codebase, (4) compare research with codebase, (5) implement the best fit or surface tradeoffs.
+- If required context is missing, do **NOT** guess. Prefer tool-based retrieval first, ask a minimal question only when the answer cannot be recovered from tools, repo context, or files.
 ## 2. Before You Edit
 - Read the relevant section of any file before editing. Don't edit from a grep snippet alone — context above and below the match changes what the correct edit is.
 - You **MUST** grep for existing examples before implementing any pattern, utility, or abstraction. If the codebase already solves it, you **MUST** use that. Inventing a parallel convention is **PROHIBITED**.
@@ -313,6 +350,7 @@ When a tool call fails, read the full error before doing anything else. When a f
 - Test everything rigorously → Future contributor cannot break behavior without failure. Prefer unit/e2e.
 - You **MUST NOT** rely on mocks — they invent behaviors that never happen in production and hide real bugs.
 - You **SHOULD** run only tests you added/modified unless asked otherwise.
+- Before yielding, verify: (1) every requirement is satisfied, (2) claims match files/tool output/source material, (3) the output format matches the ask, and (4) any high-impact action was either verified or explicitly held for permission.
 - You **MUST NOT** yield without proof when non-trivial work, self-assessment is deceptive: tests, linters, type checks, repro steps… exhaust all external verification.
 
 {{#if secretsEnabled}}

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

@@ -7,11 +7,20 @@ Edits files via syntax-aware chunks. Run `read(path="file.ts")` first. The edit
   - replacements: `chunk#CRC` or `chunk#CRC@region`
 - Without a `@region` it defaults to the entire chunk including leading trivia. Valid regions: `head`, `body`, `tail`, `decl`.
 - If the exact chunk path is unclear, run `read(path="file", sel="?")` and copy a selector from that listing.
+{{#if chunkAutoIndent}}
 - Use `\t` for indentation in `content`. Write content at indent-level 0 — the tool re-indents it to match the chunk's position in the file. For example, to replace `@body` of a method, write the body starting at column 0:
   ```
   content: "if (x) {\n\treturn true;\n}"
   ```
   The tool adds the correct base indent automatically. Never manually pad with the chunk's own indentation.
+{{else}}
+- Match the file's literal tabs/spaces in `content`. Do not convert indentation to canonical `\t`.
+- Write content at indent-level 0 relative to the target region. For example, to replace `@body` of a method, write:
+  ```
+  content: "if (x) {\n  return true;\n}"
+  ```
+  The tool adds the correct base indent automatically, then preserves the tabs/spaces you used inside the snippet. Never manually pad with the chunk's own indentation.
+{{/if}}
 - `@region` only works on container chunks (classes, functions, impl blocks, sections). Do **not** use `@head`/`@body`/`@tail` on leaf chunks (enum variants, fields, single statements) — use the whole chunk instead.
 - `replace` requires the current CRC. Insertions do not.
 - **CRCs change after every edit.** Always use the selectors/CRCs from the most recent `read` or edit response. Never reuse a CRC from a previous edit.
@@ -113,7 +122,11 @@ Given this `read` output for `example.ts`:
 
 **Replace a whole chunk** (rename a function):
 ~~~json
+{{#if chunkAutoIndent}}
 { "sel": "fn_createCounter#PQQY", "op": "replace", "content": "function makeCounter(start: number): Counter {\n\tconst c = new Counter();\n\tc.value = start;\n\treturn c;\n}\n" }
+{{else}}
+{ "sel": "fn_createCounter#PQQY", "op": "replace", "content": "function makeCounter(start: number): Counter {\n  const c = new Counter();\n  c.value = start;\n  return c;\n}\n" }
+{{/if}}
 ~~~
 Result — the entire chunk is rewritten:
 ```
@@ -163,7 +176,11 @@ function createCounter(initial: number): Counter {
 
 **Insert after a chunk** (`after`):
 ~~~json
+{{#if chunkAutoIndent}}
 { "sel": "enum_Status", "op": "after", "content": "\nfunction isActive(s: Status): boolean {\n\treturn s === Status.Active;\n}\n" }
+{{else}}
+{ "sel": "enum_Status", "op": "after", "content": "\nfunction isActive(s: Status): boolean {\n  return s === Status.Active;\n}\n" }
+{{/if}}
 ~~~
 Result — a new function appears after the enum:
 ```
@@ -194,7 +211,11 @@ class Counter {
 
 **Append inside a container** (`@body` + `append`):
 ~~~json
+{{#if chunkAutoIndent}}
 { "sel": "class_Counter@body", "op": "append", "content": "\nreset(): void {\n\tthis.value = 0;\n}\n" }
+{{else}}
+{ "sel": "class_Counter@body", "op": "append", "content": "\nreset(): void {\n  this.value = 0;\n}\n" }
+{{/if}}
 ~~~
 Result — a new method is added at the end of the class body, before the closing `}`:
 ```
@@ -214,10 +235,18 @@ Result — a new method is added at the end of the class body, before the closin
 ```
 Result — the method is removed from the class.
 - Indentation rules (important):
+{{#if chunkAutoIndent}}
   - Use `\t` for each indent level. The tool converts tabs to the file's actual style (2-space, 4-space, etc.).
+{{else}}
+  - Match the file's real indentation characters in your snippet. The tool preserves your literal tabs/spaces after adding the target region's base indent.
+{{/if}}
   - Do NOT include the chunk's base indentation — only indent relative to the region's opening level.
   - For `@body` of a function: write at column 0, e.g. `"return x;\n"`. The tool adds the correct base indent.
   - For `@head`: write at the chunk's own depth. A class member's head uses `"/** doc */\nstart(): void {"`.
+{{#if chunkAutoIndent}}
   - For a top-level item: start at zero indent. Write `"function foo() {\n\treturn 1;\n}\n"`.
+{{else}}
+  - For a top-level item: start at zero indent. Write `"function foo() {\n  return 1;\n}\n"`.
+{{/if}}
   - The tool strips common leading indentation from your content as a safety net, so accidental over-indentation is corrected.
 </examples>

package/src/prompts/tools/read-chunk.md

@@ -9,6 +9,12 @@ Each opening anchor `[< full.chunk.path#CCCC ]` in the default output identifies
 If you need a canonical target list, run `read(path="file", sel="?")`. That listing shows chunk paths with CRCs.
 Line numbers in the gutter are absolute file line numbers.
 
+{{#if chunkAutoIndent}}
+Chunk reads normalize leading indentation so copied content round-trips cleanly into chunk edits.
+{{else}}
+Chunk reads preserve literal leading tabs/spaces from the file. When editing, keep the same whitespace characters you see here.
+{{/if}}
+
 Chunk trees: JS, TS, TSX, Python, Rust, Go. Others use blank-line fallback.
 </instruction>
 

package/src/sdk.ts

@@ -15,6 +15,7 @@ import { SearchDb } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import {
 	$env,
+	$flag,
 	getAgentDbPath,
 	getAgentDir,
 	getProjectDir,
@@ -1262,7 +1263,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 	const repeatToolDescriptions = settings.get("repeatToolDescriptions");
 	const eagerTasks = settings.get("task.eager");
-	const intentField = settings.get("tools.intentTracing") || $env.PI_INTENT_TRACING === "1" ? INTENT_FIELD : undefined;
+	const intentField = settings.get("tools.intentTracing") || $flag("PI_INTENT_TRACING") ? INTENT_FIELD : undefined;
 	const rebuildSystemPrompt = async (toolNames: string[], tools: Map<string, AgentTool>): Promise<string> => {
 		toolContextStore.setToolNames(toolNames);
 		const discoverableMCPTools = mcpDiscoveryEnabled ? collectDiscoverableMCPTools(tools.values()) : [];

package/src/tools/ast-edit.ts

@@ -3,7 +3,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import { type AstReplaceChange, astEdit } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
+import { $envpos, prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { computeLineHash } from "../edit/line-hash";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
@@ -103,7 +103,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			if (maxReplacements !== undefined && (!Number.isFinite(maxReplacements) || maxReplacements < 1)) {
 				throw new ToolError("limit must be a positive number");
 			}
-			const maxFiles = parseInt(process.env.PI_MAX_AST_FILES ?? "", 10) || 1000;
+			const maxFiles = $envpos("PI_MAX_AST_FILES", 1000);
 
 			const formatScopePath = (targetPath: string): string => {
 				const relative = path.relative(this.session.cwd, targetPath).replace(/\\/g, "/");

package/src/tools/index.ts

@@ -1,7 +1,7 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { ToolChoice } from "@oh-my-pi/pi-ai";
 import type { SearchDb } from "@oh-my-pi/pi-natives";
-import { $env, logger } from "@oh-my-pi/pi-utils";
+import { $env, $flag, isBunTestRuntime, logger } from "@oh-my-pi/pi-utils";
 import type { AsyncJobManager } from "../async";
 import type { PromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings";
@@ -297,8 +297,7 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		!skipPythonPreflight &&
 		pythonMode !== "bash-only" &&
 		(requestedTools === undefined || requestedTools.includes("python"));
-	const isTestEnv = Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test";
-	const skipPythonWarm = isTestEnv || $env.PI_PYTHON_SKIP_CHECK === "1";
+	const skipPythonWarm = isBunTestRuntime() || $flag("PI_PYTHON_SKIP_CHECK");
 	if (shouldCheckPython) {
 		const availability = await logger.time("createTools:pythonCheck", checkPythonKernelAvailability, session.cwd);
 		pythonAvailable = availability.ok;

package/src/tools/read.ts

@@ -14,6 +14,7 @@ import {
 	parseChunkReadPath,
 	parseChunkSelector,
 	resolveAnchorStyle,
+	resolveChunkAutoIndent,
 } from "../edit/modes/chunk";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { parseInternalUrl } from "../internal-urls/parse";
@@ -449,6 +450,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 			resolveEditMode(session) === "chunk"
 				? prompt.render(readChunkDescription, {
 						anchorStyle: resolveAnchorStyle(session.settings),
+						chunkAutoIndent: resolveChunkAutoIndent(),
 					})
 				: prompt.render(readDescription, {
 						DEFAULT_LIMIT: String(this.#defaultLimit),

package/src/tools/report-tool-issue.ts

@@ -8,7 +8,7 @@
 import { Database } from "bun:sqlite";
 import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { $env, getAgentDir, logger, VERSION } from "@oh-my-pi/pi-utils";
+import { $flag, getAgentDir, logger, VERSION } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import type { Settings } from "..";
 import type { ToolSession } from "./index";
@@ -19,7 +19,7 @@ const ReportToolIssueParams = Type.Object({
 });
 
 export function isAutoQaEnabled(settings?: Settings): boolean {
-	return $env.PI_AUTO_QA === "1" || !!settings?.get("dev.autoqa");
+	return $flag("PI_AUTO_QA") || !!settings?.get("dev.autoqa");
 }
 
 export function getAutoQaDbPath(): string {

package/src/utils/edit-mode.ts

@@ -1,4 +1,4 @@
-import { $env } from "@oh-my-pi/pi-utils";
+import { $env, $flag } from "@oh-my-pi/pi-utils";
 
 export type EditMode = "replace" | "patch" | "hashline" | "chunk";
 
@@ -36,7 +36,7 @@ export function resolveEditMode(session: EditModeSessionLike): EditMode {
 	const envMode = normalizeEditMode($env.PI_EDIT_VARIANT);
 	if (envMode) return envMode;
 
-	if ($env.PI_STRICT_EDIT_MODE === "1") {
+	if (!$flag("PI_STRICT_EDIT_MODE")) {
 		if (activeModel?.includes("spark")) return "replace";
 		if (activeModel?.includes("nano")) return "replace";
 		if (activeModel?.includes("mini")) return "replace";

package/src/utils/lang-from-path.ts

@@ -0,0 +1,239 @@
+import * as path from "node:path";
+
+/**
+ * Extension segment → [highlight language id, LSP language id].
+ * Highlight ids match tree-sitter / native highlighter; LSP ids match Language Server Protocol.
+ */
+const EXTENSION_LANG: Record<string, readonly [string, string]> = {
+	// TypeScript / JavaScript
+	ts: ["typescript", "typescript"],
+	cts: ["typescript", "typescript"],
+	mts: ["typescript", "typescript"],
+	tsx: ["tsx", "typescriptreact"],
+	js: ["javascript", "javascript"],
+	jsx: ["javascript", "javascriptreact"],
+	mjs: ["javascript", "javascript"],
+	cjs: ["javascript", "javascript"],
+
+	// Systems
+	rs: ["rust", "rust"],
+	go: ["go", "go"],
+	c: ["c", "c"],
+	h: ["c", "c"],
+	cpp: ["cpp", "cpp"],
+	cc: ["cpp", "cpp"],
+	cxx: ["cpp", "cpp"],
+	hh: ["cpp", "cpp"],
+	hpp: ["cpp", "cpp"],
+	hxx: ["cpp", "cpp"],
+	cu: ["cpp", "cpp"],
+	ino: ["cpp", "cpp"],
+	zig: ["zig", "zig"],
+
+	// Scripting
+	py: ["python", "python"],
+	pyi: ["python", "python"],
+	rb: ["ruby", "ruby"],
+	rbw: ["ruby", "ruby"],
+	gemspec: ["ruby", "ruby"],
+	lua: ["lua", "lua"],
+	sh: ["bash", "shellscript"],
+	bash: ["bash", "shellscript"],
+	zsh: ["bash", "shellscript"],
+	ksh: ["bash", "shellscript"],
+	bats: ["bash", "shellscript"],
+	tmux: ["bash", "shellscript"],
+	cgi: ["bash", "shellscript"],
+	fcgi: ["bash", "shellscript"],
+	command: ["bash", "shellscript"],
+	tool: ["bash", "shellscript"],
+	fish: ["fish", "fish"],
+	pl: ["perl", "perl"],
+	pm: ["perl", "perl"],
+	perl: ["perl", "perl"],
+	php: ["php", "php"],
+
+	// JVM
+	java: ["java", "java"],
+	kt: ["kotlin", "kotlin"],
+	ktm: ["kotlin", "kotlin"],
+	kts: ["kotlin", "kotlin"],
+	scala: ["scala", "scala"],
+	sc: ["scala", "scala"],
+	sbt: ["scala", "scala"],
+	groovy: ["groovy", "groovy"],
+	clj: ["clojure", "clojure"],
+	cljc: ["clojure", "clojure"],
+	cljs: ["clojure", "clojure"],
+	edn: ["clojure", "clojure"],
+
+	// .NET
+	cs: ["csharp", "csharp"],
+	fs: ["fsharp", "fsharp"],
+	vb: ["vb", "vb"],
+
+	// Web
+	html: ["html", "html"],
+	htm: ["html", "html"],
+	xhtml: ["html", "html"],
+	css: ["css", "css"],
+	scss: ["scss", "scss"],
+	sass: ["sass", "sass"],
+	less: ["less", "less"],
+	vue: ["vue", "vue"],
+	svelte: ["svelte", "svelte"],
+	astro: ["astro", "astro"],
+
+	// Data
+	json: ["json", "json"],
+	jsonc: ["jsonc", "jsonc"],
+	yaml: ["yaml", "yaml"],
+	yml: ["yaml", "yaml"],
+	toml: ["toml", "toml"],
+	xml: ["xml", "xml"],
+	xsl: ["xml", "xml"],
+	xslt: ["xml", "xml"],
+	svg: ["xml", "xml"],
+	plist: ["xml", "xml"],
+	ini: ["ini", "ini"],
+
+	// Docs
+	md: ["markdown", "markdown"],
+	markdown: ["markdown", "markdown"],
+	mdx: ["markdown", "markdown"],
+	rst: ["restructuredtext", "restructuredtext"],
+	adoc: ["asciidoc", "asciidoc"],
+	tex: ["latex", "latex"],
+
+	// Other languages
+	sql: ["sql", "sql"],
+	graphql: ["graphql", "graphql"],
+	gql: ["graphql", "graphql"],
+	proto: ["protobuf", "protobuf"],
+	dockerfile: ["dockerfile", "dockerfile"],
+	containerfile: ["dockerfile", "dockerfile"],
+	tf: ["hcl", "terraform"],
+	hcl: ["hcl", "hcl"],
+	tfvars: ["hcl", "hcl"],
+	nix: ["nix", "nix"],
+	ex: ["elixir", "elixir"],
+	exs: ["elixir", "elixir"],
+	erl: ["erlang", "erlang"],
+	hrl: ["erlang", "erlang"],
+	hs: ["haskell", "haskell"],
+	ml: ["ocaml", "ocaml"],
+	mli: ["ocaml", "ocaml"],
+	swift: ["swift", "swift"],
+	r: ["r", "r"],
+	jl: ["julia", "julia"],
+	dart: ["dart", "dart"],
+	elm: ["elm", "elm"],
+	v: ["verilog", "v"],
+	nim: ["nim", "nim"],
+	cr: ["crystal", "crystal"],
+	d: ["d", "d"],
+	pas: ["pascal", "pascal"],
+	pp: ["pascal", "pascal"],
+	lisp: ["lisp", "lisp"],
+	lsp: ["lisp", "lisp"],
+	rkt: ["racket", "racket"],
+	scm: ["scheme", "scheme"],
+	ps1: ["powershell", "powershell"],
+	psm1: ["powershell", "powershell"],
+	bat: ["bat", "bat"],
+	cmd: ["bat", "bat"],
+	tla: ["tlaplus", "tlaplus"],
+	tlaplus: ["tlaplus", "tlaplus"],
+	m: ["objc", "plaintext"],
+	mm: ["objc", "plaintext"],
+	sol: ["solidity", "plaintext"],
+	odin: ["odin", "plaintext"],
+	star: ["starlark", "plaintext"],
+	bzl: ["starlark", "plaintext"],
+	sv: ["verilog", "plaintext"],
+	svh: ["verilog", "plaintext"],
+	vh: ["verilog", "plaintext"],
+	vim: ["vim", "plaintext"],
+	ipynb: ["ipynb", "plaintext"],
+	hbs: ["handlebars", "plaintext"],
+	hsb: ["handlebars", "plaintext"],
+	handlebars: ["handlebars", "plaintext"],
+	diff: ["diff", "plaintext"],
+	patch: ["diff", "plaintext"],
+	makefile: ["make", "plaintext"],
+	mk: ["make", "plaintext"],
+	mak: ["make", "plaintext"],
+	cmake: ["cmake", "cmake"],
+	justfile: ["just", "plaintext"],
+	txt: ["text", "plaintext"],
+	text: ["text", "plaintext"],
+	log: ["log", "plaintext"],
+	csv: ["csv", "plaintext"],
+	tsv: ["tsv", "plaintext"],
+	cfg: ["conf", "plaintext"],
+	conf: ["conf", "plaintext"],
+	config: ["conf", "plaintext"],
+	properties: ["conf", "plaintext"],
+	env: ["env", "plaintext"],
+	gitignore: ["conf", "plaintext"],
+	gitattributes: ["conf", "plaintext"],
+	gitmodules: ["conf", "plaintext"],
+	editorconfig: ["conf", "plaintext"],
+	npmrc: ["conf", "plaintext"],
+	prettierrc: ["conf", "plaintext"],
+	eslintrc: ["conf", "plaintext"],
+	prettierignore: ["conf", "plaintext"],
+	eslintignore: ["conf", "plaintext"],
+};
+
+/** Final segment after the last `.` in the full path (prior theme behavior). */
+function themeExtensionKey(filePath: string): string {
+	const extBeg = filePath.lastIndexOf(".");
+	return extBeg !== -1 ? filePath.slice(extBeg + 1).toLowerCase() : filePath.toLowerCase();
+}
+
+function lspExtensionKey(filePath: string): string {
+	const ext = path.extname(filePath).toLowerCase();
+	return ext.startsWith(".") ? ext.slice(1) : "";
+}
+
+/**
+ * Language id for syntax highlighting and UI (icons, read tool), or undefined if unknown.
+ */
+export function getLanguageFromPath(filePath: string): string | undefined {
+	const pair = EXTENSION_LANG[themeExtensionKey(filePath)];
+	if (pair) return pair[0];
+
+	const baseName = path.basename(filePath).toLowerCase();
+	if (baseName.startsWith(".env.")) return "env";
+	if (baseName === "dockerfile" || baseName.startsWith("dockerfile.") || baseName === "containerfile") {
+		return "dockerfile";
+	}
+	if (baseName === "justfile") return "just";
+	if (baseName === "cmakelists.txt") return "cmake";
+
+	return undefined;
+}
+
+/**
+ * LSP language identifier; falls back to `plaintext`.
+ */
+export function detectLanguageId(filePath: string): string {
+	const baseName = path.basename(filePath).toLowerCase();
+	if (baseName === "dockerfile" || baseName.startsWith("dockerfile.") || baseName === "containerfile") {
+		return "dockerfile";
+	}
+	if (baseName === "makefile" || baseName === "gnumakefile") {
+		return "makefile";
+	}
+	if (baseName === "justfile") {
+		return "just";
+	}
+
+	const lspExt = lspExtensionKey(filePath);
+	if (baseName === "cmakelists.txt" || lspExt === "cmake") {
+		return "cmake";
+	}
+
+	return EXTENSION_LANG[lspExt]?.[1] ?? "plaintext";
+}

package/src/utils/sixel.ts

@@ -1,4 +1,4 @@
-import { $env } from "@oh-my-pi/pi-utils";
+import { $env, $flag } from "@oh-my-pi/pi-utils";
 
 const SIXEL_START_REGEX = /\x1bP(?:[0-9;]*)q/u;
 const SIXEL_END_SEQUENCE = "\x1b\\";
@@ -15,7 +15,7 @@ const SIXEL_PLACEHOLDER_PREFIX = "__OMP_SIXEL_SEQUENCE_";
  */
 export function isSixelPassthroughEnabled(): boolean {
 	const forcedProtocol = $env.PI_FORCE_IMAGE_PROTOCOL?.trim().toLowerCase();
-	return forcedProtocol === "sixel" && $env.PI_ALLOW_SIXEL_PASSTHROUGH === "1";
+	return forcedProtocol === "sixel" && $flag("PI_ALLOW_SIXEL_PASSTHROUGH");
 }
 /** Returns true when the text contains a SIXEL start sequence. */
 export function containsSixelSequence(text: string): boolean {