@oh-my-pi/pi-tui 18.2.3 → 18.2.5

package/src/deccara.ts

@@ -17,11 +17,9 @@
  * component output and never decides which rows are scrollback-bound — those
  * concerns belong to the caller in `tui.ts`.
  */
+import { SEGMENT_RESET } from "./tui";
 import { visibleWidth } from "./utils";
 
-/** Reset every attribute (SGR 0). Mirrors `tui.ts`'s per-line terminator. */
-const SEGMENT_RESET = "\x1b[0m";
-
 /** DECSACE — select the rectangle change extent so DECCARA fills a rectangle. */
 export const DECSACE_RECT = "\x1b[2*x";
 /** DECSACE — restore the default (stream) change extent. */

package/src/hotkeys-markdown.ts

@@ -0,0 +1,100 @@
+import {
+	type AppKeybinding,
+	formatKeyHints,
+	type KeybindingsManager,
+	keyHintPlatform,
+	modifierLabel,
+} from "./app-keybindings";
+import { canonicalKeyId } from "./keybindings";
+
+/** Effective keybinding operations used to render the hotkey reference. */
+export interface HotkeysMarkdownBindings {
+	keybindings: Pick<KeybindingsManager, "getDisplayString" | "getKeys" | "matchesCanonical">;
+}
+
+function hotkeyLabel(bindings: HotkeysMarkdownBindings, action: AppKeybinding): string {
+	return bindings.keybindings.getDisplayString(action) || "Disabled";
+}
+
+/** Build the platform-aware Markdown reference for effective application hotkeys. */
+export function buildHotkeysMarkdown(bindings: HotkeysMarkdownBindings): string {
+	const platform = keyHintPlatform();
+	const isMac = platform === "darwin";
+	const alt = modifierLabel("alt", platform);
+	const cmd = modifierLabel("super", platform);
+	// CustomEditor tests the chord that was actually pressed, so exit keys split by role: a key
+	// that also carries tui.editor.deleteCharForward (the readline `^D` overlap) forward-deletes
+	// while the prompt holds a draft, any other exit key quits immediately. Mixed bindings such as
+	// `["ctrl+d", "ctrl+q"]` therefore get one row per behavior instead of a single row claiming
+	// both keys delete.
+	const exitKeys = bindings.keybindings.getKeys("app.exit");
+	const deletingExitKeys = exitKeys.filter(key =>
+		bindings.keybindings.matchesCanonical(canonicalKeyId(key), "tui.editor.deleteCharForward"),
+	);
+	const quittingExitKeys = exitKeys.filter(
+		key => !bindings.keybindings.matchesCanonical(canonicalKeyId(key), "tui.editor.deleteCharForward"),
+	);
+	const exitRows: string[] = [];
+	if (deletingExitKeys.length > 0) {
+		exitRows.push(
+			`| \`${formatKeyHints(deletingExitKeys)}\` | Delete char forward (with draft) / exit (empty prompt) |`,
+		);
+	}
+	// An unbound exit action still gets its row, mirroring the `Disabled` hint every other row uses.
+	if (quittingExitKeys.length > 0 || deletingExitKeys.length === 0) {
+		exitRows.push(`| \`${formatKeyHints(quittingExitKeys) || "Disabled"}\` | Exit |`);
+	}
+	return [
+		"**Navigation**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Arrow keys` | Move cursor / browse history (Up when empty) |",
+		`| \`${alt}+Left/Right\` | Move by word |`,
+		isMac ? `| \`Ctrl+A\` / \`Home\` / \`${cmd}+Left\` | Start of line |` : "| `Ctrl+A` / `Home` | Start of line |",
+		isMac ? `| \`Ctrl+E\` / \`End\` / \`${cmd}+Right\` | End of line |` : "| `Ctrl+E` / `End` | End of line |",
+		"",
+		"**Editing**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Enter` | Send message |",
+		`| \`Shift+Enter\` / \`${alt}+Enter\` | New line |`,
+		`| \`Ctrl+W\` / \`${alt}+Backspace\` | Delete word backwards |`,
+		"| `Ctrl+U` | Delete to start of line |",
+		"| `Ctrl+K` | Delete to end of line |",
+		`| \`${hotkeyLabel(bindings, "app.clipboard.copyLine")}\` | Copy current line |`,
+		`| \`${hotkeyLabel(bindings, "app.clipboard.copyPrompt")}\` | Copy whole prompt |`,
+		"",
+		"**Other**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Tab` | Path completion / accept autocomplete |",
+		`| \`${hotkeyLabel(bindings, "app.interrupt")}\` | Cancel autocomplete / interrupt active work |`,
+		`| \`${hotkeyLabel(bindings, "app.clear")}\` | Clear editor (first) / exit (second) |`,
+		...exitRows,
+		`| \`${hotkeyLabel(bindings, "app.suspend")}\` | Suspend to background |`,
+		`| \`${hotkeyLabel(bindings, "app.display.reset")}\` | Reset terminal display |`,
+		`| \`${hotkeyLabel(bindings, "app.thinking.cycle")}\` | Cycle thinking level |`,
+		`| \`${hotkeyLabel(bindings, "app.model.cycleForward")}\` | Cycle role models (slow/default/smol) |`,
+		`| \`${hotkeyLabel(bindings, "app.model.cycleBackward")}\` | Cycle role models (backward) |`,
+		`| \`${hotkeyLabel(bindings, "app.model.selectTemporary")}\` | Select model (temporary) |`,
+		`| \`${hotkeyLabel(bindings, "app.model.select")}\` | Select model (set roles) |`,
+		`| \`${hotkeyLabel(bindings, "app.plan.toggle")}\` | Toggle plan mode |`,
+		`| \`${hotkeyLabel(bindings, "app.history.search")}\` | Search prompt history |`,
+		`| \`${hotkeyLabel(bindings, "app.tools.expand")}\` | Toggle tool output expansion |`,
+		`| \`${hotkeyLabel(bindings, "app.tools.toggleVisibility")}\` | Toggle tool activity visibility |`,
+		`| \`${hotkeyLabel(bindings, "app.thinking.toggle")}\` | Toggle thinking block visibility |`,
+		`| \`${hotkeyLabel(bindings, "app.editor.external")}\` | Edit message in external editor |`,
+		`| \`${hotkeyLabel(bindings, "app.retry")}\` | Retry last failed assistant turn |`,
+		`| \`${hotkeyLabel(bindings, "app.clipboard.pasteImage")}\` | Paste image or text from clipboard |`,
+		"| Hold `Space` | Speech-to-text (push-to-talk): hold to record, release to transcribe |",
+		`| \`${hotkeyLabel(bindings, "app.live.toggle")}\` | Start/stop live voice mode (/live) |`,
+		`| \`${hotkeyLabel(bindings, "app.agents.hub")}\` / \`${hotkeyLabel(bindings, "app.session.observe")}\` / double-tap \`←\` (empty editor) | Open the agent hub |`,
+		"| `#<number>` | GitHub issue/PR reference (e.g. `#3164` → `pr://`/`issue://`) |",
+		"| `#` / `#<text>` | Prompt actions (copy / undo / move cursor) |",
+		"| `/` | Slash commands |",
+		"| `!` | Run bash command |",
+		"| `!!` | Run bash command (excluded from context) |",
+		"| `$` | Run Python in shared kernel |",
+		"| `$$` | Run Python (excluded from context) |",
+	].join("\n");
+}

