@aexol/spectral 0.7.8 → 0.8.2

package/dist/sdk/coding-agent/core/theme.js

@@ -0,0 +1,202 @@
+/**
+ * Minimal shared theme for syntax highlighting and extension API compatibility.
+ *
+ * This replaces the interactive/mode TUI theme system with a stripped-down
+ * version that supports the core utilities used by the serve/relay path:
+ * - getLanguageFromPath(): maps file extensions to highlight.js language IDs
+ * - highlightCode(): syntax-highlights code blocks
+ * - loadThemeFromPath(): loads a theme JSON file from disk
+ * - Theme class: used by resource-loader and extension types
+ *
+ * All ANSI color formatting (theme.fg(), theme.bold(), etc.) is removed —
+ * tool output is plain text for LLM consumption in serve/relay mode.
+ */
+import * as fs from "node:fs";
+import { highlight, supportsLanguage } from "../utils/syntax-highlight.js";
+// ============================================================================
+// Language detection
+// ============================================================================
+const extToLang = {
+    ts: "typescript",
+    tsx: "typescript",
+    js: "javascript",
+    jsx: "javascript",
+    mjs: "javascript",
+    cjs: "javascript",
+    py: "python",
+    rb: "ruby",
+    rs: "rust",
+    go: "go",
+    java: "java",
+    kt: "kotlin",
+    swift: "swift",
+    c: "c",
+    h: "c",
+    cpp: "cpp",
+    cc: "cpp",
+    cxx: "cpp",
+    hpp: "cpp",
+    cs: "csharp",
+    php: "php",
+    sh: "bash",
+    bash: "bash",
+    zsh: "bash",
+    fish: "fish",
+    ps1: "powershell",
+    sql: "sql",
+    html: "html",
+    htm: "html",
+    css: "css",
+    scss: "scss",
+    sass: "sass",
+    less: "less",
+    json: "json",
+    yaml: "yaml",
+    yml: "yaml",
+    toml: "toml",
+    xml: "xml",
+    md: "markdown",
+    markdown: "markdown",
+    dockerfile: "dockerfile",
+    makefile: "makefile",
+    cmake: "cmake",
+    lua: "lua",
+    perl: "perl",
+    r: "r",
+    scala: "scala",
+    clj: "clojure",
+    ex: "elixir",
+    exs: "elixir",
+    erl: "erlang",
+    hs: "haskell",
+    ml: "ocaml",
+    vim: "vim",
+    graphql: "graphql",
+    proto: "protobuf",
+    tf: "hcl",
+    hcl: "hcl",
+};
+export function getLanguageFromPath(filePath) {
+    const ext = filePath.split(".").pop()?.toLowerCase();
+    if (!ext)
+        return undefined;
+    return extToLang[ext];
+}
+// ============================================================================
+// Syntax highlighting
+// ============================================================================
+/** Identity formatter — returns text as-is (no ANSI styling in serve mode). */
+function identity(text) {
+    return text;
+}
+const neutralHighlightTheme = {
+    keyword: identity,
+    built_in: identity,
+    literal: identity,
+    number: identity,
+    string: identity,
+    comment: identity,
+    function: identity,
+    title: identity,
+    class: identity,
+    type: identity,
+    attr: identity,
+    variable: identity,
+    params: identity,
+    operator: identity,
+    punctuation: identity,
+};
+/**
+ * Highlight code with syntax coloring based on file extension or language.
+ * In serve mode, returns plain text (no ANSI coloring for LLM consumption).
+ */
+export function highlightCode(code, lang) {
+    const validLang = lang && supportsLanguage(lang) ? lang : undefined;
+    if (!validLang) {
+        return code.split("\n");
+    }
+    try {
+        return highlight(code, {
+            language: validLang,
+            ignoreIllegals: true,
+            theme: neutralHighlightTheme,
+        }).split("\n");
+    }
+    catch {
+        return code.split("\n");
+    }
+}
+// ============================================================================
+// Theme loading (for resource-loader)
+// ============================================================================
+/** Resolve built-in theme directory using config path helpers. */
+function getThemesDir() {
+    try {
+        // This function is exported from config.ts and uses the actual package directory
+        const { getThemesDir: fn } = require("../../config.js");
+        return fn();
+    }
+    catch {
+        // Fallback: themes were in modes/interactive/theme/, try to find them
+        try {
+            const { join } = require("node:path");
+            const { existsSync } = require("node:fs");
+            const packageDir = join(__dirname, "../../..");
+            for (const base of ["src", "dist"]) {
+                const candidates = [
+                    join(packageDir, base, "modes", "interactive", "theme"),
+                ];
+                for (const dir of candidates) {
+                    if (existsSync(dir))
+                        return dir;
+                }
+            }
+        }
+        catch {
+            // ignore
+        }
+        return __dirname;
+    }
+}
+function getBuiltinThemes() {
+    const themesDir = getThemesDir();
+    if (!themesDir)
+        return {};
+    try {
+        const { join } = require("node:path");
+        const { readFileSync } = require("node:fs");
+        return {
+            dark: JSON.parse(readFileSync(join(themesDir, "dark.json"), "utf-8")),
+            light: JSON.parse(readFileSync(join(themesDir, "light.json"), "utf-8")),
+        };
+    }
+    catch {
+        return {};
+    }
+}
+export function loadThemeFromPath(themePath) {
+    const content = fs.readFileSync(themePath, "utf-8");
+    const json = JSON.parse(content);
+    return {
+        name: json.name,
+        sourcePath: themePath,
+    };
+}
+// ============================================================================
+// Registered themes (for extension API compatibility)
+// ============================================================================
+const registeredThemes = new Map();
+export function setRegisteredThemes(themes) {
+    registeredThemes.clear();
+    for (const t of themes) {
+        if (t.name) {
+            registeredThemes.set(t.name, t);
+        }
+    }
+}
+export function getAvailableThemes() {
+    return Array.from(new Set([
+        ...Object.keys(getBuiltinThemes()),
+        ...registeredThemes.keys(),
+    ])).sort();
+}

