perchai-cli 2.4.4 → 2.4.6

package/dist/perch.mjs

@@ -222653,14 +222653,15 @@ async function connectCliModelProxy(input = {}) {
   const usableStoredSession = isStoredCliAuthSessionUsable(storedSession) ? storedSession : null;
   const appUrl = resolveCliAppUrl(input.appUrl, usableStoredSession?.appUrl ?? null);
   if (!appUrl) return noCliModelConnection();
+  if (!usableStoredSession?.accessToken) return noCliModelConnection(appUrl);
   const fetchImpl = input.fetchImpl ?? globalThis.fetch;
-  if (typeof fetchImpl !== "function") return noCliModelConnection();
+  if (typeof fetchImpl !== "function") return noCliModelConnection(appUrl);
   const selection = await fetchPublicModelDefaultSelection(
     appUrl,
     fetchImpl,
     usableStoredSession?.accessToken ?? null
   );
-  if (!selection) return noCliModelConnection();
+  if (!selection) return noCliModelConnection(appUrl);
   const priorProxy = process.env[MODEL_PROXY_ENV];
   const priorToken = process.env[MODEL_PROXY_TOKEN_ENV];
   process.env[MODEL_PROXY_ENV] = appUrl;
@@ -222726,9 +222727,9 @@ async function fetchPublicModelDefaultSelection(appUrl, fetchImpl, accessToken)
     clearTimeout(timeout);
   }
 }
