perchai-cli 2.4.37 → 2.4.40

package/dist/perch.mjs

@@ -86721,6 +86721,7 @@ function truncateHistoryLine(value, max2) {
 }
 var init_operatorTruth = __esm({
   "features/perchTerminal/runtime/operatorTruth.ts"() {
+    "use strict";
   }
 });
 
@@ -138640,7 +138641,6 @@ function offSandboxEvent(runId, handler) {
 var LOCAL_WORKSPACE_ACCESS_UNAVAILABLE;
 var init_bridge = __esm({
   "features/perchTerminal/desktop/bridge.ts"() {
-    "use strict";
     LOCAL_WORKSPACE_ACCESS_UNAVAILABLE = "Local workspace access is unavailable. Open Perch Desktop or update the app.";
   }
 });
@@ -205515,13 +205515,13 @@ var init_spawnWorker = __esm({
         if (workerId && customSpec && !resolveWorkerManifest(workerId)) {
           workerId = "";
         }
-        let adhocDisplayTitle;
+        let displayTitle;
         if (!workerId && customSpec) {
           const { manifest, droppedTools } = buildAdhocWorkerManifest(customSpec);
           registerWorkerManifest(manifest);
           adhocManifestId = manifest.workerId;
           adhocNickname = flockNicknameFor(manifest.workerId, 0);
-          adhocDisplayTitle = `${manifest.name} \xB7 ${adhocNickname}`;
+          displayTitle = `${manifest.name} \xB7 ${adhocNickname}`;
           workerId = manifest.workerId;
           if (droppedTools.length > 0 && ctx.onEvent) {
             ctx.onEvent({
@@ -205540,6 +205540,14 @@ var init_spawnWorker = __esm({
             errorCode: "worker_id_missing"
           };
         }
+        if (!displayTitle) {
+          const registeredManifest = resolveWorkerManifest(workerId);
+          if (registeredManifest) {
+            const runSeed = `${workerId}_${ctx.threadId ?? ""}_${Date.now().toString(36)}`;
+            const nickname = flockNicknameFor(runSeed, 0);
+            displayTitle = `${registeredManifest.name} \xB7 ${nickname}`;
+          }
+        }
         const context = typeof args.context === "string" || typeof args.context === "object" && args.context !== null && !Array.isArray(args.context) ? args.context : void 0;
         const lane = typeof args.lane === "string" ? args.lane : void 0;
         const maxIterations = typeof args.maxIterations === "number" ? adhocManifestId ? Math.min(args.maxIterations, ADHOC_MAX_ITERATIONS) : args.maxIterations : void 0;
@@ -205576,7 +205584,7 @@ Proceed with the available context. If a missing fact is essential, ask the user
               maxToolCalls: adhocManifestId ? ADHOC_MAX_TOOL_CALLS : void 0
             },
             {
-              displayTitle: adhocDisplayTitle,
+              displayTitle,
               workspaceRoot: effectiveWorkspaceRoot(ctx),
               desktopConnected: ctx.desktopConnected,
               // CLI surface: children inherit the local bridge and server auth,
@@ -287195,7 +287203,8 @@ __export(perch_cli_exports, {
   flockNicknameAccentColor: () => flockNicknameAccentColor,
   parseInteractiveSlashCommand: () => parseInteractiveSlashCommand,
   parsePerchCli: () => parsePerchCli,
-  runPerchCli: () => runPerchCli
+  runPerchCli: () => runPerchCli,
+  workerEventToCliRow: () => workerEventToCliRow
 });
 import fs14 from "node:fs";
 import { createHash as createHash4 } from "node:crypto";
@@ -287228,6 +287237,26 @@ function flockEventToCliRow(event) {
       return null;
   }
 }
+function workerEventToCliRow(event) {
+  switch (event.type) {
+    case "worker_run_started":
+      return {
+        id: `worker-${event.workerRunId ?? event.workerId}`,
+        text: `${event.title} \xB7 running`,
+        tone: "muted"
+      };
+    case "worker_run_completed": {
+      const status = event.ok ? event.usabilityStatus === "needs_user_input" ? "blocked" : "done" : "failed";
+      return {
+        id: `worker-${event.workerRunId ?? event.workerId}`,
+        text: `${event.title} \xB7 ${FLOCK_STATUS_LABELS[status] ?? status}`,
+        tone: status === "done" ? "success" : status === "failed" || status === "blocked" ? "danger" : "muted"
+      };
+    }
+    default:
+      return null;
+  }
+}
 async function runPerchCli(argv, writer = defaultWriter(), deps = {}) {
   const parsed = parsePerchCli(argv);
   if (!parsed.ok) {
@@ -287829,6 +287858,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           liveTextRef.current = "";
           const toolNamesById = /* @__PURE__ */ new Map();
           const flockWorkerNames = /* @__PURE__ */ new Map();
+          const workerTitles = /* @__PURE__ */ new Map();
           const flockLimitMeta = /* @__PURE__ */ new Map();
           const aggregateToolIds = /* @__PURE__ */ new Map();
           const aggregateToolMeta = /* @__PURE__ */ new Map();
@@ -287894,6 +287924,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     setWorkingText("recovering route");
                     break;
                   case "tool_call_started": {
+                    if (event.workerId) break;
+                    if (event.toolName === "spawn_worker") break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = humanizeCliToolName(event.toolName);
                     const aggregateKind = cliToolAggregateKind(event.toolName);
@@ -287931,6 +287963,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     break;
                   }
                   case "tool_call_completed": {
+                    if (event.workerId) break;
+                    if (event.toolName === "spawn_worker") break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const stored = toolInputsById.current.get(toolId);
                     const aggregateKind = aggregateToolIds.get(toolId);
@@ -287976,6 +288010,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     break;
                   }
                   case "tool_call_failed": {
+                    if (event.workerId) break;
+                    if (event.toolName === "spawn_worker") break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = toolNamesById.get(toolId) ?? humanizeCliToolName(event.toolName);
                     const stored = toolInputsById.current.get(toolId);
@@ -288180,7 +288216,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     meta2.skipped += event.skippedCount ?? 0;
                     for (const toolName of event.toolNames ?? []) meta2.tools.add(toolName);
                     flockLimitMeta.set(limitKey, meta2);
-                    const who = event.workerId ? flockWorkerNames.get(event.workerId) ?? "A worker" : "The model";
+                    const who = event.workerId ? workerTitles.get(event.workerId) ?? flockWorkerNames.get(event.workerId) ?? "A worker" : "The model";
                     updateToolItem(limitKey, {
                       label: "flock",
                       text: `${who} hit its tool limit and is finishing from gathered evidence.`,
@@ -288196,6 +288232,25 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     });
                     break;
                   }
+                  case "worker_run_started":
+                  case "worker_run_completed": {
+                    if (event.type === "worker_run_started") {
+                      workerTitles.set(event.workerId, event.title);
+                    }
+                    const row = workerEventToCliRow(event);
+                    if (!row) break;
+                    if (row.id) {
+                      updateToolItem(row.id, { label: "worker", text: row.text, tone: row.tone });
+                    } else {
+                      addItem({ label: "worker", text: row.text, tone: row.tone });
+                    }
+                    if (event.type === "worker_run_started") {
+                      setWorkingText(event.title.split(" \xB7 ")[0] ?? event.title);
+                    } else {
+                      setWorkingText("thinking");
+                    }
+                    break;
+                  }
                   case "flock_run_started":
                   case "flock_plan_ready":
                   case "flock_worker_update":
@@ -288370,7 +288425,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
         const renderFlockRow = (key, line, tone, showLabel) => {
           const dotParts = line.split(" \xB7 ");
           const limitMatch = dotParts.length < 2 ? line.match(/^(.+?) (hit its tool limit .*)$/) : null;
-          if (dotParts.length < 2 && !limitMatch) {
+          if (dotParts.length === 2 && WORKER_STATUS_WORDS.has(dotParts[1] ?? "") || dotParts.length < 2 && !limitMatch) {
             return renderTranscriptRow(key, "flock", line, tone, showLabel);
           }
           if (limitMatch) {
@@ -288404,6 +288459,39 @@ async function runInkInteractivePerchCli(writer, deps, options) {
             )
           );
         };
+        const renderWorkerRow = (key, line, tone, showLabel) => {
+          const dotParts = line.split(" \xB7 ");
+          if (dotParts.length >= 3 && WORKER_STATUS_WORDS.has(dotParts[dotParts.length - 1] ?? "")) {
+            const status = dotParts[dotParts.length - 1];
+            const nickname = dotParts[dotParts.length - 2] ?? "";
+            const name = dotParts.slice(0, dotParts.length - 2).join(" \xB7 ");
+            return React11.createElement(
+              Ink2.Box,
+              { key },
+              React11.createElement(
+                Ink2.Box,
+                { width: INK_LABEL_WIDTH, flexShrink: 0 },
+                React11.createElement(
+                  Ink2.Text,
+                  { color: colorForInkTone(tone) },
+                  showLabel ? renderInkSpeakerLabel("worker") : ""
+                )
+              ),
+              React11.createElement(
+                Ink2.Box,
+                { flexGrow: 1 },
+                React11.createElement(
+                  Ink2.Text,
+                  null,
+                  React11.createElement(Ink2.Text, { color: bodyColorForInkTone(tone) }, `${name} \xB7 `),
+                  React11.createElement(Ink2.Text, { color: flockNicknameAccentColor(nickname), bold: true }, nickname),
+                  React11.createElement(Ink2.Text, { color: bodyColorForInkTone(tone) }, ` \xB7 ${status}`)
+                )
+              )
+            );
+          }
+          return renderTranscriptRow(key, "worker", line, tone, showLabel);
+        };
         const renderTranscriptItem = (item, index) => {
           const lines = item.text.split(/\r?\n/);
           const previous = items[index - 1];
@@ -288417,7 +288505,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
               React11.createElement(Ink2.Box, { width: INK_LABEL_WIDTH, flexShrink: 0 }),
               React11.createElement(Ink2.Text, { color: CLI_BRAND.divider }, INK_DIVIDER)
             ) : null,
-            lines.map((line, lineIndex) => item.label === "flock" ? renderFlockRow(`${item.id}-${lineIndex}`, line, item.tone, lineIndex === 0) : renderTranscriptRow(
+            lines.map((line, lineIndex) => item.label === "flock" ? renderFlockRow(`${item.id}-${lineIndex}`, line, item.tone, lineIndex === 0) : item.label === "worker" ? renderWorkerRow(`${item.id}-${lineIndex}`, line, item.tone, lineIndex === 0) : renderTranscriptRow(
               `${item.id}-${lineIndex}`,
               item.label,
               line,
@@ -289920,7 +290008,7 @@ function defaultWriter() {
     stderr: (text) => process.stderr.write(text)
   };
 }
-var execFileAsync3, DEFAULT_CLI_LOGIN_APP_URL, CLI_PACKAGE_VERSION, CLI_BRAND, ANSI2, HELP_TEXT, INTERACTIVE_HELP_TEXT, FLOCK_STATUS_LABELS, INK_LABEL_WIDTH, INK_ROW_LIMIT, INK_DETAIL_LINE_LIMIT, INK_DIVIDER, PERCH_MOTION_FRAMES, PERCH_SPLASH_WIDTH, PERCH_SPLASH_SCENE, PERCH_SPLASH_COMMANDS, FLOCK_NICKNAME_ACCENTS;
+var execFileAsync3, DEFAULT_CLI_LOGIN_APP_URL, CLI_PACKAGE_VERSION, CLI_BRAND, ANSI2, HELP_TEXT, INTERACTIVE_HELP_TEXT, FLOCK_STATUS_LABELS, WORKER_STATUS_WORDS, INK_LABEL_WIDTH, INK_ROW_LIMIT, INK_DETAIL_LINE_LIMIT, INK_DIVIDER, PERCH_MOTION_FRAMES, PERCH_SPLASH_WIDTH, PERCH_SPLASH_SCENE, PERCH_SPLASH_COMMANDS, FLOCK_NICKNAME_ACCENTS;
 var init_perch_cli = __esm({
   "scripts/perch-cli.ts"() {
     "use strict";
@@ -290015,8 +290103,10 @@ Commands:
       done: "done",
       failed: "failed",
       cancelled: "stopped",
-      skipped: "skipped"
+      skipped: "skipped",
+      blocked: "blocked"
     };
+    WORKER_STATUS_WORDS = new Set(Object.values(FLOCK_STATUS_LABELS));
     INK_LABEL_WIDTH = 12;
     INK_ROW_LIMIT = 100;
     INK_DETAIL_LINE_LIMIT = 80;

package/package.json

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