negotium 0.1.34 → 0.1.35

package/dist/main.js

@@ -3919,7 +3919,7 @@ var init_claude_provider = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.1.34";
+var NEGOTIUM_VERSION = "0.1.35";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn3 } from "child_process";
@@ -4275,6 +4275,29 @@ function summarizeTargets(values) {
     return targets[0] ?? "";
   return `${targets[0]} +${targets.length - 1}`;
 }
+function summarizeSsh(words) {
+  let destination = "";
+  let index = 0;
+  while (index < words.length) {
+    const word = words[index] ?? "";
+    if (word === "--") {
+      destination = words[index + 1] ?? "";
+      index += 2;
+      break;
+    }
+    if (!word.startsWith("-")) {
+      destination = word;
+      index += 1;
+      break;
+    }
+    index += SSH_OPTIONS_WITH_VALUE.has(word) ? 2 : 1;
+  }
+  if (!destination)
+    return "ssh";
+  const remoteCommand = words.slice(index).join(" ");
+  const remoteSummary = remoteCommand ? summarizeShellCommand(remoteCommand) : "";
+  return ["ssh", destination, remoteSummary].filter(Boolean).join(" \xB7 ");
+}
 function summarizeShellPart(value) {
   const words = shellWords(value).filter((word) => !/^\d*>/.test(word));
   while (words[0] === "sudo")
@@ -4294,6 +4317,8 @@ function summarizeShellPart(value) {
   if (executable === "command" && words[0] === "-v") {
     return words[1] ? `find ${commandName(words[1])}` : "find command";
   }
+  if (executable === "ssh")
+    return summarizeSsh(words);
   if (executable === "git") {
     while (words[0]?.startsWith("-")) {
       const option = words.shift();
@@ -4592,8 +4617,31 @@ function formatToolUse(name, input) {
   }
   return displayName;
 }
-var TOOL_SUMMARY_MAX_CHARS = 90, TOOL_SUMMARY_HEAD_CHARS = 52, TOOL_SUMMARY_TAIL_CHARS = 28, TOOL_DIFF_MAX_CHARS = 4000, TOOL_DIFF_SOURCE_MAX_BYTES = 2000000, SHELL_SUMMARY_MAX_PARTS = 3, SUMMARY_KEYS;
+var TOOL_SUMMARY_MAX_CHARS = 90, TOOL_SUMMARY_HEAD_CHARS = 52, TOOL_SUMMARY_TAIL_CHARS = 28, TOOL_DIFF_MAX_CHARS = 4000, TOOL_DIFF_SOURCE_MAX_BYTES = 2000000, SHELL_SUMMARY_MAX_PARTS = 3, SSH_OPTIONS_WITH_VALUE, SUMMARY_KEYS;
 var init_tool_format = __esm(() => {
+  SSH_OPTIONS_WITH_VALUE = new Set([
+    "-B",
+    "-b",
+    "-c",
+    "-D",
+    "-E",
+    "-e",
+    "-F",
+    "-I",
+    "-i",
+    "-J",
+    "-L",
+    "-l",
+    "-m",
+    "-O",
+    "-o",
+    "-p",
+    "-Q",
+    "-R",
+    "-S",
+    "-W",
+    "-w"
+  ]);
   SUMMARY_KEYS = [
     "command",
     "cmd",
@@ -22917,41 +22965,13 @@ var init_path_suggest = __esm(() => {
   TRAILING_PUNCT = /[.,;:!?)\]}>"'`]+$/;
 });
 
-// ../../adapters/terminal/src/terminal-width.ts
-function stripAnsi(value) {
-  return value.replace(new RegExp("\\u001b\\[[0-?]*[ -/]*[@-~]", "g"), "");
-}
-function runeWidth(char) {
-  const code = char.codePointAt(0) ?? 0;
-  if (code === 8205 || code >= 65024 && code <= 65039)
-    return 0;
-  if (code >= 4352 && (code <= 4447 || code === 9001 || code === 9002 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 127744 && code <= 129791 || code >= 131072)) {
-    return 2;
-  }
-  return 1;
-}
-function displayWidth(value) {
-  return [...stripAnsi(value)].reduce((width, char) => width + runeWidth(char), 0);
-}
-
 // ../../adapters/terminal/src/subagent-graph.ts
-import { spawn as spawn7 } from "child_process";
-import { createRequire as createRequire2 } from "module";
+import { layoutTerminalGraph } from "orchgraph";
 function adjustSubagentGraphSpacing(current3, delta) {
   return Math.min(MAX_SUBAGENT_GRAPH_SPACING, Math.max(MIN_SUBAGENT_GRAPH_SPACING, current3 + delta));
 }
-function terminalGraphLayout(spacing) {
-  const normalized = adjustSubagentGraphSpacing(spacing, 0);
-  return {
-    padding: Math.max(1, Math.round(normalized / 4)),
-    nodeSpacing: normalized,
-    layerSpacing: Math.max(2, Math.round(normalized * 0.75)),
-    edgeNodeSpacing: Math.max(1, Math.round(normalized / 2)),
-    edgeEdgeSpacing: Math.max(1, Math.round(normalized / 2))
-  };
-}
-function textWidth(value) {
-  return displayWidth(value);
+function isSubagentGraphEdgeKind(value) {
+  return value === "owns" || value === "owns-parent-only" || value === "tell" || value === "tell-bidirectional";
 }
 function scopedTopics(topics, activeTopicId) {
   const root = topics.find((topic) => topic.id === activeTopicId);
@@ -22978,6 +22998,18 @@ function scopedTopics(topics, activeTopicId) {
   append(root);
   return scoped;
 }
+function edgePresentation(kind) {
+  switch (kind) {
+    case "owns":
+      return { direction: "both", style: "solid" };
+    case "owns-parent-only":
+      return { direction: "forward", style: "solid", label: "status only \u2193" };
+    case "tell":
+      return { direction: "forward", style: "dashed", label: "tell" };
+    case "tell-bidirectional":
+      return { direction: "both", style: "dashed", label: "tell \u2194" };
+  }
+}
 function buildSubagentGraph(topics, activeTopicId, runningTopicIds = new Set) {
   const scoped = scopedTopics(topics, activeTopicId);
   const scopedIds = new Set(scoped.map((topic) => topic.id));
@@ -23000,29 +23032,29 @@ function buildSubagentGraph(topics, activeTopicId, runningTopicIds = new Set) {
       scopedIds.add(target.id);
     }
   }
-  const edges = [];
+  const domainEdges = [];
   const edgeKeys = new Set;
   const addEdge = (kind, source, target) => {
     if (!scopedIds.has(source) || !scopedIds.has(target) || source === target)
       return;
     if (kind === "tell") {
-      const reverseIndex = edges.findIndex((edge) => (edge.kind === "tell" || edge.kind === "tell-bidirectional") && edge.source === target && edge.target === source);
+      const reverseIndex = domainEdges.findIndex((edge) => (edge.kind === "tell" || edge.kind === "tell-bidirectional") && edge.source === target && edge.target === source);
       if (reverseIndex >= 0) {
-        const reverse = edges[reverseIndex];
-        if (reverse.kind === "tell") {
+        const reverse = domainEdges[reverseIndex];
+        if (reverse?.kind === "tell") {
           edgeKeys.delete(reverse.id);
-          const id = `tell-bidirectional:${reverse.source}:${reverse.target}`;
-          edges[reverseIndex] = { ...reverse, id, kind: "tell-bidirectional" };
-          edgeKeys.add(id);
+          const id2 = `tell-bidirectional:${reverse.source}:${reverse.target}`;
+          domainEdges[reverseIndex] = { ...reverse, id: id2, kind: "tell-bidirectional" };
+          edgeKeys.add(id2);
         }
         return;
       }
     }
-    const key = `${kind}:${source}:${target}`;
-    if (edgeKeys.has(key))
+    const id = `${kind}:${source}:${target}`;
+    if (edgeKeys.has(id))
       return;
-    edgeKeys.add(key);
-    edges.push({ id: key, source, target, kind });
+    edgeKeys.add(id);
+    domainEdges.push({ id, source, target, kind });
   };
   for (const topic of scoped) {
     if (topic.id !== activeTopicId && topic.parentTopicId) {
@@ -23032,292 +23064,40 @@ function buildSubagentGraph(topics, activeTopicId, runningTopicIds = new Set) {
       addEdge("tell", topic.id, targetId);
     }
   }
-  return {
-    rootTitle: scoped[0]?.title ?? activeTopicId,
-    nodes: scoped.map((topic) => ({
-      id: topic.id,
-      title: topic.title.trim() || topic.id,
-      detail: `${topic.agent ?? "agent"} \xB7 ${topic.effectiveModel ?? topic.defaultModel ?? "default"} \xB7 ${topic.effectiveEffort ?? topic.defaultEffort ?? "default"}`,
-      running: runningTopicIds.has(topic.id)
-    })),
-    edges
-  };
-}
-function layoutInput(graph, spacing) {
-  const layout = terminalGraphLayout(spacing);
+  const nodes = scoped.map((topic) => ({
+    id: topic.id,
+    label: topic.title.trim() || topic.id,
+    detail: `${topic.agent ?? "agent"} \xB7 ${topic.effectiveModel ?? topic.defaultModel ?? "default"} \xB7 ${topic.effectiveEffort ?? topic.defaultEffort ?? "default"}`,
+    state: runningTopicIds.has(topic.id) ? "running" : "idle"
+  }));
+  const root = nodes[0];
   return {
     id: "subagents",
-    layoutOptions: {
-      "elk.algorithm": "layered",
-      "elk.direction": "DOWN",
-      "elk.edgeRouting": "ORTHOGONAL",
-      "elk.padding": `[top=${layout.padding},left=${layout.padding},bottom=${layout.padding},right=${layout.padding}]`,
-      "elk.spacing.nodeNode": String(layout.nodeSpacing),
-      "elk.layered.spacing.nodeNodeBetweenLayers": String(layout.layerSpacing),
-      "elk.layered.spacing.edgeNodeBetweenLayers": String(layout.edgeNodeSpacing),
-      "elk.layered.spacing.edgeEdgeBetweenLayers": String(layout.edgeEdgeSpacing),
-      "elk.layered.nodePlacement.favorStraightEdges": "true",
-      "elk.layered.crossingMinimization.strategy": "LAYER_SWEEP"
-    },
-    children: graph.nodes.map((node) => {
-      const contentWidth = Math.max(textWidth(node.title) + 4, textWidth(node.detail) + 2, 12);
-      return { id: node.id, width: contentWidth + 2, height: 4 };
-    }),
-    edges: graph.edges.map((edge) => ({
-      id: edge.id,
-      sources: [edge.source],
-      targets: [edge.target]
-    }))
+    title: root?.label ?? activeTopicId,
+    direction: "DOWN",
+    nodes,
+    edges: domainEdges.map((edge) => ({ ...edge, ...edgePresentation(edge.kind) })),
+    rootDetail: root?.detail,
+    rootRunning: root?.state === "running"
   };
 }
-function appendElkOutput(current3, chunk, maxBytes = MAX_ELK_OUTPUT_BYTES) {
-  if (Buffer.byteLength(current3) + Buffer.byteLength(chunk) > maxBytes) {
-    throw new Error(`ELK output exceeded ${maxBytes} bytes`);
-  }
-  return current3 + chunk;
-}
-async function runElk(input, signal) {
-  const require2 = createRequire2(import.meta.url);
-  const elkPath = require2.resolve("elkjs/lib/elk.bundled.js");
-  const nodeBinary = process.env.NEGOTIUM_NODE_BINARY?.trim() || "node";
-  return await new Promise((resolve19, reject) => {
-    const child = spawn7(nodeBinary, ["--eval", ELK_HOST_SOURCE, elkPath], {
-      stdio: ["pipe", "pipe", "pipe"],
-      signal,
-      timeout: 15000,
-      killSignal: "SIGKILL"
-    });
-    let stdout = "";
-    let stderr = "";
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => {
-      try {
-        stdout = appendElkOutput(stdout, chunk);
-      } catch (error) {
-        child.kill("SIGKILL");
-        reject(error);
-      }
-    });
-    child.stderr.on("data", (chunk) => {
-      try {
-        stderr = appendElkOutput(stderr, chunk);
-      } catch (error) {
-        child.kill("SIGKILL");
-        reject(error);
-      }
-    });
-    child.once("error", (error) => {
-      reject(error.code === "ENOENT" ? new Error("Node.js 20+ is required for the agent graph (Ctrl-G)") : error);
-    });
-    child.once("exit", (code, signal2) => {
-      if (code !== 0) {
-        reject(new Error(stderr.trim() || `ELK exited with ${signal2 ? `signal ${signal2}` : `code ${String(code)}`}`));
-        return;
-      }
-      try {
-        resolve19(JSON.parse(stdout));
-      } catch {
-        reject(new Error("ELK returned an invalid layout"));
-      }
-    });
-    child.stdin.end(JSON.stringify(input));
-  });
-}
-function rounded(value) {
-  return Math.max(0, Math.round(value ?? 0));
-}
-function edgeCharacter(existing, next, tell) {
-  const glyph = tell ? next === "horizontal" ? "\u2508" : "\u250A" : next === "horizontal" ? "\u2500" : "\u2502";
-  if (existing === " " || existing === glyph)
-    return glyph;
-  if ("\u2500\u2508".includes(existing) && next === "horizontal")
-    return existing;
-  if ("\u2502\u250A".includes(existing) && next === "vertical")
-    return existing;
-  return "\u253C";
-}
-function edgeMidpoint(points) {
-  const lengths = points.slice(1).map((point, index) => {
-    const previous = points[index];
-    return Math.abs(point.x - previous.x) + Math.abs(point.y - previous.y);
+async function layoutSubagentGraph(graph, spacing = DEFAULT_SUBAGENT_GRAPH_SPACING, signal) {
+  const canvas = await layoutTerminalGraph(graph, {
+    direction: "DOWN",
+    spacing,
+    signal,
+    timeoutMs: 15000
   });
-  let remaining = lengths.reduce((sum, length) => sum + length, 0) / 2;
-  for (let index = 0;index < lengths.length; index += 1) {
-    const length = lengths[index];
-    const start = points[index];
-    const end = points[index + 1];
-    if (remaining <= length) {
-      const ratio = length === 0 ? 0 : remaining / length;
-      return {
-        x: Math.round(start.x + (end.x - start.x) * ratio),
-        y: Math.round(start.y + (end.y - start.y) * ratio)
-      };
-    }
-    remaining -= length;
-  }
-  return points.at(-1) ?? { x: 0, y: 0 };
-}
-function renderCanvas(graph, layout) {
-  const width = Math.max(1, rounded(layout.width) + 2);
-  const height = Math.max(1, rounded(layout.height) + 2);
-  const cells = Array.from({ length: height }, () => Array.from({ length: width }, () => " "));
-  const put = (x, y, value) => {
-    if (y < 0 || y >= height || x < 0 || x >= width)
-      return;
-    cells[y][x] = value;
-  };
-  const putText = (x, y, value, maxWidth) => {
-    let column = 0;
-    for (const character of [...value]) {
-      const width2 = displayWidth(character);
-      if (column + width2 > maxWidth)
-        break;
-      put(x + column, y, character);
-      if (width2 === 2)
-        put(x + column + 1, y, "");
-      column += width2;
-    }
-  };
-  const edgeById = new Map(graph.edges.map((edge) => [edge.id, edge]));
-  const edgeLabels = [];
-  const edges = [];
-  for (const laidOutEdge of layout.edges ?? []) {
-    const edge = edgeById.get(laidOutEdge.id);
-    if (!edge)
-      continue;
-    const edgeCells = new Map;
-    const recordEdgeCell = (x, y) => {
-      edgeCells.set(`${x}:${y}`, { x, y });
-    };
-    for (const section of laidOutEdge.sections ?? []) {
-      const points = [section.startPoint, ...section.bendPoints ?? [], section.endPoint].map((point) => ({ x: rounded(point.x) + 1, y: rounded(point.y) + 1 }));
-      for (let index = 1;index < points.length; index += 1) {
-        const from = points[index - 1];
-        const to = points[index];
-        const horizontal = from.y === to.y;
-        const distance = horizontal ? Math.abs(to.x - from.x) : Math.abs(to.y - from.y);
-        const xStep = horizontal ? Math.sign(to.x - from.x) : 0;
-        const yStep = horizontal ? 0 : Math.sign(to.y - from.y);
-        for (let offset = 0;offset <= distance; offset += 1) {
-          const x = from.x + xStep * offset;
-          const y = from.y + yStep * offset;
-          const existing = cells[y]?.[x] ?? " ";
-          put(x, y, edgeCharacter(existing, horizontal ? "horizontal" : "vertical", edge.kind === "tell" || edge.kind === "tell-bidirectional"));
-          recordEdgeCell(x, y);
-        }
-      }
-      const end = points.at(-1);
-      const before = points.at(-2);
-      if (end && before) {
-        const arrowX = end.x - Math.sign(end.x - before.x);
-        const arrowY = end.y - Math.sign(end.y - before.y);
-        const arrow = end.y > before.y ? "\u25BC" : end.y < before.y ? "\u25B2" : end.x > before.x ? "\u25B6" : "\u25C0";
-        put(arrowX, arrowY, arrow);
-        recordEdgeCell(arrowX, arrowY);
-      }
-      if (edge.kind === "owns" || edge.kind === "tell-bidirectional") {
-        const start = points[0];
-        const after = points[1];
-        if (start && after) {
-          const arrowX = start.x + Math.sign(after.x - start.x);
-          const arrowY = start.y + Math.sign(after.y - start.y);
-          const arrow = after.y > start.y ? "\u25B2" : after.y < start.y ? "\u25BC" : after.x > start.x ? "\u25C0" : "\u25B6";
-          put(arrowX, arrowY, arrow);
-          recordEdgeCell(arrowX, arrowY);
-        }
-      }
-      if ((edge.kind === "owns-parent-only" || edge.kind === "tell" || edge.kind === "tell-bidirectional") && points.length > 1) {
-        const middle = edgeMidpoint(points);
-        const label = edge.kind === "owns-parent-only" ? " status only \u2193 " : edge.kind === "tell-bidirectional" ? " tell \u2194 " : " tell ";
-        edgeLabels.push({
-          x: middle.x - Math.floor(label.length / 2),
-          y: middle.y,
-          text: label
-        });
-      }
-    }
-    edges.push({
-      sourceTopicId: edge.source,
-      targetTopicId: edge.target,
-      kind: edge.kind,
-      cells: [...edgeCells.values()]
-    });
-  }
-  for (const label of edgeLabels)
-    putText(label.x, label.y, label.text, textWidth(label.text));
-  const nodeById = new Map(graph.nodes.map((node) => [node.id, node]));
-  const nodes = [];
-  for (const laidOutNode of layout.children ?? []) {
-    const node = nodeById.get(laidOutNode.id);
-    if (!node)
-      continue;
-    const x = rounded(laidOutNode.x) + 1;
-    const y = rounded(laidOutNode.y) + 1;
-    const nodeWidth = Math.max(4, rounded(laidOutNode.width));
-    const nodeHeight = Math.max(4, rounded(laidOutNode.height));
-    for (let row = 0;row < nodeHeight; row += 1) {
-      for (let column = 0;column < nodeWidth; column += 1)
-        put(x + column, y + row, " ");
-    }
-    put(x, y, "\u256D");
-    put(x + nodeWidth - 1, y, "\u256E");
-    put(x, y + nodeHeight - 1, "\u2570");
-    put(x + nodeWidth - 1, y + nodeHeight - 1, "\u256F");
-    for (let column = 1;column < nodeWidth - 1; column += 1) {
-      put(x + column, y, "\u2500");
-      put(x + column, y + nodeHeight - 1, "\u2500");
-    }
-    for (let row = 1;row < nodeHeight - 1; row += 1) {
-      put(x, y + row, "\u2502");
-      put(x + nodeWidth - 1, y + row, "\u2502");
-    }
-    putText(x + 2, y + 1, `${node.running ? "\u25CF" : "\u25CB"} ${node.title}`, nodeWidth - 3);
-    putText(x + 2, y + 2, node.detail, nodeWidth - 3);
-    nodes.push({
-      topicId: node.id,
-      title: node.title,
-      markerX: x + 2,
-      markerY: y + 1
-    });
-  }
   return {
-    title: graph.rootTitle,
-    rootDetail: graph.nodes[0]?.detail,
-    rootRunning: graph.nodes[0]?.running,
-    nodes,
-    edges,
-    lines: cells.map((row) => row.join("").trimEnd()),
-    width,
-    height
+    ...canvas,
+    title: graph.title,
+    rootDetail: graph.rootDetail,
+    rootRunning: graph.rootRunning,
+    edges: canvas.edges.map(({ kind, ...edge }) => isSubagentGraphEdgeKind(kind) ? { ...edge, kind } : edge)
   };
 }
-async function layoutSubagentGraph(graph, spacing = DEFAULT_SUBAGENT_GRAPH_SPACING, signal) {
-  if (graph.nodes.length === 0) {
-    return { title: graph.rootTitle, lines: [], width: 0, height: 0 };
-  }
-  return renderCanvas(graph, await runElk(layoutInput(graph, spacing), signal));
-}
-var DEFAULT_SUBAGENT_GRAPH_SPACING = 4, MIN_SUBAGENT_GRAPH_SPACING = 2, MAX_SUBAGENT_GRAPH_SPACING = 10, ELK_HOST_SOURCE = `
-const modulePath = process.argv[1];
-const imported = require(modulePath);
-const ELK = imported.default || imported;
-let input = "";
-process.stdin.setEncoding("utf8");
-process.stdin.on("data", (chunk) => input += chunk);
-process.stdin.on("end", async () => {
-  try {
-    const result = await new ELK().layout(JSON.parse(input));
-    process.stdout.write(JSON.stringify(result));
-  } catch (error) {
-    process.stderr.write(error && error.stack ? error.stack : String(error));
-    process.exitCode = 1;
-  }
-});
-`, MAX_ELK_OUTPUT_BYTES;
-var init_subagent_graph = __esm(() => {
-  MAX_ELK_OUTPUT_BYTES = 1024 * 1024;
-});
+var DEFAULT_SUBAGENT_GRAPH_SPACING = 4, MIN_SUBAGENT_GRAPH_SPACING = 2, MAX_SUBAGENT_GRAPH_SPACING = 10;
+var init_subagent_graph = () => {};
 
 // ../../adapters/terminal/src/state.ts
 function createInitialState(userId) {
@@ -23813,6 +23593,23 @@ var init_state2 = __esm(async () => {
   init_subagent_graph();
 });
 
+// ../../adapters/terminal/src/terminal-width.ts
+function stripAnsi(value) {
+  return value.replace(new RegExp("\\u001b\\[[0-?]*[ -/]*[@-~]", "g"), "");
+}
+function runeWidth(char) {
+  const code = char.codePointAt(0) ?? 0;
+  if (code === 8205 || code >= 65024 && code <= 65039)
+    return 0;
+  if (code >= 4352 && (code <= 4447 || code === 9001 || code === 9002 || code >= 11904 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 127744 && code <= 129791 || code >= 131072)) {
+    return 2;
+  }
+  return 1;
+}
+function displayWidth(value) {
+  return [...stripAnsi(value)].reduce((width, char) => width + runeWidth(char), 0);
+}
+
 // ../../adapters/terminal/src/render.ts
 function workingFrame(frame) {
   const index = Math.abs(Math.trunc(frame)) % WORKING_FRAMES.length;
@@ -24503,14 +24300,14 @@ function subagentGraphLines(state, width, height, animationFrame) {
   const position = maxX > 0 || maxY > 0 ? ` \xB7 view ${x + 1},${y + 1}/${maxX + 1},${maxY + 1}` : "";
   const graphNodes = canvas?.nodes ?? [];
   const graphEdges = canvas?.edges ?? [];
-  const runningNodes = graphNodes.filter((node) => state.activity[node.topicId]?.running);
-  const nodeTitleById = new Map(graphNodes.map((node) => [node.topicId, node.title]));
+  const runningNodes = graphNodes.filter((node) => state.activity[node.id]?.running);
+  const nodeTitleById = new Map(graphNodes.map((node) => [node.id, node.label]));
   const hasActiveTell = (sourceTopicId, targetTopicId) => {
     const targetTitle = nodeTitleById.get(targetTopicId);
     const activity = state.activity[sourceTopicId];
     return Boolean(activity?.running && activity.tools.some((tool) => tool.sessionAction === "tell" && (tool.sessionTarget === targetTopicId || tool.sessionTarget === targetTitle)));
   };
-  const activeEdges = graphEdges.filter((edge) => hasActiveTell(edge.sourceTopicId, edge.targetTopicId) || (edge.kind === "owns" || edge.kind === "tell-bidirectional") && hasActiveTell(edge.targetTopicId, edge.sourceTopicId));
+  const activeEdges = graphEdges.filter((edge) => hasActiveTell(edge.source, edge.target) || (edge.kind === "owns" || edge.kind === "tell-bidirectional") && hasActiveTell(edge.target, edge.source));
   const highlightedCellsByRow = new Map;
   for (const edge of activeEdges) {
     for (const cell of edge.cells) {
@@ -24519,7 +24316,7 @@ function subagentGraphLines(state, width, height, animationFrame) {
       highlightedCellsByRow.set(cell.y, columns);
     }
   }
-  const rootTopicId = graphNodes[0]?.topicId;
+  const rootTopicId = graphNodes[0]?.id;
   const rootRunning = rootTopicId ? Boolean(state.activity[rootTopicId]?.running) : Boolean(canvas?.rootRunning);
   const header = [
     line("  Agent graph", {
@@ -24527,7 +24324,7 @@ function subagentGraphLines(state, width, height, animationFrame) {
       bold: true
     }),
     line(canvas ? `  ${rootRunning ? workingFrame(animationFrame) : "\u25CB"} ${canvas.title}${canvas.rootDetail ? ` \xB7 ${canvas.rootDetail}` : ""}` : "  Current topic", { fg: rootRunning ? theme.green : theme.text, bold: true }),
-    line(runningNodes.length > 0 ? `  Working: ${runningNodes.map((node) => node.title).join(", ")}` : "  Working: none", { fg: runningNodes.length > 0 ? theme.green : theme.muted }),
+    line(runningNodes.length > 0 ? `  Working: ${runningNodes.map((node) => node.label).join(", ")}` : "  Working: none", { fg: runningNodes.length > 0 ? theme.green : theme.muted }),
     line(`  [/] spacing ${state.subagentGraphSpacing} \xB7 drag: all directions \xB7 wheel: up/down \xB7 arrows/hjkl move \xB7 Ctrl-G/Esc close${position}`, {
       fg: theme.muted
     }),
@@ -24537,7 +24334,7 @@ function subagentGraphLines(state, width, height, animationFrame) {
     line("")
   ];
   if (state.subagentGraphLoading) {
-    return [...header, line("  Laying out graph with ELK\u2026", { fg: theme.cyan })].slice(0, height);
+    return [...header, line("  Laying out graph with Orchgraph\u2026", { fg: theme.cyan })].slice(0, height);
   }
   if (!canvas || canvas.lines.length === 0) {
     return [...header, line("  No graph data", { fg: theme.muted })].slice(0, height);
@@ -24550,7 +24347,7 @@ function subagentGraphLines(state, width, height, animationFrame) {
       for (const node of graphNodes) {
         if (node.markerY !== canvasY)
           continue;
-        const marker = state.activity[node.topicId]?.running ? workingFrame(animationFrame) : "\u25CB";
+        const marker = state.activity[node.id]?.running ? workingFrame(animationFrame) : "\u25CB";
         canvasLine = replaceAtDisplayColumn(canvasLine, node.markerX, marker);
       }
       const text2 = sliceWidthRange(canvasLine, x, viewportWidth);
@@ -36161,4 +35958,4 @@ switch (command) {
   }
 }
 
-//# debugId=DC511282561B4D1A64756E2164756E21
+//# debugId=6D26E247972E960464756E2164756E21