-function noCliModelConnection() {
+function noCliModelConnection(appUrl = null) {
   return {
-    appUrl: null,
+    appUrl,
     authenticated: false,
     userId: null,
     email: null,
@@ -277559,7 +277560,8 @@ async function runReadlineInteractivePerchCli(writer, deps, options) {
             input: prompt,
             state,
             writer,
-            reconnect
+            reconnect,
+            getConnection: () => connection
           });
           if (commandResult === "exit") break;
         } catch (error) {
@@ -277626,21 +277628,22 @@ async function runInkInteractivePerchCli(writer, deps, options) {
         const [workingText, setWorkingText] = React11.useState("ready");
         const [pulse, setPulse] = React11.useState(0);
         const [, refresh] = React11.useState(0);
+        const liveTextRef = React11.useRef("");
         React11.useEffect(() => {
           if (!working) return void 0;
-          const timer = setInterval(() => setPulse((value) => (value + 1) % 4), 280);
+          const timer = setInterval(() => setPulse((value) => value + 1), 120);
           return () => clearInterval(timer);
         }, [working]);
         const addItem = React11.useCallback((item) => {
           setItems((current) => [
             ...current,
             { id: `cli-item-${Date.now()}-${current.length}`, ...item }
-          ].slice(-80));
+          ].slice(-INK_ROW_LIMIT));
         }, []);
         const updateToolItem = React11.useCallback((id, item) => {
           setItems((current) => {
             const index = current.findIndex((entry) => entry.id === id);
-            if (index < 0) return [...current, { id, ...item }].slice(-80);
+            if (index < 0) return [...current, { id, ...item }].slice(-INK_ROW_LIMIT);
             const next = current.slice();
             next[index] = { id, ...item };
             return next;
@@ -277660,7 +277663,11 @@ async function runInkInteractivePerchCli(writer, deps, options) {
             const commandWriter = {
               stdout: (text) => {
                 const clean = text.trim();
-                if (clean) addItem({ label: "mode", text: clean, tone: "muted" });
+                if (clean) addItem({
+                  label: prompt === "/status" ? "status" : "system",
+                  text: clean,
+                  tone: "muted"
+                });
               },
               stderr: (text) => {
                 const clean = text.trim();
@@ -277672,7 +277679,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                 input: prompt,
                 state,
                 writer: commandWriter,
-                reconnect
+                reconnect,
+                getConnection: () => connection
               });
               refresh((value) => value + 1);
               if (result2 === "exit") {
@@ -277687,8 +277695,17 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           setWorking(true);
           setWorkingText("thinking");
           setLiveText("");
+          liveTextRef.current = "";
           const toolNamesById = /* @__PURE__ */ new Map();
           try {
+            if (!isCliModelConnectionReady(connection)) {
+              addItem({
+                label: "need",
+                text: "Sign in with /login before chatting. Hosted model calls require an authenticated Perch session.",
+                tone: "danger"
+              });
+              return;
+            }
             const result2 = await runTurn({
               prompt,
               cwd: state.cwd,
@@ -277704,13 +277721,14 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                 switch (event.type) {
                   case "content_delta":
                   case "streaming_text":
-                    setLiveText((text) => text + event.text);
+                    liveTextRef.current += event.text;
+                    setLiveText(liveTextRef.current);
                     break;
                   case "assistant_preamble":
                   case "activity_delta":
                   case "workflow_narration":
                     if (event.text.trim()) {
-                      addItem({ label: "perch", text: event.text.trim(), tone: "normal" });
+                      addItem({ label: state.personaId, text: event.text.trim(), tone: "normal" });
                     }
                     break;
                   case "model_call_started":
@@ -277762,7 +277780,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
               }
             });
             setLiveText("");
-            const assistantText = result2.assistantText.trim() || liveText.trim();
+            const assistantText = result2.assistantText.trim() || liveTextRef.current.trim();
             if (assistantText) {
               addItem({ label: state.personaId, text: assistantText, tone: "normal" });
             }
@@ -277784,8 +277802,9 @@ async function runInkInteractivePerchCli(writer, deps, options) {
             setWorking(false);
             setWorkingText("ready");
             setLiveText("");
+            liveTextRef.current = "";
           }
-        }, [addItem, app, draft, liveText, reconnect, runTurn, updateToolItem, working]);
+        }, [addItem, app, reconnect, runTurn, updateToolItem, working]);
         Ink2.useInput((input, key) => {
           if (working) return;
           if (key.return) {
@@ -277803,47 +277822,131 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           }
           if (input && !key.escape) setDraft((value) => value + input);
         });
-        const pulseGlyph = working ? "P".slice(0, 1) : "P";
         const pulseColor = pulse % 2 === 0 ? "#c45000" : "#8e857d";
-        const auth = connection.authenticated ? `signed in${connection.email ? ` as ${connection.email}` : ""}` : "public/anonymous";
-        return React11.createElement(
+        const spinnerGlyph = inkSpinnerFrame(pulse);
+        const auth = renderCliAuthSummary(connection);
+        const meta = `${state.personaId} \xB7 ${state.chatMode} \xB7 ${state.permissionMode}`;
+        const route = connection.authenticated && connection.appUrl ? connection.appUrl.replace(/^https?:\/\//, "") : "run /login";
+        const renderTranscriptRow = (key, label, line, tone, showLabel) => React11.createElement(
           Ink2.Box,
-          { flexDirection: "column", width: "100%" },
+          { key },
           React11.createElement(
             Ink2.Box,
-            { flexDirection: "column", alignItems: "center", marginBottom: 1 },
-            React11.createElement(Ink2.Text, { color: "#c45000", bold: true }, "P"),
-            React11.createElement(Ink2.Text, { bold: true }, "Perch | Terminal"),
+            { width: INK_LABEL_WIDTH, flexShrink: 0 },
             React11.createElement(
               Ink2.Text,
-              { color: "#8e857d" },
-              `${CLI_PACKAGE_VERSION} \xB7 ${auth} \xB7 ${state.personaId} \xB7 ${state.chatMode} \xB7 ${state.permissionMode} \xB7 ${shortCwd(state.cwd)}`
+              {
+                color: colorForInkTone(tone),
+                bold: tone === "accent"
+              },
+              showLabel ? renderInkSpeakerLabel(label) : ""
             )
           ),
-          ...items.map(
-            (item) => React11.createElement(
+          React11.createElement(
+            Ink2.Box,
+            { flexGrow: 1 },
+            React11.createElement(Ink2.Text, { color: bodyColorForInkTone(tone) }, line)
+          )
+        );
+        const renderTranscriptItem = (item, index) => {
+          const lines = item.text.split(/\r?\n/);
+          const previous = items[index - 1];
+          const separateFromUser = previous?.label === "you" && item.label !== "you" && item.tone !== "danger";
+          return React11.createElement(
+            Ink2.Box,
+            { key: item.id, flexDirection: "column", marginTop: separateFromUser ? 1 : 0 },
+            separateFromUser ? React11.createElement(
+              Ink2.Box,
+              null,
+              React11.createElement(Ink2.Box, { width: INK_LABEL_WIDTH, flexShrink: 0 }),
+              React11.createElement(Ink2.Text, { color: "#2a211c" }, INK_DIVIDER)
+            ) : null,
+            lines.map((line, lineIndex) => renderTranscriptRow(
+              `${item.id}-${lineIndex}`,
+              item.label,
+              line,
+              item.tone,
+              lineIndex === 0
+            ))
+          );
+        };
+        return React11.createElement(
+          Ink2.Box,
+          { flexDirection: "column", width: "100%" },
+          React11.createElement(
+            Ink2.Box,
+            { flexDirection: "column", alignItems: "center", marginBottom: 1, paddingY: 1 },
+            React11.createElement(
               Ink2.Box,
-              { key: item.id },
-              React11.createElement(Ink2.Text, { color: colorForInkTone(item.tone), bold: item.tone === "accent" }, item.label.padEnd(7)),
-              React11.createElement(Ink2.Text, { color: bodyColorForInkTone(item.tone) }, ` ${item.text}`)
+              { width: PERCH_SPLASH_WIDTH, justifyContent: "space-between", marginBottom: 1 },
+              React11.createElement(Ink2.Text, { color: "#7a6f66" }, "perch \xB7 field terminal"),
+              React11.createElement(Ink2.Text, { color: "#7a6f66" }, `v${CLI_PACKAGE_VERSION}`)
+            ),
+            ...PERCH_SPLASH_SCENE.map(
+              (line, index) => React11.createElement(
+                Ink2.Box,
+                { key: `field-${index}`, width: PERCH_SPLASH_WIDTH },
+                React11.createElement(
+                  Ink2.Text,
+                  { color: working && index === 11 ? pulseColor : "#c45000", bold: true },
+                  line
+                )
+              )
+            ),
+            React11.createElement(
+              Ink2.Box,
+              { marginTop: 1 },
+              React11.createElement(Ink2.Text, { color: "#c45000" }, "perched"),
+              React11.createElement(Ink2.Text, { color: "#8e857d" }, " in "),
+              React11.createElement(Ink2.Text, { color: "#fff8f0", bold: true }, shortCwd(state.cwd))
+            ),
+            React11.createElement(
+              Ink2.Text,
+              { color: "#8e857d", wrap: "truncate-middle" },
+              `${auth} \xB7 ${meta}`
+            ),
+            React11.createElement(
+              Ink2.Box,
+              { flexDirection: "column", marginTop: 1 },
+              ...PERCH_SPLASH_COMMANDS.map(
+                ([command, description]) => React11.createElement(
+                  Ink2.Box,
+                  { key: command },
+                  React11.createElement(Ink2.Box, { width: 16 }, React11.createElement(Ink2.Text, { color: "#c45000" }, command)),
+                  React11.createElement(Ink2.Text, { color: "#8e857d" }, description)
+                )
+              )
+            ),
+            React11.createElement(
+              Ink2.Text,
+              { color: "#5e554d", wrap: "truncate-middle" },
+              route
             )
           ),
+          ...items.map(renderTranscriptItem),
           liveText ? React11.createElement(
             Ink2.Box,
             { key: "live-text" },
-            React11.createElement(Ink2.Text, { color: "#c45000" }, state.personaId.padEnd(7)),
-            React11.createElement(Ink2.Text, null, ` ${liveText}`)
+            renderTranscriptRow("live-text-row", state.personaId, liveText, "normal", true)
           ) : null,
           working ? React11.createElement(
             Ink2.Box,
             { key: "working", marginTop: items.length || liveText ? 1 : 0 },
-            React11.createElement(Ink2.Text, { color: pulseColor, bold: true }, pulseGlyph.padEnd(7)),
-            React11.createElement(Ink2.Text, { color: "#8e857d" }, ` ${workingText}\u2026`)
+            React11.createElement(
+              Ink2.Box,
+              { width: INK_LABEL_WIDTH, flexShrink: 0 },
+              React11.createElement(Ink2.Text, { color: pulseColor, bold: true }, spinnerGlyph)
+            ),
+            React11.createElement(
+              Ink2.Text,
+              { color: "#8e857d" },
+              `${state.personaId} \xB7 ${workingText}\u2026`
+            )
           ) : null,
           React11.createElement(
             Ink2.Box,
             { key: "prompt", marginTop: 1 },
-            React11.createElement(Ink2.Text, { color: "#c45000", bold: true }, `${state.personaId}\u203A `),
+            React11.createElement(Ink2.Text, { color: "#c45000", bold: true }, "you\u203A "),
             React11.createElement(Ink2.Text, null, draft),
             React11.createElement(Ink2.Text, { backgroundColor: "#c45000", color: "#100d0b" }, " ")
           )
@@ -277872,7 +277975,7 @@ async function runInteractiveSlashCommand(input) {
       return "continue";
     case "status": {
       const session = await readStoredCliAuthSession();
-      input.writer.stdout(renderInteractiveStatus(input.state, null, session));
+      input.writer.stdout(renderInteractiveStatus(input.state, input.getConnection?.() ?? null, session));
       return "continue";
     }
     case "cwd":
@@ -278006,38 +278109,60 @@ 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 storedAuth = session === void 0 ? renderCliAuthSummary(connection) : isStoredCliAuthSessionUsable(session) ? `signed in${session.email ? ` as ${session.email}` : ""}` : "not signed in";
+  const modelRoute = isCliModelConnectionReady(connection) ? `connected \xB7 ${connection.appUrl ?? "(unknown)"}` : "locked \xB7 run /login";
   const color = shouldUseCliColor();
   const lines = [
     ["cwd", state.cwd],
+    ["auth", storedAuth],
+    ["model-route", modelRoute],
     ["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]
+    ["app-url", state.appUrl ?? connection?.appUrl ?? "(none)"]
   ];
   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";
+  const auth = renderCliAuthSummary(connection);
+  const route = connection.authenticated && connection.appUrl ? connection.appUrl.replace(/^https?:\/\//, "") : connection.appUrl ?? state.appUrl ?? "run /login";
+  const commandLines = PERCH_SPLASH_COMMANDS.map(
+    ([command, description]) => `   ${paint(command.padEnd(13), "orange", color)}${paint(description, "muted", color)}`
+  );
   return [
-    `${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 ")}`,
+    `${paint("perch \xB7 field terminal", "muted", color)}${" ".repeat(24)}${paint(`v${CLI_PACKAGE_VERSION}`, "muted", color)}`,
+    "",
+    ...PERCH_SPLASH_SCENE.map((line) => paint(line, "orange", color)),
+    "",
+    `   ${paint("perched", "orange", color)} ${paint("in", "muted", color)} ${paint(shortCwd(state.cwd), "cream", color)}`,
+    `   ${paint([auth, state.personaId, state.chatMode, state.permissionMode].join(" \xB7 "), "muted", color)}`,
+    "",
+    ...commandLines,
+    "",
+    `   ${paint(route, "muted", color)}`,
     ""
   ].join("\n");
 }
-function renderInteractivePrompt(state) {
+function renderInteractivePrompt(_state) {
   const color = shouldUseCliColor();
-  return `${paint(state.personaId, "orange", color)}${paint("\u203A", "orange", color)} `;
+  return `${paint("you", "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 inkSpinnerFrame(frame) {
+  return INK_SPINNER_FRAMES[Math.abs(frame) % INK_SPINNER_FRAMES.length] ?? "\xB7";
+}
+function renderInkSpeakerLabel(label) {
+  if (!label.trim()) return "";
+  if (label === "tool" || label === "status" || label === "system") return `${label}\xB7`;
+  return `${label}\u203A`;
+}
 function createInteractiveCliState(options) {
   return {
     cwd: resolveExistingDirectory(options.cwd ?? process.cwd()),
@@ -278054,6 +278179,15 @@ function createInteractiveCliState(options) {
 function humanizeCliToolName(name) {
   return name.replace(/^mcp__/, "").replace(/_/g, " ");
 }
+function isCliModelConnectionReady(connection) {
+  return Boolean(connection?.authenticated && connection.founderModelSelection);
+}
+function renderCliAuthSummary(connection) {
+  if (isCliModelConnectionReady(connection)) {
+    return `signed in${connection.email ? ` as ${connection.email}` : ""}`;
+  }
+  return "not signed in";
+}
 function errorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -278372,7 +278506,7 @@ function defaultWriter() {
     stderr: (text) => process.stderr.write(text)
   };
 }
-var execFileAsync3, DEFAULT_CLI_LOGIN_APP_URL, CLI_PACKAGE_VERSION, ANSI2, HELP_TEXT, INTERACTIVE_HELP_TEXT;
+var execFileAsync3, DEFAULT_CLI_LOGIN_APP_URL, CLI_PACKAGE_VERSION, ANSI2, HELP_TEXT, INTERACTIVE_HELP_TEXT, INK_LABEL_WIDTH, INK_ROW_LIMIT, INK_DIVIDER, INK_SPINNER_FRAMES, PERCH_SPLASH_WIDTH, PERCH_SPLASH_SCENE, PERCH_SPLASH_COMMANDS;
 var init_perch_cli = __esm({
   "scripts/perch-cli.ts"() {
     "use strict";
@@ -278434,6 +278568,34 @@ Model connection:
   /logout                       Clear saved CLI auth.
   /exit                         Leave Perch CLI.
 `;
+    INK_LABEL_WIDTH = 12;
+    INK_ROW_LIMIT = 100;
+    INK_DIVIDER = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+    INK_SPINNER_FRAMES = process.platform === "darwin" ? ["\xB7", "\u2722", "\u2733", "\u2736", "\u273B", "\u273D", "\u273B", "\u2736", "\u2733", "\u2722"] : ["\xB7", "\u2722", "*", "\u2736", "\u273B", "\u273D", "\u273B", "\u2736", "*", "\u2722"];
+    PERCH_SPLASH_WIDTH = 76;
+    PERCH_SPLASH_SCENE = [
+      "       \xB7                                           \xB7              ",
+      "                                                             \xB7    ",
+      "                         \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588                     ",
+      "                         \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588        \xB7            ",
+      "                         \u2588\u2588\u2588\u2588        \u2588\u2588\u2588\u2588                     ",
+      "                         \u2588\u2588\u2588\u2588        \u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588               ",
+      "                         \u2588\u2588\u2588\u2588        \u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588\u2588\u2588        \xB7    ",
+      "                         \u2588\u2588\u2588\u2588        \u2588\u2588\u2588\u2588  \u2588\u2588\u2588\u2588               ",
+      "                         \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588                     ",
+      "                         \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588          \xB7          ",
+      "                         \u2588\u2588\u2588\u2588                                 ",
+      "                         \u2588\u2588\u2588\u2588             <( o)>              ",
+      "                         \u2588\u2588\u2588\u2588              /|\\                ",
+      "                         \u2588\u2588\u2588\u2588              / \\                ",
+      "                  \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2588\u2588\u2588\u2588\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501          "
+    ];
+    PERCH_SPLASH_COMMANDS = [
+      ["/status", "show auth, route, tools, and thread"],
+      ["/persona", "swap saffron or quill"],
+      ["/permission", "change autonomy for the next turns"],
+      ["/login", "connect your Perch account"]
+    ];
     if (!process.env.PERCH_CLI_BUNDLE_ENTRY && process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
       runPerchCli(process.argv.slice(2)).then((code) => {
         process.exitCode = code;

package/package.json

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