killeros 2.0.3 → 2.0.5

package/killeros/question.ts

@@ -89,12 +89,24 @@ function oneLine(value: string): string {
   return value.replace(/\s+/gu, " ").trim();
 }
 
+function boundedRenderLine(value: string, width: number, suffix: string): string {
+  return truncateToWidth(value.replace(/\r\n|\r|\n/gu, " "), width, suffix);
+}
+
 function visibleOptionRange(total: number, selected: number, capacity: number): { start: number; end: number } {
   const size = Math.max(1, Math.min(total, capacity));
   const start = Math.max(0, Math.min(selected - Math.floor(size / 2), total - size));
   return { start, end: Math.min(total, start + size) };
 }
 
+function boundedQuestionLines(question: string, width: number, rowLimit: number): string[] {
+  const wrapped = wrapTextWithAnsi(question.replace(/\s+/gu, " ").trim(), width);
+  if (wrapped.length <= rowLimit) return wrapped;
+  const visible = wrapped.slice(0, rowLimit);
+  visible[rowLimit - 1] = truncateToWidth(visible[rowLimit - 1]!, width, "…");
+  return visible;
+}
+
 export function registerQuestionTool(pi: ExtensionAPI): void {
   const customInputHistory: string[] = [];
   let customInputHistoryBytes = 0;
@@ -349,27 +361,29 @@ export function registerQuestionTool(pi: ExtensionAPI): void {
           if (optionIndex >= visibleOptions.length) optionIndex = Math.max(0, visibleOptions.length - 1);
           const selected = visibleOptions[optionIndex];
           const position = `Option ${Math.min(optionIndex + 1, visibleOptions.length)}/${visibleOptions.length}`;
-          const answerCount = inputCharacterCount(editor.getExpandedText()).toLocaleString();
+          const expandedAnswer = editor.getExpandedText();
+          const answerCount = inputCharacterCount(expandedAnswer).toLocaleString();
           const filterCount = inputCharacterCount(filterQuery).toLocaleString();
+          const compactDraft = expandedAnswer.replace(/\r\n|\r|\n/gu, " ↵ ") || "Type an answer";
 
           if (rowBudget <= 2) {
             const compact = editMode
-              ? [`Answer ${answerCount}/${CUSTOM_INPUT_MAX_CHARACTERS.toLocaleString()}`, editor.getExpandedText() || "Type an answer"]
+              ? [`Answer ${answerCount}/${CUSTOM_INPUT_MAX_CHARACTERS.toLocaleString()}`, compactDraft]
               : [`${selected ? `> ${selected.label}` : "No matching options"} · ${position}`];
             cachedWidth = renderWidth;
             cachedRows = rowBudget;
-            cachedLines = compact.slice(0, rowBudget).map((line) => truncateToWidth(line, renderWidth, "…"));
+            cachedLines = compact.slice(0, rowBudget).map((line) => boundedRenderLine(line, renderWidth, "…"));
             return cachedLines;
           }
 
           if (rowBudget <= 5) {
             const compact = [
-              truncateToWidth(params.question.replace(/\s+/gu, " "), renderWidth, "…"),
+              ...boundedQuestionLines(params.question, renderWidth, Math.max(1, rowBudget - 3)),
               editMode
                 ? `Answer ${answerCount}/${CUSTOM_INPUT_MAX_CHARACTERS.toLocaleString()}`
                 : `${selected ? `> ${selected.label}` : "No matching options"} · ${position}`,
               editMode
-                ? editor.getExpandedText() || "Type an answer"
+                ? compactDraft
                 : filterQuery
                   ? `Filter ${filterCount}/${FILTER_QUERY_MAX_CHARACTERS.toLocaleString()}`
                   : position,
@@ -379,11 +393,12 @@ export function registerQuestionTool(pi: ExtensionAPI): void {
             ];
             cachedWidth = renderWidth;
             cachedRows = rowBudget;
-            cachedLines = compact.slice(0, rowBudget).map((line) => truncateToWidth(line, renderWidth, "…"));
+            cachedLines = compact.slice(0, rowBudget).map((line) => boundedRenderLine(line, renderWidth, "…"));
             return cachedLines;
           }
 
-          const contentRows = rowBudget - 5;
+          const questionLines = boundedQuestionLines(params.question, renderWidth, Math.max(1, rowBudget - 5));
+          const contentRows = rowBudget - questionLines.length - 4;
           const optionCapacity = Math.max(1, Math.min(5, Math.ceil(contentRows / 2)));
           const detailCapacity = Math.max(0, contentRows - optionCapacity);
           const { start, end } = visibleOptionRange(visibleOptions.length, optionIndex, optionCapacity);
@@ -401,7 +416,7 @@ export function registerQuestionTool(pi: ExtensionAPI): void {
             : `${keyHint("tui.select.up", "up")} • ${keyHint("tui.select.down", "down")} • ${keyHint("tui.select.confirm", "select")} • ${keyHint("tui.select.cancel", filterQuery ? "clear filter" : "cancel")}`;
           const lines: string[] = [
             theme.fg("accent", "─".repeat(renderWidth)),
-            theme.fg("text", truncateToWidth(` ${params.question.replace(/\s+/gu, " ")}`, renderWidth, "…")),
+            ...questionLines.map((line) => theme.fg("text", line)),
             theme.fg("muted", truncateToWidth(` ${progress}`, renderWidth, "…")),
           ];
 
@@ -459,7 +474,7 @@ export function registerQuestionTool(pi: ExtensionAPI): void {
           lines.push(theme.fg("accent", "─".repeat(renderWidth)));
           cachedWidth = renderWidth;
           cachedRows = rowBudget;
-          cachedLines = lines.slice(0, rowBudget).map((line) => truncateToWidth(line, renderWidth, ""));
+          cachedLines = lines.slice(0, rowBudget).map((line) => boundedRenderLine(line, renderWidth, ""));
           return cachedLines;
         };
 

package/killeros/runtime.ts

@@ -1,15 +1,31 @@
+import type { InitEvidenceIndex } from "./init-evidence.ts";
+import type { InitTargetBaseline } from "./init-target.ts";
+
+export type InitOutcome =
+  | { kind: "pending" }
+  | { kind: "written" }
+  | { kind: "policy-conflict"; reason: string }
+  | { kind: "no-outcome" };
+
 export interface InitRuntime {
   active: boolean;
   targetPath?: string;
-  writeAttempted: boolean;
-  writeSucceeded: boolean;
   projectRoot?: string;
   activeTools?: string[];
-  settle?: (writeSucceeded: boolean) => void;
+  evidence?: InitEvidenceIndex;
+  baseline?: InitTargetBaseline;
+  outcome: InitOutcome;
+  settle?: (outcome: InitOutcome) => void;
 }
 
 export type GoalStatus = "active" | "paused" | "blocked" | "complete";
 
+export interface GoalBlockerAudit {
+  key: string;
+  streak: number;
+  lastTurn: number;
+}
+
 export interface GoalState {
   version: 1;
   revision: number;
@@ -24,6 +40,7 @@ export interface GoalState {
   baselineTokens: number;
   result?: string;
   resumeAfterManualCompaction?: true;
+  blockerAudit?: GoalBlockerAudit;
 }
 
 export interface GoalRuntime {
@@ -39,7 +56,7 @@ export interface GoalRuntime {
 }
 
 export function createInitRuntime(): InitRuntime {
-  return { active: false, writeAttempted: false, writeSucceeded: false };
+  return { active: false, outcome: { kind: "pending" } };
 }
 
 export function createGoalRuntime(): GoalRuntime {
@@ -55,8 +72,10 @@ export function createGoalRuntime(): GoalRuntime {
 export function resetInitRuntime(state: InitRuntime): void {
   state.active = false;
   state.targetPath = undefined;
-  state.writeAttempted = false;
-  state.writeSucceeded = false;
   state.projectRoot = undefined;
   state.activeTools = undefined;
+  state.evidence = undefined;
+  state.baseline = undefined;
+  state.outcome = { kind: "pending" };
+  state.settle = undefined;
 }

package/killeros/shell-ui.ts

@@ -19,7 +19,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";
@@ -45,6 +44,13 @@ const STARTUP_TIPS = [
   "Run /notification to enable a terminal bell when work settles.",
 ] as const;
 
+const EDITOR_SUGGESTIONS = [
+  'Try "how does <filepath> work?"',
+  'Try "find edge cases in <filepath>"',
+  'Try "simplify <filepath> without changing behavior"',
+  'Try "write tests for <filepath>"',
+] as const;
+
 export function resolveGitBranch(cwd: string): Promise<string | undefined> {
   return new Promise((resolve) => {
     execFile(
@@ -68,13 +74,26 @@ export function resolveGitBranch(cwd: string): Promise<string | undefined> {
   });
 }
 
-function shuffledTips(): string[] {
-  const tips = [...STARTUP_TIPS];
-  for (let index = tips.length - 1; index > 0; index -= 1) {
+function shuffledDeck(values: readonly string[]): string[] {
+  const deck = [...values];
+  for (let index = deck.length - 1; index > 0; index -= 1) {
     const swapIndex = Math.floor(Math.random() * (index + 1));
-    [tips[index], tips[swapIndex]] = [tips[swapIndex]!, tips[index]!];
+    [deck[index], deck[swapIndex]] = [deck[swapIndex]!, deck[index]!];
   }
-  return tips;
+  return deck;
+}
+
+let tipDeck: string[] = [];
+let editorSuggestionDeck: string[] = [];
+
+function nextStartupTip(): string {
+  if (tipDeck.length === 0) tipDeck = shuffledDeck(STARTUP_TIPS);
+  return tipDeck.pop() ?? STARTUP_TIPS[0];
+}
+
+function nextEditorSuggestion(): string {
+  if (editorSuggestionDeck.length === 0) editorSuggestionDeck = shuffledDeck(EDITOR_SUGGESTIONS);
+  return editorSuggestionDeck.pop() ?? EDITOR_SUGGESTIONS[0];
 }
 
 function compactBoxLine(content: string, width: number, theme: Theme): string {
@@ -151,113 +170,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 +188,19 @@ function isScrolledTopBorder(line: string): boolean {
 class PiCodeEditor extends CustomEditor {
   private readonly appKeybindings: KeybindingsManager;
   private readonly runtimeTheme: Theme;
-  private readonly getCommandNames: () => ReadonlySet<string>;
+  private readonly suggestion: string;
 
   constructor(
     tui: TUI,
     theme: EditorTheme,
     appKeybindings: KeybindingsManager,
     runtimeTheme: Theme,
-    getCommandNames: () => ReadonlySet<string>,
+    suggestion: string,
   ) {
     super(tui, theme, appKeybindings);
     this.appKeybindings = appKeybindings;
     this.runtimeTheme = runtimeTheme;
-    this.getCommandNames = getCommandNames;
+    this.suggestion = suggestion;
   }
 
   override handleInput(data: string): void {
@@ -305,37 +217,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[] = [];
@@ -350,8 +244,16 @@ class PiCodeEditor extends CustomEditor {
     }
 
     for (let index = 1; index < bottomBorderIndex; index += 1) {
-      const prefix = index === 1 && !isScrolledHeader ? gray("❯ ") : "  ";
-      framed.push(`${prefix}${padRight(lines[index] ?? "", innerWidth)}`);
+      const isPromptLine = index === 1 && !isScrolledHeader;
+      const prefix = isPromptLine ? gray("❯\u00A0") : "  ";
+      let content = lines[index] ?? "";
+      if (isPromptLine && this.getText() === "") {
+        const first = this.suggestion.slice(0, 1);
+        const rest = this.suggestion.slice(1);
+        const cursorMarker = this.focused ? CURSOR_MARKER : "";
+        content = `${cursorMarker}\x1B[7m${gray(first)}\x1B[27m${gray(rest)}`;
+      }
+      framed.push(`${prefix}${padRight(content, innerWidth)}`);
     }
 
     const bottom = stripAnsi(lines[bottomBorderIndex] ?? "");
@@ -381,16 +283,13 @@ 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[] = [];
   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) {
@@ -428,8 +327,13 @@ 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) {
+        const editorSuggestion = nextEditorSuggestion();
+        killerosEditorFactory = (tui, editorTheme, keybindings) =>
+          new PiCodeEditor(tui, editorTheme, keybindings, ctx.ui.theme, editorSuggestion);
+        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.5",
   "description": "TUI, goals, and workflow automation for the Pi coding agent",
   "type": "module",
   "keywords": [