perchai-cli 2.4.25 → 2.4.28

package/dist/perch.mjs

@@ -75918,7 +75918,6 @@ 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.";
   }
 });
@@ -76219,6 +76218,7 @@ 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",
@@ -76922,6 +76922,8 @@ function buildTranscriptSegments(state) {
   const terminalSegmentIdx = /* @__PURE__ */ new Map();
   const workerRunIdx = /* @__PURE__ */ new Map();
   const flockRunIdx = /* @__PURE__ */ new Map();
+  const flockIdByWorkerId = /* @__PURE__ */ new Map();
+  const flockWorkerIdByToolCallId = /* @__PURE__ */ new Map();
   const diagnosticIdxByKey = /* @__PURE__ */ new Map();
   const capabilityIdx = /* @__PURE__ */ new Map();
   const liveCardIdx = /* @__PURE__ */ new Map();
@@ -76945,6 +76947,32 @@ function buildTranscriptSegments(state) {
     if (runId) sandboxRunIdx.set(runId, idx);
     if (toolCallId) sandboxRunIdx.set(toolCallId, idx);
   }
+  function updateFlockWorkerByWorkerId(workerId, updater) {
+    if (!workerId) return false;
+    const flockId = flockIdByWorkerId.get(workerId);
+    if (!flockId) return false;
+    const idx = flockRunIdx.get(flockId);
+    if (idx === void 0) return true;
+    const seg = segments[idx];
+    if (seg?.kind !== "flock_run") return true;
+    segments[idx] = {
+      ...seg,
+      workers: seg.workers.map(
+        (worker) => worker.workerId === workerId ? updater(worker) : worker
+      )
+    };
+    return true;
+  }
+  function isFlockOwnedToolEvent(event) {
+    return Boolean(
+      event.workerId && flockIdByWorkerId.has(event.workerId) || event.toolCallId && flockWorkerIdByToolCallId.has(event.toolCallId)
+    );
+  }
+  function isQuietFlockDiagnostic(event) {
+    if (!event.workerId || !flockIdByWorkerId.has(event.workerId)) return false;
+    if (event.code === "tool_call_budget_exhausted") return false;
+    return event.code === "source_read_budget_reached" || event.code === "source_analysis_max_iteration_closing_attempted" || event.code === "source_analysis_max_iteration_synthesized" || event.code === "source_analysis_max_iteration_closing_fallback" || event.code === "source_analysis_max_iteration_incomplete" || /source-read budget|source-analysis|read-only source/i.test(event.message);
+  }
   function flushReasoning() {
     if (!pendingReasoning) return;
     segments.push({ kind: "reasoning", text: pendingReasoning, seq: seq++, timestamp: pendingReasoningTs });
@@ -77038,6 +77066,15 @@ function buildTranscriptSegments(state) {
           ev.toolCallId ? [ev.toolCallId] : [],
           ev.ts
         );
+        if (ev.workerId && flockIdByWorkerId.has(ev.workerId)) {
+          if (ev.toolCallId) flockWorkerIdByToolCallId.set(ev.toolCallId, ev.workerId);
+          updateFlockWorkerByWorkerId(ev.workerId, (worker) => ({
+            ...worker,
+            toolCalls: (worker.toolCalls ?? 0) + 1,
+            lastToolName: ev.toolName
+          }));
+          break;
+        }
         if (ev.workerId) {
           const idx = segments.length;
           segments.push({
@@ -77092,6 +77129,7 @@ function buildTranscriptSegments(state) {
       }
       case "tool_call_completed": {
         flushReasoning();
+        if (isFlockOwnedToolEvent(ev)) break;
         const id = ev.toolCallId ?? ev.toolName;
         const idx = toolCallIdx.get(id);
         if (idx !== void 0) {
@@ -77108,6 +77146,7 @@ function buildTranscriptSegments(state) {
       }
       case "tool_result": {
         flushReasoning();
+        if (isFlockOwnedToolEvent(ev)) break;
         const id = ev.toolCallId ?? ev.toolName;
         if (ev.toolName === "run_sandbox_code") {
           updateSandboxRun(ev.toolCallId, null, (seg) => ({ ...seg, resultText: ev.text }));
@@ -77136,6 +77175,7 @@ function buildTranscriptSegments(state) {
       case "tool_output_delta": {
         flushReasoning();
         if (!ev.text) break;
+        if (isFlockOwnedToolEvent(ev)) break;
         const id = ev.toolCallId ?? ev.toolName;
         if (ev.toolName === "run_sandbox_code") {
           updateSandboxRun(ev.toolCallId, null, (seg) => ({ ...seg, resultText: `${seg.resultText ?? ""}${ev.text}` }));
@@ -77544,6 +77584,7 @@ function buildTranscriptSegments(state) {
       case "diagnostic": {
         flushReasoning();
         if (!ev.message.trim()) break;
+        if (isQuietFlockDiagnostic(ev)) break;
         if (ev.code === "tool_call_budget_exhausted") {
           let attributed = false;
           if (ev.workerId) {
@@ -77695,6 +77736,7 @@ function buildTranscriptSegments(state) {
       }
       case "tool_call_failed": {
         flushReasoning();
+        if (isFlockOwnedToolEvent(ev)) break;
         const id = ev.toolCallId ?? ev.toolName;
         const idx = toolCallIdx.get(id);
         if (idx !== void 0) {
@@ -77809,6 +77851,12 @@ function buildTranscriptSegments(state) {
       }
       case "worker_run_started": {
         flushReasoning();
+        if (updateFlockWorkerByWorkerId(ev.workerId, (worker) => ({
+          ...worker,
+          status: worker.status === "queued" ? "running" : worker.status
+        }))) {
+          break;
+        }
         const idx = segments.length;
         segments.push({
           kind: "worker_run",
@@ -77825,6 +77873,12 @@ function buildTranscriptSegments(state) {
       }
       case "worker_run_completed": {
         flushReasoning();
+        if (updateFlockWorkerByWorkerId(ev.workerId, (worker) => ({
+          ...worker,
+          status: ev.ok ? "done" : "failed"
+        }))) {
+          break;
+        }
         const runIdx = workerRunIdx.get(ev.workerId);
         if (runIdx !== void 0) {
           const seg = segments[runIdx];
@@ -77877,6 +77931,11 @@ function buildTranscriptSegments(state) {
         if (idx === void 0) break;
         const seg = segments[idx];
         if (seg?.kind !== "flock_run") break;
+        if (ev.accepted) {
+          for (const worker of ev.workers) {
+            flockIdByWorkerId.set(worker.workerId, ev.flockId);
+          }
+        }
         segments[idx] = ev.accepted ? {
           ...seg,
           status: "running",
@@ -77898,7 +77957,11 @@ function buildTranscriptSegments(state) {
         if (seg?.kind !== "flock_run") break;
         const known = seg.workers.some((worker) => worker.flockWorkerId === ev.flockWorkerId);
         const workers = known ? seg.workers.map(
-          (worker) => worker.flockWorkerId === ev.flockWorkerId ? { ...worker, status: ev.status } : worker
+          (worker) => worker.flockWorkerId === ev.flockWorkerId ? {
+            ...worker,
+            status: ev.status,
+            note: ev.detail ?? worker.note
+          } : worker
         ) : [
           ...seg.workers,
           {
@@ -77906,7 +77969,8 @@ function buildTranscriptSegments(state) {
             workerId: ev.workerId,
             displayName: ev.displayName,
             nickname: ev.nickname,
-            status: ev.status
+            status: ev.status,
+            note: ev.detail
           }
         ];
         segments[idx] = { ...seg, workers };
@@ -78309,9 +78373,13 @@ function segmentToCompact(seg) {
         summary: seg.summary?.slice(0, 300),
         flockWorkers: seg.workers.map((worker) => ({
           flockWorkerId: worker.flockWorkerId,
+          workerId: worker.workerId,
           displayName: worker.displayName,
           nickname: worker.nickname,
-          status: worker.status
+          status: worker.status,
+          note: worker.note,
+          toolCalls: worker.toolCalls,
+          lastToolName: worker.lastToolName
         }))
       };
     case "worker_tool_call":
@@ -90909,7 +90977,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,
@@ -200071,6 +200138,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;
@@ -220709,11 +220777,11 @@ function flockTaskGate(rawTask) {
   if (!task) {
     return { ok: false, task, reason: "No task given. Usage: /flock <task>." };
   }
-  if (/\/flock\b/i.test(task)) {
+  if (/(^|[\s([{])\/flock(?:\s|$)/i.test(task)) {
     return {
       ok: false,
       task,
-      reason: "A flock cannot gather another flock \u2014 recursive /flock is not allowed."
+      reason: "Subagents cannot start another /flock run from inside a /flock request."
     };
   }
   const wordCount = task.split(/\s+/).length;
@@ -221475,15 +221543,30 @@ function buildSpawnContext(input, flockId, signal, emit, worker) {
   };
 }
 function buildFlockSummary(plan, outcomes, status, toolCallsUsed, wallTimeHit) {
-  const header = status === "completed" ? `Flock finished: ${plan.summary}.` : status === "partial" ? `Flock finished with partial results (${plan.summary}).` : status === "cancelled" ? `Flock stopped early${wallTimeHit ? " \u2014 wall-time cap reached" : ""}.` : `Flock failed \u2014 no worker produced a usable result.`;
+  const header = status === "completed" ? `Subagents finished: ${plan.summary}.` : status === "partial" ? `Subagents finished with partial results (${plan.summary}).` : status === "cancelled" ? `Subagents stopped early${wallTimeHit ? " \u2014 wall-time cap reached" : ""}.` : `Subagents failed \u2014 no worker produced a usable result.`;
   const lines = outcomes.map((outcome) => {
     const mark = outcome.status === "done" ? "done" : outcome.status === "failed" ? "failed" : outcome.status;
-    const detail = outcome.detail ? ` \u2014 ${clampLine(outcome.detail, 160)}` : "";
+    const detailText = friendlyOutcomeDetail(outcome.detail);
+    const detail = detailText ? ` \u2014 ${clampLine(detailText, 160)}` : "";
     return `- ${outcome.worker.displayName} (${outcome.worker.nickname}): ${mark}${detail}`;
   });
   const footer = `Used ${toolCallsUsed}/${plan.caps.maxTotalToolCalls} tool calls across ${outcomes.length} workers.`;
   return [header, ...lines, footer].join("\n");
 }
+function friendlyOutcomeDetail(detail) {
+  const clean = clampLine(detail, 220);
+  if (!clean) return "";
+  if (/Reached maximum \d+ tool-call iterations/i.test(clean)) {
+    return "finished from gathered evidence";
+  }
+  if (/source-read budget|read-only source|source-analysis/i.test(clean)) {
+    return "used gathered evidence";
+  }
+  if (/tool-call budget exhausted|Tool budget reached/i.test(clean)) {
+    return "tool limit reached; finished from evidence";
+  }
+  return clean;
+}
 function clampLine(text, max2) {
   const clean = (text ?? "").replace(/\s+/g, " ").trim();
   return clean.length > max2 ? `${clean.slice(0, max2 - 1)}\u2026` : clean;
@@ -230793,6 +230876,10 @@ var init_cliStandaloneOAuth = __esm({
 });
 
 // features/perchTerminal/runtime/contextMeterDisplay.ts
+function positiveInt3(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return null;
+  return Math.floor(value);
+}
 function formatTokenK(n) {
   if (n < 1e3) return `${Math.max(0, Math.round(n))}`;
   return `${(n / 1e3).toFixed(n < 1e4 ? 1 : 0)}k`;
@@ -230811,12 +230898,17 @@ function resolvePrimaryContextTokens(snapshot) {
   if (rowTokens > 0) return rowTokens;
   return 0;
 }
-function resolveContextMeterDisplay(snapshot) {
-  const limitTokens = snapshot?.rawContextWindowTokens ?? snapshot?.effectiveLimitTokens ?? snapshot?.contextLimitTokens ?? getEffectiveContextWindow();
+function resolveContextMeterDisplay(snapshot, activeModel) {
+  const activeRawLimitTokens = positiveInt3(activeModel?.contextWindow) ?? positiveInt3(activeModel?.contextWindowTokens);
+  const activeEffectiveLimitTokens = activeRawLimitTokens ? getEffectiveContextWindow({
+    contextWindow: activeRawLimitTokens,
+    maxOutputTokens: activeModel?.maxOutputTokens ?? null
+  }) : null;
+  const limitTokens = activeRawLimitTokens ?? snapshot?.rawContextWindowTokens ?? activeEffectiveLimitTokens ?? snapshot?.effectiveLimitTokens ?? snapshot?.contextLimitTokens ?? getEffectiveContextWindow();
   const threadTokens = snapshot?.threadContextTokens ?? snapshot?.totalContextTokens ?? snapshot?.latestSendTokens ?? 0;
   const primaryTokens = resolvePrimaryContextTokens(snapshot);
   const rawLimitTokens = Math.max(1, limitTokens);
-  const effectiveLimitTokens = snapshot?.effectiveLimitTokens ?? snapshot?.contextLimitTokens ?? rawLimitTokens;
+  const effectiveLimitTokens = activeEffectiveLimitTokens ?? snapshot?.effectiveLimitTokens ?? snapshot?.contextLimitTokens ?? rawLimitTokens;
   const reservedOutputTokens = Math.max(0, rawLimitTokens - effectiveLimitTokens);
   const committedTokens = Math.min(rawLimitTokens, primaryTokens + reservedOutputTokens);
   const workerUsageTokens = snapshot?.workerUsage?.reduce((sum, worker) => sum + Math.max(0, worker.totalTokens), 0) ?? 0;
@@ -230836,6 +230928,8 @@ function resolveContextMeterDisplay(snapshot) {
     workerTokens,
     jobTotalTokens: job,
     limitTokens,
+    effectiveLimitTokens,
+    reservedOutputTokens,
     composerLabel,
     hasWorkers
   };
@@ -285205,12 +285299,12 @@ var init_build2 = __esm({
 // scripts/perch-cli.ts
 var perch_cli_exports = {};
 __export(perch_cli_exports, {
-  FLOCK_NAME_ACCENTS: () => FLOCK_NAME_ACCENTS,
+  FLOCK_NICKNAME_ACCENTS: () => FLOCK_NICKNAME_ACCENTS,
   HELP_TEXT: () => HELP_TEXT,
   INTERACTIVE_HELP_TEXT: () => INTERACTIVE_HELP_TEXT,
   PERCH_SPLASH_COMMANDS: () => PERCH_SPLASH_COMMANDS,
   flockEventToCliRow: () => flockEventToCliRow,
-  flockNameAccentColor: () => flockNameAccentColor,
+  flockNicknameAccentColor: () => flockNicknameAccentColor,
   parseInteractiveSlashCommand: () => parseInteractiveSlashCommand,
   parsePerchCli: () => parsePerchCli,
   runPerchCli: () => runPerchCli
@@ -285305,7 +285399,8 @@ ${HELP_TEXT}`);
         trimRecentMessages(nextRecentMessages);
         writeCliTurnResult(result3, parsed.json, writer, {
           personaId: parsed.personaId,
-          color: shouldUseCliColor()
+          color: shouldUseCliColor(),
+          activeContextModel: resolveCliActiveContextModel(connection)
         });
         await admitCliLearningMemory(connection, {
           prompt: parsed.prompt,
@@ -285658,7 +285753,8 @@ async function runReadlineInteractivePerchCli(writer, deps, options) {
       });
       writeCliTurnResult(result2, false, writer, {
         personaId: state.personaId,
-        color: shouldUseCliColor()
+        color: shouldUseCliColor(),
+        activeContextModel: resolveCliActiveContextModel(connection)
       });
       appendRecentMessage(state.recentMessages, "user", prompt);
       if (result2.assistantText.trim()) {
@@ -285844,6 +285940,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           const toolNamesById = /* @__PURE__ */ new Map();
           const flockWorkerNames = /* @__PURE__ */ new Map();
           const flockLimitMeta = /* @__PURE__ */ new Map();
+          const aggregateToolIds = /* @__PURE__ */ new Map();
+          const aggregateToolMeta = /* @__PURE__ */ new Map();
           const clientRunId = createCliRunId();
           const externalController = new AbortController();
           const runtimeRun = registerRuntimeRun({
@@ -285907,11 +286005,28 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                   case "tool_call_started": {
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = humanizeCliToolName(event.toolName);
+                    const aggregateKind = cliToolAggregateKind(event.toolName);
                     toolInputsById.current.set(toolId, {
                       toolName: event.toolName,
                       input: event.input ?? {}
                     });
                     toolNamesById.set(toolId, name);
+                    if (aggregateKind) {
+                      aggregateToolIds.set(toolId, aggregateKind);
+                      const meta2 = getCliToolAggregateMeta(aggregateToolMeta, aggregateKind);
+                      meta2.started += 1;
+                      meta2.pending += 1;
+                      appendCliToolAggregateDetail(meta2, event.toolName, event.input ?? {}, "started");
+                      updateToolItem(cliToolAggregateItemId(aggregateKind), {
+                        label: "tool",
+                        text: renderCliToolAggregateText(aggregateKind, meta2),
+                        tone: "muted",
+                        detailLines: meta2.detailLines,
+                        expanded: false
+                      });
+                      setWorkingText(cliToolAggregateWorkingText(aggregateKind));
+                      break;
+                    }
                     const fileStart = buildFileToolDisplay(event.toolName, event.input ?? {}, "running");
                     if (fileStart) richToolIds.current.add(toolId);
                     updateToolItem(toolId, {
@@ -285927,6 +286042,22 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                   case "tool_call_completed": {
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const stored = toolInputsById.current.get(toolId);
+                    const aggregateKind = aggregateToolIds.get(toolId);
+                    if (aggregateKind) {
+                      const meta2 = getCliToolAggregateMeta(aggregateToolMeta, aggregateKind);
+                      meta2.pending = Math.max(0, meta2.pending - 1);
+                      meta2.done += 1;
+                      appendCliToolAggregateDetail(meta2, event.toolName, stored?.input ?? {}, "done");
+                      updateToolItem(cliToolAggregateItemId(aggregateKind), {
+                        label: "tool",
+                        text: renderCliToolAggregateText(aggregateKind, meta2),
+                        tone: meta2.failed > 0 ? "danger" : "success",
+                        detailLines: meta2.detailLines,
+                        expanded: false
+                      });
+                      setWorkingText("thinking");
+                      break;
+                    }
                     const fileDone = buildFileToolDisplay(event.toolName, stored?.input ?? {}, "done");
                     if (fileDone) {
                       richToolIds.current.add(toolId);
@@ -285956,6 +286087,22 @@ async function runInkInteractivePerchCli(writer, deps, options) {
                   case "tool_call_failed": {
                     const toolId = event.toolCallId ?? `${event.toolName}-${Date.now()}`;
                     const name = toolNamesById.get(toolId) ?? humanizeCliToolName(event.toolName);
+                    const stored = toolInputsById.current.get(toolId);
+                    const aggregateKind = aggregateToolIds.get(toolId);
+                    if (aggregateKind) {
+                      const meta2 = getCliToolAggregateMeta(aggregateToolMeta, aggregateKind);
+                      meta2.pending = Math.max(0, meta2.pending - 1);
+                      meta2.failed += 1;
+                      appendCliToolAggregateDetail(meta2, event.toolName, stored?.input ?? {}, "failed", event.error);
+                      updateToolItem(cliToolAggregateItemId(aggregateKind), {
+                        label: "tool",
+                        text: renderCliToolAggregateText(aggregateKind, meta2),
+                        tone: "danger",
+                        detailLines: meta2.detailLines,
+                        expanded: false
+                      });
+                      break;
+                    }
                     updateToolItem(toolId, {
                       label: "need",
                       text: `${name} \xB7 ${event.error ?? "needs attention"}`,
@@ -286334,8 +286481,12 @@ async function runInkInteractivePerchCli(writer, deps, options) {
           if (dotParts.length < 2 && !limitMatch) {
             return renderTranscriptRow(key, "flock", line, tone, showLabel);
           }
-          const name = limitMatch ? limitMatch[1] : dotParts[0];
-          const restText = limitMatch ? ` ${limitMatch[2]}` : ` \xB7 ${dotParts.slice(1).join(" \xB7 ")}`;
+          if (limitMatch) {
+            return renderTranscriptRow(key, "flock", line, tone, showLabel);
+          }
+          const name = dotParts[0];
+          const nickname = dotParts[1] ?? "";
+          const restText = dotParts.length > 2 ? ` \xB7 ${dotParts.slice(2).join(" \xB7 ")}` : "";
           return React11.createElement(
             Ink2.Box,
             { key },
@@ -286354,7 +286505,8 @@ async function runInkInteractivePerchCli(writer, deps, options) {
               React11.createElement(
                 Ink2.Text,
                 null,
-                React11.createElement(Ink2.Text, { color: flockNameAccentColor(name), bold: true }, name),
+                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) }, restText)
               )
             )
@@ -286510,7 +286662,10 @@ async function runInteractiveSlashCommand(input) {
 `);
       return "continue";
     case "context":
-      input.writer.stdout(renderCliContextDetails(input.state.contextSnapshot));
+      input.writer.stdout(renderCliContextDetails(
+        input.state.contextSnapshot,
+        resolveCliActiveContextModel(input.getConnection?.() ?? null)
+      ));
       return "continue";
     case "memoryAudit": {
       const audit = explainLearningAdmission({
@@ -286680,6 +286835,7 @@ function renderInteractiveStatus(state, connection, session, workspaceId) {
   const signedIn = session === void 0 ? isCliModelConnectionReady(connection) : isStoredCliAuthSessionUsable(session);
   const connectionStatus = isCliModelConnectionReady(connection) ? "connected" : "locked \xB7 run /login";
   const color = shouldUseCliColor();
+  const activeContextModel = resolveCliActiveContextModel(connection);
   const lines = [
     ["version", CLI_PACKAGE_VERSION],
     ["cwd", state.cwd],
@@ -286692,7 +286848,7 @@ function renderInteractiveStatus(state, connection, session, workspaceId) {
     ["mode", state.chatMode],
     ["persona", state.personaId],
     ["thread", state.threadId],
-    ["context", renderCliContextMeter(state.contextSnapshot)],
+    ["context", renderCliContextMeter(state.contextSnapshot, activeContextModel)],
     ["saved", state.persistedThreadUpdatedAt ? new Date(state.persistedThreadUpdatedAt).toLocaleString() : "(new thread)"],
     ["local-tools", state.cliLocalTools ? "on" : "off"]
   ];
@@ -287040,21 +287196,21 @@ function isPermanentMemoryLike2(value) {
   const memory = value;
   return typeof memory.id === "string" && typeof memory.title === "string" && typeof memory.body === "string";
 }
-function renderCliContextMeter(snapshot) {
+function renderCliContextMeter(snapshot, activeModel) {
   if (!snapshot) return "Context";
-  const meter = resolveContextMeterDisplay(snapshot);
+  const meter = resolveContextMeterDisplay(snapshot, activeModel);
   const percent2 = snapshot.contextPercentage ?? Math.round(meter.committedTokens / Math.max(1, meter.limitTokens) * 100);
   const parts = [`${meter.composerLabel}`, `${Math.max(0, Math.min(100, percent2))}%`];
   const compacted = snapshot.compactedRowCount ?? 0;
   if (snapshot.compacted || compacted > 0) parts.push(`compacted ${compacted}`);
   return parts.join(" \xB7 ");
 }
-function renderCliContextDetails(snapshot) {
+function renderCliContextDetails(snapshot, activeModel) {
   if (!snapshot) return "context     no meter yet\n";
-  const meter = resolveContextMeterDisplay(snapshot);
+  const meter = resolveContextMeterDisplay(snapshot, activeModel);
   const percent2 = snapshot.contextPercentage ?? Math.round(meter.committedTokens / Math.max(1, meter.limitTokens) * 100);
   const lines = [
-    ["context", renderCliContextMeter(snapshot)],
+    ["context", renderCliContextMeter(snapshot, activeModel)],
     ["thread", `${formatCliTokenCount(meter.threadTokens)} tokens`],
     ["limit", `${formatCliTokenCount(meter.limitTokens)} tokens`],
     ["fill", `${Math.max(0, Math.min(100, percent2))}%`],
@@ -287074,6 +287230,10 @@ function humanizeCliToolName(name) {
 function isCliModelConnectionReady(connection) {
   return Boolean(connection?.authenticated && connection.founderModelSelection);
 }
+function resolveCliActiveContextModel(connection) {
+  if (!connection?.founderModelSelection) return null;
+  return resolveModelForLane(connection.founderModelSelection, "chat");
+}
 function renderCliAuthSummary(connection) {
   if (isCliModelConnectionReady(connection)) {
     return `signed in${connection.email ? ` as ${connection.email}` : ""}`;
@@ -287109,12 +287269,12 @@ function colorForInkTone(tone) {
       return CLI_BRAND.patina;
   }
 }
-function flockNameAccentColor(name) {
+function flockNicknameAccentColor(name) {
   let hash = 0;
   for (let i = 0; i < name.length; i++) {
     hash = hash * 31 + name.charCodeAt(i) >>> 0;
   }
-  return FLOCK_NAME_ACCENTS[hash % FLOCK_NAME_ACCENTS.length];
+  return FLOCK_NICKNAME_ACCENTS[hash % FLOCK_NICKNAME_ACCENTS.length];
 }
 function bodyColorForInkTone(tone) {
   switch (tone) {
@@ -287410,6 +287570,67 @@ function buildFileToolDisplay(toolName, input, phase, summary) {
     ]
   };
 }
+function cliToolAggregateKind(toolName) {
+  const normalized = toolName.toLowerCase();
+  if (normalized === "readlocalfile" || normalized === "readlocalsourcefile") return "read";
+  if (normalized === "glob" || normalized === "grep" || normalized === "listlocalsources" || normalized === "statpath" || normalized === "validateworkspaceroot") return "search";
+  return null;
+}
+function getCliToolAggregateMeta(store, kind) {
+  const existing = store.get(kind);
+  if (existing) return existing;
+  const created = {
+    started: 0,
+    done: 0,
+    failed: 0,
+    pending: 0,
+    detailLines: []
+  };
+  store.set(kind, created);
+  return created;
+}
+function cliToolAggregateItemId(kind) {
+  return `tool-aggregate-${kind}`;
+}
+function cliToolAggregateWorkingText(kind) {
+  return kind === "read" ? "reading files" : "searching";
+}
+function renderCliToolAggregateText(kind, meta) {
+  const completed = meta.done + meta.failed;
+  const count = Math.max(completed, meta.started);
+  const noun = kind === "read" ? `file${count === 1 ? "" : "s"}` : `path${count === 1 ? "" : "s"}`;
+  const verb = kind === "read" ? "read" : "searched";
+  const status = meta.pending > 0 ? `${meta.pending} running` : "done";
+  const failed = meta.failed > 0 ? ` \xB7 ${meta.failed} failed` : "";
+  return `${verb} ${count} ${noun} \xB7 ${status}${failed} \xB7 ctrl-e`;
+}
+function appendCliToolAggregateDetail(meta, toolName, input, status, error) {
+  const label = humanizeCliToolName(toolName);
+  const target = describeCliToolAggregateInput(toolName, input);
+  const tail = error ? ` \xB7 ${error}` : "";
+  meta.detailLines.push({
+    tone: "meta",
+    text: `${label}${target ? ` \xB7 ${target}` : ""} \xB7 ${status}${tail}`
+  });
+  if (meta.detailLines.length > INK_DETAIL_LINE_LIMIT) {
+    meta.detailLines = meta.detailLines.slice(-INK_DETAIL_LINE_LIMIT);
+  }
+}
+function describeCliToolAggregateInput(toolName, input) {
+  const normalized = toolName.toLowerCase();
+  if (normalized === "glob") {
+    const pattern = stringValue8(input.pattern) ?? stringValue8(input.glob) ?? "*";
+    const base = stringValue8(input.path) ?? stringValue8(input.cwd) ?? ".";
+    return `${pattern} in ${shortFilePath(base)}`;
+  }
+  if (normalized === "grep") {
+    const pattern = stringValue8(input.pattern) ?? stringValue8(input.query) ?? "";
+    const base = stringValue8(input.path) ?? stringValue8(input.cwd) ?? ".";
+    return `${pattern || "pattern"} in ${shortFilePath(base)}`;
+  }
+  const filePath = stringValue8(input.path) ?? stringValue8(input.filePath) ?? stringValue8(input.localSourceId) ?? stringValue8(input.cwd);
+  return filePath ? shortFilePath(filePath) : null;
+}
 function describeChangeSummary(summary) {
   const kind = summary.changeKind ?? "changed";
   const added = summary.linesAdded ?? 0;
@@ -287652,7 +287873,7 @@ function writeCliTurnResult(result2, json, writer, options = {}) {
     color: options.color,
     streamLabels: true
   });
-  const contextLine = `${paint("context".padEnd(12), "muted", options.color === true)} ${renderCliContextMeter(result2.contextSnapshot)}
+  const contextLine = `${paint("context".padEnd(12), "muted", options.color === true)} ${renderCliContextMeter(result2.contextSnapshot, options.activeContextModel)}
 `;
   writer.stdout(`${rendered}${rendered.endsWith("\n") ? "" : "\n"}${contextLine}`);
 }
@@ -287798,7 +288019,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_NAME_ACCENTS;
+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 init_perch_cli = __esm({
   "scripts/perch-cli.ts"() {
     "use strict";
@@ -287808,6 +288029,7 @@ var init_perch_cli = __esm({
     init_cliAuthSession();
     init_cliStandaloneOAuth();
     init_contextMeterDisplay();
+    init_modelRegistry();
     init_threadSession();
     init_runRegistry();
     init_learningMemory();
@@ -287934,7 +288156,7 @@ Commands:
       ["/permission", "change autonomy for the next turns"],
       ["/login", "connect your Perch account"]
     ];
-    FLOCK_NAME_ACCENTS = [
+    FLOCK_NICKNAME_ACCENTS = [
       CLI_BRAND.patinaActive,
       CLI_BRAND.bronze,
       CLI_BRAND.bronzeGlint

package/package.json

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