package/dist/{pi → sdk}/coding-agent/core/tools/bash.js

@@ -1,12 +1,10 @@
 import { existsSync } from "node:fs";
 import { spawn } from "child_process";
 import { Type } from "typebox";
-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
-import { theme } from "../../modes/interactive/theme/theme.js";
 import { waitForChildProcess } from "../../utils/child-process.js";
 import { getShellConfig, getShellEnv, killProcessTree, trackDetachedChildPid, untrackDetachedChildPid, } from "../../utils/shell.js";
 import { OutputAccumulator } from "./output-accumulator.js";
-import { getTextOutput, invalidArgText, str } from "./render-utils.js";
+import { getTextOutput, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "./truncate.js";
 const bashSchema = Type.Object({
@@ -103,12 +101,17 @@ const BASH_UPDATE_THROTTLE_MS = 100;
 function formatDuration(ms) {
     return `${(ms / 1000).toFixed(1)}s`;
 }
+function plainText(s) { return s; }
+const noopTheme = {
+    fg: (_name, text) => text,
+    bold: plainText,
+};
 function formatBashCall(args) {
     const command = str(args?.command);
     const timeout = args?.timeout;
-    const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
-    const commandDisplay = command === null ? invalidArgText(theme) : command ? command : theme.fg("toolOutput", "...");
-    return theme.fg("toolTitle", theme.bold(`$ ${commandDisplay}`)) + timeoutSuffix;
+    const timeoutSuffix = timeout ? ` (timeout ${timeout}s)` : "";
+    const commandDisplay = command === null ? "[invalid]" : command || "...";
+    return `$ ${commandDisplay}${timeoutSuffix}`;
 }
 function formatBashResult(result, options, showImages, startedAt, endedAt) {
     let output = getTextOutput(result, showImages).trim();
@@ -122,24 +125,20 @@ function formatBashResult(result, options, showImages, startedAt, endedAt) {
     }
     const parts = [];
     if (output) {
-        const styledOutput = output
-            .split("\n")
-            .map((line) => theme.fg("toolOutput", line))
-            .join("\n");
         if (options.expanded) {
-            parts.push(`\n${styledOutput}`);
+            parts.push(`\n${output}`);
         }
         else {
-            const styledLines = styledOutput.split("\n");
-            if (styledLines.length > BASH_PREVIEW_LINES) {
-                const hint = theme.fg("muted", `... (${styledLines.length - BASH_PREVIEW_LINES} earlier lines, ${keyHint("app.tools.expand", "to expand")})`);
+            const lines = output.split("\n");
+            if (lines.length > BASH_PREVIEW_LINES) {
+                const hint = `... (${lines.length - BASH_PREVIEW_LINES} earlier lines)`;
                 parts.push("");
                 parts.push(hint);
-                parts.push(...styledLines.slice(-BASH_PREVIEW_LINES));
+                parts.push(...lines.slice(-BASH_PREVIEW_LINES));
             }
             else {
                 parts.push("");
-                parts.push(...styledLines);
+                parts.push(...lines);
             }
         }
     }
@@ -156,12 +155,12 @@ function formatBashResult(result, options, showImages, startedAt, endedAt) {
                 warnings.push(`Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`);
             }
         }
-        parts.push(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`);
+        parts.push(`\n[${warnings.join(". ")}]`);
     }
     if (startedAt !== undefined) {
         const label = options.isPartial ? "Elapsed" : "Took";
         const endTime = endedAt ?? Date.now();
-        parts.push(`\n${theme.fg("muted", `${label} ${formatDuration(endTime - startedAt)}`)}`);
+        parts.push(`\n${label} ${formatDuration(endTime - startedAt)}`);
     }
     return parts.join("");
 }

package/dist/{pi → sdk}/coding-agent/core/tools/edit.js

@@ -1,11 +1,11 @@
 import { constants } from "fs";
 import { access as fsAccess, readFile as fsReadFile, writeFile as fsWriteFile } from "fs/promises";
 import { Type } from "typebox";
-import { renderDiff } from "../../modes/interactive/components/diff.js";
+import { renderDiff } from "./render-diff.js";
 import { applyEditsToNormalizedContent, detectLineEnding, generateDiffString, generateUnifiedPatch, normalizeToLF, restoreLineEndings, stripBom, } from "./edit-diff.js";
 import { withFileMutationQueue } from "./file-mutation-queue.js";
 import { resolveToCwd } from "./path-utils.js";
-import { invalidArgText, shortenPath, str } from "./render-utils.js";
+import { shortenPath, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 const replaceEditSchema = Type.Object({
     oldText: Type.String({
@@ -53,14 +53,13 @@ function validateEditInput(input) {
     }
     return { path: input.path, edits: input.edits };
 }
-function formatEditCall(args, theme) {
-    const invalidArg = invalidArgText(theme);
+function formatEditCall(args, _theme) {
     const rawPath = str(args?.file_path ?? args?.path);
     const path = rawPath !== null ? shortenPath(rawPath) : null;
-    const pathDisplay = path === null ? invalidArg : path ? theme.fg("accent", path) : theme.fg("toolOutput", "...");
-    return `${theme.fg("toolTitle", theme.bold("edit"))} ${pathDisplay}`;
+    const pathDisplay = path === null ? "[invalid]" : path || "...";
+    return `edit ${pathDisplay}`;
 }
-function formatEditResult(args, result, theme, isError) {
+function formatEditResult(args, result, _theme, isError) {
     const rawPath = str(args?.file_path ?? args?.path);
     if (isError) {
         const errorText = result.content
@@ -70,7 +69,7 @@ function formatEditResult(args, result, theme, isError) {
         if (!errorText) {
             return undefined;
         }
-        return theme.fg("error", errorText);
+        return errorText;
     }
     const resultDiff = result.details?.diff;
     if (resultDiff) {

package/dist/{pi → sdk}/coding-agent/core/tools/find.js

@@ -3,10 +3,9 @@ import { spawn } from "child_process";
 import { existsSync } from "fs";
 import path from "path";
 import { Type } from "typebox";
-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { resolveToCwd } from "./path-utils.js";
-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";
+import { getTextOutput, shortenPath, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
 function toPosixPath(value) {
@@ -25,22 +24,19 @@ const defaultFindOperations = {
     // This is a placeholder. Actual fd execution happens in execute() when no custom glob is provided.
     glob: () => [],
 };
-function formatFindCall(args, theme) {
+function formatFindCall(args, _theme) {
     const pattern = str(args?.pattern);
     const rawPath = str(args?.path);
     const path = rawPath !== null ? shortenPath(rawPath || ".") : null;
     const limit = args?.limit;
-    const invalidArg = invalidArgText(theme);
-    let text = theme.fg("toolTitle", theme.bold("find")) +
-        " " +
-        (pattern === null ? invalidArg : theme.fg("accent", pattern || "")) +
-        theme.fg("toolOutput", ` in ${path === null ? invalidArg : path}`);
+    const invalidArg = "[invalid]";
+    let text = `find ${pattern === null ? invalidArg : pattern || ""} in ${path === null ? invalidArg : path}`;
     if (limit !== undefined) {
-        text += theme.fg("toolOutput", ` (limit ${limit})`);
+        text += ` (limit ${limit})`;
     }
     return text;
 }
-function formatFindResult(result, options, theme, showImages) {
+function formatFindResult(result, options, _theme, showImages) {
     const output = getTextOutput(result, showImages).trim();
     let text = "";
     if (output) {
@@ -48,9 +44,9 @@ function formatFindResult(result, options, theme, showImages) {
         const maxLines = options.expanded ? lines.length : 20;
         const displayLines = lines.slice(0, maxLines);
         const remaining = lines.length - maxLines;
-        text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+        text += `\n${displayLines.join("\n")}`;
         if (remaining > 0) {
-            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
+            text += `\n... (${remaining} more lines)`;
         }
     }
     const resultLimit = result.details?.resultLimitReached;
@@ -61,7 +57,7 @@ function formatFindResult(result, options, theme, showImages) {
             warnings.push(`${resultLimit} results limit`);
         if (truncation?.truncated)
             warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
-        text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
+        text += `\n[Truncated: ${warnings.join(", ")}]`;
     }
     return text;
 }

package/dist/{pi → sdk}/coding-agent/core/tools/grep.js

@@ -3,10 +3,9 @@ import { spawn } from "child_process";
 import { readFileSync, statSync } from "fs";
 import path from "path";
 import { Type } from "typebox";
-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { resolveToCwd } from "./path-utils.js";
-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";
+import { getTextOutput, shortenPath, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, formatSize, GREP_MAX_LINE_LENGTH, truncateHead, truncateLine, } from "./truncate.js";
 const grepSchema = Type.Object({
@@ -23,24 +22,21 @@ const defaultGrepOperations = {
     isDirectory: (p) => statSync(p).isDirectory(),
     readFile: (p) => readFileSync(p, "utf-8"),
 };
-function formatGrepCall(args, theme) {
+function formatGrepCall(args, _theme) {
     const pattern = str(args?.pattern);
     const rawPath = str(args?.path);
     const path = rawPath !== null ? shortenPath(rawPath || ".") : null;
     const glob = str(args?.glob);
     const limit = args?.limit;
-    const invalidArg = invalidArgText(theme);
-    let text = theme.fg("toolTitle", theme.bold("grep")) +
-        " " +
-        (pattern === null ? invalidArg : theme.fg("accent", `/${pattern || ""}/`)) +
-        theme.fg("toolOutput", ` in ${path === null ? invalidArg : path}`);
+    const invalidArg = "[invalid]";
+    let text = `grep ${pattern === null ? invalidArg : `/${pattern || ""}/`} in ${path === null ? invalidArg : path}`;
     if (glob)
-        text += theme.fg("toolOutput", ` (${glob})`);
+        text += ` (${glob})`;
     if (limit !== undefined)
-        text += theme.fg("toolOutput", ` limit ${limit}`);
+        text += ` limit ${limit}`;
     return text;
 }
-function formatGrepResult(result, options, theme, showImages) {
+function formatGrepResult(result, options, _theme, showImages) {
     const output = getTextOutput(result, showImages).trim();
     let text = "";
     if (output) {
@@ -48,9 +44,9 @@ function formatGrepResult(result, options, theme, showImages) {
         const maxLines = options.expanded ? lines.length : 15;
         const displayLines = lines.slice(0, maxLines);
         const remaining = lines.length - maxLines;
-        text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+        text += `\n${displayLines.join("\n")}`;
         if (remaining > 0) {
-            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
+            text += `\n... (${remaining} more lines)`;
         }
     }
     const matchLimit = result.details?.matchLimitReached;
@@ -64,7 +60,7 @@ function formatGrepResult(result, options, theme, showImages) {
             warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
         if (linesTruncated)
             warnings.push("some lines truncated");
-        text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
+        text += `\n[Truncated: ${warnings.join(", ")}]`;
     }
     return text;
 }

package/dist/{pi → sdk}/coding-agent/core/tools/ls.js

@@ -1,9 +1,8 @@
 import { existsSync, readdirSync, statSync } from "fs";
 import nodePath from "path";
 import { Type } from "typebox";
-import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { resolveToCwd } from "./path-utils.js";
-import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";
+import { getTextOutput, shortenPath, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
 const lsSchema = Type.Object({
@@ -16,18 +15,18 @@ const defaultLsOperations = {
     stat: statSync,
     readdir: readdirSync,
 };
-function formatLsCall(args, theme) {
+function formatLsCall(args, _theme) {
     const rawPath = str(args?.path);
     const path = rawPath !== null ? shortenPath(rawPath || ".") : null;
     const limit = args?.limit;
-    const invalidArg = invalidArgText(theme);
-    let text = `${theme.fg("toolTitle", theme.bold("ls"))} ${path === null ? invalidArg : theme.fg("accent", path)}`;
+    const invalidArg = "[invalid]";
+    let text = `ls ${path === null ? invalidArg : path}`;
     if (limit !== undefined) {
-        text += theme.fg("toolOutput", ` (limit ${limit})`);
+        text += ` (limit ${limit})`;
     }
     return text;
 }
-function formatLsResult(result, options, theme, showImages) {
+function formatLsResult(result, options, _theme, showImages) {
     const output = getTextOutput(result, showImages).trim();
     let text = "";
     if (output) {
@@ -35,9 +34,9 @@ function formatLsResult(result, options, theme, showImages) {
         const maxLines = options.expanded ? lines.length : 20;
         const displayLines = lines.slice(0, maxLines);
         const remaining = lines.length - maxLines;
-        text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+        text += `\n${displayLines.join("\n")}`;
         if (remaining > 0) {
-            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
+            text += `\n... (${remaining} more lines)`;
         }
     }
     const entryLimit = result.details?.entryLimitReached;
@@ -48,7 +47,7 @@ function formatLsResult(result, options, theme, showImages) {
             warnings.push(`${entryLimit} entries limit`);
         if (truncation?.truncated)
             warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
-        text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
+        text += `\n[Truncated: ${warnings.join(", ")}]`;
     }
     return text;
 }

package/dist/{pi → sdk}/coding-agent/core/tools/read.js

@@ -3,13 +3,12 @@ import { constants } from "fs";
 import { access as fsAccess, readFile as fsReadFile } from "fs/promises";
 import { Type } from "typebox";
 import { getReadmePath } from "../../config.js";
-import { keyHint, keyText } from "../../modes/interactive/components/keybinding-hints.js";
-import { getLanguageFromPath, highlightCode } from "../../modes/interactive/theme/theme.js";
+import { getLanguageFromPath, highlightCode } from "../theme.js";
 import { formatDimensionNote, resizeImage } from "../../utils/image-resize.js";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime.js";
 import { formatPathRelativeToCwdOrAbsolute } from "../../utils/paths.js";
 import { resolveReadPath } from "./path-utils.js";
-import { getTextOutput, invalidArgText, replaceTabs, shortenPath, str } from "./render-utils.js";
+import { getTextOutput, replaceTabs, shortenPath, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead } from "./truncate.js";
 const readSchema = Type.Object({
@@ -23,19 +22,18 @@ const defaultReadOperations = {
     access: (path) => fsAccess(path, constants.R_OK),
     detectImageMimeType: detectSupportedImageMimeTypeFromFile,
 };
-function formatReadLineRange(args, theme) {
+function formatReadLineRange(args, _theme) {
     if (args?.offset === undefined && args?.limit === undefined)
         return "";
     const startLine = args.offset ?? 1;
     const endLine = args.limit !== undefined ? startLine + args.limit - 1 : "";
-    return theme.fg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
+    return `:${startLine}${endLine ? `-${endLine}` : ""}`;
 }
-function formatReadCall(args, theme) {
+function formatReadCall(args, _theme) {
     const rawPath = str(args?.file_path ?? args?.path);
     const path = rawPath !== null ? shortenPath(rawPath) : null;
-    const invalidArg = invalidArgText(theme);
-    const pathDisplay = path === null ? invalidArg : path ? theme.fg("accent", path) : theme.fg("toolOutput", "...");
-    return `${theme.fg("toolTitle", theme.bold("read"))} ${pathDisplay}${formatReadLineRange(args, theme)}`;
+    const pathDisplay = path === null ? "[invalid]" : path || "...";
+    return `read ${pathDisplay}${formatReadLineRange(args)}`;
 }
 function trimTrailingEmptyLines(lines) {
     let end = lines.length;
@@ -85,19 +83,11 @@ function getCompactReadClassification(args, cwd) {
     }
     return undefined;
 }
-function formatCompactReadCall(classification, args, theme) {
-    const expandHint = theme.fg("dim", ` (${keyText("app.tools.expand")} to expand)`);
+function formatCompactReadCall(classification, args, _theme) {
     if (classification.kind === "skill") {
-        return (theme.fg("customMessageLabel", `\x1b[1m[skill]\x1b[22m `) +
-            theme.fg("customMessageText", classification.label) +
-            formatReadLineRange(args, theme) +
-            expandHint);
+        return `[skill] ${classification.label}${formatReadLineRange(args)}`;
     }
-    return (theme.fg("toolTitle", theme.bold(`read ${classification.kind}`)) +
-        " " +
-        theme.fg("accent", classification.label) +
-        formatReadLineRange(args, theme) +
-        expandHint);
+    return `read ${classification.kind} ${classification.label}${formatReadLineRange(args)}`;
 }
 function formatReadResult(args, result, options, theme, showImages, cwd, isError) {
     if (!options.expanded && !isError && getCompactReadClassification(args, cwd)) {
@@ -111,20 +101,20 @@ function formatReadResult(args, result, options, theme, showImages, cwd, isError
     const maxLines = options.expanded ? lines.length : 10;
     const displayLines = lines.slice(0, maxLines);
     const remaining = lines.length - maxLines;
-    let text = `\n${displayLines.map((line) => (lang ? replaceTabs(line) : theme.fg("toolOutput", replaceTabs(line)))).join("\n")}`;
+    let text = `\n${displayLines.map((line) => replaceTabs(line)).join("\n")}`;
     if (remaining > 0) {
-        text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
+        text += `\n... (${remaining} more lines)`;
     }
     const truncation = result.details?.truncation;
     if (truncation?.truncated) {
         if (truncation.firstLineExceedsLimit) {
-            text += `\n${theme.fg("warning", `[First line exceeds ${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit]`)}`;
+            text += `\n[First line exceeds ${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit]`;
         }
         else if (truncation.truncatedBy === "lines") {
-            text += `\n${theme.fg("warning", `[Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines (${truncation.maxLines ?? DEFAULT_MAX_LINES} line limit)]`)}`;
+            text += `\n[Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines (${truncation.maxLines ?? DEFAULT_MAX_LINES} line limit)]`;
         }
         else {
-            text += `\n${theme.fg("warning", `[Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)]`)}`;
+            text += `\n[Truncated: ${truncation.outputLines} lines shown (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)]`;
         }
     }
     return text;