killeros 1.5.8 → 2.0.1

package/killeros/shell-ui.ts

@@ -1,4 +1,4 @@
-import { execFileSync } from "node:child_process";
+import { execFile } from "node:child_process";
 import { readFileSync } from "node:fs";
 import {
   CustomEditor,
@@ -11,6 +11,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import {
   Container,
+  CURSOR_MARKER,
   Text,
   truncateToWidth,
   visibleWidth,
@@ -18,16 +19,14 @@ import {
   type EditorTheme,
   type TUI,
 } from "@earendil-works/pi-tui";
+import { availableCommandNames } from "./commands.ts";
 import { formatCwd, padRight } from "./display.ts";
 import { reportError } from "./errors.ts";
 import { formatModel } from "./footer.ts";
 import { LEVEL_COLORS, type ThinkingLevel } from "./variants.ts";
 
-const COMMAND_BLUE_RGB = "120;169;255";
 const COMPACT_HEADER_MAX_WIDTH = 52;
 
-const commandBlue = (text: string): string => `\x1B[38;2;${COMMAND_BLUE_RGB}m${text}\x1B[39m`;
-
 function readPackageVersion(path: string | URL): string | undefined {
   try {
     const value = JSON.parse(readFileSync(path, "utf8")) as { version?: unknown };
@@ -45,20 +44,27 @@ const STARTUP_TIPS = [
   "Type / to browse every command available in this session.",
 ] as const;
 
-function resolveGitBranch(cwd: string): string | undefined {
-  try {
-    const branch = execFileSync("git", ["-C", cwd, "rev-parse", "--abbrev-ref", "HEAD"], {
-      encoding: "utf8",
-      maxBuffer: 64 * 1024,
-      stdio: ["ignore", "pipe", "ignore"],
-      timeout: 500,
-      windowsHide: true,
-    }).trim();
-    if (!branch) return undefined;
-    return branch === "HEAD" ? "detached" : branch;
-  } catch {
-    return undefined;
-  }
+export function resolveGitBranch(cwd: string): Promise<string | undefined> {
+  return new Promise((resolve) => {
+    execFile(
+      "git",
+      ["-C", cwd, "rev-parse", "--abbrev-ref", "HEAD"],
+      {
+        encoding: "utf8",
+        maxBuffer: 64 * 1024,
+        timeout: 500,
+        windowsHide: true,
+      },
+      (error, stdout) => {
+        if (error) {
+          resolve(undefined);
+          return;
+        }
+        const branch = stdout.trim();
+        resolve(branch ? branch === "HEAD" ? "detached" : branch : undefined);
+      },
+    );
+  });
 }
 
 function shuffledTips(): string[] {
@@ -78,14 +84,21 @@ function compactBoxLine(content: string, width: number, theme: Theme): string {
 class PiStartupHeader {
   private readonly pi: ExtensionAPI;
   private readonly ctx: ExtensionContext;
-  private readonly branch: string | undefined;
   private readonly tip: string;
+  private readonly tui: TUI;
+  private branch: string | undefined;
+  private disposed = false;
 
-  constructor(pi: ExtensionAPI, ctx: ExtensionContext, tip: string) {
+  constructor(pi: ExtensionAPI, ctx: ExtensionContext, tip: string, tui: TUI) {
     this.pi = pi;
     this.ctx = ctx;
-    this.branch = resolveGitBranch(ctx.cwd);
     this.tip = tip;
+    this.tui = tui;
+    void resolveGitBranch(ctx.cwd).then((branch) => {
+      if (this.disposed) return;
+      this.branch = branch;
+      this.tui.requestRender();
+    });
   }
 
   private tipLines(width: number, theme: Theme): string[] {
@@ -113,7 +126,7 @@ class PiStartupHeader {
     const repository = this.branch
       ? `${directory} ${theme.fg("dim", `· ${this.branch}`)}`
       : directory;
-    const modelCommand = commandBlue("/model");
+    const modelCommand = theme.fg("mdLink", "/model");
     const agentWidth = Math.max(0, innerWidth - visibleWidth(modelCommand) - 1);
     const agentCommand = `${truncateToWidth(agent, agentWidth, "…")} ${modelCommand}`;
     const border = (left: string, right: string): string => theme.fg("dim", `${left}${"─".repeat(panelWidth - 2)}${right}`);
@@ -131,10 +144,119 @@ class PiStartupHeader {
   }
 
   invalidate(): void {}
-  dispose(): void {}
+  dispose(): void {
+    this.disposed = true;
+  }
 }
 
 const ANSI_REGEX = /\x1b(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g;
+const ANSI_SEQUENCE_AT_START = /^\x1b\[[0-?]*[ -/]*[@-~]/u;
+const COMMAND_TOKEN_PATTERN = /(^|[ \t])(\/[A-Za-z0-9:_-]*)/gu;
+
+function controlSequenceAt(text: string, index: number): string | undefined {
+  if (text.startsWith(CURSOR_MARKER, index)) return CURSOR_MARKER;
+  return text.slice(index).match(ANSI_SEQUENCE_AT_START)?.[0];
+}
+
+interface CommandToken {
+  text: string;
+  start: number;
+  end: number;
+  valid: boolean;
+}
+
+interface EditorVisualLine {
+  logicalLine: number;
+  startCol: number;
+  length: number;
+}
+
+function commandTokens(text: string, normalizedNames: readonly string[]): CommandToken[] {
+  return [...text.matchAll(COMMAND_TOKEN_PATTERN)].map((match) => {
+    const token = match[2] ?? "";
+    const prefix = token.slice(1).toLocaleLowerCase();
+    const start = (match.index ?? 0) + (match[1]?.length ?? 0);
+    return {
+      text: token,
+      start,
+      end: start + token.length,
+      valid: normalizedNames.some((name) => name.startsWith(prefix)),
+    };
+  });
+}
+
+function highlightTextRanges(
+  text: string,
+  ranges: Array<{ start: number; end: number }>,
+  color: (value: string) => string,
+): string {
+  if (ranges.length === 0) return text;
+
+  let output = "";
+  let buffer = "";
+  let bufferHighlighted: boolean | undefined;
+  let plainIndex = 0;
+  const flush = (): void => {
+    if (!buffer) return;
+    output += bufferHighlighted ? color(buffer) : buffer;
+    buffer = "";
+  };
+
+  for (let index = 0; index < text.length;) {
+    const control = controlSequenceAt(text, index);
+    if (control) {
+      flush();
+      output += control;
+      index += control.length;
+      continue;
+    }
+
+    const highlighted = ranges.some((range) => plainIndex >= range.start && plainIndex < range.end);
+    if (bufferHighlighted !== highlighted) {
+      flush();
+      bufferHighlighted = highlighted;
+    }
+    buffer += text[index];
+    plainIndex += 1;
+    index += 1;
+  }
+  flush();
+  return output;
+}
+
+function highlightEditorLines(
+  lines: string[],
+  sourceLines: string[],
+  visualLines: EditorVisualLine[],
+  scrollOffset: number,
+  commandNames: ReadonlySet<string>,
+  color: (value: string) => string,
+): { lines: string[]; bottomBorderIndex: number } {
+  let bottomBorderIndex = -1;
+  for (let index = lines.length - 1; index >= 1; index -= 1) {
+    if (isBorderLine(lines[index] ?? "")) {
+      bottomBorderIndex = index;
+      break;
+    }
+  }
+  if (bottomBorderIndex < 0) bottomBorderIndex = lines.length - 1;
+
+  const normalizedNames = [...commandNames].map((name) => name.toLocaleLowerCase());
+  for (let index = 1; index < bottomBorderIndex; index += 1) {
+    const visualLine = visualLines[scrollOffset + index - 1];
+    if (!visualLine) continue;
+    const visibleStart = visualLine.startCol;
+    const visibleEnd = visibleStart + visualLine.length;
+    const ranges = commandTokens(sourceLines[visualLine.logicalLine] ?? "", normalizedNames)
+      .filter((token) => token.valid && token.start < visibleEnd && token.end > visibleStart)
+      .map((token) => ({
+        start: Math.max(token.start, visibleStart) - visibleStart,
+        end: Math.min(token.end, visibleEnd) - visibleStart,
+      }));
+    lines[index] = highlightTextRanges(lines[index] ?? "", ranges, color);
+  }
+  return { lines, bottomBorderIndex };
+}
 
 function stripAnsi(text: string): string {
   return text.replace(ANSI_REGEX, "").trim();
@@ -145,12 +267,27 @@ function isBorderLine(line: string): boolean {
   return /^[─━═]+$/.test(unstyled) || /^───\s*[↓↑]/.test(unstyled) || /^─{3,}/.test(unstyled);
 }
 
+function isScrolledTopBorder(line: string): boolean {
+  const unstyled = stripAnsi(line);
+  return unstyled.includes("↑") || unstyled.includes(".");
+}
+
 class PiCodeEditor extends CustomEditor {
   private readonly appKeybindings: KeybindingsManager;
-
-  constructor(tui: TUI, theme: EditorTheme, appKeybindings: KeybindingsManager) {
+  private readonly runtimeTheme: Theme;
+  private readonly getCommandNames: () => ReadonlySet<string>;
+
+  constructor(
+    tui: TUI,
+    theme: EditorTheme,
+    appKeybindings: KeybindingsManager,
+    runtimeTheme: Theme,
+    getCommandNames: () => ReadonlySet<string>,
+  ) {
     super(tui, theme, appKeybindings);
     this.appKeybindings = appKeybindings;
+    this.runtimeTheme = runtimeTheme;
+    this.getCommandNames = getCommandNames;
   }
 
   override handleInput(data: string): void {
@@ -167,25 +304,42 @@ class PiCodeEditor extends CustomEditor {
     super.handleInput(data);
   }
 
+  private renderWithCommandHighlighting(
+    width: number,
+    color: (value: string) => string,
+  ): { lines: string[]; bottomBorderIndex: number } {
+    const lines = super.render(width);
+    const internals = this as unknown as {
+      lastWidth: number;
+      scrollOffset: number;
+      buildVisualLineMap: (layoutWidth: number) => EditorVisualLine[];
+    };
+    return highlightEditorLines(
+      lines,
+      this.getLines(),
+      internals.buildVisualLineMap(internals.lastWidth),
+      internals.scrollOffset,
+      this.getCommandNames(),
+      color,
+    );
+  }
+
   override render(width: number): string[] {
-    if (width < 4) return super.render(width);
+    if (width <= 0) return [];
+    const colorCommand = (value: string): string => this.runtimeTheme.fg("mdLink", value);
+    if (width < 4) {
+      return this.renderWithCommandHighlighting(width, colorCommand)
+        .lines.map((line) => truncateToWidth(line, width, ""));
+    }
     const innerWidth = width - 2;
-    const lines = super.render(innerWidth);
+    const highlighted = this.renderWithCommandHighlighting(innerWidth, colorCommand);
+    const { lines, bottomBorderIndex } = highlighted;
     if (lines.length < 2) return lines.map((line) => truncateToWidth(line, width, ""));
 
-    const gray = (text: string): string => `\x1B[90m${text}\x1B[39m`;
-    let bottomBorderIndex = -1;
-    for (let index = lines.length - 1; index >= 1; index -= 1) {
-      if (isBorderLine(lines[index] ?? "")) {
-        bottomBorderIndex = index;
-        break;
-      }
-    }
-    if (bottomBorderIndex < 0) bottomBorderIndex = lines.length - 1;
-
+    const gray = (text: string): string => this.runtimeTheme.fg("dim", text);
     const framed: string[] = [];
     const top = stripAnsi(lines[0] ?? "");
-    const isScrolledHeader = top.includes("↑");
+    const isScrolledHeader = isScrolledTopBorder(lines[0] ?? "");
     if (isScrolledHeader) {
       const count = top.match(/↑\s*(\d+)/)?.[1] ?? "";
       const indicator = `${gray("─── ↑ ")}${count}${gray(" more ")}${gray("─".repeat(Math.max(0, width - 12 - count.length)))}`;
@@ -219,34 +373,50 @@ const ACTIVITY_WORDS = ["Brewing", "Pondering", "Tinkering", "Wrangling", "Noodl
 
 export function registerShellUi(pi: ExtensionAPI): void {
   let activeHeader: PiStartupHeader | undefined;
-  let activityWordIndex = 0;
+  let activityDeck: string[] = [];
+  let lastActivityWord: string | undefined;
+  let activityTimer: ReturnType<typeof setInterval> | undefined;
   let tipDeck: string[] = [];
   const nextStartupTip = (): string => {
     if (tipDeck.length === 0) tipDeck = shuffledTips();
     return tipDeck.pop() ?? STARTUP_TIPS[0];
   };
+  const refillActivityDeck = (): void => {
+    activityDeck = [...ACTIVITY_WORDS];
+    for (let index = activityDeck.length - 1; index > 0; index -= 1) {
+      const swapIndex = Math.floor(Math.random() * (index + 1));
+      [activityDeck[index], activityDeck[swapIndex]] = [activityDeck[swapIndex]!, activityDeck[index]!];
+    }
+    if (activityDeck.length > 1 && activityDeck.at(-1) === lastActivityWord) {
+      [activityDeck[0], activityDeck[activityDeck.length - 1]] = [activityDeck.at(-1)!, activityDeck[0]!];
+    }
+  };
+  const nextActivityWord = (): string => {
+    if (activityDeck.length === 0) refillActivityDeck();
+    const word = activityDeck.pop() ?? ACTIVITY_WORDS[0];
+    lastActivityWord = word;
+    return word;
+  };
+  const clearActivityTimer = (): void => {
+    if (activityTimer) clearInterval(activityTimer);
+    activityTimer = undefined;
+  };
 
   pi.on("session_start", (_event, ctx) => {
     if (ctx.mode !== "tui") return;
     try {
       ctx.ui.setTheme("killeros");
       const startupTip = nextStartupTip();
-      ctx.ui.setHeader(() => {
+      ctx.ui.setHeader((tui) => {
         activeHeader?.dispose();
-        activeHeader = new PiStartupHeader(pi, ctx, startupTip);
+        activeHeader = new PiStartupHeader(pi, ctx, startupTip, tui);
         return activeHeader;
       });
-      ctx.ui.setWorkingIndicator({
-        frames: [
-          ctx.ui.theme.fg("dim", "✻"),
-          ctx.ui.theme.fg("muted", "✻"),
-          ctx.ui.theme.fg("accent", "✻"),
-          ctx.ui.theme.fg("muted", "✻"),
-        ],
-        intervalMs: 180,
-      });
+      clearActivityTimer();
+      ctx.ui.setWorkingIndicator({ frames: [ctx.ui.theme.fg("accent", "✻")] });
       ctx.ui.setHiddenThinkingLabel("└ Thinking…");
-      ctx.ui.setEditorComponent((tui, theme, keybindings) => new PiCodeEditor(tui, theme, keybindings));
+      ctx.ui.setEditorComponent((tui, editorTheme, keybindings) =>
+        new PiCodeEditor(tui, editorTheme, keybindings, ctx.ui.theme, () => availableCommandNames(pi)));
     } catch (error) {
       reportError(ctx, "Killeros UI failed to initialize", error);
     }
@@ -254,17 +424,23 @@ export function registerShellUi(pi: ExtensionAPI): void {
 
   pi.on("agent_start", (_event, ctx) => {
     if (ctx.mode !== "tui") return;
-    ctx.ui.setWorkingMessage(`${ACTIVITY_WORDS[activityWordIndex]}…`);
-    activityWordIndex = (activityWordIndex + 1) % ACTIVITY_WORDS.length;
+    clearActivityTimer();
+    const updateWorkingWord = (): void => ctx.ui.setWorkingMessage(`${nextActivityWord()}…`);
+    updateWorkingWord();
+    activityTimer = setInterval(updateWorkingWord, 2_500);
+    activityTimer.unref?.();
   });
 
   pi.on("agent_end", (_event, ctx) => {
+    clearActivityTimer();
     if (ctx.mode === "tui") ctx.ui.setWorkingMessage();
   });
 
   pi.on("session_shutdown", () => {
+    clearActivityTimer();
     activeHeader?.dispose();
     activeHeader = undefined;
-    activityWordIndex = 0;
+    activityDeck = [];
+    lastActivityWord = undefined;
   });
 }

package/killeros/variants.ts

@@ -1,4 +1,4 @@
-import { DynamicBorder, type ExtensionAPI, type ExtensionContext, type ThemeColor } from "@earendil-works/pi-coding-agent";
+import { DynamicBorder, keyHint, type ExtensionAPI, type ExtensionContext, type ThemeColor } from "@earendil-works/pi-coding-agent";
 import { Container, SelectList, Text, truncateToWidth } from "@earendil-works/pi-tui";
 
 export type ThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
@@ -119,7 +119,11 @@ export function registerVariants(pi: ExtensionAPI): void {
         selectList.onCancel = () => done(null);
         container.addChild(selectList);
         container.addChild(new Text("", 0, 0));
-        container.addChild(new Text(theme.fg("dim", "↑↓ navigate • Enter select • Esc cancel"), 1, 0));
+        container.addChild(new Text(
+          theme.fg("dim", `${keyHint("tui.select.up", "up")} • ${keyHint("tui.select.down", "down")} • ${keyHint("tui.select.confirm", "select")} • ${keyHint("tui.select.cancel", "cancel")}`),
+          1,
+          0,
+        ));
         container.addChild(new DynamicBorder((text: string) => theme.fg("accent", text)));
         return {
           render: (width) => container.render(width).map((line) => truncateToWidth(line, width, "")),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "killeros",
-  "version": "1.5.8",
+  "version": "2.0.1",
   "description": "A production-hardened TUI and workflow extension for the Pi coding agent.",
   "type": "module",
   "keywords": [
@@ -22,10 +22,6 @@
   "files": [
     "Killeros.ts",
     "killeros/*.ts",
-    "subagents.ts",
-    "subagent-lifecycle.ts",
-    "subagent-process.ts",
-    "subagent-ui.ts",
     "themes/killeros.json",
     "README.md",
     "CHANGELOG.md"
@@ -49,7 +45,6 @@
     "@earendil-works/pi-ai": ">=0.82.1",
     "@earendil-works/pi-coding-agent": ">=0.82.1",
     "@earendil-works/pi-tui": ">=0.82.1",
-    "pi-web-access": ">=0.17.1",
     "typebox": ">=1.1.38 <2"
   },
   "devDependencies": {

package/themes/killeros.json

@@ -4,6 +4,7 @@
   "vars": {
     "coral": "#d77757",
     "coralBright": "#e58b6d",
+    "commandBlue": "#78a9ff",
     "canvas": "#0a0a0a",
     "surface": "#121212",
     "surfaceRaised": "#1a1a1a",
@@ -43,7 +44,7 @@
     "toolOutput": "muted",
 
     "mdHeading": "coralBright",
-    "mdLink": "coralBright",
+    "mdLink": "commandBlue",
     "mdLinkUrl": "dim",
     "mdCode": "coralBright",
     "mdCodeBlock": "text",
@@ -68,8 +69,8 @@
     "syntaxPunctuation": "muted",
 
     "thinkingOff": "dim",
-    "thinkingMinimal": "#78685f",
-    "thinkingLow": "#98705f",
+    "thinkingMinimal": "#927f74",
+    "thinkingLow": "#a27b6a",
     "thinkingMedium": "#b27762",
     "thinkingHigh": "coral",
     "thinkingXhigh": "#d58272",