perchai-cli 2.4.4 → 2.4.5

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) {
@@ -277660,7 +277662,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 +277678,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                 input: prompt,
                 state,
                 writer: commandWriter,
-                reconnect
+                reconnect,
+                getConnection: () => connection
               });
               refresh((value) => value + 1);
               if (result2 === "exit") {
@@ -277689,6 +277696,14 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           setLiveText("");
           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,
@@ -277803,47 +277818,104 @@ 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";
+        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 renderTranscriptItem = (item, index) => {
+          const lines = item.text.split(/\r?\n/);
+          const previous = items[index - 1];
+          const separateFromUser = previous?.label === "you" && item.label !== "you";
+          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" }, "------------------------------")
+            ) : null,
+            lines.map((line, lineIndex) => React11.createElement(
+              Ink2.Box,
+              { key: `${item.id}-${lineIndex}` },
+              React11.createElement(
+                Ink2.Box,
+                { width: INK_LABEL_WIDTH, flexShrink: 0 },
+                React11.createElement(
+                  Ink2.Text,
+                  {
+                    color: colorForInkTone(item.tone),
+                    bold: item.tone === "accent",
+                    wrap: "truncate"
+                  },
+                  lineIndex === 0 ? item.label : ""
+                )
+              ),
+              React11.createElement(
+                Ink2.Box,
+                { flexGrow: 1 },
+                React11.createElement(Ink2.Text, { color: bodyColorForInkTone(item.tone) }, line)
+              )
+            ))
+          );
+        };
         return React11.createElement(
           Ink2.Box,
           { flexDirection: "column", width: "100%" },
           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"),
+            { flexDirection: "column", alignItems: "center", marginBottom: 1, paddingY: 1 },
+            ...PERCH_CLI_MARK.map(
+              (line, index) => React11.createElement(
+                Ink2.Text,
+                { key: `mark-${index}`, color: index === 1 && working ? pulseColor : "#c45000", bold: true },
+                line
+              )
+            ),
             React11.createElement(
-              Ink2.Text,
-              { color: "#8e857d" },
-              `${CLI_PACKAGE_VERSION} \xB7 ${auth} \xB7 ${state.personaId} \xB7 ${state.chatMode} \xB7 ${state.permissionMode} \xB7 ${shortCwd(state.cwd)}`
-            )
-          ),
-          ...items.map(
-            (item) => 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}`)
+              { marginTop: 1 },
+              React11.createElement(Ink2.Text, { color: "#c45000", bold: true }, "Perch"),
+              React11.createElement(Ink2.Text, { color: "#8e857d" }, " | "),
+              React11.createElement(Ink2.Text, { bold: true }, "Terminal")
+            ),
+            React11.createElement(Ink2.Text, { color: "#8e857d" }, CLI_PACKAGE_VERSION),
+            React11.createElement(
+              Ink2.Text,
+              { color: "#8e857d", wrap: "truncate-middle" },
+              `${auth} \xB7 ${meta}`
+            ),
+            React11.createElement(
+              Ink2.Text,
+              { color: "#8e857d", wrap: "truncate-middle" },
+              `${route} \xB7 ${shortCwd(state.cwd)}`
             )
           ),
+          ...items.map(renderTranscriptItem),
           liveText ? React11.createElement(
             Ink2.Box,
             { key: "live-text" },
-            React11.createElement(Ink2.Text, { color: "#c45000" }, state.personaId.padEnd(7)),
+            React11.createElement(
+              Ink2.Box,
+              { width: INK_LABEL_WIDTH, flexShrink: 0 },
+              React11.createElement(Ink2.Text, { color: "#c45000" }, state.personaId)
+            ),
             React11.createElement(Ink2.Text, null, ` ${liveText}`)
           ) : 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.Box,
+              { width: INK_LABEL_WIDTH, flexShrink: 0 },
+              React11.createElement(Ink2.Text, { color: pulseColor, bold: true }, "perch")
+            ),
             React11.createElement(Ink2.Text, { color: "#8e857d" }, ` ${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 +277944,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,32 +278078,39 @@ 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);
   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(" .----.", "orange", color)}`,
+    `${paint(" | .-. |--", "orange", color)}`,
+    `${paint(" | '-' |", "orange", color)}`,
+    `${paint(" | .--'", "orange", color)}  ${paint("Perch", "orange", color)} ${paint("|", "muted", color)} ${paint("Terminal", "cream", color)}`,
+    `${paint(" | |", "orange", color)}    ${paint(CLI_PACKAGE_VERSION, "muted", color)}`,
+    `   ${[auth, state.personaId, state.chatMode, state.permissionMode].join(" \xB7 ")}`,
+    `   ${[connection.appUrl ?? state.appUrl ?? "run /login", shortCwd(state.cwd)].join(" \xB7 ")}`,
     ""
   ].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();
@@ -278054,6 +278133,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 +278460,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, PERCH_CLI_MARK;
 var init_perch_cli = __esm({
   "scripts/perch-cli.ts"() {
     "use strict";
@@ -278434,6 +278522,14 @@ Model connection:
   /logout                       Clear saved CLI auth.
   /exit                         Leave Perch CLI.
 `;
+    INK_LABEL_WIDTH = 10;
+    PERCH_CLI_MARK = [
+      " .----.",
+      " | .-. |--",
+      " | '-' |",
+      " | .--'",
+      " | |"
+    ];
     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.5",
   "description": "Perch AI command-line interface",
   "bin": {
     "perch": "bin/perch"