killeros 2.0.3 → 2.0.4

package/killeros/shell-ui.ts

@@ -11,7 +11,6 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import {
   Container,
-  CURSOR_MARKER,
   Text,
   truncateToWidth,
   visibleWidth,
@@ -19,7 +18,6 @@ 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";
@@ -151,113 +149,6 @@ class PiStartupHeader {
 }
 
 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();
@@ -276,19 +167,16 @@ function isScrolledTopBorder(line: string): boolean {
 class PiCodeEditor extends CustomEditor {
   private readonly 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 {
@@ -305,37 +193,19 @@ 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 <= 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, ""));
-    }
+    if (width < 4) return super.render(width).map((line) => truncateToWidth(line, width, ""));
     const innerWidth = width - 2;
-    const highlighted = this.renderWithCommandHighlighting(innerWidth, colorCommand);
-    const { lines, bottomBorderIndex } = highlighted;
+    const lines = super.render(innerWidth);
     if (lines.length < 2) return lines.map((line) => truncateToWidth(line, width, ""));
+    let bottomBorderIndex = lines.length - 1;
+    for (let index = lines.length - 1; index >= 1; index -= 1) {
+      if (isBorderLine(lines[index] ?? "")) {
+        bottomBorderIndex = index;
+        break;
+      }
+    }
 
     const gray = (text: string): string => this.runtimeTheme.fg("dim", text);
     const framed: string[] = [];
@@ -381,6 +251,8 @@ function formatActivityMessage(word: string, theme: Theme): string {
   return `${theme.fg("accent", `${word}…`)} ${theme.fg("dim", `(${theme.bold("esc")} to interrupt · thinking)`)}`;
 }
 
+let killerosEditorFactory: ReturnType<ExtensionContext["ui"]["getEditorComponent"]>;
+
 export function registerShellUi(pi: ExtensionAPI): void {
   let activeHeader: PiStartupHeader | undefined;
   let activityDeck: string[] = [];
@@ -428,8 +300,12 @@ export function registerShellUi(pi: ExtensionAPI): void {
         intervalMs: ACTIVITY_FRAME_INTERVAL_MS,
       });
       ctx.ui.setHiddenThinkingLabel("└ Thinking…");
-      ctx.ui.setEditorComponent((tui, editorTheme, keybindings) =>
-        new PiCodeEditor(tui, editorTheme, keybindings, ctx.ui.theme, () => availableCommandNames(pi)));
+      const existingEditorFactory = ctx.ui.getEditorComponent?.();
+      if (!existingEditorFactory || existingEditorFactory === killerosEditorFactory) {
+        killerosEditorFactory = (tui, editorTheme, keybindings) =>
+          new PiCodeEditor(tui, editorTheme, keybindings, ctx.ui.theme);
+        ctx.ui.setEditorComponent(killerosEditorFactory);
+      }
     } catch (error) {
       reportError(ctx, "Killeros UI failed to initialize", error);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "killeros",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "TUI, goals, and workflow automation for the Pi coding agent",
   "type": "module",
   "keywords": [