perchai-cli 2.4.2 → 2.4.3

package/dist/perch.cjs

@@ -48438,23 +48438,23 @@ var require_html2canvas = __commonJS({
               });
             });
           };
-          CanvasRenderer2.prototype.renderNode = function(paint) {
+          CanvasRenderer2.prototype.renderNode = function(paint2) {
             return __awaiter3(this, void 0, void 0, function() {
               return __generator2(this, function(_a) {
                 switch (_a.label) {
                   case 0:
                     if (contains2(
-                      paint.container.flags,
+                      paint2.container.flags,
                       16
                       /* DEBUG_RENDER */
                     )) {
                       debugger;
                     }
-                    if (!paint.container.styles.isVisible()) return [3, 3];
-                    return [4, this.renderNodeBackgroundAndBorders(paint)];
+                    if (!paint2.container.styles.isVisible()) return [3, 3];
+                    return [4, this.renderNodeBackgroundAndBorders(paint2)];
                   case 1:
                     _a.sent();
-                    return [4, this.renderNodeContent(paint)];
+                    return [4, this.renderNodeContent(paint2)];
                   case 2:
                     _a.sent();
                     _a.label = 3;
@@ -48572,18 +48572,18 @@ var require_html2canvas = __commonJS({
               this.ctx.restore();
             }
           };
-          CanvasRenderer2.prototype.renderNodeContent = function(paint) {
+          CanvasRenderer2.prototype.renderNodeContent = function(paint2) {
             return __awaiter3(this, void 0, void 0, function() {
               var container, curves, styles, _i, _a, child, image2, image2, iframeRenderer, canvas, size2, _b, fontFamily2, fontSize2, baseline, bounds, x, textBounds, img, image2, url, fontFamily2, bounds;
               return __generator2(this, function(_c) {
                 switch (_c.label) {
                   case 0:
-                    this.applyEffects(paint.getEffects(
+                    this.applyEffects(paint2.getEffects(
                       4
                       /* CONTENT */
                     ));
-                    container = paint.container;
-                    curves = paint.curves;
+                    container = paint2.container;
+                    curves = paint2.curves;
                     styles = container.styles;
                     _i = 0, _a = container.textNodes;
                     _c.label = 1;
@@ -48731,14 +48731,14 @@ var require_html2canvas = __commonJS({
                   case 18:
                     return [3, 20];
                   case 19:
-                    if (paint.listValue && container.styles.listStyleType !== -1) {
+                    if (paint2.listValue && container.styles.listStyleType !== -1) {
                       fontFamily2 = this.createFontStyle(styles)[0];
                       this.ctx.font = fontFamily2;
                       this.ctx.fillStyle = asString(styles.color);
                       this.ctx.textBaseline = "middle";
                       this.ctx.textAlign = "right";
                       bounds = new Bounds(container.bounds.left, container.bounds.top + getAbsoluteValue(container.styles.paddingTop, container.bounds.width), container.bounds.width, computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 1);
-                      this.renderTextWithLetterSpacing(new TextBounds(paint.listValue, bounds), styles.letterSpacing, computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 2);
+                      this.renderTextWithLetterSpacing(new TextBounds(paint2.listValue, bounds), styles.letterSpacing, computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 2);
                       this.ctx.textBaseline = "bottom";
                       this.ctx.textAlign = "left";
                     }
@@ -49082,18 +49082,18 @@ var require_html2canvas = __commonJS({
               });
             });
           };
-          CanvasRenderer2.prototype.renderNodeBackgroundAndBorders = function(paint) {
+          CanvasRenderer2.prototype.renderNodeBackgroundAndBorders = function(paint2) {
             return __awaiter3(this, void 0, void 0, function() {
               var styles, hasBackground, borders, backgroundPaintingArea, side, _i, borders_1, border;
               var _this = this;
               return __generator2(this, function(_a) {
                 switch (_a.label) {
                   case 0:
-                    this.applyEffects(paint.getEffects(
+                    this.applyEffects(paint2.getEffects(
                       2
                       /* BACKGROUND_BORDERS */
                     ));
-                    styles = paint.container.styles;
+                    styles = paint2.container.styles;
                     hasBackground = !isTransparent(styles.backgroundColor) || styles.backgroundImage.length;
                     borders = [
                       { style: styles.borderTopStyle, color: styles.borderTopColor, width: styles.borderTopWidth },
@@ -49101,7 +49101,7 @@ var require_html2canvas = __commonJS({
                       { style: styles.borderBottomStyle, color: styles.borderBottomColor, width: styles.borderBottomWidth },
                       { style: styles.borderLeftStyle, color: styles.borderLeftColor, width: styles.borderLeftWidth }
                     ];
-                    backgroundPaintingArea = calculateBackgroundCurvedPaintingArea(getBackgroundValueForIndex(styles.backgroundClip, 0), paint.curves);
+                    backgroundPaintingArea = calculateBackgroundCurvedPaintingArea(getBackgroundValueForIndex(styles.backgroundClip, 0), paint2.curves);
                     if (!(hasBackground || styles.boxShadow.length)) return [3, 2];
                     this.ctx.save();
                     this.path(backgroundPaintingArea);
@@ -49110,13 +49110,13 @@ var require_html2canvas = __commonJS({
                       this.ctx.fillStyle = asString(styles.backgroundColor);
                       this.ctx.fill();
                     }
-                    return [4, this.renderBackgroundImage(paint.container)];
+                    return [4, this.renderBackgroundImage(paint2.container)];
                   case 1:
                     _a.sent();
                     this.ctx.restore();
                     styles.boxShadow.slice(0).reverse().forEach(function(shadow2) {
                       _this.ctx.save();
-                      var borderBoxArea = calculateBorderBoxPath(paint.curves);
+                      var borderBoxArea = calculateBorderBoxPath(paint2.curves);
                       var maskOffset = shadow2.inset ? 0 : MASK_OFFSET;
                       var shadowPaintingArea = transformPath(borderBoxArea, -maskOffset + (shadow2.inset ? 1 : -1) * shadow2.spread.number, (shadow2.inset ? 1 : -1) * shadow2.spread.number, shadow2.spread.number * (shadow2.inset ? -2 : 2), shadow2.spread.number * (shadow2.inset ? -2 : 2));
                       if (shadow2.inset) {
@@ -49150,7 +49150,7 @@ var require_html2canvas = __commonJS({
                       border.color,
                       border.width,
                       side,
-                      paint.curves,
+                      paint2.curves,
                       2
                       /* DASHED */
                     )];
@@ -49163,7 +49163,7 @@ var require_html2canvas = __commonJS({
                       border.color,
                       border.width,
                       side,
-                      paint.curves,
+                      paint2.curves,
                       3
                       /* DOTTED */
                     )];
@@ -49172,12 +49172,12 @@ var require_html2canvas = __commonJS({
                     return [3, 11];
                   case 7:
                     if (!(border.style === 4)) return [3, 9];
-                    return [4, this.renderDoubleBorder(border.color, border.width, side, paint.curves)];
+                    return [4, this.renderDoubleBorder(border.color, border.width, side, paint2.curves)];
                   case 8:
                     _a.sent();
                     return [3, 11];
                   case 9:
-                    return [4, this.renderSolidBorder(border.color, side, paint.curves)];
+                    return [4, this.renderSolidBorder(border.color, side, paint2.curves)];
                   case 10:
                     _a.sent();
                     _a.label = 11;
@@ -220726,23 +220726,44 @@ function findRunId(events) {
 }
 
 // features/perchTerminal/runtime/cliHost/renderCliTurn.ts
-function renderCliTurnText(result2) {
+var ANSI = {
+  reset: "\x1B[0m",
+  orange: "\x1B[38;2;196;80;0m",
+  cream: "\x1B[38;2;255;248;240m",
+  muted: "\x1B[38;2;142;133;125m",
+  green: "\x1B[38;2;110;191;130m",
+  red: "\x1B[38;2;208;107;85m"
+};
+function renderCliTurnText(result2, options = {}) {
   const lines = [];
   const seen = /* @__PURE__ */ new Set();
   for (const event of result2.events) {
     const line = renderEventLine(event);
     if (!line) continue;
-    if (seen.has(line)) continue;
-    seen.add(line);
-    lines.push(line);
+    const lineKey = `${line.label}:${line.text}`;
+    if (seen.has(lineKey)) continue;
+    seen.add(lineKey);
+    lines.push(renderStreamLine(line.label, line.text, options));
   }
   if (result2.assistantText.trim()) {
     if (lines.length) lines.push("");
-    lines.push(result2.assistantText.trim());
+    lines.push(
+      renderStreamLine(
+        personaLabel(options.personaId),
+        result2.assistantText.trim(),
+        options
+      )
+    );
   }
   if (!result2.ok) {
     if (lines.length) lines.push("");
-    lines.push(`Perch stopped: ${result2.error ?? result2.status}`);
+    lines.push(
+      renderStreamLine(
+        "stop",
+        `Perch stopped: ${result2.error ?? result2.status}`,
+        { ...options, color: options.color }
+      )
+    );
   }
   return `${lines.join("\n").trim()}
 `;
@@ -220759,33 +220780,36 @@ function renderEventLine(event) {
     case "assistant_preamble":
     case "activity_delta":
     case "workflow_narration":
-      return event.text.trim() || null;
+      return event.text.trim() ? { label: "perch", text: event.text.trim() } : null;
     case "model_call_started":
-      return event.lane ? `Working (${event.lane})` : "Working";
+      return { label: "work", text: event.lane ? `Working (${event.lane})` : "Working" };
     case "tool_call_started":
-      return `Running ${humanizeToolName(event.toolName)}`;
+      return { label: "tool", text: `Running ${humanizeToolName(event.toolName)}` };
     case "tool_call_failed":
-      return `Needs attention: ${humanizeToolName(event.toolName)}${event.error ? ` \u2014 ${event.error}` : ""}`;
+      return {
+        label: "need",
+        text: `Needs attention: ${humanizeToolName(event.toolName)}${event.error ? ` \u2014 ${event.error}` : ""}`
+      };
     case "live_card_start":
-      return event.subtitle ? `${event.title} \u2014 ${event.subtitle}` : event.title;
+      return { label: "tool", text: event.subtitle ? `${event.title} \xB7 ${event.subtitle}` : event.title };
     case "live_step":
-      return `${event.label} ${event.status}`;
+      return { label: "tool", text: `${event.label} ${event.status}` };
     case "live_card_end":
-      return event.receipt?.summary ?? event.error ?? null;
+      return event.receipt?.summary || event.error ? { label: event.error ? "need" : "tool", text: event.receipt?.summary ?? event.error ?? "" } : null;
     case "workflow_card_start":
-      return `${event.personaName}: ${event.workflowLabel}`;
+      return { label: "tool", text: `${event.personaName}: ${event.workflowLabel}` };
     case "workflow_step":
-      return `${event.label} ${event.status}`;
+      return { label: "tool", text: `${event.label} ${event.status}` };
     case "managed_workflow_started":
-      return event.title;
+      return { label: "tool", text: event.title };
     case "managed_workflow_completed":
-      return event.summary;
+      return { label: "tool", text: event.summary };
     case "capability_required":
-      return `Action needed: ${event.message}`;
+      return { label: "need", text: `Action needed: ${event.message}` };
     case "executor_waiting_for_user":
-      return `Waiting: ${event.prompt}`;
+      return { label: "wait", text: `Waiting: ${event.prompt}` };
     case "executor_result_summary":
-      return event.summary;
+      return { label: "tool", text: event.summary };
     default:
       return null;
   }
@@ -220793,6 +220817,35 @@ function renderEventLine(event) {
 function humanizeToolName(name) {
   return name.replace(/^mcp__/, "").replace(/_/g, " ");
 }
+function renderStreamLine(label, text, options) {
+  if (!options.streamLabels) return text;
+  const rawLabel = label.toLowerCase().slice(0, 7);
+  const padded = rawLabel.padEnd(7, " ");
+  const labelText = colorize(padded, colorForLabel(rawLabel), options.color);
+  const body = colorizeMultiline(text, colorForBody(rawLabel), options.color, " ".repeat(7));
+  return `${labelText} ${body}`;
+}
+function colorize(text, color, enabled) {
+  return enabled ? `${ANSI[color]}${text}${ANSI.reset}` : text;
+}
+function colorizeMultiline(text, color, enabled, continuationIndent) {
+  const painted = colorize(text, color, enabled);
+  return painted.replace(/\n/g, `
+${continuationIndent} `);
+}
+function colorForLabel(label) {
+  if (label === "need" || label === "stop") return "red";
+  if (label === "tool" || label === "work" || label === "wait") return "muted";
+  return "orange";
+}
+function colorForBody(label) {
+  if (label === "need" || label === "stop") return "red";
+  if (label === "tool" || label === "work" || label === "wait") return "muted";
+  return "cream";
+}
+function personaLabel(personaId) {
+  return personaId === "quill" ? "quill" : personaId === "saffron" ? "saffron" : "perch";
+}
 
 // features/perchTerminal/runtime/publicModelDefault.ts
 init_modelRegistry();
@@ -221198,6 +221251,15 @@ async function openExternal(url) {
 var import_meta2 = {};
 var execFileAsync3 = (0, import_node_util3.promisify)(import_node_child_process5.execFile);
 var DEFAULT_CLI_LOGIN_APP_URL = "https://app.perchai.app";
+var CLI_PACKAGE_VERSION = readCliPackageVersion();
+var ANSI2 = {
+  reset: "\x1B[0m",
+  orange: "\x1B[38;2;196;80;0m",
+  cream: "\x1B[38;2;255;248;240m",
+  muted: "\x1B[38;2;142;133;125m",
+  green: "\x1B[38;2;110;191;130m",
+  red: "\x1B[38;2;208;107;85m"
+};
 var HELP_TEXT = `Perch CLI
 
 Usage:
@@ -221273,7 +221335,10 @@ ${HELP_TEXT}`);
           desktopConnected: parsed.desktopConnected,
           cliLocalTools: parsed.cliLocalTools
         });
-        writeCliTurnResult(result3, parsed.json, writer);
+        writeCliTurnResult(result3, parsed.json, writer, {
+          personaId: parsed.personaId,
+          color: shouldUseCliColor()
+        });
         return cliExitCodeForTurn(result3);
       } finally {
         connection.restore();
@@ -221556,11 +221621,10 @@ async function runInteractivePerchCli(writer, deps, options) {
     connection = await connectCliModelProxy({ appUrl: state.appUrl });
     if (!state.appUrl && connection.appUrl) state.appUrl = connection.appUrl;
   };
-  writer.stdout("Perch CLI chat. Type /help for commands, /exit to quit.\n");
-  writer.stdout(renderInteractiveStatus(state, connection));
+  writer.stdout(renderInteractiveStartup(state, connection));
   try {
     while (true) {
-      const prompt = (await rl.question("perch> ")).trim();
+      const prompt = (await rl.question(renderInteractivePrompt(state))).trim();
       if (!prompt) continue;
       if (prompt === "/exit" || prompt === "exit" || prompt === "quit") break;
       if (prompt.startsWith("/")) {
@@ -221591,7 +221655,10 @@ async function runInteractivePerchCli(writer, deps, options) {
         desktopConnected: state.desktopConnected,
         cliLocalTools: state.cliLocalTools
       });
-      writeCliTurnResult(result2, false, writer);
+      writeCliTurnResult(result2, false, writer, {
+        personaId: state.personaId,
+        color: shouldUseCliColor()
+      });
       appendRecentMessage(state.recentMessages, "user", prompt);
       if (result2.assistantText.trim()) {
         appendRecentMessage(state.recentMessages, "assistant", result2.assistantText.trim());
@@ -221626,79 +221693,65 @@ async function runInteractiveSlashCommand(input) {
     }
     case "cwd":
       if (!parsed.value) {
-        input.writer.stdout(`cwd: ${input.state.cwd}
-`);
+        writeModeLine(input.writer, "cwd", input.state.cwd);
         return "continue";
       }
       input.state.cwd = resolveExistingDirectory(parsed.value);
-      input.writer.stdout(`cwd: ${input.state.cwd}
-`);
+      writeModeLine(input.writer, "cwd", input.state.cwd);
       return "continue";
     case "permission":
       if (!parsed.value) {
-        input.writer.stdout(`permission: ${input.state.permissionMode}
-`);
+        writeModeLine(input.writer, "permission", input.state.permissionMode);
         return "continue";
       }
       input.state.permissionMode = parsed.value;
-      input.writer.stdout(`permission: ${input.state.permissionMode}
-`);
+      writeModeLine(input.writer, "permission", input.state.permissionMode);
       return "continue";
     case "mode":
       if (!parsed.value) {
-        input.writer.stdout(`mode: ${input.state.chatMode}
-`);
+        writeModeLine(input.writer, "mode", input.state.chatMode);
         return "continue";
       }
       input.state.chatMode = parsed.value;
-      input.writer.stdout(`mode: ${input.state.chatMode}
-`);
+      writeModeLine(input.writer, "mode", input.state.chatMode);
       return "continue";
     case "persona":
       if (!parsed.value) {
-        input.writer.stdout(`persona: ${input.state.personaId}
-`);
+        writeModeLine(input.writer, "persona", input.state.personaId);
         return "continue";
       }
       input.state.personaId = parsed.value;
-      input.writer.stdout(`persona: ${input.state.personaId}
-`);
+      writeModeLine(input.writer, "persona", input.state.personaId);
       return "continue";
     case "appUrl":
       if (!parsed.value) {
-        input.writer.stdout(`app-url: ${input.state.appUrl ?? "(none)"}
-`);
+        writeModeLine(input.writer, "app-url", input.state.appUrl ?? "(none)");
         return "continue";
       }
       input.state.appUrl = requireCliAppUrl(parsed.value);
       await input.reconnect();
-      input.writer.stdout(`app-url: ${input.state.appUrl}
-`);
+      writeModeLine(input.writer, "app-url", input.state.appUrl);
       return "continue";
     case "localTools":
       if (parsed.value === void 0) {
-        input.writer.stdout(`local-tools: ${input.state.cliLocalTools ? "on" : "off"}
-`);
+        writeModeLine(input.writer, "local-tools", input.state.cliLocalTools ? "on" : "off");
         return "continue";
       }
       input.state.cliLocalTools = parsed.value;
-      input.writer.stdout(`local-tools: ${input.state.cliLocalTools ? "on" : "off"}
-`);
+      writeModeLine(input.writer, "local-tools", input.state.cliLocalTools ? "on" : "off");
       return "continue";
     case "thread":
       if (!parsed.value) {
-        input.writer.stdout(`thread: ${input.state.threadId}
-`);
+        writeModeLine(input.writer, "thread", input.state.threadId);
         return "continue";
       }
       input.state.threadId = parsed.value === "new" ? `cli-${Date.now()}` : parsed.value;
       input.state.recentMessages = [];
-      input.writer.stdout(`thread: ${input.state.threadId}
-`);
+      writeModeLine(input.writer, "thread", input.state.threadId);
       return "continue";
     case "clear":
       input.state.recentMessages = [];
-      input.writer.stdout("Conversation memory cleared for this terminal session.\n");
+      writeModeLine(input.writer, "memory", "cleared");
       return "continue";
     case "login":
       await runAuthCommand({
@@ -221712,7 +221765,7 @@ async function runInteractiveSlashCommand(input) {
     case "logout":
       await clearStoredCliAuthSession();
       await input.reconnect();
-      input.writer.stdout("Perch CLI session cleared.\n");
+      writeModeLine(input.writer, "auth", "signed out");
       return "continue";
     case "exit":
       return "exit";
@@ -221770,16 +221823,36 @@ function parseInteractiveSlashCommand(input) {
 }
 function renderInteractiveStatus(state, connection, session) {
   const auth = session === void 0 ? connection?.authenticated ? `signed in${connection.email ? ` as ${connection.email}` : ""}` : "public/anonymous" : isStoredCliAuthSessionUsable(session) ? `signed in${session.email ? ` as ${session.email}` : ""}` : "not signed in";
+  const color = shouldUseCliColor();
+  const lines = [
+    ["cwd", state.cwd],
+    ["permission", state.permissionMode],
+    ["mode", state.chatMode],
+    ["persona", state.personaId],
+    ["thread", state.threadId],
+    ["local-tools", state.cliLocalTools ? "on" : "off"],
+    ["app-url", state.appUrl ?? connection?.appUrl ?? "(none)"],
+    ["auth", auth]
+  ];
+  return lines.map(([key, value]) => `${paint(key.padEnd(11), "muted", color)} ${value}`).join("\n") + "\n";
+}
+function renderInteractiveStartup(state, connection) {
+  const color = shouldUseCliColor();
+  const auth = connection.authenticated ? `signed in${connection.email ? ` as ${connection.email}` : ""}` : "public/anonymous";
   return [
-    `cwd: ${state.cwd}`,
-    `permission: ${state.permissionMode}`,
-    `mode: ${state.chatMode}`,
-    `persona: ${state.personaId}`,
-    `thread: ${state.threadId}`,
-    `local-tools: ${state.cliLocalTools ? "on" : "off"}`,
-    `app-url: ${state.appUrl ?? connection?.appUrl ?? "(none)"}`,
-    `auth: ${auth}`
-  ].join(" \xB7 ") + "\n";
+    `${paint("P", "orange", color)}  ${paint("Perch CLI", "cream", color)} ${paint(CLI_PACKAGE_VERSION, "muted", color)}`,
+    `   ${[auth, state.personaId, state.chatMode, state.permissionMode, shortCwd(state.cwd)].join(" \xB7 ")}`,
+    ""
+  ].join("\n");
+}
+function renderInteractivePrompt(state) {
+  const color = shouldUseCliColor();
+  return `${paint(state.personaId, "orange", color)}${paint("\u203A", "orange", color)} `;
+}
+function writeModeLine(writer, key, value) {
+  const color = shouldUseCliColor();
+  writer.stdout(`${paint("mode".padEnd(7), "muted", color)} ${key} \u2192 ${value}
+`);
 }
 function parseGlobalFlags(argv) {
   const args = [];
@@ -221907,13 +221980,17 @@ function parseTestApCommand(folderPath, rest2) {
   }
   return { ok: true, domain: "test", action: "ap", folderPath, json, outputRoot, timestamp, profile, expectations, includePacket };
 }
-function writeCliTurnResult(result2, json, writer) {
+function writeCliTurnResult(result2, json, writer, options = {}) {
   if (json) {
     writer.stdout(`${JSON.stringify(result2, null, 2)}
 `);
     return;
   }
-  writer.stdout(renderCliTurnText(result2));
+  writer.stdout(renderCliTurnText(result2, {
+    personaId: options.personaId,
+    color: options.color,
+    streamLabels: true
+  }));
 }
 function writeAPEvidenceResult(result2, json, writer) {
   if (json) {
@@ -222017,6 +222094,37 @@ function parseExpectation(input) {
   if (Number.isFinite(numeric) && rawValue !== "") return { key, value: numeric };
   return { key, value: rawValue };
 }
+function readCliPackageVersion() {
+  const candidates = [
+    import_node_path15.default.resolve(__dirname, "../packages/cli/package.json"),
+    import_node_path15.default.resolve(__dirname, "../package.json")
+  ];
+  for (const candidate of candidates) {
+    try {
+      const raw = import_node_fs10.default.readFileSync(candidate, "utf8");
+      const parsed = JSON.parse(raw);
+      if (typeof parsed.version === "string" && parsed.version.trim()) {
+        return parsed.version.trim();
+      }
+    } catch {
+    }
+  }
+  return "dev";
+}
+function shortCwd(cwd) {
+  const home = process.env.HOME;
+  if (home && cwd === home) return "~";
+  if (home && cwd.startsWith(`${home}${import_node_path15.default.sep}`)) {
+    return `~/${cwd.slice(home.length + 1)}`;
+  }
+  return cwd;
+}
+function shouldUseCliColor() {
+  return Boolean(process.stdout.isTTY) && process.env.NO_COLOR !== "1";
+}
+function paint(text, color, enabled) {
+  return enabled ? `${ANSI2[color]}${text}${ANSI2.reset}` : text;
+}
 function defaultWriter() {
   return {
     stdout: (text) => process.stdout.write(text),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perchai-cli",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Perch AI command-line interface",
   "bin": {
     "perch": "bin/perch"