@ordewell/cli 0.4.9 → 0.4.10

package/dist/main.js

@@ -2729,9 +2729,21 @@ var import_core13 = require("@ordewell/core");
 
 // src/tui/ansi.ts
 var import_string_width = __toESM(require("string-width"));
-var ANSI = /\x1b\[[0-9;]*m/g;
+var ESCAPE = /\x1b(?:\][\s\S]*?(?:\x07|\x1b\\|$)|[P^_][\s\S]*?(?:\x1b\\|$)|\[[0-?]*[ -/]*[@-~]?|[ -/]*[0-~]?)/g;
+var ESCAPE_SPLIT = new RegExp(`(${ESCAPE.source})`);
+var CONTROL = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g;
+var CONTROL_IN_ROW = /[\x00-\x1f\x7f-\x9f]/g;
+var HAS_CONTROL = /[\x00-\x1f\x7f-\x9f]/;
+var PAINT_ESCAPE = /^\x1b\[[0-9;]*[mGK]$/;
 function stripAnsi(text) {
-  return text.replace(ANSI, "");
+  return text.replace(ESCAPE, "");
+}
+function sanitize(text) {
+  return text.replace(ESCAPE, "").replace(/\r\n?/g, "\n").replace(/\t/g, " ").replace(CONTROL, "");
+}
+function paintOnly(line) {
+  if (!HAS_CONTROL.test(line)) return line;
+  return line.split(ESCAPE_SPLIT).map((piece) => piece.startsWith("\x1B") ? PAINT_ESCAPE.test(piece) ? piece : "" : piece.replace(CONTROL_IN_ROW, "")).join("");
 }
 function width(text) {
   return (0, import_string_width.default)(stripAnsi(text));
@@ -2749,9 +2761,6 @@ function truncate(text, max) {
   }
   return out + "\u2026";
 }
-function stripTabs(text) {
-  return text.replace(/\t/g, " ");
-}
 function pad(text, target) {
   const current = width(text);
   if (current > target) return truncate(text, target);
@@ -3676,13 +3685,16 @@ function cells(line) {
 }
 var INVERSE_ON = "\x1B[7m";
 var INVERSE_OFF = "\x1B[27m";
-var SGR_SPLIT = /(\x1b\[[0-9;]*m)/;
+var ESCAPE_SPLIT2 = /(\x1b\[[0-9;]*[A-Za-z])/;
+var CURSOR_COLUMN = /^\x1b\[([0-9]*)G$/;
 function invertCells(line, from, to) {
   let out = "";
   let col = 1;
   let inside = false;
-  for (const piece of line.split(SGR_SPLIT)) {
-    if (SGR_SPLIT.test(piece)) {
+  for (const piece of line.split(ESCAPE_SPLIT2)) {
+    if (ESCAPE_SPLIT2.test(piece)) {
+      const jump = CURSOR_COLUMN.exec(piece);
+      if (jump) col = Number(jump[1] || "1");
       out += piece + (inside ? INVERSE_ON : "");
       continue;
     }
@@ -3782,15 +3794,18 @@ function suggest(state, room) {
 function renderFooter(state, cols) {
   return packHints(footerHints(state), cols).map((line) => truncate(style.grey(line), cols));
 }
+var ERASE_TO_END = "\x1B[K";
+var atColumn = (col) => `\x1B[${col}G`;
 function renderBody(state, rows, cols) {
   const planCols = planPaneWidth(state);
   if (planCols === 0) return renderChat(state, rows, cols);
   const chatCols = chatPaneWidth(state);
   const chat = renderChat(state, rows, chatCols);
   const plan = renderPlan(state, rows, planCols);
+  const divider = `${ERASE_TO_END}${atColumn(chatCols + 1)}${style.grey("\u2502")}`;
   return Array.from(
     { length: rows },
-    (_, i) => `${pad(chat[i] ?? "", chatCols)}${style.grey("\u2502")}${pad(plan[i] ?? "", planCols)}`
+    (_, i) => `${pad(chat[i] ?? "", chatCols)}${divider}${pad(plan[i] ?? "", planCols)}`
   );
 }
 function renderChat(state, rows, cols) {
@@ -3901,13 +3916,13 @@ function step(state, effects = []) {
   return { state, effects };
 }
 function say(state, role, content, research) {
-  const message = { role, content: stripTabs(content), timestamp: (/* @__PURE__ */ new Date()).toISOString(), ...research ? { research } : {} };
+  const message = { role, content: sanitize(content), timestamp: (/* @__PURE__ */ new Date()).toISOString(), ...research ? { research } : {} };
   return { ...state, messages: [...state.messages, message], scroll: 0 };
 }
 function restoredMessages(history) {
   return history.map((entry) => ({
     role: entry.kind === "plan_generated" ? "system" : entry.kind === "system" ? "system" : entry.role,
-    content: stripTabs(entry.kind === "plan_generated" ? "Plan generated." : entry.content),
+    content: sanitize(entry.kind === "plan_generated" ? "Plan generated." : entry.content),
     timestamp: entry.timestamp
   }));
 }
@@ -3921,13 +3936,13 @@ function researchLabel(messages, summary) {
   return others > 0 ? `${summary} (+${others} more)` : summary;
 }
 function settleResearchStep(messages, action) {
-  const summary = stripTabs(action.summary);
+  const summary = sanitize(action.summary);
   const index = findLastIndex(messages, (m) => isPendingResearch(m) && (action.toolCallId ? m.research?.toolCallId === action.toolCallId : m.content === summary));
   if (index < 0) return messages;
   const next = [...messages];
   next[index] = {
     ...next[index],
-    research: { ...next[index].research, outcome: action.outcome, result: stripTabs(action.result) }
+    research: { ...next[index].research, outcome: action.outcome, result: sanitize(action.result) }
   };
   return next;
 }
@@ -3985,13 +4000,13 @@ function reduce(state, action) {
     case "plannerMessage": {
       if (stale(state, action.sessionId)) return step(state);
       const settled = { ...state, status: "idle", busyLabel: "", thinkingLine: "" };
-      const content = stripTabs(action.content);
+      const content = sanitize(action.content);
       if (alreadySpoken(state.messages, content)) return step(settled);
       return step(say(settled, "assistant", content));
     }
     case "researchStep": {
       if (stale(state, action.sessionId)) return step(state);
-      const summary = stripTabs(action.summary);
+      const summary = sanitize(action.summary);
       const spoken = say(state, "research", summary, { toolCallId: action.toolCallId });
       const status = state.status === "planning" ? "researching" : state.status;
       return step({ ...spoken, status, busyLabel: researchLabel(spoken.messages, summary) });
@@ -4010,7 +4025,7 @@ function reduce(state, action) {
     }
     case "plannerThinking": {
       if (stale(state, action.sessionId)) return step(state);
-      return step({ ...state, thinkingLine: (state.thinkingLine + action.text).slice(-THINKING_TAIL) });
+      return step({ ...state, thinkingLine: (state.thinkingLine + sanitize(action.text)).slice(-THINKING_TAIL) });
     }
     case "taskStatus": {
       if (stale(state, action.sessionId) || !state.tasks.some((t) => t.id === action.taskId)) return step(state);
@@ -4099,6 +4114,8 @@ function reduce(state, action) {
       return step({ ...state, spinnerFrame: (state.spinnerFrame + 1) % 10 });
   }
 }
+var planText = (value, fallback = "") => sanitize(String(value ?? fallback));
+var planLabel = (value, fallback = "") => planText(value, fallback).replace(/\n+/g, " ");
 function normalizeTasks(plan) {
   const source = plan;
   const byId = /* @__PURE__ */ new Map();
@@ -4111,19 +4128,19 @@ function normalizeTasks(plan) {
   return raw.map((t, i) => ({
     id: String(t.id ?? `task-${i + 1}`),
     order: typeof t.order === "number" ? t.order : i + 1,
-    title: String(t.title ?? "Untitled task"),
-    description: String(t.description ?? t.title ?? ""),
-    prompt: typeof t.prompt === "string" ? t.prompt : void 0,
+    title: planLabel(t.title, "Untitled task"),
+    description: planText(t.description ?? t.title),
+    prompt: typeof t.prompt === "string" ? sanitize(t.prompt) : void 0,
     type: t.type === "user" ? "user" : "ai",
-    status: String(t.status ?? "pending"),
-    dependencies: Array.isArray(t.dependencies) ? t.dependencies.map(String) : [],
-    assignedRunner: typeof t.assignedRunner === "string" ? t.assignedRunner : void 0,
-    taskMode: typeof t.taskMode === "string" ? t.taskMode : void 0,
+    status: planLabel(t.status, "pending"),
+    dependencies: Array.isArray(t.dependencies) ? t.dependencies.map((id) => planLabel(id)) : [],
+    assignedRunner: typeof t.assignedRunner === "string" ? planLabel(t.assignedRunner) : void 0,
+    taskMode: typeof t.taskMode === "string" ? planLabel(t.taskMode) : void 0,
     assignedModel: t.assignedModel && typeof t.assignedModel === "object" ? {
-      modelId: String(t.assignedModel.modelId ?? ""),
-      modelLabel: String(t.assignedModel.modelLabel ?? t.assignedModel.modelId ?? ""),
-      thinkingEffort: typeof t.assignedModel.thinkingEffort === "string" ? t.assignedModel.thinkingEffort : typeof t.thinkingEffort === "string" ? t.thinkingEffort : void 0,
-      availableVariants: Array.isArray(t.assignedModel.availableVariants) ? t.assignedModel.availableVariants.map(String) : void 0
+      modelId: planLabel(t.assignedModel.modelId),
+      modelLabel: planLabel(t.assignedModel.modelLabel ?? t.assignedModel.modelId),
+      thinkingEffort: typeof t.assignedModel.thinkingEffort === "string" ? planLabel(t.assignedModel.thinkingEffort) : typeof t.thinkingEffort === "string" ? planLabel(t.thinkingEffort) : void 0,
+      availableVariants: Array.isArray(t.assignedModel.availableVariants) ? t.assignedModel.availableVariants.map((variant) => planLabel(variant)) : void 0
     } : void 0
   }));
 }
@@ -5745,7 +5762,7 @@ async function loadSettings(deps) {
 }
 
 // src/tui/keys.ts
-var CONTROL = {
+var CONTROL2 = {
   "\r": "enter",
   "\n": "enter",
   "	": "tab",
@@ -5850,7 +5867,7 @@ function decodeMouse(seq) {
 function decodeKey(seq) {
   const escaped = ESCAPES[seq];
   if (escaped) return { name: escaped };
-  const control = CONTROL[seq];
+  const control = CONTROL2[seq];
   if (control) return { name: control };
   if (seq.startsWith("\x1B[")) {
     const mouse = decodeMouse(seq);
@@ -5862,8 +5879,7 @@ function decodeKey(seq) {
 var PASTE_START = "\x1B[200~";
 var PASTE_END = "\x1B[201~";
 function pasteKey(raw) {
-  const text = stripTabs(raw.replace(/\r\n?/g, "\n").replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, ""));
-  return { name: "paste", text };
+  return { name: "paste", text: sanitize(raw) };
 }
 function createKeyDecoder() {
   let paste = null;
@@ -5997,7 +6013,7 @@ function openTerminal(options) {
     draw(frame2) {
       if (closed) return;
       const { cols } = size();
-      const rows = frame2.map((line, i) => `\x1B[${i + 1};1H${clampToCols(line, cols)}\x1B[K`).join("");
+      const rows = frame2.map((line, i) => `\x1B[${i + 1};1H${clampToCols(paintOnly(line), cols)}\x1B[K`).join("");
       output.write(AUTOWRAP_OFF + rows + AUTOWRAP_ON);
     },
     setMouse(enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",