poe-code 3.0.216 → 3.0.218

package/dist/providers/poe-agent.js

@@ -6035,9 +6035,9 @@ function getOptionalGrepOutputMode(args, key2) {
 function formatDisplayPath(cwd, filePath) {
   return path11.relative(cwd, filePath) || path11.basename(filePath);
 }
-async function sortPathsByModifiedTime(matches2, fs4) {
+async function sortPathsByModifiedTime(matches, fs4) {
   const entries = await Promise.all(
-    matches2.map(async (match) => ({
+    matches.map(async (match) => ({
       path: match,
       mtimeMs: (await fs4.stat(match)).mtimeMs
     }))
@@ -6422,12 +6422,12 @@ var init_poe_agent_plugin_files = __esm({
             allowedPaths,
             getOptionalString(args, "path") ?? "."
           );
-          const matches2 = await globFiles({
+          const matches = await globFiles({
             pattern: getRequiredString(args, "pattern"),
             cwd: searchPath
           });
           const sortedMatches = await sortPathsByModifiedTime(
-            matches2.map((match) => resolveAllowedPath(cwd, allowedPaths, match)),
+            matches.map((match) => resolveAllowedPath(cwd, allowedPaths, match)),
             fs4
           );
           if (sortedMatches.length === 0) {
@@ -23110,6 +23110,9 @@ function cellToAnsi(cell) {
   if (style.dim) {
     painter = painter.dim;
   }
+  if (style.underline) {
+    painter = painter.underline;
+  }
   if (style.fg) {
     painter = applyForegroundColor(painter, style.fg);
   }
@@ -23142,13 +23145,16 @@ function normalizeStyle(style) {
   if (style?.dim !== void 0) {
     next.dim = style.dim;
   }
+  if (style?.underline !== void 0) {
+    next.underline = style.underline;
+  }
   return next;
 }
 function normalizeSize(value) {
   return Math.max(0, Math.floor(value));
 }
 function cellsEqual(left, right) {
-  return left.ch === right.ch && left.style.fg === right.style.fg && left.style.bg === right.style.bg && left.style.bold === right.style.bold && left.style.dim === right.style.dim;
+  return left.ch === right.ch && left.style.fg === right.style.fg && left.style.bg === right.style.bg && left.style.bold === right.style.bold && left.style.dim === right.style.dim && left.style.underline === right.style.underline;
 }
 function applyForegroundColor(instance, color) {
   if (color.startsWith("#")) {
@@ -24158,24 +24164,60 @@ var init_stats_pane = __esm({
 });
 
 // packages/design-system/src/dashboard/keymap.ts
-function createKeymap(overrides) {
+function createKeymap(overrides, options) {
+  const resolvedCommands = options?.commands ?? commands;
+  const resolvedDefaults = options?.defaultBindings ?? defaultBindings;
   const bindings = /* @__PURE__ */ new Map();
-  for (const command of commands) {
-    const keys = overrides?.[command] ?? defaultBindings[command];
-    bindings.set(
-      command,
-      keys.map(parseBinding).filter((binding) => binding !== void 0)
-    );
+  const sequences = /* @__PURE__ */ new Set();
+  let pendingSequence = "";
+  for (const command of resolvedCommands) {
+    const keys = overrides?.[command] ?? resolvedDefaults[command];
+    const commandBindings = keys.map(parseBinding).filter((binding) => binding !== void 0);
+    for (const binding of commandBindings) {
+      if (binding.sequence !== void 0) {
+        sequences.add(binding.sequence);
+      }
+    }
+    bindings.set(command, commandBindings);
   }
   return (event) => {
-    for (const command of commands) {
+    for (const command of resolvedCommands) {
       const commandBindings = bindings.get(command);
-      if (commandBindings?.some((binding) => matches(binding, event))) {
+      if (commandBindings?.some((binding) => matchesSingleKey(binding, event))) {
+        pendingSequence = "";
         return command;
       }
     }
+    const sequenceCommand = resolveSequence(event);
+    if (sequenceCommand !== void 0) {
+      return sequenceCommand;
+    }
     return void 0;
   };
+  function resolveSequence(event) {
+    const token = eventToSequenceToken(event);
+    if (token === void 0) {
+      pendingSequence = "";
+      return void 0;
+    }
+    pendingSequence = `${pendingSequence}${token}`;
+    for (const command of resolvedCommands) {
+      const commandBindings = bindings.get(command);
+      if (commandBindings?.some((binding) => binding.sequence === pendingSequence)) {
+        pendingSequence = "";
+        return command;
+      }
+    }
+    if (hasSequencePrefix(sequences, pendingSequence)) {
+      return void 0;
+    }
+    pendingSequence = token;
+    if (hasSequencePrefix(sequences, pendingSequence)) {
+      return void 0;
+    }
+    pendingSequence = "";
+    return void 0;
+  }
 }
 function parseBinding(binding) {
   const value = binding.trim();
@@ -24208,25 +24250,37 @@ function parseBinding(binding) {
       continue;
     }
   }
-  if (parts.length === 1 && isShiftedCharacter(key2)) {
+  const normalizedKey = normalizeKeyName(key2);
+  if (parts.length === 1 && isShiftedCharacter(normalizedKey)) {
     shift = true;
   }
-  if (key2.length === 1) {
+  if (normalizedKey.length === 1) {
+    return {
+      ch: normalizeBindingCharacter(normalizedKey, shift),
+      ctrl,
+      meta,
+      shift
+    };
+  }
+  if (!ctrl && !meta && !shift && !isNamedKey(normalizedKey) && isPrintableSequence(normalizedKey)) {
     return {
-      ch: normalizeBindingCharacter(key2, shift),
+      sequence: normalizedKey,
       ctrl,
       meta,
       shift
     };
   }
   return {
-    name: key2.toLowerCase(),
+    name: normalizedKey.toLowerCase(),
     ctrl,
     meta,
     shift
   };
 }
-function matches(binding, event) {
+function matchesSingleKey(binding, event) {
+  if (binding.sequence !== void 0) {
+    return false;
+  }
   if (binding.ctrl !== event.ctrl || binding.meta !== event.meta || binding.shift !== event.shift) {
     return false;
   }
@@ -24238,6 +24292,20 @@ function matches(binding, event) {
   }
   return false;
 }
+function eventToSequenceToken(event) {
+  if (event.ctrl || event.meta || event.ch === void 0) {
+    return void 0;
+  }
+  return event.ch;
+}
+function hasSequencePrefix(sequences, prefix) {
+  for (const sequence of sequences) {
+    if (sequence.startsWith(prefix)) {
+      return true;
+    }
+  }
+  return false;
+}
 function isShiftedCharacter(value) {
   return value.length === 1 && value.toLowerCase() !== value && value.toUpperCase() === value;
 }
@@ -24247,7 +24315,40 @@ function normalizeBindingCharacter(value, shift) {
   }
   return value.toUpperCase();
 }
-var commands, defaultBindings;
+function normalizeKeyName(value) {
+  if (value.toLowerCase() === "space") {
+    return " ";
+  }
+  if (value === "\u2191") {
+    return "up";
+  }
+  if (value === "\u2193") {
+    return "down";
+  }
+  if (value === "\u2190") {
+    return "left";
+  }
+  if (value === "\u2192") {
+    return "right";
+  }
+  return value;
+}
+function isNamedKey(value) {
+  return namedKeys.has(value.toLowerCase());
+}
+function isPrintableSequence(value) {
+  if (Array.from(value).length <= 1) {
+    return false;
+  }
+  for (const char of value) {
+    const codePoint = char.codePointAt(0);
+    if (codePoint === void 0 || codePoint < 32 || codePoint === 127) {
+      return false;
+    }
+  }
+  return true;
+}
+var commands, defaultBindings, namedKeys;
 var init_keymap = __esm({
   "packages/design-system/src/dashboard/keymap.ts"() {
     "use strict";
@@ -24260,6 +24361,22 @@ var init_keymap = __esm({
       retry: ["r"],
       "view-log": ["l"]
     };
+    namedKeys = /* @__PURE__ */ new Set([
+      "backspace",
+      "delete",
+      "down",
+      "end",
+      "enter",
+      "escape",
+      "home",
+      "left",
+      "pagedown",
+      "pageup",
+      "return",
+      "right",
+      "tab",
+      "up"
+    ]);
   }
 });
 
@@ -24581,6 +24698,10 @@ function createTerminalDriver(opts) {
   };
 }
 function toKeypressEvent(str, key2) {
+  const controlCharacter = controlCharacterToKeypress(key2?.sequence);
+  if (controlCharacter !== void 0) {
+    return controlCharacter;
+  }
   const ctrl = key2?.ctrl ?? false;
   const meta = key2?.meta ?? false;
   const shift = key2?.shift ?? false;
@@ -24602,12 +24723,22 @@ function extractPrintableCharacter(str, sequence) {
   if (isPrintableCharacter(str)) {
     return str;
   }
+  if (isSinglePrintableSequence(sequence)) {
+    return sequence;
+  }
   if (sequence === void 0 || sequence.length <= 1 || sequence[0] !== "\x1B") {
     return void 0;
   }
   const candidate = sequence.slice(1);
   return isPrintableCharacter(candidate) ? candidate : void 0;
 }
+function isSinglePrintableSequence(value) {
+  if (value === void 0 || Array.from(value).length !== 1) {
+    return false;
+  }
+  const codePoint = value.codePointAt(0);
+  return codePoint !== void 0 && codePoint >= 32 && codePoint !== 127;
+}
 function isPrintableCharacter(value) {
   if (value === void 0 || Array.from(value).length !== 1) {
     return false;
@@ -24615,6 +24746,23 @@ function isPrintableCharacter(value) {
   const codePoint = value.codePointAt(0);
   return codePoint !== void 0 && codePoint >= 32 && codePoint !== 127;
 }
+function controlCharacterToKeypress(sequence) {
+  if (sequence === "") {
+    return { ch: "/", ctrl: true, meta: false, shift: false };
+  }
+  if (sequence !== void 0 && sequence.length === 1) {
+    const code = sequence.charCodeAt(0);
+    if (code >= 1 && code <= 26 && code !== 9 && code !== 10 && code !== 13) {
+      return {
+        name: String.fromCharCode(code + 96),
+        ctrl: true,
+        meta: false,
+        shift: false
+      };
+    }
+  }
+  return void 0;
+}
 function cursorPositionAnsi(x, y) {
   return `\x1B[${normalizeCoordinate(y) + 1};${normalizeCoordinate(x) + 1}H`;
 }
@@ -24845,6 +24993,158 @@ var init_dashboard2 = __esm({
   }
 });
 
+// packages/design-system/src/explorer/jobs.ts
+var init_jobs2 = __esm({
+  "packages/design-system/src/explorer/jobs.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/layout.ts
+var init_layout2 = __esm({
+  "packages/design-system/src/explorer/layout.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/keymap.ts
+var init_keymap2 = __esm({
+  "packages/design-system/src/explorer/keymap.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/state.ts
+var REGION_HEADER, REGION_LIST, REGION_DETAIL, REGION_FOOTER, REGION_MODAL, REGION_TOAST, REGION_ALL;
+var init_state3 = __esm({
+  "packages/design-system/src/explorer/state.ts"() {
+    "use strict";
+    init_keymap2();
+    REGION_HEADER = 1 << 0;
+    REGION_LIST = 1 << 1;
+    REGION_DETAIL = 1 << 2;
+    REGION_FOOTER = 1 << 3;
+    REGION_MODAL = 1 << 4;
+    REGION_TOAST = 1 << 5;
+    REGION_ALL = REGION_HEADER | REGION_LIST | REGION_DETAIL | REGION_FOOTER | REGION_MODAL | REGION_TOAST;
+  }
+});
+
+// packages/design-system/src/explorer/theme.ts
+var init_theme = __esm({
+  "packages/design-system/src/explorer/theme.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/render/detail.ts
+var init_detail = __esm({
+  "packages/design-system/src/explorer/render/detail.ts"() {
+    "use strict";
+    init_theme();
+  }
+});
+
+// packages/design-system/src/explorer/render/footer.ts
+var init_footer2 = __esm({
+  "packages/design-system/src/explorer/render/footer.ts"() {
+    "use strict";
+    init_theme();
+  }
+});
+
+// packages/design-system/src/explorer/render/header.ts
+var init_header = __esm({
+  "packages/design-system/src/explorer/render/header.ts"() {
+    "use strict";
+    init_theme();
+  }
+});
+
+// packages/design-system/src/explorer/render/list.ts
+var init_list = __esm({
+  "packages/design-system/src/explorer/render/list.ts"() {
+    "use strict";
+    init_theme();
+  }
+});
+
+// packages/design-system/src/explorer/render/modal.ts
+var init_modal = __esm({
+  "packages/design-system/src/explorer/render/modal.ts"() {
+    "use strict";
+    init_theme();
+  }
+});
+
+// packages/design-system/src/explorer/render/index.ts
+var init_render2 = __esm({
+  "packages/design-system/src/explorer/render/index.ts"() {
+    "use strict";
+    init_layout2();
+    init_state3();
+    init_theme();
+    init_detail();
+    init_footer2();
+    init_header();
+    init_list();
+    init_modal();
+    init_detail();
+    init_footer2();
+    init_header();
+    init_list();
+    init_modal();
+  }
+});
+
+// packages/design-system/src/explorer/actions.ts
+var init_actions = __esm({
+  "packages/design-system/src/explorer/actions.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/filter.ts
+var init_filter = __esm({
+  "packages/design-system/src/explorer/filter.ts"() {
+    "use strict";
+  }
+});
+
+// packages/design-system/src/explorer/reducer.ts
+var init_reducer = __esm({
+  "packages/design-system/src/explorer/reducer.ts"() {
+    "use strict";
+    init_actions();
+    init_filter();
+    init_state3();
+  }
+});
+
+// packages/design-system/src/explorer/runtime.ts
+var init_runtime3 = __esm({
+  "packages/design-system/src/explorer/runtime.ts"() {
+    "use strict";
+    init_buffer();
+    init_terminal();
+    init_jobs2();
+    init_layout2();
+    init_render2();
+    init_reducer();
+    init_state3();
+  }
+});
+
+// packages/design-system/src/explorer/index.ts
+var init_explorer = __esm({
+  "packages/design-system/src/explorer/index.ts"() {
+    "use strict";
+    init_runtime3();
+    init_state3();
+    init_keymap2();
+  }
+});
+
 // packages/design-system/src/prompts/primitives/cancel.ts
 import chalk9 from "chalk";
 import { isCancel } from "@clack/prompts";
@@ -24936,7 +25236,7 @@ var init_prompts2 = __esm({
 });
 
 // packages/design-system/src/prompts/theme.ts
-var init_theme = __esm({
+var init_theme2 = __esm({
   "packages/design-system/src/prompts/theme.ts"() {
     "use strict";
     init_colors();
@@ -24983,9 +25283,11 @@ var init_src13 = __esm({
     init_acp();
     init_dashboard2();
     init_dashboard2();
+    init_explorer();
+    init_explorer();
     init_prompts2();
     init_prompts2();
-    init_theme();
+    init_theme2();
     init_static();
     init_static();
     init_terminal_markdown();
@@ -26680,8 +26982,8 @@ async function runServiceInstall(definition, context) {
     return true;
   }
   const platformSteps = filterStepsByPlatform(definition.steps, context.platform);
-  for (const step of platformSteps) {
-    await runInstallStep(step, context);
+  for (const step2 of platformSteps) {
+    await runInstallStep(step2, context);
   }
   await definition.check.run(checkContext);
   if (definition.postChecks) {
@@ -26694,8 +26996,8 @@ async function runServiceInstall(definition, context) {
   );
   return true;
 }
-function describeInstallCommand(step) {
-  return `[${step.id}] ${formatCommand(step.command, step.args)}`;
+function describeInstallCommand(step2) {
+  return `[${step2.id}] ${formatCommand(step2.command, step2.args)}`;
 }
 function formatCommand(command, args) {
   return [command, ...args.map(quoteIfNeeded)].join(" ");
@@ -26711,24 +27013,24 @@ function quoteIfNeeded(value) {
 }
 function filterStepsByPlatform(steps, platform) {
   return steps.filter(
-    (step) => !step.platforms || step.platforms.includes(platform)
+    (step2) => !step2.platforms || step2.platforms.includes(platform)
   );
 }
 function logInstallDryRun(definition, context) {
   context.logger(`Dry run: would install ${definition.summary}.`);
   const platformSteps = filterStepsByPlatform(definition.steps, context.platform);
-  for (const step of platformSteps) {
-    context.logger(`Dry run: ${describeInstallCommand(step)}`);
+  for (const step2 of platformSteps) {
+    context.logger(`Dry run: ${describeInstallCommand(step2)}`);
   }
 }
-async function runInstallStep(step, context) {
-  context.logger(`Running ${describeInstallCommand(step)}`);
-  const result = await context.runCommand(step.command, step.args);
+async function runInstallStep(step2, context) {
+  context.logger(`Running ${describeInstallCommand(step2)}`);
+  const result = await context.runCommand(step2.command, step2.args);
   if (result.exitCode !== 0) {
     const stderr = result.stderr.trim();
     const suffix = stderr.length > 0 ? `: ${stderr}` : "";
     throw new Error(
-      `${describeInstallCommand(step)} failed with exit code ${result.exitCode}${suffix}`
+      `${describeInstallCommand(step2)} failed with exit code ${result.exitCode}${suffix}`
     );
   }
 }
@@ -29756,7 +30058,7 @@ function formatError(err) {
   }
 }
 
-// packages/braintrust/src/redact.ts
+// packages/acp-telemetry/src/redact.ts
 var MAX_STRING_BYTES = 65536;
 var MAX_JSON_BYTES = 262144;
 var BINARY_SCAN_BYTES = 1024;
@@ -29795,6 +30097,220 @@ function redactLeaf(value) {
   return value;
 }
 
+// packages/acp-telemetry/src/trace.ts
+function acpToTrace(ctx) {
+  const spawnCtx = ctx;
+  return {
+    root: {
+      name: `agent:${ctx.agent}:${ctx.model ?? "?"}`,
+      kind: "agent",
+      input: redact({
+        prompt: ctx.prompt,
+        mode: ctx.mode,
+        cwd: ctx.cwd
+      }),
+      output: redact(accumulateAgentOutput(ctx.events)),
+      metadata: {
+        sessionId: ctx.sessionId,
+        threadId: ctx.threadId,
+        ...spawnCtx.metadata
+      },
+      metrics: buildMetrics(ctx),
+      children: logToolSpans(ctx.events)
+    }
+  };
+}
+function logToolSpans(events) {
+  const spans = [];
+  for (const [index, event] of events.entries()) {
+    const toolCall = asToolCall(event);
+    if (toolCall === void 0) {
+      continue;
+    }
+    const metadata = collectToolMeta(events, index, readString6(toolCall.toolCallId));
+    spans.push({
+      name: `tool_call:${readString6(toolCall.kind) ?? "unknown"}`,
+      kind: "tool",
+      input: redact(readToolInput(toolCall)),
+      output: redact(assembleToolOutput(events, index, readString6(toolCall.toolCallId))),
+      ...metadata ? { metadata } : {},
+      ...readSpanTimestamps(metadata),
+      children: []
+    });
+  }
+  return spans;
+}
+function collectToolMeta(events, toolCallIndex, toolCallId) {
+  const merged = {};
+  const startMeta = asRecord2(asRecord2(events[toolCallIndex])?._meta);
+  if (startMeta) {
+    for (const [key2, value] of Object.entries(startMeta)) {
+      merged[key2 === "ts" ? "startTs" : key2] = value;
+    }
+  }
+  for (const event of events.slice(toolCallIndex + 1)) {
+    const update = asToolCallUpdate(event);
+    if (update === void 0) continue;
+    if (toolCallId !== void 0 && update.toolCallId !== toolCallId) continue;
+    const updateMeta = asRecord2(update._meta);
+    if (!updateMeta) continue;
+    for (const [key2, value] of Object.entries(updateMeta)) {
+      merged[key2 === "ts" ? "endTs" : key2] = value;
+    }
+  }
+  return Object.keys(merged).length > 0 ? merged : void 0;
+}
+function accumulateAgentOutput(events) {
+  let output = "";
+  for (const event of events) {
+    const record = asRecord2(event);
+    if (record === void 0) {
+      continue;
+    }
+    if (record.event === "agent_message") {
+      output += readString6(record.text) ?? "";
+      continue;
+    }
+    if (record.sessionUpdate === "agent_message_chunk") {
+      output += readContentText(record.content);
+    }
+  }
+  return output;
+}
+function assembleToolOutput(events, toolCallIndex, toolCallId) {
+  const outputs = [];
+  let text5 = "";
+  for (const event of events.slice(toolCallIndex + 1)) {
+    const update = asToolCallUpdate(event);
+    if (update === void 0) {
+      continue;
+    }
+    if (toolCallId !== void 0 && update.toolCallId !== toolCallId) {
+      continue;
+    }
+    if (Object.hasOwn(update, "rawOutput")) {
+      outputs.push(update.rawOutput);
+    }
+    const contentText = readContentText(update.content);
+    if (contentText.length > 0) {
+      text5 += contentText;
+    }
+  }
+  if (outputs.length === 0) {
+    return text5;
+  }
+  if (text5.length > 0) {
+    outputs.push(text5);
+  }
+  return outputs.length === 1 ? outputs[0] : outputs;
+}
+function buildMetrics(ctx) {
+  const usage = ctx.usage;
+  const metrics = {};
+  const promptTokens = readNumber(usage.prompt_tokens) ?? readNumber(usage.inputTokens);
+  const completionTokens = readNumber(usage.completion_tokens) ?? readNumber(usage.outputTokens);
+  addMetric(metrics, "prompt_tokens", promptTokens);
+  addMetric(metrics, "completion_tokens", completionTokens);
+  addMetric(
+    metrics,
+    "tokens",
+    readNumber(usage.tokens) ?? sumIfPresent(promptTokens, completionTokens)
+  );
+  addMetric(
+    metrics,
+    "prompt_cached_tokens",
+    readNumber(usage.prompt_cached_tokens) ?? readNumber(usage.cachedTokens)
+  );
+  addMetric(
+    metrics,
+    "prompt_cache_creation_tokens",
+    readNumber(usage.prompt_cache_creation_tokens)
+  );
+  addMetric(metrics, "durationMs", readNumber(usage.durationMs));
+  return metrics;
+}
+function asToolCall(event) {
+  const record = asRecord2(event);
+  return record?.sessionUpdate === "tool_call" ? record : void 0;
+}
+function asToolCallUpdate(event) {
+  const record = asRecord2(event);
+  return record?.sessionUpdate === "tool_call_update" ? record : void 0;
+}
+function readToolInput(toolCall) {
+  if (Object.hasOwn(toolCall, "input")) {
+    return toolCall.input;
+  }
+  return toolCall.rawInput;
+}
+function readContentText(value) {
+  if (Array.isArray(value)) {
+    return value.map(readContentText).join("");
+  }
+  const record = asRecord2(value);
+  if (record === void 0 || record.type !== "text") {
+    return "";
+  }
+  return readString6(record.text) ?? "";
+}
+function readSpanTimestamps(metadata) {
+  if (metadata === void 0) {
+    return {};
+  }
+  const startTs = readNumber(metadata.startTs);
+  const endTs = readNumber(metadata.endTs);
+  return {
+    ...startTs !== void 0 ? { startTs } : {},
+    ...endTs !== void 0 ? { endTs } : {}
+  };
+}
+function asRecord2(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
+function readString6(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function readNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function addMetric(metrics, key2, value) {
+  if (value !== void 0) {
+    metrics[key2] = value;
+  }
+}
+function sumIfPresent(left, right) {
+  return left !== void 0 && right !== void 0 ? left + right : void 0;
+}
+
+// packages/acp-telemetry/src/emit-braintrust.ts
+function emitToBraintrust(trace, parent) {
+  const root = parent.startSpan({ name: trace.root.name, type: "task" });
+  try {
+    emitSpan(root, trace.root);
+  } finally {
+    root.end();
+  }
+}
+function emitSpan(span, traceSpan) {
+  span.log(toBraintrustLogEvent(traceSpan));
+  for (const child of traceSpan.children) {
+    const childSpan = span.startSpan({ name: child.name, type: "tool" });
+    try {
+      emitSpan(childSpan, child);
+    } finally {
+      childSpan.end();
+    }
+  }
+}
+function toBraintrustLogEvent(span) {
+  return {
+    ...Object.hasOwn(span, "input") ? { input: span.input } : {},
+    ...Object.hasOwn(span, "output") ? { output: span.output } : {},
+    ...Object.hasOwn(span, "metadata") ? { metadata: span.metadata } : {},
+    ...Object.hasOwn(span, "metrics") ? { metrics: span.metrics } : {}
+  };
+}
+
 // packages/braintrust/src/row-builder.ts
 function makePipelineRowState(client) {
   const rows = /* @__PURE__ */ new Map();
@@ -29950,8 +30466,8 @@ async function openCurrentChildSpan(client, args, ctx) {
   }
 }
 function buildPipelineCompletionLog(started, completed) {
-  const startRecord = asRecord2(started) ?? {};
-  const completeRecord = asRecord2(completed) ?? {};
+  const startRecord = asRecord3(started) ?? {};
+  const completeRecord = asRecord3(completed) ?? {};
   return {
     input: redact({
       step_name: readPipelineStep(started),
@@ -29974,7 +30490,7 @@ function buildPipelineCompletionLog(started, completed) {
   };
 }
 function buildSuperintendentLog(role, result) {
-  const record = asRecord2(result);
+  const record = asRecord3(result);
   const event = {
     input: redact(record?.input),
     output: redact(record?.output ?? result)
@@ -29988,7 +30504,7 @@ function buildSuperintendentLog(role, result) {
   return event;
 }
 function buildExperimentLog(row, entry) {
-  const entryRecord = asRecord2(entry) ?? {};
+  const entryRecord = asRecord3(entry) ?? {};
   const scores = buildExperimentScores(row.baseline, entry.scores);
   const metrics = { ...row.metrics };
   if (Number.isFinite(entry.durationMs)) {
@@ -30017,12 +30533,12 @@ function buildPipelineMetrics(progress) {
   const metrics = {};
   const usage = progress.usage;
   if (usage !== void 0) {
-    addMetric(metrics, "prompt_tokens", usage.inputTokens);
-    addMetric(metrics, "completion_tokens", usage.outputTokens);
-    addMetric(metrics, "tokens", usage.inputTokens + usage.outputTokens);
-    addMetric(metrics, "prompt_cached_tokens", usage.cachedTokens);
+    addMetric2(metrics, "prompt_tokens", usage.inputTokens);
+    addMetric2(metrics, "completion_tokens", usage.outputTokens);
+    addMetric2(metrics, "tokens", usage.inputTokens + usage.outputTokens);
+    addMetric2(metrics, "prompt_cached_tokens", usage.cachedTokens);
   }
-  addMetric(metrics, "durationMs", progress.durationMs);
+  addMetric2(metrics, "durationMs", progress.durationMs);
   return metrics;
 }
 function buildExperimentScores(baseline, scores) {
@@ -30099,7 +30615,7 @@ function asSpanParent(value) {
   }
   return span;
 }
-function asRecord2(value) {
+function asRecord3(value) {
   return typeof value === "object" && value !== null ? value : void 0;
 }
 function readFirstString(record, keys) {
@@ -30114,7 +30630,7 @@ function readFirstValue(record, keys) {
   }
   return void 0;
 }
-function addMetric(metrics, key2, value) {
+function addMetric2(metrics, key2, value) {
   if (value !== void 0 && Number.isFinite(value)) {
     metrics[key2] = value;
   }
@@ -30166,197 +30682,6 @@ function createPipelineCallbacks(client) {
   };
 }
 
-// packages/braintrust/src/span-builder.ts
-async function logSpawnSession(client, ctx) {
-  try {
-    const { currentSpan } = await import("braintrust");
-    const agentSpan = asSpanParent2(currentSpan()).startSpan({
-      name: `agent:${ctx.agent}:${ctx.model ?? "?"}`,
-      type: "task"
-    });
-    try {
-      logToolSpans(agentSpan, ctx.events);
-      agentSpan.log({
-        input: redact({
-          prompt: ctx.prompt,
-          mode: ctx.mode,
-          cwd: ctx.cwd
-        }),
-        output: redact(accumulateAgentOutput(ctx.events)),
-        metadata: {
-          sessionId: ctx.sessionId,
-          threadId: ctx.threadId,
-          ...ctx.metadata
-        },
-        metrics: buildMetrics(ctx)
-      });
-    } finally {
-      agentSpan.end();
-    }
-  } catch (err) {
-    client.recordError(err, "log spawn session");
-  }
-}
-function logToolSpans(agentSpan, events) {
-  for (const [index, event] of events.entries()) {
-    const toolCall = asToolCall(event);
-    if (toolCall === void 0) {
-      continue;
-    }
-    const toolSpan = agentSpan.startSpan({
-      name: `tool_call:${readString6(toolCall.kind) ?? "unknown"}`,
-      type: "tool"
-    });
-    try {
-      const metadata = collectToolMeta(events, index, readString6(toolCall.toolCallId));
-      toolSpan.log({
-        input: redact(readToolInput(toolCall)),
-        output: redact(assembleToolOutput(events, index, readString6(toolCall.toolCallId))),
-        ...metadata ? { metadata } : {}
-      });
-    } finally {
-      toolSpan.end();
-    }
-  }
-}
-function collectToolMeta(events, toolCallIndex, toolCallId) {
-  const merged = {};
-  const startMeta = asRecord3(asRecord3(events[toolCallIndex])?._meta);
-  if (startMeta) {
-    for (const [key2, value] of Object.entries(startMeta)) {
-      merged[key2 === "ts" ? "startTs" : key2] = value;
-    }
-  }
-  for (const event of events.slice(toolCallIndex + 1)) {
-    const update = asToolCallUpdate(event);
-    if (update === void 0) continue;
-    if (toolCallId !== void 0 && update.toolCallId !== toolCallId) continue;
-    const updateMeta = asRecord3(update._meta);
-    if (!updateMeta) continue;
-    for (const [key2, value] of Object.entries(updateMeta)) {
-      merged[key2 === "ts" ? "endTs" : key2] = value;
-    }
-  }
-  return Object.keys(merged).length > 0 ? merged : void 0;
-}
-function accumulateAgentOutput(events) {
-  let output = "";
-  for (const event of events) {
-    const record = asRecord3(event);
-    if (record === void 0) {
-      continue;
-    }
-    if (record.event === "agent_message") {
-      output += readString6(record.text) ?? "";
-      continue;
-    }
-    if (record.sessionUpdate === "agent_message_chunk") {
-      output += readContentText(record.content);
-    }
-  }
-  return output;
-}
-function assembleToolOutput(events, toolCallIndex, toolCallId) {
-  const outputs = [];
-  let text5 = "";
-  for (const event of events.slice(toolCallIndex + 1)) {
-    const update = asToolCallUpdate(event);
-    if (update === void 0) {
-      continue;
-    }
-    if (toolCallId !== void 0 && update.toolCallId !== toolCallId) {
-      continue;
-    }
-    if (Object.hasOwn(update, "rawOutput")) {
-      outputs.push(update.rawOutput);
-    }
-    const contentText = readContentText(update.content);
-    if (contentText.length > 0) {
-      text5 += contentText;
-    }
-  }
-  if (outputs.length === 0) {
-    return text5;
-  }
-  if (text5.length > 0) {
-    outputs.push(text5);
-  }
-  return outputs.length === 1 ? outputs[0] : outputs;
-}
-function buildMetrics(ctx) {
-  const usage = ctx.usage;
-  const metrics = {};
-  const promptTokens = readNumber(usage.prompt_tokens) ?? readNumber(usage.inputTokens);
-  const completionTokens = readNumber(usage.completion_tokens) ?? readNumber(usage.outputTokens);
-  addMetric2(metrics, "prompt_tokens", promptTokens);
-  addMetric2(metrics, "completion_tokens", completionTokens);
-  addMetric2(
-    metrics,
-    "tokens",
-    readNumber(usage.tokens) ?? sumIfPresent(promptTokens, completionTokens)
-  );
-  addMetric2(
-    metrics,
-    "prompt_cached_tokens",
-    readNumber(usage.prompt_cached_tokens) ?? readNumber(usage.cachedTokens)
-  );
-  addMetric2(
-    metrics,
-    "prompt_cache_creation_tokens",
-    readNumber(usage.prompt_cache_creation_tokens)
-  );
-  addMetric2(metrics, "durationMs", readNumber(usage.durationMs));
-  return metrics;
-}
-function asSpanParent2(value) {
-  const span = value;
-  if (span === void 0 || typeof span.startSpan !== "function") {
-    throw new Error("Braintrust current span unavailable");
-  }
-  return span;
-}
-function asToolCall(event) {
-  const record = asRecord3(event);
-  return record?.sessionUpdate === "tool_call" ? record : void 0;
-}
-function asToolCallUpdate(event) {
-  const record = asRecord3(event);
-  return record?.sessionUpdate === "tool_call_update" ? record : void 0;
-}
-function readToolInput(toolCall) {
-  if (Object.hasOwn(toolCall, "input")) {
-    return toolCall.input;
-  }
-  return toolCall.rawInput;
-}
-function readContentText(value) {
-  if (Array.isArray(value)) {
-    return value.map(readContentText).join("");
-  }
-  const record = asRecord3(value);
-  if (record === void 0 || record.type !== "text") {
-    return "";
-  }
-  return readString6(record.text) ?? "";
-}
-function asRecord3(value) {
-  return typeof value === "object" && value !== null ? value : void 0;
-}
-function readString6(value) {
-  return typeof value === "string" ? value : void 0;
-}
-function readNumber(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
-}
-function addMetric2(metrics, key2, value) {
-  if (value !== void 0) {
-    metrics[key2] = value;
-  }
-}
-function sumIfPresent(left, right) {
-  return left !== void 0 && right !== void 0 ? left + right : void 0;
-}
-
 // packages/braintrust/src/adapters/spawn.ts
 function createSpawnMiddleware(client) {
   return async (ctx, next) => {
@@ -30370,7 +30695,12 @@ function createSpawnMiddleware(client) {
       };
       throw err;
     } finally {
-      await logSpawnSession(client, ctx);
+      try {
+        const { currentSpan } = await import("braintrust");
+        emitToBraintrust(acpToTrace(ctx), currentSpan());
+      } catch (err) {
+        client.recordError(err, "log spawn session");
+      }
     }
   };
 }
@@ -30401,7 +30731,7 @@ function createSuperintendentCallbacks(client) {
 async function logFailedRole(client, role, error2, name) {
   try {
     const { currentSpan } = await import("braintrust");
-    const span = asSpanParent3(currentSpan()).startSpan({
+    const span = asSpanParent2(currentSpan()).startSpan({
       name: name === void 0 ? `role:${role}:failed` : `role:${role}:${name}:failed`,
       type: "task"
     });
@@ -30423,7 +30753,7 @@ async function logFailedRole(client, role, error2, name) {
     client.recordError(err, `superintendent ${role} failed`);
   }
 }
-function asSpanParent3(value) {
+function asSpanParent2(value) {
   const span = value;
   if (span === void 0 || typeof span.startSpan !== "function") {
     throw new Error("Braintrust current span unavailable");