@zhijiewang/openharness 2.24.0 → 2.25.0

package/dist/renderer/index.js

@@ -4,6 +4,7 @@
  * right after the scrollback content each frame (no absolute positioning gap).
  */
 import { recordApproval } from "../harness/approvals.js";
+import { appendToolPermission } from "../harness/config.js";
 import { getTheme } from "../utils/theme-data.js";
 import { summarizeToolArgs } from "../utils/tool-summary.js";
 import { CellGrid } from "./cells.js";
@@ -396,9 +397,6 @@ export class TerminalRenderer {
             // exists (we don't auto-create on first interaction).
             if (k === "a" && toolName) {
                 try {
-                    // Lazy import to avoid pulling config into the renderer bundle
-                    // for callers that don't trip the permission path.
-                    const { appendToolPermission } = require("../harness/config.js");
                     appendToolPermission(toolName);
                 }
                 catch {

package/dist/renderer/layout-sections.js

@@ -5,6 +5,8 @@
 import { getTheme } from "../utils/theme-data.js";
 import { renderDiff } from "./diff.js";
 import { isImageOutput, renderImageInline } from "./image.js";
+import { deriveSpinnerLabel } from "./spinner-label.js";
+import { toolColor } from "./tool-color.js";
 // ── Style constants ──
 const s = (fg, bold = false, dim = false) => ({ fg, bg: null, bold, dim, underline: false });
 export const S_TEXT = s(null);
@@ -93,14 +95,14 @@ export function renderThinkingSummarySection(state, grid, r, limit) {
 export function renderSpinnerSection(state, grid, r, limit) {
     if (!state.loading || state.streamingText || state.thinkingText || r >= limit)
         return r;
-    const thinkText = "Thinking";
+    const thinkText = deriveSpinnerLabel(state.toolCalls);
     const elapsed = state.thinkingStartedAt ? Math.floor((Date.now() - state.thinkingStartedAt) / 1000) : 0;
     const t = getTheme();
     const baseColor = elapsed > 60 ? t.error : elapsed > 30 ? t.stall : t.primary;
     const shimmerColor = elapsed > 60 ? t.stallShimmer : elapsed > 30 ? t.warning : t.primaryShimmer;
     const baseStyle = { fg: baseColor, bg: null, bold: false, dim: false, underline: false };
     grid.writeText(r, 0, "◆ ", { ...baseStyle, bold: true });
-    const shimmerPos = state.spinnerFrame % (thinkText.length + 6);
+    const shimmerPos = state.spinnerFrame % 20;
     const shimmerStyle = { fg: shimmerColor, bg: null, bold: true, dim: false, underline: false };
     for (let ci = 0; ci < thinkText.length; ci++) {
         grid.setCell(r, 2 + ci, thinkText[ci], Math.abs(ci - shimmerPos) <= 1 ? shimmerStyle : baseStyle);
@@ -141,8 +143,9 @@ export function renderToolCallsSection(state, grid, r, limit, opts) {
                 : tc.status === "done"
                     ? "✓"
                     : "✗";
-        const statusStyle = tc.status === "error" ? S_ERROR : tc.status === "done" ? S_GREEN : isAgent ? S_AGENT : S_YELLOW;
-        const nameStyle = isAgent ? S_AGENT : { ...S_YELLOW, bold: true };
+        const toolStyle = { fg: toolColor(tc.toolName), bg: null, bold: false, dim: false, underline: false };
+        const statusStyle = tc.status === "error" ? S_ERROR : tc.status === "done" ? S_GREEN : isAgent ? S_AGENT : toolStyle;
+        const nameStyle = isAgent ? S_AGENT : { ...toolStyle, bold: true };
         const isExpanded = state.expandedToolCalls.has(callId);
         const canExpand = tc.status !== "running" && tc.output;
         if (canExpand) {
@@ -427,21 +430,33 @@ export function renderInputSection(state, grid, inputRow, limit, promptText, pro
     const inputStart = promptWidth;
     const inputLines = state.inputText.split("\n");
     const maxInputLines = Math.min(inputLines.length, 5);
+    // Pre-compute the [N lines] suffix column on row 0 (if multi-line) so the
+    // wrap glyph for line 0 can yield to the suffix when they would collide.
+    // The +1 reserves the glyph column so the suffix starts one column after
+    // it (produces "text↵ [N lines]"); a +0 would let the suffix overwrite the
+    // glyph on narrow terminals.
+    let lineCountCol = -1;
+    if (inputLines.length > 1) {
+        const lineCountStr = ` [${inputLines.length} lines]`;
+        lineCountCol = Math.min(inputStart + (inputLines[0]?.length ?? 0) + 1, grid.width - lineCountStr.length - 1);
+    }
     for (let li = 0; li < maxInputLines; li++) {
         if (inputRow + li >= limit)
             break;
-        if (li === 0) {
-            grid.writeText(inputRow, inputStart, inputLines[0], S_TEXT);
-        }
-        else {
-            grid.writeText(inputRow + li, inputStart, inputLines[li], S_TEXT);
+        const lineText = inputLines[li];
+        grid.writeText(inputRow + li, inputStart, lineText, S_TEXT);
+        // Audit U-C2: append a dim ↵ continuation glyph to every non-last line.
+        if (li < inputLines.length - 1) {
+            const glyphCol = inputStart + lineText.length;
+            const wouldCollideWithLineCount = li === 0 && lineCountCol > inputStart && glyphCol >= lineCountCol;
+            if (glyphCol < grid.width && !wouldCollideWithLineCount) {
+                grid.writeText(inputRow + li, glyphCol, "↵", S_DIM);
+            }
         }
     }
-    if (inputLines.length > 1) {
+    if (inputLines.length > 1 && lineCountCol > inputStart) {
         const lineCountStr = ` [${inputLines.length} lines]`;
-        const lineCountCol = Math.min(inputStart + (inputLines[0]?.length ?? 0) + 1, grid.width - lineCountStr.length - 1);
-        if (lineCountCol > inputStart)
-            grid.writeText(inputRow, lineCountCol, lineCountStr, S_DIM);
+        grid.writeText(inputRow, lineCountCol, lineCountStr, S_DIM);
     }
     const hintsRow = inputRow + maxInputLines;
     if (hintsRow < limit) {

package/dist/renderer/spinner-label.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Derives the spinner section label from the live tool-call map.
+ */
+import type { ToolCallInfo } from "./layout.js";
+export declare function deriveSpinnerLabel(toolCalls: Map<string, ToolCallInfo>): string;
+//# sourceMappingURL=spinner-label.d.ts.map

package/dist/renderer/spinner-label.js

@@ -0,0 +1,24 @@
+/**
+ * Derives the spinner section label from the live tool-call map.
+ */
+export function deriveSpinnerLabel(toolCalls) {
+    const running = [];
+    for (const tc of toolCalls.values()) {
+        if (tc.status === "running")
+            running.push(tc);
+    }
+    if (running.length === 0)
+        return "Thinking";
+    if (running.length === 1) {
+        const name = running[0].toolName;
+        if (name.startsWith("mcp__")) {
+            const rest = name.slice("mcp__".length);
+            const idx = rest.indexOf("__");
+            if (idx > 0)
+                return `Calling ${rest.slice(0, idx)}:${rest.slice(idx + 2)}`;
+        }
+        return `Running ${name}`;
+    }
+    return `Running ${running.length} tools`;
+}
+//# sourceMappingURL=spinner-label.js.map

package/dist/renderer/tool-color.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Maps a tool name to a display color for the tool-call section.
+ * Read-class tools → cyan, Mutate-class → yellow, Exec-class → magenta,
+ * MCP tools (mcp__ prefix) → green, everything else → yellow fallback.
+ */
+export type ToolColor = "cyan" | "yellow" | "magenta" | "green";
+export declare function toolColor(toolName: string): ToolColor;
+//# sourceMappingURL=tool-color.d.ts.map

package/dist/renderer/tool-color.js

@@ -0,0 +1,20 @@
+/**
+ * Maps a tool name to a display color for the tool-call section.
+ * Read-class tools → cyan, Mutate-class → yellow, Exec-class → magenta,
+ * MCP tools (mcp__ prefix) → green, everything else → yellow fallback.
+ */
+const READ = new Set(["Read", "Glob", "Grep", "WebFetch", "WebSearch", "ExaSearch"]);
+const MUTATE = new Set(["Edit", "Write", "NotebookEdit"]);
+const EXEC = new Set(["Bash", "PowerShell"]);
+export function toolColor(toolName) {
+    if (READ.has(toolName))
+        return "cyan";
+    if (MUTATE.has(toolName))
+        return "yellow";
+    if (EXEC.has(toolName))
+        return "magenta";
+    if (toolName.startsWith("mcp__"))
+        return "green";
+    return "yellow";
+}
+//# sourceMappingURL=tool-color.js.map

package/dist/repl.js

@@ -977,7 +977,6 @@ export async function startREPL(config) {
                     case "tool_call_end": {
                         const toolName = callIdToToolName.get(event.callId) ?? event.callId;
                         const prevTc = renderer.getToolCall(event.callId);
-                        const _elapsed = prevTc?.startedAt ? Math.floor((Date.now() - prevTc.startedAt) / 1000) : 0;
                         renderer.setToolCall(event.callId, {
                             toolName,
                             status: event.isError ? "error" : "done",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhijiewang/openharness",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "description": "Open-source terminal coding agent. Works with any LLM.",
   "type": "module",
   "bin": {