perchai-cli 2.4.50 → 2.4.51

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();
@@ -91149,7 +91150,6 @@ Final answers lead with findings, name artifacts or delivery status, and give on
 var MARKET_DESK_TOOL_NAMES;
 var init_marketDeskAccess = __esm({
   "features/perchTerminal/runtime/marketDesk/marketDeskAccess.ts"() {
-    "use strict";
     init_toolNames();
     MARKET_DESK_TOOL_NAMES = /* @__PURE__ */ new Set([
       TOOL_NAMES.getMarketSignal,
@@ -139518,7 +139518,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.";
   }
 });
@@ -197736,6 +197735,7 @@ function recordDispatchBatchResult(tasks, result2, ctx, opts = {}) {
 var lifecycleByRun, MAX_LIFECYCLE_RUNS;
 var init_workerLifecycle = __esm({
   "features/perchTerminal/runtime/workers/workerLifecycle.ts"() {
+    "use strict";
     init_workerManifest();
     lifecycleByRun = /* @__PURE__ */ new Map();
     MAX_LIFECYCLE_RUNS = 200;
@@ -223760,7 +223760,13 @@ async function runFlockTurn(input, deps, options = {}) {
         turnInput: input
       };
       const modelCall = options.plannerModelCall ?? defaultFlockPlannerModelCall(llmCtx);
-      plan = await runLlmFlockPlanner(llmCtx, modelCall).catch(() => null);
+      const plannerTimeoutMs = options.plannerTimeoutMs ?? FLOCK_PLANNER_TIMEOUT_MS;
+      const first2 = await runLlmPlannerWithTimeout(llmCtx, modelCall, plannerTimeoutMs);
+      plan = first2.plan;
+      if (!plan && !first2.timedOut) {
+        const retry = await runLlmPlannerWithTimeout(llmCtx, modelCall, plannerTimeoutMs);
+        plan = retry.plan;
+      }
     }
     if (!plan) {
       plan = (options.planFn ?? planFlock)(task, {
@@ -223991,14 +223997,25 @@ ${FLOCK_GROUNDING_CONTRACT}` : worker.objective;
     const workersFailed = outcomes.filter((outcome) => outcome.status === "failed").length + workersBlocked;
     const flockStatus = userCancelled || wallTimeHit && workersDone === 0 ? "cancelled" : workersFailed === 0 && workersDone === plan.workers.length ? "completed" : workersDone > 0 ? "partial" : "failed";
     const permissionHint = workersBlocked > 0 && (turnInput.permissionMode ?? "default") === "default" ? "\n\nTip: flock workers inherit default permissions \u2014 run `/permission take_the_wheel` before `/flock` so bash redirects and file writes do not stall on approval gates." : "";
+    const deterministicSummary = buildFlockSummary(
+      plan,
+      [...outcomes, ...revisionOutcomes],
+      flockStatus,
+      toolCallsUsed,
+      wallTimeHit
+    );
+    const synthesisModelCall = options.synthesisModelCall !== void 0 ? options.synthesisModelCall : options.plannerModelCall === void 0 ? defaultFlockSynthesisModelCall(input, plan.flockId) : null;
+    let summaryBody = deterministicSummary;
+    if (synthesisModelCall && !userCancelled && workersDone > 0) {
+      const synthesized = await runFlockSynthesisWithTimeout(
+        synthesisModelCall,
+        buildFlockSynthesisPrompt(task, [...outcomes, ...revisionOutcomes], revisionReport),
+        FLOCK_SYNTHESIS_TIMEOUT_MS
+      );
+      if (synthesized) summaryBody = synthesized;
+    }
     const assistantText = [
-      buildFlockSummary(
-        plan,
-        [...outcomes, ...revisionOutcomes],
-        flockStatus,
-        toolCallsUsed,
-        wallTimeHit
-      ),
+      summaryBody,
       ...buildVerificationSection(revisionReport),
       ...modelOverrides.applied.map(
         (override) => `Model override: ${override.displayName} ran on ${override.label}.`
@@ -224040,6 +224057,89 @@ ${FLOCK_GROUNDING_CONTRACT}` : worker.objective;
     }
   }
 }
+async function runLlmPlannerWithTimeout(ctx, modelCall, timeoutMs) {
+  let timer;
+  const timeout = new Promise((resolve5) => {
+    timer = setTimeout(() => resolve5("timeout"), Math.max(1, timeoutMs));
+  });
+  try {
+    const race = await Promise.race([
+      runLlmFlockPlanner(ctx, modelCall).then((plan) => ({ plan })).catch(() => ({ plan: null })),
+      timeout
+    ]);
+    if (race === "timeout") return { plan: null, timedOut: true };
+    return { plan: race.plan, timedOut: false };
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+function defaultFlockSynthesisModelCall(input, flockId) {
+  return async ({ systemPrompt, userPrompt }) => {
+    const result2 = await runModelToolLoop({
+      lane: "chat",
+      founderModelSelection: input.founderModelSelection ?? null,
+      systemPrompt,
+      messages: [{ role: "user", content: userPrompt }],
+      tools: [],
+      workspaceRoot: input.activeRootPath ?? "",
+      desktopConnected: input.desktopConnected,
+      cliLocalTools: input.cliLocalTools === true,
+      activeRootPath: input.activeRootPath,
+      permissionMode: input.permissionMode,
+      workspaceId: input.workspaceId,
+      threadId: input.threadId,
+      supabaseConfigured: input.supabaseConfigured,
+      supabase: input.supabase ?? null,
+      cliServerAppUrl: input.cliServerAppUrl ?? null,
+      cliServerAccessToken: input.cliServerAccessToken ?? null,
+      runId: flockId,
+      chatMode: "ask",
+      maxIterations: 1,
+      onEvent: () => {
+      }
+    });
+    return { ok: result2.ok, text: result2.text };
+  };
+}
+function buildFlockSynthesisPrompt(task, outcomes, revisionReport) {
+  const results = outcomes.filter((outcome) => outcome.status === "done" && outcome.result).map((outcome) => {
+    const raw = outcome.result?.structuredOutput ?? outcome.result?.summary ?? "";
+    const serialized = typeof raw === "string" ? raw : JSON.stringify(raw);
+    return {
+      role: outcome.worker.displayName,
+      output: serialized.slice(0, FLOCK_SYNTHESIS_MAX_OUTPUT_PER_WORKER)
+    };
+  });
+  const verification = revisionReport ? {
+    verdict: revisionReport.recheckFindings?.verdict ?? revisionReport.findings.verdict ?? null,
+    issues: (revisionReport.recheckFindings?.issues ?? revisionReport.findings.issues).slice(0, 6),
+    revised: revisionReport.revised
+  } : null;
+  const systemPrompt = [
+    "You are the coordinator that just ran a Flock: a team of sub-agents that worked in parallel on the user's task.",
+    "The sub-agents have finished. Write the final answer to the user in your own voice \u2014 clear, direct, friendly, first person.",
+    "Lead with what the user asked for. Present the actual results and fold in any important verification caveats.",
+    "Do not mention sub-agents, workers, roles, nicknames, IDs, or orchestration mechanics unless directly useful to the user.",
+    "Synthesize only from the provided results \u2014 do not invent facts and do not say you will do further work."
+  ].join("\n");
+  const userPrompt = JSON.stringify({ task, results, verification });
+  return { systemPrompt, userPrompt };
+}
+async function runFlockSynthesisWithTimeout(call, prompt, timeoutMs) {
+  let timer;
+  const timeout = new Promise((resolve5) => {
+    timer = setTimeout(() => resolve5("timeout"), Math.max(1, timeoutMs));
+  });
+  try {
+    const race = await Promise.race([
+      call(prompt).then((result2) => result2.ok && result2.text.trim() ? result2.text.trim() : null).catch(() => null),
+      timeout
+    ]);
+    return race === "timeout" ? null : race;
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 function emitPlanEvent(emit, plan) {
   emit({
     type: "flock_plan_ready",
@@ -224272,7 +224372,7 @@ function flockWorkerStatusFromSpawnResult(result2) {
 function now11() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-var FLOCK_GROUNDING_CONTRACT;
+var FLOCK_PLANNER_TIMEOUT_MS, FLOCK_SYNTHESIS_TIMEOUT_MS, FLOCK_SYNTHESIS_MAX_OUTPUT_PER_WORKER, FLOCK_GROUNDING_CONTRACT;
 var init_runFlockTurn = __esm({
   "features/perchTerminal/runtime/flock/runFlockTurn.ts"() {
     "use strict";
@@ -224286,6 +224386,10 @@ var init_runFlockTurn = __esm({
     init_flockLlmPlanner();
     init_flockPlanner();
     init_flockRoles();
+    init_toolLoop();
+    FLOCK_PLANNER_TIMEOUT_MS = 35e3;
+    FLOCK_SYNTHESIS_TIMEOUT_MS = 3e4;
+    FLOCK_SYNTHESIS_MAX_OUTPUT_PER_WORKER = 2e3;
     FLOCK_GROUNDING_CONTRACT = [
       "Grounding contract: your context includes sources[] gathered by research.",
       "Every nontrivial factual claim in the draft must carry an inline [n] marker mapping to one of those sources, with a numbered source list at the end.",
@@ -232698,15 +232802,13 @@ function getBackgroundTaskStore() {
 var STORE_FILE, BackgroundTaskStore, singleton;
 var init_backgroundTaskRegistry = __esm({
   "features/perchTerminal/runtime/background/backgroundTaskRegistry.ts"() {
+    "use strict";
     init_backgroundTaskTypes();
     STORE_FILE = "background-tasks.json";
     BackgroundTaskStore = class {
-      baseDir;
-      storePath;
-      outputDir;
-      records = /* @__PURE__ */ new Map();
-      loaded = false;
       constructor(options = {}) {
+        this.records = /* @__PURE__ */ new Map();
+        this.loaded = false;
         this.baseDir = options.baseDir ?? path11.join(os.homedir(), ".perch");
         this.storePath = path11.join(this.baseDir, STORE_FILE);
         this.outputDir = path11.join(this.baseDir, "background-output");
@@ -289977,9 +290079,17 @@ function flockEventToCliRow(event) {
   switch (event.type) {
     case "flock_run_started":
       return { id: null, text: "gathering the flock\u2026", tone: "accent" };
-    case "flock_plan_ready":
+    case "flock_plan_ready": {
       if (!event.accepted) return null;
-      return { id: null, text: `flock plan \xB7 ${event.workers.length} workers`, tone: "muted" };
+      const names = event.workers.map((worker) => worker.displayName);
+      const shown = names.slice(0, 4).join(", ");
+      const extra = names.length > 4 ? ` +${names.length - 4} more` : "";
+      return {
+        id: null,
+        text: `flock plan \xB7 ${event.workers.length} agents \xB7 ${shown}${extra}`,
+        tone: "accent"
+      };
+    }
     case "flock_worker_update":
       return {
         id: `flock-${event.flockId}-${event.flockWorkerId}`,
@@ -290475,18 +290585,18 @@ async function runReadlineInteractivePerchCli(writer, deps, options) {
     trimRecentMessages(state.recentMessages);
     recordCliUsageRunId(state, result2.runId);
     state.contextSnapshot = result2.contextSnapshot ?? state.contextSnapshot;
-    const admitted = await admitCliLearningMemory(connection, {
+    void admitCliLearningMemory(connection, {
       prompt: turnPrompt,
       assistantText: result2.assistantText,
       status: result2.status,
       personaId: state.personaId,
       threadId: result2.threadId,
       runId: result2.runId
+    }).then((admitted) => {
+      if (admitted > 0) writeModeLine(writer, "memory", `saved ${admitted}`);
+    }).catch(() => {
     });
     await persistInteractiveCliState(state);
-    if (admitted > 0) {
-      writeModeLine(writer, "memory", `saved ${admitted}`);
-    }
   };
   try {
     while (true) {
@@ -291188,17 +291298,19 @@ async function runInkInteractivePerchCli(writer, deps, options) {
             trimRecentMessages(state.recentMessages);
             recordCliUsageRunId(state, result2.runId);
             state.contextSnapshot = result2.contextSnapshot ?? state.contextSnapshot;
-            const admitted = await admitCliLearningMemory(connection, {
+            void admitCliLearningMemory(connection, {
               prompt,
               assistantText,
               status: result2.status,
               personaId: state.personaId,
               threadId: result2.threadId,
               runId: result2.runId
+            }).then((admitted) => {
+              if (admitted > 0) {
+                addItem({ label: "memory", text: `saved ${admitted}`, tone: "muted" });
+              }
+            }).catch(() => {
             });
-            if (admitted > 0) {
-              addItem({ label: "memory", text: `saved ${admitted}`, tone: "muted" });
-            }
             await persistInteractiveCliState(state);
           } catch (error) {
             addItem({ label: "stop", text: humanizeCliError(errorMessage(error)), tone: "danger" });

package/package.json

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