package/src/index.ts

@@ -3,21 +3,37 @@
 // Autocomplete support
 export * from "./autocomplete";
 // Components
+export * from "./chat/transcript-browser";
 export * from "./components/box";
 export * from "./components/cancellable-loader";
 export * from "./components/composer";
+export * from "./components/disclosure";
 export * from "./components/editor";
+export * from "./components/form";
 export * from "./components/image";
 export * from "./components/input";
+export * from "./components/key-value-list";
+export * from "./components/layout/geometry";
+export * from "./components/layout/row";
+export * from "./components/layout/split-pane";
+export * from "./components/layout/stack";
 export * from "./components/loader";
 export * from "./components/markdown";
+export * from "./components/menu-selection";
+export * from "./components/metric";
+export * from "./components/progress-bar";
 export * from "./components/scroll-view";
+export * from "./components/scroll-viewport";
+export * from "./components/section";
 export * from "./components/select-list";
 export * from "./components/settings-list";
 export * from "./components/spacer";
 export * from "./components/tab-bar";
+export * from "./components/table";
 export * from "./components/text";
+export * from "./components/tree-view";
 export * from "./components/truncated-text";
+export * from "./components/wizard-step";
 // Headless debug socket server
 export * from "./debug-server";
 // DECCARA rectangular-SGR background-fill optimizer
@@ -47,6 +63,8 @@ export type * from "./symbols";
 export * from "./terminal";
 // Terminal image support
 export * from "./terminal-capabilities";
+// Theme runtime (active theme singleton, loaders, shimmer, session accents, path → language)
+export * from "./theme";
 // TTY ID
 export * from "./ttyid";
 export * from "./tui";

package/src/keybinding-matchers.ts

