@tutti-os/agent-gui 0.0.103 → 0.0.104

package/dist/{chunk-IVY4OL7B.js → chunk-HLVC4NNL.js}

@@ -16,7 +16,7 @@ import {
   isWorkspaceAgentSyntheticControlMessage,
   mentionItemToAttrs,
   parseAgentMentionMarkdown
-} from "./chunk-PCXBTG5X.js";
+} from "./chunk-NOXQOGT5.js";
 import {
   AgentGUIConversation_styles_default,
   AgentMessageMarkdown,
@@ -34,12 +34,12 @@ import {
   resolveWorkspaceFilePathCandidate,
   resolveWorkspaceLinkAction,
   useAgentTargetPresentations
-} from "./chunk-UHOVZI6B.js";
+} from "./chunk-TPV2SV6L.js";
 import {
   useOptionalAgentActivityRuntime,
   useOptionalAgentHostApi,
   workspaceAgentProviderLabel
-} from "./chunk-6PMLIVTI.js";
+} from "./chunk-OFSDOID4.js";
 import {
   fileChangeCountFromChanges,
   fileChangeEntriesFromChanges,
@@ -51,7 +51,7 @@ import {
 import {
   getActiveUiLanguage,
   translate
-} from "./chunk-IBFGOAY3.js";
+} from "./chunk-F5LFPORI.js";
 
 // shared/imageGenerationTool.ts
 var KNOWN_IMAGE_GENERATION_TOOL_NAMES = /* @__PURE__ */ new Set([
@@ -1500,511 +1500,6 @@ function normalizeStatusToken(value) {
   return (value ?? "").trim().toLowerCase().replace(/[\s-]+/g, "_");
 }
 
-// shared/agentConversation/projection/subAgentTimelinePartition.ts
-function timelineItemOwnerThreadId(item) {
-  return trimmedPayloadString(item.payload?.ownerThreadId);
-}
-function timelineItemOwnerCallId(item) {
-  return trimmedPayloadString(item.payload?.ownerCallId);
-}
-function trimmedPayloadString(value) {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-function partitionSubAgentTimelineItems(timelineItems) {
-  const subAgentItemsByOwner = /* @__PURE__ */ new Map();
-  let mainTimelineItems = null;
-  for (let index = 0; index < timelineItems.length; index += 1) {
-    const item = timelineItems[index];
-    if (!item) {
-      continue;
-    }
-    const ownerThreadId = timelineItemOwnerThreadId(item);
-    if (!ownerThreadId) {
-      mainTimelineItems?.push(item);
-      continue;
-    }
-    if (!mainTimelineItems) {
-      mainTimelineItems = timelineItems.slice(0, index);
-    }
-    const ownerItems = subAgentItemsByOwner.get(ownerThreadId) ?? [];
-    ownerItems.push(item);
-    subAgentItemsByOwner.set(ownerThreadId, ownerItems);
-  }
-  return {
-    mainTimelineItems: mainTimelineItems ?? timelineItems,
-    subAgentItemsByOwner
-  };
-}
-function buildSubAgentLanesByCallId(partition) {
-  const lanesByCallId = /* @__PURE__ */ new Map();
-  const cards = collectCollabCards(partition.mainTimelineItems);
-  if (cards.length === 0) {
-    return lanesByCallId;
-  }
-  const cardsByCallId = new Map(cards.map((card) => [card.callId, card]));
-  const lanedOwners = /* @__PURE__ */ new Set();
-  for (const [ownerThreadId, items] of partition.subAgentItemsByOwner) {
-    const sortedItems = [...items].sort(compareTimelineItemsAscending);
-    const ownerCallId = firstOwnerCallId(sortedItems);
-    if (!ownerCallId) {
-      continue;
-    }
-    const card = cardsByCallId.get(ownerCallId);
-    if (!card || isControlAgentToken(card.agentName)) {
-      continue;
-    }
-    lanedOwners.add(ownerThreadId);
-    const lanes = lanesByCallId.get(card.callId) ?? [];
-    lanes.push(subAgentLane(ownerThreadId, sortedItems, card));
-    lanesByCallId.set(card.callId, lanes);
-  }
-  for (const card of cards) {
-    if (!isSpawnAgentToken(card.agentName)) {
-      continue;
-    }
-    for (const receiverThreadId of card.receiverThreadIds) {
-      if (lanedOwners.has(receiverThreadId)) {
-        continue;
-      }
-      lanedOwners.add(receiverThreadId);
-      const lanes = lanesByCallId.get(card.callId) ?? [];
-      lanes.push(subAgentLane(receiverThreadId, [], card));
-      lanesByCallId.set(card.callId, lanes);
-    }
-    if (!lanesByCallId.has(card.callId)) {
-      lanesByCallId.set(card.callId, [
-        {
-          ...subAgentLane(`spawn-pending:${card.callId}`, [], card),
-          status: card.callStatus,
-          // No child thread exists yet: codex caps concurrent sub-agents
-          // (4/session by default) and queues further spawns.
-          queued: card.callStatus === "running"
-        }
-      ]);
-    }
-  }
-  for (const lanes of lanesByCallId.values()) {
-    lanes.sort(
-      (left, right) => (left.startedAtUnixMs ?? 0) - (right.startedAtUnixMs ?? 0) || left.ownerThreadId.localeCompare(right.ownerThreadId)
-    );
-    for (let index = 0; index < lanes.length; index += 1) {
-      const lane = lanes[index];
-      if (!lane) {
-        continue;
-      }
-      lanes[index] = {
-        ...lane,
-        laneIndex: index + 1,
-        laneCount: lanes.length
-      };
-    }
-  }
-  return lanesByCallId;
-}
-function attachSubAgentLanesToConversationVM(conversation, lanesByCallId) {
-  if (!conversation || lanesByCallId.size === 0) {
-    return conversation;
-  }
-  let changed = false;
-  const rows = conversation.rows.map((row) => {
-    if (row.kind !== "tool-group") {
-      return row;
-    }
-    const nextRow = toolGroupRowWithSubAgents(row, lanesByCallId);
-    if (nextRow !== row) {
-      changed = true;
-    }
-    return nextRow;
-  });
-  return changed ? { ...conversation, rows } : conversation;
-}
-function toolGroupRowWithSubAgents(row, lanesByCallId) {
-  let changed = false;
-  const callsById = /* @__PURE__ */ new Map();
-  const calls = row.calls.map((call) => {
-    const lanes = call.task ? lanesByCallId.get(toolCallRawId(call.id)) : null;
-    if (!lanes || lanes.length === 0 || !call.task) {
-      return call;
-    }
-    changed = true;
-    const nextCall = {
-      ...call,
-      task: { ...call.task, subAgents: lanes }
-    };
-    callsById.set(nextCall.id, nextCall);
-    return nextCall;
-  });
-  if (!changed) {
-    return row;
-  }
-  const entries = row.entries.map((entry) => {
-    if (entry.kind !== "tool-call") {
-      return entry;
-    }
-    const nextCall = callsById.get(entry.call.id);
-    return nextCall ? { ...entry, call: nextCall } : entry;
-  });
-  return { ...row, calls, entries };
-}
-function toolCallRawId(id) {
-  return id.startsWith("call:") ? id.slice("call:".length) : id;
-}
-var SUB_AGENT_ACTIVITY_LOG_CAP = 20;
-function subAgentLane(ownerThreadId, sortedItems, card) {
-  const activity = subAgentActivityLog(sortedItems);
-  const latest = activity.entries[activity.entries.length - 1] ?? null;
-  const terminal = latestTerminalMarker(sortedItems);
-  const lastItem = sortedItems[sortedItems.length - 1];
-  const status = terminal?.status ?? card.childStatuses.get(ownerThreadId) ?? "running";
-  const terminalAtUnixMs = terminal?.occurredAtUnixMs ?? null;
-  return {
-    ownerThreadId,
-    status,
-    // Identity precedence: the child thread's own name (subAgentName marker,
-    // rare in practice) > a short name derived from the task's opening
-    // self-address ("你是 X。…" / "You are X. …") > the view's localized
-    // numbered fallback. Never the collab tool name.
-    name: latestNameMarker(sortedItems) ?? deriveSubAgentNameFromTask(card.task),
-    task: card.task,
-    laneIndex: 1,
-    laneCount: 1,
-    latestActivity: latest?.text ?? null,
-    latestActivityKind: latest?.kind ?? null,
-    activityLog: activity.entries,
-    activityOmittedCount: activity.omittedCount,
-    failureDetail: terminal?.detail ?? null,
-    startedAtUnixMs: timelineItemTime(sortedItems[0]) || card.startedAtUnixMs || null,
-    latestActivityAtUnixMs: terminalAtUnixMs ?? (lastItem ? timelineItemTime(lastItem) : card.startedAtUnixMs) ?? null,
-    terminalAtUnixMs
-  };
-}
-var SUB_AGENT_DERIVED_NAME_MAX = 36;
-function deriveSubAgentNameFromTask(task) {
-  if (!task) {
-    return null;
-  }
-  const firstSentence = task.trim().split(/[。．.!?！？，,\n]/, 1)[0]?.trim();
-  if (!firstSentence) {
-    return null;
-  }
-  const selfAddress = /^(你现在是|你現在是|你是|you are|act as)\s*/i;
-  if (!selfAddress.test(firstSentence)) {
-    return null;
-  }
-  const stripped = firstSentence.replace(selfAddress, "").replace(/\s+/g, " ").trim();
-  if (stripped.length < 2 || stripped.length > SUB_AGENT_DERIVED_NAME_MAX) {
-    return null;
-  }
-  if (/^(spawnagent|agent)$/i.test(stripped)) {
-    return null;
-  }
-  return stripped;
-}
-function isSpawnAgentToken(agentName) {
-  const token = normalizeToolToken4(agentName);
-  return token === "spawnagent" || token === "spawn";
-}
-function latestNameMarker(sortedItems) {
-  for (let index = sortedItems.length - 1; index >= 0; index -= 1) {
-    const payload = sortedItems[index]?.payload;
-    if (payload?.messageKind !== "subAgentName") {
-      continue;
-    }
-    const name = stringValue2(payload.subAgentName);
-    if (name) {
-      return name;
-    }
-  }
-  return null;
-}
-function isSubAgentMarkerItem(item) {
-  const kind = item.payload?.messageKind;
-  return kind === "subAgentLifecycle" || kind === "subAgentName";
-}
-function subAgentActivityLog(sortedItems) {
-  const all = [];
-  for (const item of sortedItems) {
-    if (!item || isSubAgentMarkerItem(item)) {
-      continue;
-    }
-    const entry = displayableActivityEntry(item);
-    if (entry) {
-      all.push(entry);
-    }
-  }
-  const omittedCount = Math.max(0, all.length - SUB_AGENT_ACTIVITY_LOG_CAP);
-  return { entries: all.slice(omittedCount), omittedCount };
-}
-function displayableActivityEntry(item) {
-  const atUnixMs = timelineItemTime(item) || null;
-  if (isWorkspaceAgentToolCallItem(item)) {
-    const name = firstString2(item.name, stringValue2(item.payload?.name)) ?? null;
-    return name ? { kind: "tool", text: name, atUnixMs } : null;
-  }
-  const text = snippet(timelineItemText(item));
-  if (!text) {
-    return null;
-  }
-  const itemType = item.itemType?.trim().toLowerCase() ?? "";
-  const role = item.role?.trim().toLowerCase() ?? "";
-  if (itemType === "message.assistant_thinking" || role === "assistant_thinking") {
-    return { kind: "reasoning", text, atUnixMs };
-  }
-  return { kind: "message", text, atUnixMs };
-}
-function latestTerminalMarker(sortedItems) {
-  for (let index = sortedItems.length - 1; index >= 0; index -= 1) {
-    const item = sortedItems[index];
-    const payload = item?.payload;
-    if (!payload || payload.messageKind !== "subAgentLifecycle") {
-      continue;
-    }
-    return {
-      status: subAgentStatusFromLifecycle(payload.subAgentLifecycleStatus),
-      detail: stringValue2(payload.detail) ?? null,
-      occurredAtUnixMs: timelineItemTime(item) || null
-    };
-  }
-  return null;
-}
-var SUB_AGENT_ACTIVITY_SNIPPET_LENGTH = 140;
-function snippet(text) {
-  if (text.length <= SUB_AGENT_ACTIVITY_SNIPPET_LENGTH) {
-    return text;
-  }
-  return `\u2026${text.slice(-SUB_AGENT_ACTIVITY_SNIPPET_LENGTH)}`;
-}
-function timelineItemText(item) {
-  const text = stringValue2(item.payload?.text) ?? stringValue2(item.payload?.content) ?? stringValue2(item.content) ?? "";
-  return text.replace(/\s+/g, " ").trim();
-}
-var COLLAB_CARD_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "task",
-  "subagent",
-  "delegatetask",
-  "delegateagent",
-  "agent"
-]);
-function collectCollabCards(mainTimelineItems) {
-  const cardsByCallId = /* @__PURE__ */ new Map();
-  for (const item of mainTimelineItems) {
-    if (!isWorkspaceAgentToolCallItem(item) || !isCollabCardItem(item)) {
-      continue;
-    }
-    const callId = firstString2(item.callId, stringValue2(item.payload?.callId));
-    if (!callId) {
-      continue;
-    }
-    const time = timelineItemTime(item);
-    const input = recordValue4(item.payload?.input);
-    const output = recordValue4(item.payload?.output);
-    const existing = cardsByCallId.get(callId);
-    if (!existing) {
-      cardsByCallId.set(callId, {
-        callId,
-        startedAtUnixMs: time,
-        latestAtUnixMs: time,
-        latestCallStatus: firstString2(
-          item.status,
-          stringValue2(item.payload?.status)
-        ),
-        receiverThreadIds: collectReceiverThreadIds(input),
-        childStatuses: collectChildStatuses(output)
-      });
-      continue;
-    }
-    existing.startedAtUnixMs = Math.min(existing.startedAtUnixMs, time);
-    if (time >= existing.latestAtUnixMs) {
-      existing.latestAtUnixMs = time;
-      existing.latestCallStatus = firstString2(item.status, stringValue2(item.payload?.status)) ?? existing.latestCallStatus;
-    }
-    for (const value of collectReceiverThreadIds(input)) {
-      existing.receiverThreadIds.add(value);
-    }
-    for (const [threadId, childStatus] of collectChildStatuses(output)) {
-      existing.childStatuses.set(threadId, childStatus);
-    }
-  }
-  return [...cardsByCallId.values()].map((card) => {
-    const input = recordValue4(
-      partitionCardInput(mainTimelineItems, card.callId)?.payload?.input
-    );
-    return {
-      callId: card.callId,
-      startedAtUnixMs: card.startedAtUnixMs,
-      task: stringValue2(input?.task),
-      agentName: stringValue2(input?.agentName),
-      callStatus: subAgentStatusFromCallStatus(card.latestCallStatus),
-      receiverThreadIds: card.receiverThreadIds,
-      childStatuses: card.childStatuses
-    };
-  }).sort((left, right) => left.startedAtUnixMs - right.startedAtUnixMs);
-}
-function partitionCardInput(mainTimelineItems, callId) {
-  for (const item of mainTimelineItems) {
-    if (!isWorkspaceAgentToolCallItem(item) || !isCollabCardItem(item)) {
-      continue;
-    }
-    if (firstString2(item.callId, stringValue2(item.payload?.callId)) === callId) {
-      return item;
-    }
-  }
-  return null;
-}
-function isCollabCardItem(item) {
-  const toolName = normalizeToolToken4(resolveWorkspaceAgentToolName(item));
-  return COLLAB_CARD_TOOL_NAMES.has(toolName);
-}
-function firstOwnerCallId(sortedItems) {
-  for (const item of sortedItems) {
-    const ownerCallId = timelineItemOwnerCallId(item);
-    if (ownerCallId) {
-      return ownerCallId;
-    }
-  }
-  return null;
-}
-function isControlAgentToken(agentName) {
-  switch (normalizeToolToken4(agentName)) {
-    case "wait":
-    case "waitagent":
-    case "close":
-    case "closeagent":
-      return true;
-    default:
-      return false;
-  }
-}
-function subAgentStatusFromCallStatus(status) {
-  switch ((status ?? "").trim().toLowerCase()) {
-    case "completed":
-    case "done":
-    case "success":
-    case "succeeded":
-      return "completed";
-    case "failed":
-    case "error":
-    case "errored":
-      return "failed";
-    case "canceled":
-    case "cancelled":
-      return "canceled";
-    default:
-      return "running";
-  }
-}
-function subAgentStatusFromLifecycle(status) {
-  switch (typeof status === "string" ? status.trim().toLowerCase() : "") {
-    case "completed":
-    case "done":
-    case "success":
-    case "succeeded":
-      return "completed";
-    case "failed":
-    case "error":
-    case "errored":
-      return "failed";
-    case "canceled":
-    case "cancelled":
-    case "interrupted":
-    case "stopped":
-      return "canceled";
-    default:
-      return "running";
-  }
-}
-function collectReceiverThreadIds(input) {
-  const out = /* @__PURE__ */ new Set();
-  if (input == null || typeof input !== "object" || Array.isArray(input)) {
-    return out;
-  }
-  const raw = input.receiverThreadIds;
-  if (!Array.isArray(raw)) {
-    return out;
-  }
-  for (const entry of raw) {
-    const id = stringValue2(entry);
-    if (id) {
-      out.add(id);
-    }
-  }
-  return out;
-}
-function collectChildStatuses(value) {
-  const out = /* @__PURE__ */ new Map();
-  collectChildStatusesInto(value, out, 0);
-  return out;
-}
-function collectChildStatusesInto(value, out, depth) {
-  if (depth > 6 || value == null) {
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const entry of value) {
-      collectChildStatusesInto(entry, out, depth + 1);
-    }
-    return;
-  }
-  if (typeof value !== "object") {
-    return;
-  }
-  const record = value;
-  const status = subAgentStatusFromLifecycle(record.status ?? record.state);
-  const id = firstString2(
-    stringValue2(record.threadId),
-    stringValue2(record.threadID),
-    stringValue2(record.agentId),
-    stringValue2(record.agent_id),
-    stringValue2(record.id)
-  );
-  if (id && status !== "running") {
-    out.set(id, status);
-  }
-  for (const [key, entry] of Object.entries(record)) {
-    if (key === "agentsStates" || key === "statuses") {
-      collectChildStatusesInto(entry, out, depth + 1);
-      continue;
-    }
-    if (typeof entry === "object" && entry != null) {
-      const nestedStatus = subAgentStatusFromLifecycle(
-        entry.status ?? entry.state
-      );
-      if (nestedStatus !== "running" && key.trim()) {
-        out.set(key, nestedStatus);
-      }
-    }
-    collectChildStatusesInto(entry, out, depth + 1);
-  }
-}
-function timelineItemTime(item) {
-  return item?.occurredAtUnixMs ?? item?.createdAtUnixMs ?? 0;
-}
-function compareTimelineItemsAscending(left, right) {
-  return timelineItemTime(left) - timelineItemTime(right) || (left.seq ?? 0) - (right.seq ?? 0) || left.id - right.id;
-}
-function normalizeToolToken4(value) {
-  return (value ?? "").replace(/[\s_-]+/g, "").trim().toLowerCase();
-}
-function stringValue2(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : null;
-}
-function recordValue4(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
-}
-function firstString2(...values) {
-  for (const value of values) {
-    const resolved = stringValue2(value);
-    if (resolved) {
-      return resolved;
-    }
-  }
-  return null;
-}
-
 // shared/workspaceAgentTimelineProjectionHelpers.ts
 function delegatedToolStepFromCall(call) {
   const payload = normalizedPayload(call.payload ?? void 0);
@@ -2108,7 +1603,7 @@ function mergeSourceTimelineItems(previous, next) {
   if (merged.length === 0) return void 0;
   const byKey = /* @__PURE__ */ new Map();
   for (const item of merged) byKey.set(sourceTimelineItemKey(item), item);
-  return [...byKey.values()].sort(compareTimelineItemsAscending2);
+  return [...byKey.values()].sort(compareTimelineItemsAscending);
 }
 function normalizedPayload(payload) {
   return payload && typeof payload === "object" ? payload : null;
@@ -2189,7 +1684,7 @@ function sourceTimelineItemKey(item) {
   const seq = item.seq ?? 0;
   return seq > 0 ? `seq:${seq}` : `local:${item.itemType}:${item.occurredAtUnixMs ?? 0}`;
 }
-function compareTimelineItemsAscending2(left, right) {
+function compareTimelineItemsAscending(left, right) {
   return (left.seq ?? 0) - (right.seq ?? 0) || (left.occurredAtUnixMs ?? left.createdAtUnixMs ?? 0) - (right.occurredAtUnixMs ?? right.createdAtUnixMs ?? 0) || left.id - right.id;
 }
 function booleanRecordValue(record, key) {
@@ -2229,13 +1724,10 @@ function buildCanonicalWorkspaceAgentDetailView({
   const seenThinkingMessages = /* @__PURE__ */ new Set();
   let activeSequenceTurnId = null;
   const sortedTimelineItems = [...timelineItems].sort(
-    compareTimelineItemsAscending3
+    compareTimelineItemsAscending2
   );
   const suppressedToolCallIds = suppressedUnavailableAskUserQuestionCallIds(sortedTimelineItems);
   for (const item of sortedTimelineItems) {
-    if (timelineItemOwnerThreadId(item)) {
-      continue;
-    }
     const role = messageRole(item);
     const body = messageBody(item);
     const explicitTurnId = item.turnId?.trim();
@@ -2386,7 +1878,7 @@ function getTurn(turns, id) {
   turns.set(id, turn);
   return turn;
 }
-function compareTimelineItemsAscending3(left, right) {
+function compareTimelineItemsAscending2(left, right) {
   const leftSeq = left.seq ?? 0;
   const rightSeq = right.seq ?? 0;
   if (leftSeq > 0 && rightSeq > 0 && leftSeq !== rightSeq) {
@@ -3061,13 +2553,13 @@ function normalizeToolName3(value) {
 }
 function hasMcpMetadata(metadata) {
   return Boolean(
-    stringValue3(metadata?.server) ?? stringValue3(metadata?.serverName) ?? stringValue3(metadata?.mcpServer)
+    stringValue2(metadata?.server) ?? stringValue2(metadata?.serverName) ?? stringValue2(metadata?.mcpServer)
   );
 }
 function normalizeCallType(value) {
   return (value ?? "").trim().toLowerCase();
 }
-function stringValue3(value) {
+function stringValue2(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 
@@ -3078,7 +2570,7 @@ function projectAgentApprovalItem(call, input, output) {
   if (callType !== "approval" && toolName !== "approval") {
     return null;
   }
-  const requestId = stringValue4(input?.requestId) ?? stringValue4(call.payload?.requestId) ?? stringValue4(output?.requestId);
+  const requestId = stringValue3(input?.requestId) ?? stringValue3(call.payload?.requestId) ?? stringValue3(output?.requestId);
   if (!requestId) {
     return null;
   }
@@ -3102,7 +2594,7 @@ function projectAgentApprovalItem(call, input, output) {
     callId: call.id.replace(/^call:/, ""),
     title: mcpTarget?.displayName ?? (call.summary.trim() || call.name),
     toolName: call.toolName,
-    status: stringValue4(call.payload?.status) ?? call.status,
+    status: stringValue3(call.payload?.status) ?? call.status,
     input,
     options,
     output,
@@ -3112,17 +2604,17 @@ function projectAgentApprovalItem(call, input, output) {
 function normalizeApprovalOptions(values) {
   return values.flatMap((value) => {
     const option = objectValue(value);
-    const id = stringValue4(option?.optionId) ?? stringValue4(option?.id);
+    const id = stringValue3(option?.optionId) ?? stringValue3(option?.id);
     if (!id) {
       return [];
     }
-    const label = stringValue4(option?.name) ?? stringValue4(option?.label) ?? stringValue4(option?.title) ?? stringValue4(option?.kind) ?? id;
+    const label = stringValue3(option?.name) ?? stringValue3(option?.label) ?? stringValue3(option?.title) ?? stringValue3(option?.kind) ?? id;
     return [
       {
         id,
         label,
-        kind: stringValue4(option?.kind) ?? "",
-        ...stringValue4(option?.description) ? { description: stringValue4(option?.description) } : {}
+        kind: stringValue3(option?.kind) ?? "",
+        ...stringValue3(option?.description) ? { description: stringValue3(option?.description) } : {}
       }
     ];
   });
@@ -3130,7 +2622,7 @@ function normalizeApprovalOptions(values) {
 function normalizeToken(value) {
   return (value ?? "").trim().toLowerCase();
 }
-function stringValue4(value) {
+function stringValue3(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function objectValue(value) {
@@ -3154,7 +2646,7 @@ function projectAgentAskUserQuestionItem(call, input, output) {
     kind: "ask-user",
     id: call.id,
     turnId: call.turnId ?? "turn:unknown",
-    requestId: stringValue5(input?.requestId) ?? stringValue5(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
+    requestId: stringValue4(input?.requestId) ?? stringValue4(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
     title: call.name,
     status: call.status,
     questions: questions.map((question) => ({
@@ -3170,12 +2662,12 @@ function projectAgentPlanModeItem(call, input) {
       itemKind: "plan-mode",
       id: call.id,
       turnId: call.turnId ?? "turn:unknown",
-      requestId: stringValue5(input?.requestId) ?? stringValue5(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
+      requestId: stringValue4(input?.requestId) ?? stringValue4(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
       kind: "exit",
-      title: stringValue5(objectValue2(input?.toolCall)?.title) ?? call.name,
+      title: stringValue4(objectValue2(input?.toolCall)?.title) ?? call.name,
       status: call.status,
-      plan: stringValue5(input?.plan) ?? stringValue5(call.payload?.plan) ?? (call.summary.trim() || null),
-      filePath: stringValue5(input?.filePath) ?? stringValue5(call.payload?.filePath),
+      plan: stringValue4(input?.plan) ?? stringValue4(call.payload?.plan) ?? (call.summary.trim() || null),
+      filePath: stringValue4(input?.filePath) ?? stringValue4(call.payload?.filePath),
       options: extractExitPlanModeOptions(input),
       ...keepPlanningOption(extractExitPlanKeepPlanningOptionId(input)),
       occurredAtUnixMs: call.occurredAtUnixMs ?? null
@@ -3190,8 +2682,8 @@ function projectAgentPlanModeItem(call, input) {
       kind: "enter",
       title: call.name,
       status: call.status,
-      plan: stringValue5(input?.content) ?? (call.summary.trim() || null),
-      filePath: stringValue5(input?.filePath),
+      plan: stringValue4(input?.content) ?? (call.summary.trim() || null),
+      filePath: stringValue4(input?.filePath),
       occurredAtUnixMs: call.occurredAtUnixMs ?? null
     };
   }
@@ -3202,12 +2694,12 @@ function projectAgentPlanModeItem(call, input) {
     itemKind: "plan-mode",
     id: call.id,
     turnId: call.turnId ?? "turn:unknown",
-    requestId: stringValue5(input?.requestId) ?? stringValue5(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
+    requestId: stringValue4(input?.requestId) ?? stringValue4(call.payload?.requestId) ?? call.id.replace(/^call:/, ""),
     kind: "exit",
     title: call.name,
     status: call.status,
-    plan: stringValue5(input?.plan) ?? stringValue5(call.payload?.plan) ?? (call.summary.trim() || null),
-    filePath: stringValue5(input?.filePath) ?? stringValue5(call.payload?.filePath),
+    plan: stringValue4(input?.plan) ?? stringValue4(call.payload?.plan) ?? (call.summary.trim() || null),
+    filePath: stringValue4(input?.filePath) ?? stringValue4(call.payload?.filePath),
     occurredAtUnixMs: call.occurredAtUnixMs ?? null
   };
 }
@@ -3234,7 +2726,7 @@ function keepPlanningOption(optionId) {
 function normalizeToolName4(value) {
   return (value ?? "").replace(/[_\s-]+/g, "").trim().toLowerCase();
 }
-function stringValue5(value) {
+function stringValue4(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function objectValue2(value) {
@@ -3262,9 +2754,9 @@ function projectAgentTaskItem(call, input, output, metadata) {
     id: call.id,
     turnId: call.turnId ?? "turn:unknown",
     title: call.summary.trim() || call.name,
-    status: stringValue6(metadata?.taskStatus) ?? stringValue6(metadata?.subagentStatus) ?? call.status,
-    prompt: stringValue6(input?.prompt) ?? stringValue6(input?.description) ?? stringValue6(call.payload?.description) ?? stringValue6(claudeToolResponse?.prompt),
-    delegateSessionId: stringValue6(metadata?.childSessionID) ?? stringValue6(metadata?.child_session_id) ?? stringValue6(metadata?.subagentSessionID) ?? stringValue6(metadata?.subagent_session_id) ?? stringValue6(metadata?.subagentAgentId) ?? stringValue6(metadata?.agentId) ?? stringValue6(claudeToolResponse?.agentId),
+    status: stringValue5(metadata?.taskStatus) ?? stringValue5(metadata?.subagentStatus) ?? call.status,
+    prompt: stringValue5(input?.prompt) ?? stringValue5(input?.description) ?? stringValue5(call.payload?.description) ?? stringValue5(claudeToolResponse?.prompt),
+    delegateSessionId: stringValue5(metadata?.childSessionID) ?? stringValue5(metadata?.child_session_id) ?? stringValue5(metadata?.subagentSessionID) ?? stringValue5(metadata?.subagent_session_id) ?? stringValue5(metadata?.subagentAgentId) ?? stringValue5(metadata?.agentId) ?? stringValue5(claudeToolResponse?.agentId),
     steps,
     result: firstNonEmptyText(output),
     resultMarkdown: firstNonEmptyText(output),
@@ -3278,8 +2770,8 @@ function normalizeTaskSteps(values, turnId) {
     if (!step) {
       return [];
     }
-    const toolName = stringValue6(step.toolName) ?? stringValue6(step.tool_name) ?? stringValue6(step.name);
-    const callType = stringValue6(step.callType) ?? stringValue6(step.call_type);
+    const toolName = stringValue5(step.toolName) ?? stringValue5(step.tool_name) ?? stringValue5(step.name);
+    const callType = stringValue5(step.callType) ?? stringValue5(step.call_type);
     if (isApprovalToolCall({ toolName, callType })) {
       return [];
     }
@@ -3292,11 +2784,11 @@ function normalizeTaskSteps(values, turnId) {
     const locations = arrayValue3(step.locations);
     return [
       {
-        id: stringValue6(step.toolUseId) ?? stringValue6(step.id) ?? `step-${index + 1}`,
+        id: stringValue5(step.toolUseId) ?? stringValue5(step.id) ?? `step-${index + 1}`,
         turnId,
         name: toolName ? humanizeToolLabel(toolName) : `Step ${index + 1}`,
         toolName: toolName ?? null,
-        status: stringValue6(step.status) ?? stringValue6(objectValue3(step.toolResult)?.status) ?? stringValue6(objectValue3(step.tool_result)?.status),
+        status: stringValue5(step.status) ?? stringValue5(objectValue3(step.toolResult)?.status) ?? stringValue5(objectValue3(step.tool_result)?.status),
         summary: firstNonEmptyText(outputPayload, inputPayload) ?? "",
         payload: {
           input: inputPayload,
@@ -3304,12 +2796,12 @@ function normalizeTaskSteps(values, turnId) {
           error: errorPayload
         },
         tool: projectAgentTaskStepTool({
-          id: stringValue6(step.toolUseId) ?? stringValue6(step.id) ?? `step-${index + 1}`,
+          id: stringValue5(step.toolUseId) ?? stringValue5(step.id) ?? `step-${index + 1}`,
           turnId,
           toolName,
-          name: stringValue6(step.name),
+          name: stringValue5(step.name),
           callType,
-          status: stringValue6(step.status) ?? stringValue6(outputPayload?.status),
+          status: stringValue5(step.status) ?? stringValue5(outputPayload?.status),
           summary: firstNonEmptyText(outputPayload, inputPayload) ?? "",
           payload,
           metadata,
@@ -3391,7 +2883,7 @@ function projectAgentTaskStepTool(step) {
 function humanizeToolLabel(value) {
   return value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").replace(/\s+/g, " ").trim().replace(/^\w/, (match) => match.toUpperCase());
 }
-function stringValue6(value) {
+function stringValue5(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function numberValue(value) {
@@ -4095,7 +3587,7 @@ function userPromptContentBlocks(message, fallbackWorkspaceId) {
   );
   const content = Array.isArray(item?.payload?.content) ? item.payload.content : null;
   if (!content) return [];
-  const displayPrompt = firstString3(
+  const displayPrompt = firstString2(
     message.sourceTimelineItems?.map(
       (candidate) => typeof candidate.payload?.displayPrompt === "string" ? candidate.payload.displayPrompt : ""
     ) ?? []
@@ -4128,7 +3620,7 @@ function userPromptContentBlocks(message, fallbackWorkspaceId) {
 function optionalString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
-function firstString3(values) {
+function firstString2(values) {
   for (const value of values) {
     const trimmed = value.trim();
     if (trimmed) return trimmed;
@@ -4505,11 +3997,11 @@ function collectContentDiffFiles(messageId, toolName, occurredAtUnixMs, contentI
     if (!item) {
       return [];
     }
-    const type = stringValue7(item.type);
+    const type = stringValue6(item.type);
     if (type && type !== "diff") {
       return [];
     }
-    const path = normalizedFilePath(stringValue7(item.path), options);
+    const path = normalizedFilePath(stringValue6(item.path), options);
     if (!path) {
       return [];
     }
@@ -4518,10 +4010,10 @@ function collectContentDiffFiles(messageId, toolName, occurredAtUnixMs, contentI
       relatedChange ? fileChangeTypeValue(relatedChange) : null
     );
     const unifiedDiff = firstNonEmptyString(
-      stringValue7(item.diff),
-      stringValue7(item.patch),
-      stringValue7(relatedChange?.unified_diff),
-      stringValue7(relatedChange?.unifiedDiff)
+      stringValue6(item.diff),
+      stringValue6(item.patch),
+      stringValue6(relatedChange?.unified_diff),
+      stringValue6(relatedChange?.unifiedDiff)
     );
     let oldString = firstPresentString6(
       literalStringValue(item.oldText),
@@ -4808,9 +4300,9 @@ function nestedTaskStepsFromPayload(payload, output) {
 }
 function nestedTaskStepStatusKind(step, fallback) {
   return firstNonEmptyString(
-    stringValue7(step.statusKind),
-    stringValue7(step.status),
-    stringValue7(step.toolStatus)
+    stringValue6(step.statusKind),
+    stringValue6(step.status),
+    stringValue6(step.toolStatus)
   ) ?? fallback ?? null;
 }
 function firstLocationPath(value) {
@@ -4819,7 +4311,7 @@ function firstLocationPath(value) {
   }
   for (const item of value) {
     const record = objectValue5(item);
-    const path = stringValue7(record?.path);
+    const path = stringValue6(record?.path);
     if (path) {
       return path;
     }
@@ -4831,14 +4323,14 @@ function firstPathValue(value) {
     return null;
   }
   for (const item of value) {
-    const path = stringValue7(item);
+    const path = stringValue6(item);
     if (path) {
       return path;
     }
   }
   return null;
 }
-function stringValue7(value) {
+function stringValue6(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function literalStringValue(value) {
@@ -4993,8 +4485,8 @@ function filesFromCall(call, options) {
       return [];
     }
     return extractFileChanges({
-      id: stringValue7(step.toolUseId) ?? stringValue7(step.id) ?? `${call.id}:step:${index + 1}`,
-      toolName: stringValue7(step.toolName) ?? stringValue7(step.tool_name) ?? stringValue7(step.name) ?? null,
+      id: stringValue6(step.toolUseId) ?? stringValue6(step.id) ?? `${call.id}:step:${index + 1}`,
+      toolName: stringValue6(step.toolName) ?? stringValue6(step.tool_name) ?? stringValue6(step.name) ?? null,
       statusKind: nestedTaskStepStatusKind(step, call.statusKind ?? null),
       occurredAtUnixMs: numberValue2(step.occurredAtUnixMs) ?? numberValue2(step.occurred_at_unix_ms) ?? call.occurredAtUnixMs ?? null,
       payload: objectValue5(step.payload),
@@ -5031,7 +4523,7 @@ function patchBatchesFromCall(call, options) {
       return [];
     }
     return patchBatchFromPayload({
-      id: stringValue7(step.toolUseId) ?? stringValue7(step.id) ?? `${call.id}:step:${index + 1}`,
+      id: stringValue6(step.toolUseId) ?? stringValue6(step.id) ?? `${call.id}:step:${index + 1}`,
       payload: objectValue5(step.payload),
       toolInput: objectValue5(step.toolInput) ?? objectValue5(step.tool_input),
       toolOutput: objectValue5(step.toolResult) ?? objectValue5(step.tool_result),
@@ -5060,11 +4552,11 @@ function patchBatchFromPayload(input) {
   return [
     {
       cwd: firstNonEmptyString(
-        stringValue7(input.payload?.cwd),
-        stringValue7(payloadInput?.cwd),
-        stringValue7(rawInput?.cwd),
-        stringValue7(payloadOutput?.cwd),
-        stringValue7(metadata?.cwd),
+        stringValue6(input.payload?.cwd),
+        stringValue6(payloadInput?.cwd),
+        stringValue6(rawInput?.cwd),
+        stringValue6(payloadOutput?.cwd),
+        stringValue6(metadata?.cwd),
         input.options.defaultCwd ?? null
       ) ?? null,
       toolCallId: input.id,
@@ -5081,10 +4573,10 @@ function patchChangesFromChangeMap(changes) {
     }
     const normalizedType = normalizeChangeType(fileChangeTypeValue(change));
     const unifiedDiff = firstNonEmptyString(
-      stringValue7(change.unified_diff),
-      stringValue7(change.unifiedDiff),
-      stringValue7(change.diff),
-      stringValue7(change.patch)
+      stringValue6(change.unified_diff),
+      stringValue6(change.unifiedDiff),
+      stringValue6(change.diff),
+      stringValue6(change.patch)
     ) ?? null;
     let oldString = firstPresentString6(
       literalStringValue(change.old_string),
@@ -5160,10 +4652,10 @@ function extractFileChanges(input) {
     input.occurredAtUnixMs,
     arrayValue5(objectValue5(payload?.fileChanges)?.files),
     firstNonEmptyString(
-      stringValue7(input.input?.patch),
-      stringValue7(input.output?.patch),
-      stringValue7(payload?.patch),
-      stringValue7(metadata?.patch)
+      stringValue6(input.input?.patch),
+      stringValue6(input.output?.patch),
+      stringValue6(payload?.patch),
+      stringValue6(metadata?.patch)
     ),
     firstPresentString6(
       literalStringValue(input.output?.oldString),
@@ -5207,24 +4699,24 @@ function extractFileChanges(input) {
   if (filesFromContentDiff.length > 0) {
     return filesFromContentDiff;
   }
-  const summaryFallbackPath = input.input?.summaryPathFallback === true ? stringValue7(input.input?.path) : null;
-  const explicitInputPath = summaryFallbackPath ? null : stringValue7(input.input?.path);
+  const summaryFallbackPath = input.input?.summaryPathFallback === true ? stringValue6(input.input?.path) : null;
+  const explicitInputPath = summaryFallbackPath ? null : stringValue6(input.input?.path);
   const filePath = firstNonEmptyString(
     firstPathValue(payloadPaths),
-    stringValue7(input.input?.file_path),
-    stringValue7(input.input?.filePath),
+    stringValue6(input.input?.file_path),
+    stringValue6(input.input?.filePath),
     explicitInputPath,
-    stringValue7(input.input?.notebook_path),
-    stringValue7(input.output?.file_path),
-    stringValue7(input.output?.filePath),
-    stringValue7(input.output?.path),
-    stringValue7(input.output?.notebook_path),
+    stringValue6(input.input?.notebook_path),
+    stringValue6(input.output?.file_path),
+    stringValue6(input.output?.filePath),
+    stringValue6(input.output?.path),
+    stringValue6(input.output?.notebook_path),
     firstLocationPath(inputLocations),
     firstLocationPath(payloadLocations)
   ) ?? extractAgentPatchPath(
     firstNonEmptyString(
-      stringValue7(input.input?.patch),
-      stringValue7(input.output?.patch)
+      stringValue6(input.input?.patch),
+      stringValue6(input.output?.patch)
     )
   ) ?? summaryFallbackPath;
   const normalizedFilePathValue = normalizedFilePath(filePath, input.options);
@@ -5232,11 +4724,11 @@ function extractFileChanges(input) {
     return [];
   }
   const patch = firstNonEmptyString(
-    stringValue7(input.input?.patch),
-    stringValue7(input.output?.patch),
-    stringValue7(payload?.patch),
-    stringValue7(metadata?.patch),
-    stringValue7(input.output?.content)
+    stringValue6(input.input?.patch),
+    stringValue6(input.output?.patch),
+    stringValue6(payload?.patch),
+    stringValue6(metadata?.patch),
+    stringValue6(input.output?.content)
   ) ?? null;
   const oldString = firstPresentString6(
     literalStringValue(input.output?.oldString),
@@ -5259,10 +4751,10 @@ function extractFileChanges(input) {
   );
   const explicitChangeType = normalizeChangeType(
     firstNonEmptyString(
-      stringValue7(payload?.fileChangeKind),
-      stringValue7(metadata?.fileChangeKind),
-      stringValue7(input.input?.fileChangeKind),
-      stringValue7(input.output?.fileChangeKind)
+      stringValue6(payload?.fileChangeKind),
+      stringValue6(metadata?.fileChangeKind),
+      stringValue6(input.input?.fileChangeKind),
+      stringValue6(input.output?.fileChangeKind)
     )
   ) ?? null;
   const changeType = explicitChangeType ?? (normalizedToolName === "write" || normalizedToolName === "writefile" ? "created" : normalizedToolName === "notebookedit" ? "created" : inferAgentPatchChangeType(patch));
@@ -5302,16 +4794,16 @@ function isStructuredWriteTool(normalizedToolName, payload, metadata) {
     return false;
   }
   const activityKind = firstNonEmptyString(
-    stringValue7(payload?.activityKind),
-    stringValue7(metadata?.activityKind)
+    stringValue6(payload?.activityKind),
+    stringValue6(metadata?.activityKind)
   );
   if (activityKind === "write_file" || activityKind === "edit_file" || activityKind === "delete_file") {
     return true;
   }
   return normalizeChangeType(
     firstNonEmptyString(
-      stringValue7(payload?.fileChangeKind),
-      stringValue7(metadata?.fileChangeKind)
+      stringValue6(payload?.fileChangeKind),
+      stringValue6(metadata?.fileChangeKind)
     )
   ) !== null;
 }
@@ -5321,15 +4813,15 @@ function collectMetadataFiles(messageId, toolName, occurredAtUnixMs, files, patc
   }
   return files.flatMap((value, index) => {
     const file = objectValue5(value);
-    const path = normalizedFilePath(stringValue7(file?.path), options);
+    const path = normalizedFilePath(stringValue6(file?.path), options);
     if (!path) {
       return [];
     }
     const fileUnifiedDiff = firstNonEmptyString(
-      stringValue7(file?.diff),
-      stringValue7(file?.patch),
-      stringValue7(file?.unifiedDiff),
-      stringValue7(file?.unified_diff)
+      stringValue6(file?.diff),
+      stringValue6(file?.patch),
+      stringValue6(file?.unifiedDiff),
+      stringValue6(file?.unified_diff)
     ) ?? patch;
     const fileOldString = firstPresentString6(
       literalStringValue(file?.oldString),
@@ -5340,7 +4832,7 @@ function collectMetadataFiles(messageId, toolName, occurredAtUnixMs, files, patc
       literalStringValue(file?.new_string)
     ) ?? newString;
     const fileContent = firstPresentString6(literalStringValue(file?.content)) ?? content;
-    const change = normalizeChangeType(stringValue7(file?.change));
+    const change = normalizeChangeType(stringValue6(file?.change));
     return [
       buildFileChange({
         id: `${messageId}:${index + 1}`,
@@ -5365,10 +4857,10 @@ function collectChangeMapFiles(messageId, toolName, occurredAtUnixMs, changes, o
     }
     const normalizedType = normalizeChangeType(fileChangeTypeValue(change));
     const unifiedDiff = firstNonEmptyString(
-      stringValue7(change.unified_diff),
-      stringValue7(change.unifiedDiff),
-      stringValue7(change.diff),
-      stringValue7(change.patch)
+      stringValue6(change.unified_diff),
+      stringValue6(change.unifiedDiff),
+      stringValue6(change.diff),
+      stringValue6(change.patch)
     );
     let oldString = firstPresentString6(
       literalStringValue(change.old_string),
@@ -8999,9 +8491,9 @@ function WriteLinedIcon(props) {
 
 // shared/agentConversation/components/tool-renderers/render-data/agentToolFileChangeRenderData.ts
 function getFileChangeRenderData(call) {
-  const payloadInput = recordValue5(call.payload?.input);
-  const payloadOutput = recordValue5(call.payload?.output);
-  const rawInput = recordValue5(call.input?.rawInput) ?? recordValue5(payloadInput?.rawInput);
+  const payloadInput = recordValue4(call.payload?.input);
+  const payloadOutput = recordValue4(call.payload?.output);
+  const rawInput = recordValue4(call.input?.rawInput) ?? recordValue4(payloadInput?.rawInput);
   const inputLocations = arrayValue6(call.locations) ?? arrayValue6(call.input?.locations) ?? arrayValue6(payloadInput?.locations);
   const fromStructuredPatch = structuredPatchFiles(
     call.output?.structuredPatch ?? payloadOutput?.structuredPatch ?? call.payload?.structuredPatch ?? call.output?.files ?? payloadOutput?.files
@@ -9035,44 +8527,44 @@ function getFileChangeRenderData(call) {
   if (fromContentDiff.length > 0) {
     return fromContentDiff;
   }
-  const inputPath = firstString4(
-    stringValue8(call.input?.file_path),
-    stringValue8(call.input?.filePath),
-    stringValue8(call.input?.path),
-    stringValue8(payloadInput?.file_path),
-    stringValue8(payloadInput?.filePath),
-    stringValue8(payloadInput?.path),
+  const inputPath = firstString3(
+    stringValue7(call.input?.file_path),
+    stringValue7(call.input?.filePath),
+    stringValue7(call.input?.path),
+    stringValue7(payloadInput?.file_path),
+    stringValue7(payloadInput?.filePath),
+    stringValue7(payloadInput?.path),
     firstLocationPath2(inputLocations)
   );
-  const unifiedDiff = firstString4(
-    stringValue8(call.output?.patch),
-    stringValue8(payloadOutput?.patch),
-    stringValue8(call.output?.diff),
-    stringValue8(payloadOutput?.diff)
+  const unifiedDiff = firstString3(
+    stringValue7(call.output?.patch),
+    stringValue7(payloadOutput?.patch),
+    stringValue7(call.output?.diff),
+    stringValue7(payloadOutput?.diff)
   );
-  const path = firstString4(
+  const path = firstString3(
     inputPath,
     unifiedDiff ? extractAgentPatchPath(unifiedDiff) : null
   );
   if (!path) {
     return [];
   }
-  const content = firstString4(
-    stringValue8(call.input?.content),
-    stringValue8(payloadInput?.content),
-    stringValue8(rawInput?.content)
+  const content = firstString3(
+    stringValue7(call.input?.content),
+    stringValue7(payloadInput?.content),
+    stringValue7(rawInput?.content)
   );
-  const oldString = firstString4(
-    stringValue8(call.input?.old_string),
-    stringValue8(payloadInput?.old_string),
-    stringValue8(call.output?.oldString),
-    stringValue8(payloadOutput?.oldString)
+  const oldString = firstString3(
+    stringValue7(call.input?.old_string),
+    stringValue7(payloadInput?.old_string),
+    stringValue7(call.output?.oldString),
+    stringValue7(payloadOutput?.oldString)
   );
-  const newString = firstString4(
-    stringValue8(call.input?.new_string),
-    stringValue8(payloadInput?.new_string),
-    stringValue8(call.output?.newString),
-    stringValue8(payloadOutput?.newString)
+  const newString = firstString3(
+    stringValue7(call.input?.new_string),
+    stringValue7(payloadInput?.new_string),
+    stringValue7(call.output?.newString),
+    stringValue7(payloadOutput?.newString)
   );
   const changeType = inferFileChangeType(
     call.toolName,
@@ -9109,33 +8601,33 @@ function structuredPatchFiles(value) {
     return [];
   }
   return patches.flatMap((item) => {
-    const patch = recordValue5(item);
-    const path = firstString4(
-      stringValue8(patch?.filePath),
-      stringValue8(patch?.path)
+    const patch = recordValue4(item);
+    const path = firstString3(
+      stringValue7(patch?.filePath),
+      stringValue7(patch?.path)
     );
-    const diff = firstString4(
-      stringValue8(patch?.diff),
-      stringValue8(patch?.patch)
+    const diff = firstString3(
+      stringValue7(patch?.diff),
+      stringValue7(patch?.patch)
     );
     if (!path) {
       return [];
     }
-    const oldString = firstString4(
-      stringValue8(patch?.oldString),
-      stringValue8(patch?.old_string)
+    const oldString = firstString3(
+      stringValue7(patch?.oldString),
+      stringValue7(patch?.old_string)
     );
-    const newString = firstString4(
-      stringValue8(patch?.newString),
-      stringValue8(patch?.new_string)
+    const newString = firstString3(
+      stringValue7(patch?.newString),
+      stringValue7(patch?.new_string)
     );
-    const content = firstString4(stringValue8(patch?.content), newString);
+    const content = firstString3(stringValue7(patch?.content), newString);
     if (!diff && !oldString && !newString && !content) {
       return [];
     }
     const changeType = firstKnownChangeType(
-      normalizeChangeType2(stringValue8(patch?.kind)),
-      normalizeChangeType2(stringValue8(patch?.change)),
+      normalizeChangeType2(stringValue7(patch?.kind)),
+      normalizeChangeType2(stringValue7(patch?.change)),
       inferFileChangeType(null, diff, content, oldString, newString)
     );
     const stats = fileChangeStats(
@@ -9161,7 +8653,7 @@ function structuredPatchFiles(value) {
   });
 }
 function detailedDiffFiles(value) {
-  const diff = stringValue8(value);
+  const diff = stringValue7(value);
   if (!diff) {
     return [];
   }
@@ -9186,35 +8678,35 @@ function detailedDiffFiles(value) {
   ];
 }
 function fileChangesFiles(value) {
-  const record = recordValue5(value);
+  const record = recordValue4(value);
   const files = arrayValue6(record?.files);
   if (!files) {
     return [];
   }
   return files.flatMap((item) => {
-    const file = recordValue5(item);
-    const path = stringValue8(file?.path);
+    const file = recordValue4(item);
+    const path = stringValue7(file?.path);
     if (!path) {
       return [];
     }
-    const unifiedDiff = firstString4(
-      stringValue8(file?.diff),
-      stringValue8(file?.patch),
-      stringValue8(file?.unifiedDiff),
-      stringValue8(file?.unified_diff)
+    const unifiedDiff = firstString3(
+      stringValue7(file?.diff),
+      stringValue7(file?.patch),
+      stringValue7(file?.unifiedDiff),
+      stringValue7(file?.unified_diff)
     );
-    const oldString = firstString4(
-      stringValue8(file?.oldString),
-      stringValue8(file?.old_string)
+    const oldString = firstString3(
+      stringValue7(file?.oldString),
+      stringValue7(file?.old_string)
     );
-    const newString = firstString4(
-      stringValue8(file?.newString),
-      stringValue8(file?.new_string)
+    const newString = firstString3(
+      stringValue7(file?.newString),
+      stringValue7(file?.new_string)
     );
-    const content = firstString4(stringValue8(file?.content), newString);
+    const content = firstString3(stringValue7(file?.content), newString);
     const changeType = firstKnownChangeType(
-      normalizeChangeType2(stringValue8(file?.change)),
-      normalizeChangeType2(stringValue8(file?.kind)),
+      normalizeChangeType2(stringValue7(file?.change)),
+      normalizeChangeType2(stringValue7(file?.kind)),
       inferFileChangeType(null, unifiedDiff, content, oldString, newString)
     );
     const stats = fileChangeStats(
@@ -9246,21 +8738,21 @@ function changeMapFiles(value) {
     if (!normalizedPath) {
       return [];
     }
-    const unifiedDiff = firstString4(
-      stringValue8(change.unified_diff),
-      stringValue8(change.unifiedDiff),
-      stringValue8(change.diff),
-      stringValue8(change.patch)
+    const unifiedDiff = firstString3(
+      stringValue7(change.unified_diff),
+      stringValue7(change.unifiedDiff),
+      stringValue7(change.diff),
+      stringValue7(change.patch)
     );
-    const explicitContent = stringValue8(change.content);
+    const explicitContent = stringValue7(change.content);
     const normalizedType = normalizeChangeType2(fileChangeTypeValue(change));
-    let oldString = firstString4(
-      stringValue8(change.old_string),
-      stringValue8(change.oldString)
+    let oldString = firstString3(
+      stringValue7(change.old_string),
+      stringValue7(change.oldString)
     );
-    let newString = firstString4(
-      stringValue8(change.new_string),
-      stringValue8(change.newString),
+    let newString = firstString3(
+      stringValue7(change.new_string),
+      stringValue7(change.newString),
       explicitContent
     );
     if (normalizedType === "created" && oldString === null && newString !== null) {
@@ -9273,7 +8765,7 @@ function changeMapFiles(value) {
     if (normalizedType === "deleted" && newString === null && oldString !== null) {
       newString = "";
     }
-    const content = firstString4(
+    const content = firstString3(
       normalizedType === "deleted" ? null : explicitContent,
       normalizedType === "created" ? newString : null
     );
@@ -9319,40 +8811,40 @@ function contentDiffFiles(value, changesValue, toolName) {
     ])
   );
   return items.flatMap((item) => {
-    const record = recordValue5(item);
+    const record = recordValue4(item);
     if (!record) {
       return [];
     }
-    const type = stringValue8(record.type);
+    const type = stringValue7(record.type);
     if (type && type !== "diff") {
       return [];
     }
-    const path = stringValue8(record.path);
+    const path = stringValue7(record.path);
     if (!path) {
       return [];
     }
     const relatedChange = changesByPath.get(path) ?? null;
-    const unifiedDiff = firstString4(
-      stringValue8(record.diff),
-      stringValue8(record.patch),
-      stringValue8(relatedChange?.unified_diff),
-      stringValue8(relatedChange?.unifiedDiff)
+    const unifiedDiff = firstString3(
+      stringValue7(record.diff),
+      stringValue7(record.patch),
+      stringValue7(relatedChange?.unified_diff),
+      stringValue7(relatedChange?.unifiedDiff)
     );
     const normalizedType = normalizeChangeType2(
       relatedChange ? fileChangeTypeValue(relatedChange) : null
     );
-    let oldString = firstString4(
-      stringValue8(record.oldText),
-      stringValue8(record.oldString),
-      stringValue8(relatedChange?.old_string),
-      stringValue8(relatedChange?.oldString)
+    let oldString = firstString3(
+      stringValue7(record.oldText),
+      stringValue7(record.oldString),
+      stringValue7(relatedChange?.old_string),
+      stringValue7(relatedChange?.oldString)
     );
-    let newString = firstString4(
-      stringValue8(record.newText),
-      stringValue8(record.newString),
-      stringValue8(relatedChange?.new_string),
-      stringValue8(relatedChange?.newString),
-      stringValue8(relatedChange?.content)
+    let newString = firstString3(
+      stringValue7(record.newText),
+      stringValue7(record.newString),
+      stringValue7(relatedChange?.new_string),
+      stringValue7(relatedChange?.newString),
+      stringValue7(relatedChange?.content)
     );
     if (normalizedType === "created" && oldString === null && newString !== null) {
       oldString = "";
@@ -9364,9 +8856,9 @@ function contentDiffFiles(value, changesValue, toolName) {
     if (normalizedType === "deleted" && newString === null && oldString !== null) {
       newString = "";
     }
-    const explicitContent = firstString4(
-      stringValue8(record.content),
-      stringValue8(relatedChange?.content)
+    const explicitContent = firstString3(
+      stringValue7(record.content),
+      stringValue7(relatedChange?.content)
     );
     const changeType = firstKnownChangeType(
       normalizedType,
@@ -9381,7 +8873,7 @@ function contentDiffFiles(value, changesValue, toolName) {
     if (changeType === "created" && oldString === null && newString !== null) {
       oldString = "";
     }
-    const content = firstString4(
+    const content = firstString3(
       changeType === "deleted" ? null : explicitContent,
       changeType === "created" ? newString : null
     );
@@ -9561,7 +9053,7 @@ function languageForPath(path) {
 function normalizeToolName7(value) {
   return (value ?? "").trim().replace(/[_\s-]+/g, "").toLowerCase();
 }
-function firstString4(...values) {
+function firstString3(...values) {
   for (const value of values) {
     if (typeof value === "string" && value.trim()) {
       return value.trim();
@@ -9569,7 +9061,7 @@ function firstString4(...values) {
   }
   return null;
 }
-function recordValue5(value) {
+function recordValue4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function arrayValue6(value) {
@@ -9580,42 +9072,42 @@ function firstLocationPath2(value) {
     return null;
   }
   for (const item of value) {
-    const record = recordValue5(item);
-    const path = stringValue8(record?.path);
+    const record = recordValue4(item);
+    const path = stringValue7(record?.path);
     if (path) {
       return path;
     }
   }
   return null;
 }
-function stringValue8(value) {
+function stringValue7(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 
 // shared/agentConversation/components/tool-renderers/render-data/agentToolRenderData.ts
 function getCommandRenderData(call) {
-  const inputRawInput = recordValue6(call.input?.rawInput);
-  const payloadInput = recordValue6(call.payload?.input);
-  const payloadInputRawInput = recordValue6(payloadInput?.rawInput);
-  const outputRawOutput = recordValue6(call.output?.rawOutput);
-  const errorRawOutput = recordValue6(call.error?.rawOutput);
+  const inputRawInput = recordValue5(call.input?.rawInput);
+  const payloadInput = recordValue5(call.payload?.input);
+  const payloadInputRawInput = recordValue5(payloadInput?.rawInput);
+  const outputRawOutput = recordValue5(call.output?.rawOutput);
+  const errorRawOutput = recordValue5(call.error?.rawOutput);
   return {
-    command: firstString5(
-      stringValue9(call.input?.command),
-      stringValue9(call.input?.cmd),
+    command: firstString4(
+      stringValue8(call.input?.command),
+      stringValue8(call.input?.cmd),
       commandArrayToString(call.input?.command),
-      stringValue9(inputRawInput?.command),
-      stringValue9(inputRawInput?.cmd),
-      stringValue9(call.payload?.command),
-      stringValue9(payloadInput?.command),
-      stringValue9(payloadInputRawInput?.command),
-      stringValue9(payloadInputRawInput?.cmd)
+      stringValue8(inputRawInput?.command),
+      stringValue8(inputRawInput?.cmd),
+      stringValue8(call.payload?.command),
+      stringValue8(payloadInput?.command),
+      stringValue8(payloadInputRawInput?.command),
+      stringValue8(payloadInputRawInput?.cmd)
     ),
-    cwd: firstString5(
-      stringValue9(call.input?.cwd),
-      stringValue9(inputRawInput?.cwd),
-      stringValue9(payloadInput?.cwd),
-      stringValue9(payloadInputRawInput?.cwd)
+    cwd: firstString4(
+      stringValue8(call.input?.cwd),
+      stringValue8(inputRawInput?.cwd),
+      stringValue8(payloadInput?.cwd),
+      stringValue8(payloadInputRawInput?.cwd)
     ),
     stdout: firstRawString(
       rawStringValue(call.output?.stdout),
@@ -9650,42 +9142,42 @@ function getCommandRenderData(call) {
 function getSearchRenderData(call) {
   const canonicalContent = contentText(call.content);
   const canonicalFiles = locationPaths(call.locations);
-  const output = firstString5(
+  const output = firstString4(
     canonicalContent,
     contentText(call.output?.content),
-    stringValue9(call.output?.content),
-    stringValue9(call.output?.output),
-    stringValue9(call.output?.aggregated_output),
-    stringValue9(call.output?.formatted_output),
-    stringValue9(call.output?.stdout),
-    stringValue9(call.summary),
+    stringValue8(call.output?.content),
+    stringValue8(call.output?.output),
+    stringValue8(call.output?.aggregated_output),
+    stringValue8(call.output?.formatted_output),
+    stringValue8(call.output?.stdout),
+    stringValue8(call.summary),
     ""
   ) ?? "";
   const outputLines = output.split("\n").filter(Boolean);
   const mode = canonicalFiles.length > 0 && !output ? "list_files" : searchMode(call.output, output);
   const filenames = canonicalFiles.length > 0 ? canonicalFiles : stringArray(call.output?.filenames);
   return {
-    query: firstString5(
-      stringValue9(call.input?.pattern),
-      stringValue9(call.input?.query),
-      stringValue9(call.input?.search_query),
-      stringValue9(call.input?.searchQuery),
-      stringValue9(call.input?.glob)
+    query: firstString4(
+      stringValue8(call.input?.pattern),
+      stringValue8(call.input?.query),
+      stringValue8(call.input?.search_query),
+      stringValue8(call.input?.searchQuery),
+      stringValue8(call.input?.glob)
     ),
-    scope: firstString5(
-      stringValue9(call.input?.path),
-      stringValue9(call.input?.file_path),
-      stringValue9(call.input?.glob)
+    scope: firstString4(
+      stringValue8(call.input?.path),
+      stringValue8(call.input?.file_path),
+      stringValue8(call.input?.glob)
     ),
     mode,
     files: filenames.length > 0 ? filenames : mode === "list_files" ? outputLines : [],
     lines: outputLines,
     output,
-    error: firstString5(
-      stringValue9(call.error?.aggregated_output),
-      stringValue9(call.error?.stdout),
-      stringValue9(call.error?.formatted_output),
-      stringValue9(call.error?.message)
+    error: firstString4(
+      stringValue8(call.error?.aggregated_output),
+      stringValue8(call.error?.stdout),
+      stringValue8(call.error?.formatted_output),
+      stringValue8(call.error?.message)
     ) ?? ""
   };
 }
@@ -9693,45 +9185,45 @@ function getWebSearchRenderData(call) {
   const queries = normalizedQueries(
     call.input?.search_query,
     call.input?.searchQuery,
-    recordValue6(call.input?.action)?.search_query,
-    recordValue6(call.input?.action)?.searchQuery
+    recordValue5(call.input?.action)?.search_query,
+    recordValue5(call.input?.action)?.searchQuery
   );
   return {
-    query: firstString5(
-      stringValue9(call.input?.query),
-      stringValue9(recordValue6(call.input?.action)?.query),
+    query: firstString4(
+      stringValue8(call.input?.query),
+      stringValue8(recordValue5(call.input?.action)?.query),
       queries[0] ?? null
     ),
     queries,
-    url: firstString5(
-      stringValue9(call.input?.url),
-      stringValue9(recordValue6(call.input?.action)?.url)
+    url: firstString4(
+      stringValue8(call.input?.url),
+      stringValue8(recordValue5(call.input?.action)?.url)
     ),
-    output: firstString5(
-      stringValue9(call.output?.text),
+    output: firstString4(
+      stringValue8(call.output?.text),
       contentText(call.content),
       contentText(call.output?.content),
-      stringValue9(call.output?.stdout),
-      stringValue9(call.output?.output),
-      stringValue9(call.output?.content)
+      stringValue8(call.output?.stdout),
+      stringValue8(call.output?.output),
+      stringValue8(call.output?.content)
     ) ?? "",
-    error: firstString5(
-      stringValue9(call.error?.message),
-      stringValue9(call.error?.stdout)
+    error: firstString4(
+      stringValue8(call.error?.message),
+      stringValue8(call.error?.stdout)
     ) ?? ""
   };
 }
 function getWebFetchRenderData(call, maxContentLength = 3e3) {
-  const url = firstString5(
-    stringValue9(call.input?.url),
-    stringValue9(recordValue6(call.input?.action)?.url)
+  const url = firstString4(
+    stringValue8(call.input?.url),
+    stringValue8(recordValue5(call.input?.action)?.url)
   );
-  const content = firstString5(
+  const content = firstString4(
     contentText(call.content),
     contentText(call.output?.content),
-    stringValue9(call.output?.output),
-    stringValue9(call.output?.content),
-    stringValue9(call.output?.stdout)
+    stringValue8(call.output?.output),
+    stringValue8(call.output?.content),
+    stringValue8(call.output?.stdout)
   );
   return {
     url,
@@ -9747,21 +9239,21 @@ function getTodoRenderData(call) {
     return [];
   }
   return todos.flatMap((todo) => {
-    const record = recordValue6(todo);
-    const content = firstString5(
-      stringValue9(record?.content),
-      stringValue9(record?.text)
+    const record = recordValue5(todo);
+    const content = firstString4(
+      stringValue8(record?.content),
+      stringValue8(record?.text)
     );
     if (!content) {
       return [];
     }
-    return [{ content, status: stringValue9(record?.status) }];
+    return [{ content, status: stringValue8(record?.status) }];
   });
 }
 function getToolSearchRenderData(call) {
-  const query = stringValue9(call.input?.query);
-  const matches = arrayValue7(call.output?.matches)?.map(stringValue9).filter((value) => value !== null) ?? [];
-  const totalDeferredTools = numberValue3(call.output?.total_deferred_tools) ?? numberValue3(call.output?.totalDeferredTools) ?? numberValue3(recordValue6(call.payload?.output)?.total_deferred_tools);
+  const query = stringValue8(call.input?.query);
+  const matches = arrayValue7(call.output?.matches)?.map(stringValue8).filter((value) => value !== null) ?? [];
+  const totalDeferredTools = numberValue3(call.output?.total_deferred_tools) ?? numberValue3(call.output?.totalDeferredTools) ?? numberValue3(recordValue5(call.payload?.output)?.total_deferred_tools);
   const mode = query?.startsWith("select:") ? "direct" : "search";
   const displayQuery = query?.startsWith("select:") ? query.slice("select:".length) : query?.startsWith("+") ? query.slice(1) : query;
   return {
@@ -9773,22 +9265,22 @@ function getToolSearchRenderData(call) {
   };
 }
 function getPlanModeRenderData(call) {
-  const enterText = call.rendererKind === "plan-enter" ? firstString5(
-    stringValue9(call.planMode?.plan),
-    stringValue9(call.output?.text),
-    stringValue9(call.input?.content),
+  const enterText = call.rendererKind === "plan-enter" ? firstString4(
+    stringValue8(call.planMode?.plan),
+    stringValue8(call.output?.text),
+    stringValue8(call.input?.content),
     nonEmpty(call.summary),
     "Exploring codebase and designing implementation approach."
   ) : null;
-  const filePath = firstString5(
-    stringValue9(call.input?.filePath),
-    stringValue9(call.input?.file_path)
+  const filePath = firstString4(
+    stringValue8(call.input?.filePath),
+    stringValue8(call.input?.file_path)
   );
   return {
     enterText,
-    plan: call.rendererKind === "plan-enter" ? null : firstString5(
-      stringValue9(call.input?.plan),
-      stringValue9(call.payload?.plan),
+    plan: call.rendererKind === "plan-enter" ? null : firstString4(
+      stringValue8(call.input?.plan),
+      stringValue8(call.payload?.plan),
       nonEmpty(call.summary)
     ),
     filePath,
@@ -9798,51 +9290,51 @@ function getPlanModeRenderData(call) {
 function getTaskRenderData(call) {
   const task = call.task;
   const steps = task?.steps ?? normalizeTaskStepsFromCall(call);
-  const outputRawOutput = recordValue6(call.output?.rawOutput);
-  const errorRawOutput = recordValue6(call.error?.rawOutput);
+  const outputRawOutput = recordValue5(call.output?.rawOutput);
+  const errorRawOutput = recordValue5(call.error?.rawOutput);
   return {
     title: task?.title ?? call.name,
-    status: task?.status ?? stringValue9(call.metadata?.taskStatus) ?? stringValue9(call.metadata?.subagentStatus),
+    status: task?.status ?? stringValue8(call.metadata?.taskStatus) ?? stringValue8(call.metadata?.subagentStatus),
     durationText: typeof task?.durationMs === "number" && Number.isFinite(task.durationMs) ? formatDuration(task.durationMs) : null,
     latestStepSummary: task?.status === "running" ? steps.at(-1)?.summary ?? null : null,
-    prompt: firstString5(
-      stringValue9(task?.prompt),
-      stringValue9(call.input?.prompt),
-      stringValue9(call.input?.description),
-      stringValue9(call.payload?.description)
+    prompt: firstString4(
+      stringValue8(task?.prompt),
+      stringValue8(call.input?.prompt),
+      stringValue8(call.input?.description),
+      stringValue8(call.payload?.description)
     ),
-    childSessionId: firstString5(
-      stringValue9(task?.delegateSessionId),
-      stringValue9(call.metadata?.childSessionID),
-      stringValue9(call.metadata?.child_session_id),
-      stringValue9(call.metadata?.subagentSessionID),
-      stringValue9(call.metadata?.subagent_session_id),
-      stringValue9(call.metadata?.subagentAgentId),
-      stringValue9(call.metadata?.agentId)
+    childSessionId: firstString4(
+      stringValue8(task?.delegateSessionId),
+      stringValue8(call.metadata?.childSessionID),
+      stringValue8(call.metadata?.child_session_id),
+      stringValue8(call.metadata?.subagentSessionID),
+      stringValue8(call.metadata?.subagent_session_id),
+      stringValue8(call.metadata?.subagentAgentId),
+      stringValue8(call.metadata?.agentId)
     ),
     steps,
-    resultMarkdown: firstString5(
-      stringValue9(task?.resultMarkdown),
+    resultMarkdown: firstString4(
+      stringValue8(task?.resultMarkdown),
       firstNonEmptyStructuredText(call.output, outputRawOutput)
     ),
     errorMarkdown: firstNonEmptyStructuredText(call.error, errorRawOutput)
   };
 }
 function getSkillRenderData(call) {
-  const inputRawInput = recordValue6(call.input?.rawInput);
+  const inputRawInput = recordValue5(call.input?.rawInput);
   const outputRawOutput = call.output?.rawOutput;
-  const success = booleanValue(call.output?.success) ?? legacySkillSuccess(outputRawOutput) ?? booleanValue(recordValue6(outputRawOutput)?.success);
+  const success = booleanValue(call.output?.success) ?? legacySkillSuccess(outputRawOutput) ?? booleanValue(recordValue5(outputRawOutput)?.success);
   return {
-    skill: firstString5(
-      stringValue9(call.input?.skill),
-      stringValue9(inputRawInput?.skill),
-      stringValue9(call.output?.commandName),
-      stringValue9(recordValue6(outputRawOutput)?.commandName),
+    skill: firstString4(
+      stringValue8(call.input?.skill),
+      stringValue8(inputRawInput?.skill),
+      stringValue8(call.output?.commandName),
+      stringValue8(recordValue5(outputRawOutput)?.commandName),
       nonEmpty(call.summary)
     ),
-    args: firstString5(
-      stringValue9(call.input?.args),
-      stringValue9(inputRawInput?.args)
+    args: firstString4(
+      stringValue8(call.input?.args),
+      stringValue8(inputRawInput?.args)
     ),
     success,
     statusText: success === null ? null : success ? "Skill loaded" : "Failed to load skill"
@@ -9855,7 +9347,7 @@ function getImageGenerationRenderData(call) {
     content: call.content,
     outputContent: call.output?.content,
     inputPrompt: call.input?.prompt,
-    payloadInputPrompt: recordValue6(call.payload?.input)?.prompt
+    payloadInputPrompt: recordValue5(call.payload?.input)?.prompt
   });
   return {
     prompt: preview.prompt,
@@ -9887,31 +9379,31 @@ function getToolFallbackText(call) {
 function normalizeTaskStepsFromCall(call) {
   const steps = arrayValue7(call.metadata?.steps) ?? arrayValue7(call.output?.steps) ?? arrayValue7(call.payload?.steps) ?? [];
   return steps.flatMap((value, index) => {
-    const step = recordValue6(value);
+    const step = recordValue5(value);
     if (!step) {
       return [];
     }
-    const toolName = stringValue9(step.toolName) ?? stringValue9(step.tool_name) ?? stringValue9(step.name) ?? null;
+    const toolName = stringValue8(step.toolName) ?? stringValue8(step.tool_name) ?? stringValue8(step.name) ?? null;
     const name = toolName ? humanizeToolName2(toolName) : `Step ${index + 1}`;
-    const status = stringValue9(step.status) ?? stringValue9(recordValue6(step.toolResult)?.status) ?? stringValue9(recordValue6(step.tool_result)?.status) ?? null;
+    const status = stringValue8(step.status) ?? stringValue8(recordValue5(step.toolResult)?.status) ?? stringValue8(recordValue5(step.tool_result)?.status) ?? null;
     const summary = firstNonEmptyStructuredText(
-      recordValue6(step.toolResult),
-      recordValue6(step.tool_result),
-      recordValue6(step.toolInput),
-      recordValue6(step.tool_input)
+      recordValue5(step.toolResult),
+      recordValue5(step.tool_result),
+      recordValue5(step.toolInput),
+      recordValue5(step.tool_input)
     ) ?? "";
     return [
       {
-        id: stringValue9(step.toolUseId) ?? stringValue9(step.id) ?? `step-${index + 1}`,
+        id: stringValue8(step.toolUseId) ?? stringValue8(step.id) ?? `step-${index + 1}`,
         turnId: call.turnId,
         name,
         toolName,
         status,
         summary,
         payload: {
-          input: recordValue6(step.toolInput) ?? recordValue6(step.tool_input),
-          output: recordValue6(step.toolResult) ?? recordValue6(step.tool_result),
-          error: recordValue6(step.toolError) ?? recordValue6(step.tool_error)
+          input: recordValue5(step.toolInput) ?? recordValue5(step.tool_input),
+          output: recordValue5(step.toolResult) ?? recordValue5(step.tool_result),
+          error: recordValue5(step.toolError) ?? recordValue5(step.tool_error)
         },
         tool: null,
         occurredAtUnixMs: null
@@ -9975,7 +9467,7 @@ function normalizeCommandStatus(value) {
   }
 }
 function searchMode(output, outputText) {
-  const mode = stringValue9(output?.mode);
+  const mode = stringValue8(output?.mode);
   if (mode === "files_with_matches" || mode === "content" || mode === "count" || mode === "list_files") {
     return mode;
   }
@@ -9998,7 +9490,7 @@ function commandArrayToString(value) {
   return parts.length > 0 ? parts.join(" ") : null;
 }
 function durationToMs(value) {
-  const record = recordValue6(value);
+  const record = recordValue5(value);
   if (!record) {
     return null;
   }
@@ -10015,15 +9507,15 @@ function contentText(value) {
     return null;
   }
   const text = items.flatMap((item) => {
-    const record = recordValue6(item);
+    const record = recordValue5(item);
     if (!record) {
       return [];
     }
     return [
-      firstString5(
-        stringValue9(record.text),
-        stringValue9(record.content),
-        stringValue9(recordValue6(record.content)?.text)
+      firstString4(
+        stringValue8(record.text),
+        stringValue8(record.content),
+        stringValue8(recordValue5(record.content)?.text)
       )
     ].filter(Boolean);
   }).join("\n").trim();
@@ -10036,38 +9528,38 @@ function structuredText(value) {
   if (typeof value === "number" || typeof value === "boolean") {
     return String(value);
   }
-  const record = recordValue6(value);
+  const record = recordValue5(value);
   if (!record) {
     return null;
   }
-  const preferred = firstString5(
-    stringValue9(record.plan),
-    stringValue9(record.text),
-    stringValue9(record.output),
-    stringValue9(record.content),
+  const preferred = firstString4(
+    stringValue8(record.plan),
+    stringValue8(record.text),
+    stringValue8(record.output),
+    stringValue8(record.content),
     contentText(record.content),
-    stringValue9(record.summary),
-    stringValue9(record.result),
-    stringValue9(record.message),
-    stringValue9(record.aggregated_output),
-    stringValue9(record.formatted_output),
-    stringValue9(record.stdout),
-    stringValue9(record.stderr),
-    stringValue9(record.query),
-    stringValue9(record.path),
-    stringValue9(record.file),
-    stringValue9(record.filePath),
-    stringValue9(record.file_path),
-    stringValue9(record.url),
-    stringValue9(record.cmd),
-    stringValue9(record.command)
+    stringValue8(record.summary),
+    stringValue8(record.result),
+    stringValue8(record.message),
+    stringValue8(record.aggregated_output),
+    stringValue8(record.formatted_output),
+    stringValue8(record.stdout),
+    stringValue8(record.stderr),
+    stringValue8(record.query),
+    stringValue8(record.path),
+    stringValue8(record.file),
+    stringValue8(record.filePath),
+    stringValue8(record.file_path),
+    stringValue8(record.url),
+    stringValue8(record.cmd),
+    stringValue8(record.command)
   );
   if (preferred) {
     return preferred;
   }
   return null;
 }
-function firstString5(...values) {
+function firstString4(...values) {
   for (const value of values) {
     if (typeof value === "string" && value.trim()) {
       return value.trim();
@@ -10086,13 +9578,13 @@ function firstRawString(...values) {
 function nonEmpty(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
-function recordValue6(value) {
+function recordValue5(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function arrayValue7(value) {
   return Array.isArray(value) ? value : null;
 }
-function stringValue9(value) {
+function stringValue8(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function rawStringValue(value) {
@@ -10132,15 +9624,15 @@ function locationPaths(value) {
     return [];
   }
   const paths = locations.flatMap((location) => {
-    const record = recordValue6(location);
+    const record = recordValue5(location);
     if (!record) {
       return [];
     }
     return [
-      firstString5(
-        stringValue9(record.path),
-        stringValue9(record.filePath),
-        stringValue9(record.file_path)
+      firstString4(
+        stringValue8(record.path),
+        stringValue8(record.filePath),
+        stringValue8(record.file_path)
       )
     ].filter((path) => path !== null);
   });
@@ -11118,9 +10610,9 @@ function AgentReadContent({
   call
 }) {
   "use memo";
-  const path = stringValue10(call.input?.path) ?? stringValue10(call.input?.file_path) ?? stringValue10(call.input?.filePath) ?? stringValue10(call.input?.file) ?? null;
+  const path = stringValue9(call.input?.path) ?? stringValue9(call.input?.file_path) ?? stringValue9(call.input?.filePath) ?? stringValue9(call.input?.file) ?? null;
   const file = objectValue6(call.output?.file);
-  const outputText = stringValue10(call.output?.text) ?? stringValue10(call.output?.output) ?? contentText2(call.output?.content) ?? stringValue10(call.output?.aggregated_output) ?? stringValue10(call.output?.formatted_output) ?? stringValue10(call.output?.stdout) ?? (!file ? call.summary.trim() || null : null);
+  const outputText = stringValue9(call.output?.text) ?? stringValue9(call.output?.output) ?? contentText2(call.output?.content) ?? stringValue9(call.output?.aggregated_output) ?? stringValue9(call.output?.formatted_output) ?? stringValue9(call.output?.stdout) ?? (!file ? call.summary.trim() || null : null);
   const fileLineRange = fileRange(file);
   const fileTotalLines = numericValue(file?.totalLines);
   return /* @__PURE__ */ jsx29("div", { className: "workspace-agents-status-panel__detail-tool-body workspace-agents-status-panel__detail-tool-body--plain", children: outputText ? /* @__PURE__ */ jsx29(
@@ -11165,9 +10657,9 @@ function contentText2(value) {
     const record = item;
     const nestedContent = record.content && typeof record.content === "object" && !Array.isArray(record.content) ? record.content : null;
     return [
-      stringValue10(record.text),
-      stringValue10(record.content),
-      stringValue10(nestedContent?.text)
+      stringValue9(record.text),
+      stringValue9(record.content),
+      stringValue9(nestedContent?.text)
     ].filter((entry) => Boolean(entry));
   }).join("\n").trim();
   return text || null;
@@ -11371,13 +10863,13 @@ function hasWebSearchContent(call) {
 function hasReadContent(call) {
   const file = objectValue6(call.output?.file);
   return Boolean(
-    stringValue10(call.output?.text) || stringValue10(call.output?.output) || readContentText(call.output?.content) || stringValue10(call.output?.aggregated_output) || stringValue10(call.output?.formatted_output) || stringValue10(call.output?.stdout) || !file && call.summary.trim() || stringValue10(call.input?.path) || stringValue10(call.input?.file_path) || stringValue10(call.input?.filePath) || stringValue10(call.input?.file) || fileRange(file) || numericValue2(file?.totalLines) !== null
+    stringValue9(call.output?.text) || stringValue9(call.output?.output) || readContentText(call.output?.content) || stringValue9(call.output?.aggregated_output) || stringValue9(call.output?.formatted_output) || stringValue9(call.output?.stdout) || !file && call.summary.trim() || stringValue9(call.input?.path) || stringValue9(call.input?.file_path) || stringValue9(call.input?.filePath) || stringValue9(call.input?.file) || fileRange(file) || numericValue2(file?.totalLines) !== null
   );
 }
 function hasWriteContent(call) {
   const files = getFileChangeRenderData(call);
   return Boolean(
-    files.some((file) => file.content || file.unifiedDiff) || files.length === 0 && (call.summary.trim() || stringValue10(call.input?.path) || stringValue10(call.input?.file_path) || stringValue10(call.input?.filePath))
+    files.some((file) => file.content || file.unifiedDiff) || files.length === 0 && (call.summary.trim() || stringValue9(call.input?.path) || stringValue9(call.input?.file_path) || stringValue9(call.input?.filePath))
   );
 }
 function hasEditContent(call) {
@@ -11385,7 +10877,7 @@ function hasEditContent(call) {
   return Boolean(
     files.some(
       (file) => file.unifiedDiff || file.oldString !== null && file.newString !== null || file.content
-    ) || files.length === 0 && (stringValue10(call.input?.path) || stringValue10(call.input?.file_path) || stringValue10(call.input?.filePath))
+    ) || files.length === 0 && (stringValue9(call.input?.path) || stringValue9(call.input?.file_path) || stringValue9(call.input?.filePath))
   );
 }
 function readContentText(value) {
@@ -11399,9 +10891,9 @@ function readContentText(value) {
     const record = item;
     const nestedContent = record.content && typeof record.content === "object" && !Array.isArray(record.content) ? record.content : null;
     return [
-      stringValue10(record.text),
-      stringValue10(record.content),
-      stringValue10(nestedContent?.text)
+      stringValue9(record.text),
+      stringValue9(record.content),
+      stringValue9(nestedContent?.text)
     ].filter((entry) => Boolean(entry));
   }).join("\n").trim();
   return text || null;
@@ -11415,7 +10907,7 @@ function objectValue6(value) {
 function arrayValue8(value) {
   return Array.isArray(value) ? value : null;
 }
-function stringValue10(value) {
+function stringValue9(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 function numericValue2(value) {
@@ -11523,7 +11015,7 @@ function AgentEditContent({
   "use memo";
   const files = getFileChangeRenderData(call);
   const [file] = files;
-  const path = file?.path ?? stringValue10(call.input?.path) ?? stringValue10(call.input?.file_path) ?? stringValue10(call.input?.filePath) ?? null;
+  const path = file?.path ?? stringValue9(call.input?.path) ?? stringValue9(call.input?.file_path) ?? stringValue9(call.input?.filePath) ?? null;
   const patchFiles = files.filter((candidate) => candidate.unifiedDiff);
   const diffFiles = files.filter(
     (candidate) => !candidate.unifiedDiff && candidate.oldString !== null && candidate.newString !== null
@@ -11696,13 +11188,13 @@ function normalizeLinks(value, output) {
   const explicitLinks = arrayValue8(value)?.map(optionRecord).filter(
     (candidate) => candidate !== null
   ).flatMap((link) => {
-    const url = stringValue10(link.url);
+    const url = stringValue9(link.url);
     if (!url) {
       return [];
     }
     return [
       {
-        title: stringValue10(link.title) ?? url,
+        title: stringValue9(link.title) ?? url,
         url,
         domain: domainForUrl2(url)
       }
@@ -11723,13 +11215,13 @@ function normalizeLinks(value, output) {
     const parsed = JSON.parse(linksJson);
     return parsed.flatMap((entry) => {
       const link = optionRecord(entry);
-      const url = stringValue10(link?.url);
+      const url = stringValue9(link?.url);
       if (!url) {
         return [];
       }
       return [
         {
-          title: stringValue10(link?.title) ?? url,
+          title: stringValue9(link?.title) ?? url,
           url,
           domain: domainForUrl2(url)
         }
@@ -11814,7 +11306,7 @@ function approvalPreviewCall(call) {
     return null;
   }
   const normalizedKind = normalizeToolKind(
-    stringValue10(toolCall.kind) ?? stringValue10(toolCall.title) ?? stringValue10(toolCall.toolName)
+    stringValue9(toolCall.kind) ?? stringValue9(toolCall.title) ?? stringValue9(toolCall.toolName)
   );
   const preview = approvalPreviewKindFor(normalizedKind);
   if (!preview) {
@@ -11827,10 +11319,10 @@ function approvalPreviewCall(call) {
     kind: "tool-call",
     id: `${call.id}:approval-preview`,
     turnId: call.turnId,
-    name: stringValue10(toolCall.title) ?? call.name,
+    name: stringValue9(toolCall.title) ?? call.name,
     toolName: preview.toolName,
     callType: "tool",
-    status: stringValue10(toolCall.status) ?? call.status,
+    status: stringValue9(toolCall.status) ?? call.status,
     statusKind: call.statusKind,
     summary: "",
     compactSummary: null,
@@ -11866,7 +11358,7 @@ function AgentAskUserQuestionContent({
 }) {
   "use memo";
   const questions = call.askUserQuestion?.questions ?? [];
-  const outputText = stringValue11(call.output?.text);
+  const outputText = stringValue10(call.output?.text);
   if (questions.length === 0) {
     return null;
   }
@@ -11927,7 +11419,7 @@ function formatAnswer(answer) {
   }
   return typeof answer === "string" && answer.trim() ? answer.trim() : null;
 }
-function stringValue11(value) {
+function stringValue10(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
 }
 
@@ -12004,7 +11496,7 @@ function AgentBashContent({
 }) {
   "use memo";
   const commandData = getCommandRenderData(call);
-  const fallbackErrorText = commandData.status === "failed" && !commandData.stdout && !commandData.stderr ? stringValue10(call.error?.message) : null;
+  const fallbackErrorText = commandData.status === "failed" && !commandData.stdout && !commandData.stderr ? stringValue9(call.error?.message) : null;
   return /* @__PURE__ */ jsx37("div", { className: "workspace-agents-status-panel__detail-tool-body workspace-agents-status-panel__detail-tool-body--plain", children: /* @__PURE__ */ jsx37(
     AgentTerminalBlock,
     {
@@ -12132,8 +11624,8 @@ function normalizeMcpPayload(call) {
     toolName: call.toolName,
     name: call.name
   });
-  const server = target?.server ?? stringValue10(call.metadata?.server) ?? stringValue10(call.metadata?.serverName) ?? stringValue10(call.metadata?.mcpServer) ?? null;
-  const tool = target?.tool ?? stringValue10(call.metadata?.tool) ?? stringValue10(call.metadata?.toolName) ?? call.toolName;
+  const server = target?.server ?? stringValue9(call.metadata?.server) ?? stringValue9(call.metadata?.serverName) ?? stringValue9(call.metadata?.mcpServer) ?? null;
+  const tool = target?.tool ?? stringValue9(call.metadata?.tool) ?? stringValue9(call.metadata?.toolName) ?? call.toolName;
   const structured = firstStructuredValue(
     call.output?.structuredContent,
     parseJsonString(call.output?.content),
@@ -12143,19 +11635,19 @@ function normalizeMcpPayload(call) {
   return {
     server,
     tool,
-    inputSummary: firstString6(
-      stringValue10(call.input?.query),
-      stringValue10(call.input?.url),
-      stringValue10(call.input?.path),
-      stringValue10(call.input?.prompt),
-      stringValue10(call.input?.command)
+    inputSummary: firstString5(
+      stringValue9(call.input?.query),
+      stringValue9(call.input?.url),
+      stringValue9(call.input?.path),
+      stringValue9(call.input?.prompt),
+      stringValue9(call.input?.command)
     ),
     structured,
-    text: firstString6(
+    text: firstString5(
       contentArrayText(call.output?.content),
-      stringValue10(call.output?.content),
-      stringValue10(call.output?.output),
-      stringValue10(call.output?.stdout)
+      stringValue9(call.output?.content),
+      stringValue9(call.output?.output),
+      stringValue9(call.output?.stdout)
     )
   };
 }
@@ -12190,21 +11682,21 @@ function parsedItems(value) {
   return [];
 }
 function itemPrimaryText(item) {
-  return firstString6(
-    stringValue10(item.key),
-    stringValue10(item.title),
-    stringValue10(item.name),
-    stringValue10(item.path),
-    stringValue10(item.url),
-    stringValue10(item.id)
+  return firstString5(
+    stringValue9(item.key),
+    stringValue9(item.title),
+    stringValue9(item.name),
+    stringValue9(item.path),
+    stringValue9(item.url),
+    stringValue9(item.id)
   );
 }
 function itemSecondaryText(item) {
-  return firstString6(
-    stringValue10(item.summary),
-    stringValue10(item.description),
-    stringValue10(item.status),
-    stringValue10(item.type)
+  return firstString5(
+    stringValue9(item.summary),
+    stringValue9(item.description),
+    stringValue9(item.status),
+    stringValue9(item.type)
   );
 }
 function firstStructuredValue(...values) {
@@ -12239,16 +11731,16 @@ function contentArrayText(value) {
       return [];
     }
     return [
-      firstString6(
-        stringValue10(record.text),
-        stringValue10(record.content),
-        stringValue10(objectValue6(record.content)?.text)
+      firstString5(
+        stringValue9(record.text),
+        stringValue9(record.content),
+        stringValue9(objectValue6(record.content)?.text)
       )
     ].filter((candidate) => Boolean(candidate));
   }).join("\n").trim();
   return text || null;
 }
-function firstString6(...values) {
+function firstString5(...values) {
   for (const value of values) {
     if (value) {
       return value;
@@ -12714,7 +12206,7 @@ function AgentWriteContent({
   "use memo";
   const files = getFileChangeRenderData(call);
   const [file] = files;
-  const path = file?.path ?? stringValue10(call.input?.path) ?? stringValue10(call.input?.file_path) ?? stringValue10(call.input?.filePath) ?? null;
+  const path = file?.path ?? stringValue9(call.input?.path) ?? stringValue9(call.input?.file_path) ?? stringValue9(call.input?.filePath) ?? null;
   const contentFiles = files.filter((candidate) => candidate.content);
   const contentPaths = new Set(contentFiles.map((candidate) => candidate.path));
   const patchFiles = files.filter(
@@ -13021,7 +12513,7 @@ function AgentSubAgentCards({
       subAgent,
       onLinkClick
     },
-    subAgent.ownerThreadId
+    subAgent.childSessionId
   )) });
 }
 var AgentSubAgentCard = memo(
@@ -13029,7 +12521,7 @@ var AgentSubAgentCard = memo(
   (prev, next) => prev.onLinkClick === next.onLinkClick && subAgentVMEquals(prev.subAgent, next.subAgent)
 );
 function subAgentVMEquals(left, right) {
-  return left.ownerThreadId === right.ownerThreadId && left.status === right.status && left.name === right.name && left.task === right.task && left.laneIndex === right.laneIndex && left.laneCount === right.laneCount && left.latestActivity === right.latestActivity && left.failureDetail === right.failureDetail && left.queued === right.queued && left.startedAtUnixMs === right.startedAtUnixMs && left.latestActivityAtUnixMs === right.latestActivityAtUnixMs && left.terminalAtUnixMs === right.terminalAtUnixMs;
+  return left.childSessionId === right.childSessionId && left.parentToolCallId === right.parentToolCallId && left.status === right.status && left.name === right.name && left.task === right.task && left.laneIndex === right.laneIndex && left.laneCount === right.laneCount && left.latestActivity === right.latestActivity && left.failureDetail === right.failureDetail && left.queued === right.queued && left.startedAtUnixMs === right.startedAtUnixMs && left.latestActivityAtUnixMs === right.latestActivityAtUnixMs && left.terminalAtUnixMs === right.terminalAtUnixMs && left.childSessions === right.childSessions;
 }
 function AgentSubAgentCardImpl({
   subAgent,
@@ -13109,12 +12601,21 @@ function SubAgentHeader({
   );
 }
 function SubAgentBody({
-  subAgent
+  subAgent,
+  onLinkClick
 }) {
   "use memo";
   return /* @__PURE__ */ jsx56("div", { className: "workspace-agents-status-panel__detail-tool-body workspace-agents-status-panel__detail-tool-body--plain", children: /* @__PURE__ */ jsxs42("div", { className: "workspace-agents-status-panel__detail-subagent-terminal", children: [
     subAgent.task ? /* @__PURE__ */ jsx56("div", { className: "workspace-agents-status-panel__detail-subagent-task-strip", children: subAgent.task }) : null,
-    /* @__PURE__ */ jsx56(SubAgentProgress, { subAgent })
+    /* @__PURE__ */ jsx56(SubAgentProgress, { subAgent }),
+    subAgent.childSessions.length > 0 ? /* @__PURE__ */ jsx56("div", { className: "workspace-agents-status-panel__detail-subagent-children", children: subAgent.childSessions.map((childSession) => /* @__PURE__ */ jsx56(
+      AgentSubAgentCard,
+      {
+        subAgent: childSession,
+        onLinkClick
+      },
+      childSession.childSessionId
+    )) }) : null
   ] }) });
 }
 function SubAgentProgress({
@@ -15313,9 +14814,8 @@ function useProjectedAgentConversation({
 
 export {
   Button,
-  partitionSubAgentTimelineItems,
-  buildSubAgentLanesByCallId,
-  attachSubAgentLanesToConversationVM,
+  isWorkspaceAgentToolCallItem,
+  resolveWorkspaceAgentToolName,
   buildWorkspaceAgentSessionDetailViewModel,
   skillTriggerForPrefix,
   labelForProviderSkill,
@@ -15355,4 +14855,4 @@ export {
   AgentConversationFlow,
   useProjectedAgentConversation
 };
-//# sourceMappingURL=chunk-IVY4OL7B.js.map
+//# sourceMappingURL=chunk-HLVC4NNL.js.map