perchai-cli 2.4.52 → 2.4.54

package/dist/perch.mjs

@@ -75908,6 +75908,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();
@@ -76259,6 +76260,7 @@ function isTurnAbortedError(error) {
 var TURN_STOPPED_BY_USER_MESSAGE;
 var init_turnAbort = __esm({
   "features/perchTerminal/runtime/turnAbort.ts"() {
+    "use strict";
     TURN_STOPPED_BY_USER_MESSAGE = "Turn stopped by user.";
   }
 });
@@ -76564,7 +76566,6 @@ function getToolDisplayName(toolName) {
 var NON_MODULE_TOOL_OWNERS, TOOL_RISK, TOOL_DISPLAY_NAMES;
 var init_catalog = __esm({
   "features/perchTerminal/runtime/toolSystem/catalog.ts"() {
-    "use strict";
     init_toolNames();
     NON_MODULE_TOOL_OWNERS = {
       [TOOL_NAMES.listSources]: "lane",
@@ -84012,6 +84013,7 @@ function listWorkerContracts() {
 }
 var init_workerManifest = __esm({
   "features/perchTerminal/runtime/workers/workerManifest.ts"() {
+    "use strict";
     init_managedWorkflowRegistry();
     init_platformRoles();
     init_financialRoles();
@@ -87169,7 +87171,6 @@ function truncateHistoryLine(value, max2) {
 }
 var init_operatorTruth = __esm({
   "features/perchTerminal/runtime/operatorTruth.ts"() {
-    "use strict";
   }
 });
 
@@ -91720,6 +91721,7 @@ 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,
@@ -200020,7 +200022,6 @@ function dedupeEvidence(items) {
 var packetStore, ROLE_KIND_MAP, DOWNSTREAM_CONSUMERS, URL_PATTERN, MARKDOWN_LINK_PATTERN;
 var init_contextPackets = __esm({
   "features/perchTerminal/agentPlatform/contextPackets.ts"() {
-    "use strict";
     packetStore = /* @__PURE__ */ new Map();
     ROLE_KIND_MAP = {
       legal_source_scout: "research",
@@ -210204,25 +210205,61 @@ var init_workGraph = __esm({
 });
 
 // features/perchTerminal/runtime/parseModelJson.ts
-function extractJsonFromText(text) {
-  const trimmed = text.trim();
-  if (!trimmed) return null;
-  const fenceMatch = trimmed.match(/^```(?:json)?\s*\n?([\s\S]*?)```\s*$/);
-  if (fenceMatch?.[1]) return fenceMatch[1].trim();
-  if (trimmed.startsWith("{") || trimmed.startsWith("[")) return trimmed;
-  const innerMatch = trimmed.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
-  if (innerMatch?.[1]) return innerMatch[1];
-  return null;
+function stripReasoningWrappers(text) {
+  return text.replace(/<think>[\s\S]*?<\/think>/gi, " ").replace(/<thinking>[\s\S]*?<\/thinking>/gi, " ").replace(/<reasoning>[\s\S]*?<\/reasoning>/gi, " ").replace(/<\/?(?:think|thinking|reasoning)>/gi, " ");
+}
+function balancedJsonObjects(text) {
+  const out = [];
+  let depth = 0;
+  let start = -1;
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+    } else if (ch === "{") {
+      if (depth === 0) start = i;
+      depth++;
+    } else if (ch === "}" && depth > 0) {
+      depth--;
+      if (depth === 0 && start >= 0) {
+        out.push(text.slice(start, i + 1));
+        start = -1;
+      }
+    }
+  }
+  return out;
+}
+function jsonCandidates(text) {
+  const candidates = [];
+  const stripped = stripReasoningWrappers(text).trim();
+  if (!stripped) return candidates;
+  const fenceMatch = stripped.match(/```(?:json)?\s*\n?([\s\S]*?)```/i);
+  if (fenceMatch?.[1]?.trim()) candidates.push(fenceMatch[1].trim());
+  if (stripped.startsWith("{") || stripped.startsWith("[")) candidates.push(stripped);
+  for (const obj2 of balancedJsonObjects(stripped).sort((a, b2) => b2.length - a.length)) {
+    candidates.push(obj2);
+  }
+  const greedy = stripped.match(/\{[\s\S]*\}|\[[\s\S]*\]/);
+  if (greedy?.[0]) candidates.push(greedy[0]);
+  return candidates;
 }
 function parseStructuredRecordFromModelText(text) {
-  const raw = extractJsonFromText(text);
-  if (!raw) return null;
-  try {
-    const parsed = JSON.parse(raw);
-    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-      return parsed;
+  for (const candidate of jsonCandidates(text)) {
+    try {
+      const parsed = JSON.parse(candidate);
+      if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+        return parsed;
+      }
+    } catch {
     }
-  } catch {
   }
   return null;
 }
@@ -225499,6 +225536,8 @@ async function runFlockTurn(input, deps, options = {}) {
     ensureFlockWorkersRegistered();
     const planStartMs = Date.now();
     let plan = null;
+    let plannerRawSnippet = "";
+    let plannerTimedOut = false;
     if (options.plannerModelCall !== null) {
       const llmCtx = {
         task,
@@ -225506,13 +225545,20 @@ async function runFlockTurn(input, deps, options = {}) {
         surface: detectFlockSurface(),
         turnInput: input
       };
-      const modelCall = options.plannerModelCall ?? defaultFlockPlannerModelCall(llmCtx);
+      const baseModelCall = options.plannerModelCall ?? defaultFlockPlannerModelCall(llmCtx);
+      const modelCall = async (prompts) => {
+        const result2 = await baseModelCall(prompts);
+        plannerRawSnippet = (result2.text ?? "").trim().slice(0, 600);
+        return result2;
+      };
       const plannerTimeoutMs = options.plannerTimeoutMs ?? FLOCK_PLANNER_TIMEOUT_MS;
       const first2 = await runLlmPlannerWithTimeout(llmCtx, modelCall, plannerTimeoutMs);
       plan = first2.plan;
+      plannerTimedOut = first2.timedOut;
       if (!plan && !first2.timedOut) {
         const retry = await runLlmPlannerWithTimeout(llmCtx, modelCall, plannerTimeoutMs);
         plan = retry.plan;
+        plannerTimedOut = retry.timedOut;
       }
     }
     if (!plan) {
@@ -225539,12 +225585,10 @@ async function runFlockTurn(input, deps, options = {}) {
       );
     }
     const modelOverrides = plan.accepted ? applyFlockModelOverrides(plan, task) : { applied: [], unavailable: [] };
-    emit({
-      type: "diagnostic",
-      code: "flock_planner_outcome",
-      message: `planner source=${plan.source} accepted=${plan.accepted} workers=${plan.accepted ? plan.workers.length : 0} elapsed=${Date.now() - planStartMs}ms`,
-      ts: now11()
-    });
+    const plannerReason = plannerTimedOut ? "timeout" : plan.accepted ? "ok" : plannerRawSnippet ? "unparseable_or_invalid" : "empty_or_error";
+    const plannerTraceMsg = `planner source=${plan.source} accepted=${plan.accepted} reason=${plannerReason} elapsed=${Date.now() - planStartMs}ms rawLen=${plannerRawSnippet.length} raw=${JSON.stringify(plannerRawSnippet.slice(0, 300))}`;
+    emit({ type: "diagnostic", code: "flock_planner_outcome", message: plannerTraceMsg, ts: now11() });
+    void appendFlockTrace(`[${flockId}] ${plannerTraceMsg}`);
     emitPlanEvent(emit, plan);
     if (!plan.accepted) {
       emit({
@@ -225791,12 +225835,9 @@ ${FLOCK_GROUNDING_CONTRACT}` : worker.objective;
         buildFlockSynthesisPrompt(task, [...outcomes, ...revisionOutcomes], revisionReport),
         FLOCK_SYNTHESIS_TIMEOUT_MS
       );
-      emit({
-        type: "diagnostic",
-        code: "flock_merge_outcome",
-        message: `merge ${merge.reason} in ${merge.elapsedMs}ms`,
-        ts: now11()
-      });
+      const mergeTraceMsg = `merge ${merge.reason} in ${merge.elapsedMs}ms`;
+      emit({ type: "diagnostic", code: "flock_merge_outcome", message: mergeTraceMsg, ts: now11() });
+      void appendFlockTrace(`[${plan.flockId}] ${mergeTraceMsg}`);
       if (merge.text) summaryBody = merge.text;
     }
     const assistantText = [
@@ -226161,6 +226202,21 @@ function flockWorkerStatusFromSpawnResult(result2) {
 function now11() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
+async function appendFlockTrace(line) {
+  if (typeof window !== "undefined" || typeof process === "undefined") return;
+  try {
+    const [os9, path19, fs19] = await Promise.all([
+      import("node:os"),
+      import("node:path"),
+      import("node:fs/promises")
+    ]);
+    const dir = path19.join(os9.homedir(), ".perch");
+    await fs19.mkdir(dir, { recursive: true });
+    await fs19.appendFile(path19.join(dir, "flock-trace.log"), `${now11()} ${line}
+`);
+  } catch {
+  }
+}
 var FLOCK_PLANNER_TIMEOUT_MS, FLOCK_WORKER_STALL_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"() {
@@ -226176,7 +226232,7 @@ var init_runFlockTurn = __esm({
     init_flockPlanner();
     init_flockRoles();
     init_toolLoop();
-    FLOCK_PLANNER_TIMEOUT_MS = 35e3;
+    FLOCK_PLANNER_TIMEOUT_MS = 12e4;
     FLOCK_WORKER_STALL_TIMEOUT_MS = 15e4;
     FLOCK_SYNTHESIS_TIMEOUT_MS = 3e4;
     FLOCK_SYNTHESIS_MAX_OUTPUT_PER_WORKER = 8e3;

package/package.json

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