perchai-cli 2.4.36 → 2.4.38

package/dist/perch.mjs

@@ -75566,6 +75566,7 @@ var init_payroll = __esm({
 // lib/perchBusinessTools/index.ts
 var init_perchBusinessTools = __esm({
   "lib/perchBusinessTools/index.ts"() {
+    "use strict";
     init_generateAPAuditPacket();
     init_inventoryFolder();
     init_loadBusinessTables();
@@ -83126,7 +83127,6 @@ function listFinancialRoleIds() {
 var FINANCIAL_ROLE_REGISTRY, evidenceScoutManifest;
 var init_financialRoles = __esm({
   "features/perchTerminal/agentPlatform/financialRoles.ts"() {
-    "use strict";
     FINANCIAL_ROLE_REGISTRY = /* @__PURE__ */ new Map();
     evidenceScoutManifest = {
       workerId: "evidence_scout",
@@ -205378,7 +205378,7 @@ function clampInt(value, min2, max2, fallback) {
   const num = typeof value === "number" && Number.isFinite(value) ? Math.floor(value) : fallback;
   return Math.min(Math.max(num, min2), max2);
 }
-var ADHOC_FORBIDDEN_TOOLS, ADHOC_WRITE_TOOLS, ADHOC_MAX_ITERATIONS, MAX_NAME_CHARS, MAX_CONTRACT_CHARS, DEFAULT_OUTPUT_CONTRACT;
+var ADHOC_FORBIDDEN_TOOLS, ADHOC_WRITE_TOOLS, ADHOC_MAX_ITERATIONS, ADHOC_MAX_TOOL_CALLS, MAX_NAME_CHARS, MAX_CONTRACT_CHARS, DEFAULT_OUTPUT_CONTRACT;
 var init_adhocManifest = __esm({
   "features/perchTerminal/runtime/workers/adhocManifest.ts"() {
     "use strict";
@@ -205407,6 +205407,7 @@ var init_adhocManifest = __esm({
       TOOL_NAMES.createDirectory
     ]);
     ADHOC_MAX_ITERATIONS = 10;
+    ADHOC_MAX_TOOL_CALLS = 40;
     MAX_NAME_CHARS = 40;
     MAX_CONTRACT_CHARS = 240;
     DEFAULT_OUTPUT_CONTRACT = "Return a short structured summary of what was found or done.";
@@ -205495,6 +205496,14 @@ var init_spawnWorker = __esm({
       handler: async (args, ctx) => {
         let workerId = String(args.workerId ?? "");
         const objective = String(args.objective ?? "");
+        if (!ctx.onEvent) {
+          return {
+            ok: false,
+            workerId,
+            summary: "spawn_worker requires an event sink from the parent tool loop.",
+            errorCode: "worker_event_sink_missing"
+          };
+        }
         let adhocManifestId = null;
         let adhocNickname = null;
         const customSpec = parseAdhocSpec(args.custom);
@@ -205509,11 +205518,13 @@ var init_spawnWorker = __esm({
         if (workerId && customSpec && !resolveWorkerManifest(workerId)) {
           workerId = "";
         }
+        let adhocDisplayTitle;
         if (!workerId && customSpec) {
           const { manifest, droppedTools } = buildAdhocWorkerManifest(customSpec);
           registerWorkerManifest(manifest);
           adhocManifestId = manifest.workerId;
           adhocNickname = flockNicknameFor(manifest.workerId, 0);
+          adhocDisplayTitle = `${manifest.name} \xB7 ${adhocNickname}`;
           workerId = manifest.workerId;
           if (droppedTools.length > 0 && ctx.onEvent) {
             ctx.onEvent({
@@ -205534,15 +205545,7 @@ var init_spawnWorker = __esm({
         }
         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" ? args.maxIterations : void 0;
-        if (!ctx.onEvent) {
-          return {
-            ok: false,
-            workerId,
-            summary: "spawn_worker requires an event sink from the parent tool loop.",
-            errorCode: "worker_event_sink_missing"
-          };
-        }
+        const maxIterations = typeof args.maxIterations === "number" ? adhocManifestId ? Math.min(args.maxIterations, ADHOC_MAX_ITERATIONS) : args.maxIterations : void 0;
         const enrichedContext = await threadPriorSpecialistContext({
           threadId: ctx.threadId,
           roleId: workerId,
@@ -205564,8 +205567,19 @@ Proceed with the available context. If a missing fact is essential, ask the user
         ].filter(Boolean).join("\n\n");
         try {
           const result2 = await spawnWorker(
-            { workerId, objective: workerObjective, context: enrichedContext, lane, maxIterations },
             {
+              workerId,
+              objective: workerObjective,
+              context: enrichedContext,
+              lane,
+              maxIterations,
+              // Ad-hoc workers get a hard real-tool-call ceiling (observed live:
+              // an unbounded 66-call run). Registered workers keep their existing
+              // behavior — suites and managed workflows own their own budgets.
+              maxToolCalls: adhocManifestId ? ADHOC_MAX_TOOL_CALLS : void 0
+            },
+            {
+              displayTitle: adhocDisplayTitle,
               workspaceRoot: effectiveWorkspaceRoot(ctx),
               desktopConnected: ctx.desktopConnected,
               // CLI surface: children inherit the local bridge and server auth,
@@ -220237,12 +220251,13 @@ async function spawnWorker(args, ctx) {
       errorCode: "worker_not_found"
     };
   }
+  const eventTitle = ctx.displayTitle?.trim() || manifest.name;
   const runDiscriminator = ctx.runId ?? Date.now().toString(36);
   const childThreadId = args.childThreadId ?? (ctx.threadId ? `${ctx.threadId}::worker::${args.workerId}::${runDiscriminator}` : null);
   const workerRun = ctx.threadId ? await registerWorkerRun({
     threadId: ctx.threadId,
     workerId: args.workerId,
-    title: manifest.name,
+    title: eventTitle,
     objective: args.objective,
     context: args.context,
     parentToolCallId: ctx.parentToolCallId ?? null,
@@ -220265,14 +220280,14 @@ async function spawnWorker(args, ctx) {
       childThreadId,
       workerRunId: runtimeWorkerRunId,
       workerId: args.workerId,
-      title: manifest.name
+      title: eventTitle
     });
   }
   ctx.onEvent({
     type: "worker_run_started",
     workerId: args.workerId,
     workerRunId: runtimeWorkerRunId,
-    title: manifest.name,
+    title: eventTitle,
     objective: args.objective,
     contextSummary: summarizeWorkerContextForTranscript(args.context),
     childThreadId,
@@ -220479,18 +220494,24 @@ ${contextBlock}
       attachOperatorScreenshots: isBrowserDeliveryRole(args.workerId)
     };
     const result2 = await runModelToolLoop(loopInput);
+    const approvalBlocked = result2.stopReason === "approval_required" ? result2.pendingApproval ?? null : null;
     const recoveredStructuredOutput = recoverWorkerStructuredOutput(args.workerId, args.objective, args.context, result2.toolCalls);
     const structuredOutput = parseStructuredRecordFromModelText(result2.text) ?? recoveredStructuredOutput;
     const missingRequiredOutput = result2.ok && Boolean(manifest.outputSchema) && !structuredOutput;
     const verifierPartialOrFail = (args.workerId === "source_verifier" || args.workerId === "legal_citation_verifier") && structuredOutput !== null && typeof structuredOutput === "object" && structuredOutput.verificationStatus !== "pass";
     const hasUsableOutput = Boolean(structuredOutput) || Boolean(recoveredStructuredOutput) || (result2.text?.trim().length ?? 0) > 50;
-    const workerOk = (result2.ok || Boolean(recoveredStructuredOutput)) && !missingRequiredOutput;
-    const usabilityStatus = resolveWorkerUsability({
+    const workerOk = !approvalBlocked && (result2.ok || Boolean(recoveredStructuredOutput)) && !missingRequiredOutput;
+    const usabilityStatus = approvalBlocked ? "needs_user_input" : resolveWorkerUsability({
       workerOk,
       hasUsableOutput,
       verifierPartialOrFail
     });
     const workerWarnings = [];
+    if (approvalBlocked) {
+      workerWarnings.push(
+        "Worker stopped at an approval gate \u2014 the gated action did not run."
+      );
+    }
     if (verifierPartialOrFail && hasUsableOutput) {
       workerWarnings.push(`Verification returned "${structuredOutput?.verificationStatus ?? "unknown"}" \u2014 output usable with caveat.`);
     }
@@ -220502,7 +220523,7 @@ ${contextBlock}
     }
     const recoveredSummary = recoveredStructuredOutput ? summarizeRecoveredWorkerOutput(args.workerId, recoveredStructuredOutput) : null;
     const summary = truncateSummary(
-      workerOk ? !result2.ok && recoveredSummary ? recoveredSummary : result2.text || recoveredSummary || (recoveredStructuredOutput ? JSON.stringify(recoveredStructuredOutput) : "") : missingRequiredOutput ? result2.text || "Worker stopped without returning the required structured JSON output." : result2.text || result2.error || "Worker failed before producing output."
+      approvalBlocked ? `Blocked at an approval gate: ${approvalBlocked.toolName ?? "a gated tool"} requires approval in the current permission mode${approvalBlocked.reason ? ` (${approvalBlocked.reason})` : ""}. The action did not run. Approve it interactively, or re-run under /permission take_the_wheel.` : workerOk ? !result2.ok && recoveredSummary ? recoveredSummary : result2.text || recoveredSummary || (recoveredStructuredOutput ? JSON.stringify(recoveredStructuredOutput) : "") : missingRequiredOutput ? result2.text || "Worker stopped without returning the required structured JSON output." : result2.text || result2.error || "Worker failed before producing output."
     );
     const durationMs = Date.now() - startMs;
     let contextPacket = null;
@@ -220539,7 +220560,7 @@ ${contextBlock}
       type: "worker_run_completed",
       workerId: args.workerId,
       workerRunId: runtimeWorkerRunId,
-      title: manifest.name,
+      title: eventTitle,
       childThreadId,
       persistedThreadId,
       parentToolCallId: ctx.parentToolCallId ?? null,
@@ -220573,7 +220594,7 @@ ${contextBlock}
           missingRequiredOutput,
           verifierPartialOrFail,
           error: result2.error
-        }) : void 0,
+        }) : approvalBlocked ? "worker_approval_required" : void 0,
         workerOffThreadTokens: workerTokenEstimate,
         contextPacket
       }, { supabase: ctx.supabase ?? null });
@@ -220597,7 +220618,7 @@ ${contextBlock}
         missingRequiredOutput,
         verifierPartialOrFail,
         error: result2.error
-      }) : void 0,
+      }) : approvalBlocked ? "worker_approval_required" : void 0,
       warnings: workerWarnings.length > 0 ? workerWarnings : void 0
     };
   } catch (error) {
@@ -220608,7 +220629,7 @@ ${contextBlock}
       type: "worker_run_completed",
       workerId: args.workerId,
       workerRunId: runtimeWorkerRunId,
-      title: manifest.name,
+      title: eventTitle,
       childThreadId,
       parentToolCallId: ctx.parentToolCallId ?? null,
       ok: false,
@@ -287177,7 +287198,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";
@@ -287210,6 +287232,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) {
@@ -287811,6 +287853,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();
@@ -287876,6 +287919,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     setWorkingText("recovering route");
                     break;
                   case "tool_call_started": {
+                    if (event.workerId) break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = humanizeCliToolName(event.toolName);
                     const aggregateKind = cliToolAggregateKind(event.toolName);
@@ -287913,6 +287957,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     break;
                   }
                   case "tool_call_completed": {
+                    if (event.workerId) break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const stored = toolInputsById.current.get(toolId);
                     const aggregateKind = aggregateToolIds.get(toolId);
@@ -287958,6 +288003,7 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                     break;
                   }
                   case "tool_call_failed": {
+                    if (event.workerId) break;
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = toolNamesById.get(toolId) ?? humanizeCliToolName(event.toolName);
                     const stored = toolInputsById.current.get(toolId);
@@ -288162,7 +288208,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.`,
@@ -288178,6 +288224,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":
@@ -288352,7 +288417,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) {
@@ -288399,7 +288464,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" || item.label === "worker" ? renderFlockRow(`${item.id}-${lineIndex}`, line, item.tone, lineIndex === 0) : renderTranscriptRow(
               `${item.id}-${lineIndex}`,
               item.label,
               line,
@@ -289902,7 +289967,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";
@@ -289997,8 +290062,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.36",
+  "version": "2.4.38",
   "description": "Perch AI command-line interface",
   "bin": {
     "perch": "bin/perch"