@@ -0,0 +1,99 @@
+import type { KeyId } from "./app-keybindings";
+import { getKeybindings } from "./keybindings";
+import { matchesKey } from "./keys";
+
+/**
+ * Match the coding-agent interrupt key.
+ *
+ * Interactive mode installs a keybinding manager that exposes `app.interrupt`
+ * globally, but some isolated component tests still run with only TUI
+ * keybindings registered. In that case, fall back to raw Escape matching.
+ */
+export function matchesAppInterrupt(data: string): boolean {
+	const keybindings = getKeybindings();
+	const interruptKeys = keybindings.getKeys("app.interrupt");
+	if (interruptKeys.length > 0) {
+		return keybindings.matches(data, "app.interrupt");
+	}
+	return matchesKey(data, "escape") || matchesKey(data, "esc");
+}
+
+/** Match `app.tools.expand`, falling back to Ctrl+O when the action is unbound. */
+export function matchesAppToolsExpand(data: string): boolean {
+	const keybindings = getKeybindings();
+	const expandKeys = keybindings.getKeys("app.tools.expand");
+	if (expandKeys.length > 0) {
+		return keybindings.matches(data, "app.tools.expand");
+	}
+	return matchesKey(data, "ctrl+o");
+}
+
+/** Match the generic selector cancel keybinding. */
+export function matchesSelectCancel(data: string): boolean {
+	return getKeybindings().matches(data, "tui.select.cancel");
+}
+
+/** Match the generic selector up-navigation keybinding. */
+export function matchesSelectUp(data: string): boolean {
+	return getKeybindings().matches(data, "tui.select.up");
+}
+
+/** Match the generic selector down-navigation keybinding. */
+export function matchesSelectDown(data: string): boolean {
+	return getKeybindings().matches(data, "tui.select.down");
+}
+
+/** Match the generic selector page-up keybinding. */
+export function matchesSelectPageUp(data: string): boolean {
+	return getKeybindings().matches(data, "tui.select.pageUp");
+}
+
+/** Match the generic selector page-down keybinding. */
+export function matchesSelectPageDown(data: string): boolean {
+	return getKeybindings().matches(data, "tui.select.pageDown");
+}
+
+/** Match the external-editor keybinding, falling back to Ctrl+G when unbound. */
+export function matchesAppExternalEditor(data: string): boolean {
+	const keybindings = getKeybindings();
+	const externalEditorKeys = keybindings.getKeys("app.editor.external");
+	if (externalEditorKeys.length > 0) {
+		return keybindings.matches(data, "app.editor.external");
+	}
+	return matchesKey(data, "ctrl+g");
+}
+
+function matchesEffectiveKey(data: string, key: KeyId): boolean {
+	if ((key === "ctrl+enter" || key === "ctrl+return") && data.charCodeAt(0) === 10 && data.length > 1) {
+		return true;
+	}
+	return matchesKey(data, key);
+}
+
+function matchesEffectiveKeys(data: string, keys: readonly KeyId[]): boolean {
+	for (const key of keys) {
+		if (matchesEffectiveKey(data, key)) return true;
+	}
+	return false;
+}
+
+/**
+ * Match the "submit multi-line text input" keybinding (`app.message.followUp`).
+ *
+ * Used by forms where plain Enter inserts a newline and a modified-Enter chord
+ * submits — the main editor's follow-up handler, the agent dashboard's new-agent
+ * description, and the hook editor's hook-style mode. The keybinding defaults to
+ * `["ctrl+q", "ctrl+enter"]` so Windows Terminal (which can't deliver a distinct
+ * Ctrl+Enter event; #1903) still has a working chord without user remapping.
+ *
+ * Also recognizes modifier-tagged LF as Ctrl+Enter only when Ctrl+Enter is an
+ * effective follow-up binding.
+ */
+export function matchesAppFollowUp(data: string): boolean {
+	const keybindings = getKeybindings();
+	const keys = keybindings.getKeys("app.message.followUp");
+	if (keys.length > 0) {
+		return matchesEffectiveKeys(data, keys);
+	}
+	return matchesEffectiveKeys(data, ["ctrl+enter", "ctrl+q"]);
+}

package/src/keys.ts

@@ -111,7 +111,7 @@ type Letter =
 
 type Digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
 
-type SymbolKey =
+type KeySymbol =
 	| "`"
 	| "-"
 	| "="
@@ -176,7 +176,7 @@ type SpecialKey =
 	| "f11"
 	| "f12";
 
-type BaseKey = Letter | Digit | SymbolKey | SpecialKey;
+type BaseKey = Letter | Digit | KeySymbol | SpecialKey;
 type ModifierName = "ctrl" | "shift" | "alt" | "super";
 
 type ModifiedKeyId<Key extends string, RemainingModifiers extends ModifierName = ModifierName> = {

package/src/lang-from-path.ts

@@ -0,0 +1,252 @@
+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"],
+	cuh: ["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"],
+	el: ["emacs-lisp", "emacs-lisp"],
+
+	// .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"],
+	mdc: ["markdown", "markdown"],
+	mkd: ["markdown", "markdown"],
+	mdown: ["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 baseName = path.basename(filePath).toLowerCase();
+	if (baseName.startsWith(".env.")) return "env";
+	if (baseName === "dockerfile" || baseName.startsWith("dockerfile.") || baseName === "containerfile") {
+		return "dockerfile";
+	}
+	if (baseName === ".emacs") return "emacs-lisp";
+	if (baseName === "justfile") return "just";
+	if (baseName === "cmakelists.txt") return "cmake";
+
+	const pair = EXTENSION_LANG[themeExtensionKey(filePath)];
+	if (pair) return pair[0];
+
+	return undefined;
+}
+
+export function isMarkdownPath(filePath: string): boolean {
+	return getLanguageFromPath(filePath) === "markdown";
+}
+
+/**
+ * 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 === ".emacs") {
+		return "emacs-lisp";
+	}
+	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";
+}