agentel 0.2.4 → 0.2.6

package/src/cli.js

@@ -24,6 +24,7 @@ const { runSupervisorForeground, startSupervisorDetached, stopSupervisor, superv
 const { configureRemoteFromFlags, hasRemoteTarget, listRemoteSnapshots, replaceRemoteArchive, snapshotArchive, syncArchive, wipeRemoteArchive } = require("./sync");
 const { version } = require("./version");
 const { listWebAccounts, renameWebAccount } = require("./web-accounts");
+const { webExportInstructions } = require("./web-export-instructions");
 
 const HISTORY_AUTH_COOKIE = "agentlog_history";
 const SESSION_WEB_PAYLOAD_VERSION = 3;
@@ -2185,21 +2186,20 @@ async function importCommand(args, flags, env) {
     printImportResults([result]);
     return;
   }
-  if (sub === "claude-web" || sub === "chatgpt") {
-    let importFile = flags.file || args[1] || "";
-    if (!importFile && process.stdin.isTTY) {
-      printSection(`${sub} Export`);
-      printMuted("Choose the official export JSON, ZIP, or extracted folder.");
-      importFile = (await ask("  Export path: ")).trim();
+  if (sub === "claude-web" || sub === "claude_web" || sub === "chatgpt") {
+    const instructions = webExportInstructions(sub);
+    if (flags.instructions || flags.instruction || flags.docs) {
+      return printWebExportInstructions(instructions, flags);
     }
-    if (!importFile) throw new Error(`usage: agentlog import ${sub} <path> --username <name> [--display-name <name>] [--account-id <id>] [--scope local|team]`);
+    let importFile = flags.file || args[1] || "";
+    if (!importFile) return printWebExportInstructions(instructions, flags);
     let username = flags.username || "";
     let displayName = flags["display-name"] || flags.displayName || "";
     if (!username && process.stdin.isTTY) {
       username = (await ask(`${sub} account username/email: `)).trim();
       if (!displayName) displayName = (await ask(`Display name [${username}]: `)).trim() || username;
     }
-    const result = importWebChat(sub, path.resolve(importFile), {
+    const result = importWebChat(instructions.source, path.resolve(importFile), {
       scope: flags.scope || "local",
       dryRun: flags["dry-run"],
       username,
@@ -2544,7 +2544,7 @@ function resumeCommandForSession(session) {
   if (provider === "devin" && sourceType === "devin-cli-history") {
     return `devin -r ${shellArg(sessionId.replace(/^devin-/, ""))}`;
   }
-  if (provider === "opencode" && ["opencode-history", "opencode-sqlite-history"].includes(sourceType)) {
+  if (provider === "opencode" && ["opencode-cli-history", "opencode-cli-sqlite-history", "opencode-desktop-history", "opencode-desktop-sqlite-history", "opencode-web-sqlite-history", "opencode-history", "opencode-sqlite-history"].includes(sourceType)) {
     return `opencode --session ${shellArg(sessionId.replace(/^opencode-/, ""))}`;
   }
   if (provider === "gemini_cli" && sourceType === "gemini-cli-history") {
@@ -2827,10 +2827,13 @@ function compareHistorySessionsForTree(a, b) {
 
 function statsPayload(filters, env) {
   const sessions = listHistorySessions({ ...filters, limit: 5000 }, env);
-  return statsPayloadForSessions(sessions);
+  return statsPayloadForSessions(sessions, { includeSdk: statsFiltersTargetSdk(filters) });
 }
 
 function statsPayloadForSessions(sessions, options = {}) {
+  const allSessions = Array.isArray(sessions) ? sessions : [];
+  const sdkSessions = allSessions.filter(isSdkStatsSession);
+  const statsSessions = options.includeSdk ? allSessions : allSessions.filter((session) => !isSdkStatsSession(session));
   const providerSet = new Set();
   const companySet = new Set();
   const modelGroupSet = new Set();
@@ -2853,7 +2856,7 @@ function statsPayloadForSessions(sessions, options = {}) {
   let totalUserMessages = 0;
   let peakSessionTokens = 0;
   let peakSessionLabel = "";
-  for (const session of sessions) {
+  for (const session of statsSessions) {
     const provider = String(session.provider || "unknown");
     const modelGroup = statsSessionPrimaryModel(session);
     const companyGroup = statsSessionCompany(session, provider, modelGroup);
@@ -3114,15 +3117,25 @@ function statsPayloadForSessions(sessions, options = {}) {
   const avgMessagesPerConversation =
     totalConversations > 0 ? totalMessages / totalConversations : 0;
   const splitStats = options.includeSplit === false ? null : {
-    agent: statsPayloadForSessions(sessions.filter((session) => statsSessionCategory(session) === "agent"), { includeSplit: false, category: "agent" }),
-    chat: statsPayloadForSessions(sessions.filter((session) => statsSessionCategory(session) === "chat"), { includeSplit: false, category: "chat" })
+    agent: statsPayloadForSessions(allSessions.filter((session) => !isSdkStatsSession(session) && statsSessionCategory(session) === "agent"), { includeSplit: false, category: "agent" }),
+    chat: statsPayloadForSessions(allSessions.filter((session) => !isSdkStatsSession(session) && statsSessionCategory(session) === "chat"), { includeSplit: false, category: "chat" }),
+    sdk: statsPayloadForSessions(sdkSessions, { includeSplit: false, includeSdk: true, category: "sdk" })
   };
+  const sdkStats = splitStats?.sdk || null;
   return {
     category: options.category || "all",
     generated_at: new Date().toISOString(),
     session_count: totalConversations,
     agent_session_count: splitStats ? splitStats.agent.session_count : undefined,
     chat_session_count: splitStats ? splitStats.chat.session_count : undefined,
+    sdk_session_count: sdkStats ? sdkStats.session_count : undefined,
+    sdk_message_count: sdkStats ? sdkStats.message_count : undefined,
+    sdk_user_message_count: sdkStats ? sdkStats.user_message_count : undefined,
+    sdk_total_tokens: sdkStats ? sdkStats.total_tokens : undefined,
+    sdk_total_input_tokens: sdkStats ? sdkStats.total_input_tokens : undefined,
+    sdk_total_output_tokens: sdkStats ? sdkStats.total_output_tokens : undefined,
+    sdk_total_cache_tokens: sdkStats ? sdkStats.total_cache_tokens : undefined,
+    sdk_total_estimated_tokens: sdkStats ? sdkStats.total_estimated_tokens : undefined,
     message_count: totalMessages,
     user_message_count: totalUserMessages,
     total_tokens: totalTokens,
@@ -3188,6 +3201,7 @@ function statsCompanyFromProvider(provider) {
   if (["claude_code", "claude_desktop", "claude_sdk", "claude_web"].includes(value)) return "anthropic";
   if (["gemini_cli", "antigravity"].includes(value)) return "google";
   if (value === "devin" || value === "windsurf") return "cognition";
+  if (value === "cursor") return "cursor";
   return "unknown";
 }
 
@@ -3201,7 +3215,7 @@ function statsCompanyFromModel(model) {
   if (text.includes("devin") || text.includes("cognition")) return "cognition";
   if (text.includes("windsurf") || text.includes("swe-")) return "cognition";
   if (text.includes("antigravity")) return "google";
-  if (text.startsWith("composer-") || text.startsWith("cursor-") || text === "auto") return "cursor";
+  if (text.startsWith("composer-") || text.startsWith("cursor-") || text === "auto" || text === "default") return "cursor";
   return "";
 }
 
@@ -3220,6 +3234,20 @@ function statsSessionCategory(session) {
   return provider === "chatgpt" || provider === "claude_web" ? "chat" : "agent";
 }
 
+const SDK_STATS_SOURCE_TYPES = new Set(["codex-sdk-history", "claude-sdk-history"]);
+
+function isSdkStatsSession(session) {
+  const provider = String(session?.provider || "").toLowerCase();
+  const sourceType = String(session?.sourceType || session?.source_type || "").toLowerCase();
+  return provider === "claude_sdk" || SDK_STATS_SOURCE_TYPES.has(sourceType);
+}
+
+function statsFiltersTargetSdk(filters = {}) {
+  const provider = String(filters.provider || filters.source || "").trim().toLowerCase().replace(/[-\s]+/g, "_");
+  const sourceType = String(filters.sourceType || filters.source_type || "").trim().toLowerCase();
+  return provider === "codex_sdk" || provider === "claude_sdk" || SDK_STATS_SOURCE_TYPES.has(sourceType);
+}
+
 function isWebChatStatsProvider(provider) {
   return provider === "chatgpt" || provider === "claude_web";
 }
@@ -3512,14 +3540,14 @@ function serverCommand(flags, env) {
 }
 
 const RECALL_TARGET_SOURCE_MAP = {
-  codex: ["codex-cli", "codex-desktop"],
+  codex: ["codex-cli", "codex-desktop", "codex-sdk"],
   claude: ["claude", "claude-code-desktop", "claude-workspace"],
   gemini: ["gemini-cli"],
   antigravity: ["antigravity"],
   devin: ["devin-cli"],
   cursor: ["cursor"],
   cline: ["cline"],
-  opencode: ["opencode"],
+  opencode: ["opencode-cli", "opencode-desktop", "opencode-web"],
   aider: ["aider"]
 };
 
@@ -3600,6 +3628,9 @@ function normalizeRecallTarget(target) {
     "gemini-cli": "gemini",
     "devin-cli": "devin",
     "open-code": "opencode",
+    "opencode-cli": "opencode",
+    "opencode-desktop": "opencode",
+    "opencode-web": "opencode",
     open_code: "opencode",
     clinecli: "cline",
     "cline-cli": "cline",
@@ -4033,7 +4064,7 @@ function recallArchiveHints() {
   return `- Sessions live under \`~/.agentlog/data/agentlog/sessions/repo=<repo-or-path-key>/provider=<provider>/year=YYYY/month=MM/day=DD/session=<session_id>.conversation.md\`.
 - Git repositories use canonical keys like \`github.com/org/repo\`. Non-git directories may use stable \`path:<hash>\` storage keys, but history results include \`repo_display\` and \`cwd\` with the readable local path.
 - When the user names a repo or folder, add \`--repo "<repo-or-path>"\`; it matches canonical repo keys, \`path:<hash>\`, web scopes, local \`cwd\`, and display labels, so local paths and path fragments work.
-- Useful filters include \`--provider <provider>\`, \`--since 30d\`, and \`--repo "<repo-or-path>"\`. Provider aliases are ordered as OpenAI (\`codex-cli\`, \`codex-desktop\`, \`chatgpt\`), Anthropic (\`claude\`, \`claude-code-desktop\`, \`claude-workspace\`, \`claude-web\`, \`claude-sdk\`), Google (\`gemini-cli\`, \`antigravity\`), then other local tools (\`devin-cli\`, \`cursor\`, \`cline\`, \`opencode\`, \`aider\`).
+- Useful filters include \`--provider <provider>\`, \`--since 30d\`, and \`--repo "<repo-or-path>"\`. Provider aliases are ordered as OpenAI (\`codex-cli\`, \`codex-desktop\`, \`codex-sdk\`, \`chatgpt\`), Anthropic (\`claude\`, \`claude-code-desktop\`, \`claude-workspace\`, \`claude-web\`, \`claude-sdk\`), Google (\`gemini-cli\`, \`antigravity\`), then other local tools (\`devin-cli\`, \`cursor\`, \`cline\`, \`opencode\`, \`aider\`).
 - If the user is asking about the current repository, start without \`--repo\` unless results are noisy; current-repo matches are already weighted higher.`;
 }
 
@@ -4301,6 +4332,10 @@ function printDiscovery(label, result) {
 
 function printImportResults(results, options = {}) {
   for (const result of results) {
+    if (result.instructions) {
+      printWebExportInstructionBlock(result.instructions);
+      continue;
+    }
     const detailText = result.details ? formatDetails(result.details) : "";
     const details = detailText ? ` ${detailText}` : "";
     printCheck(
@@ -4322,6 +4357,37 @@ function printImportResults(results, options = {}) {
   }
 }
 
+function printWebExportInstructions(instructions, flags = {}) {
+  if (!instructions) throw new Error("unknown web export instruction source");
+  if (flags.json) {
+    console.log(JSON.stringify({
+      provider: instructions.provider,
+      source: instructions.source,
+      manual: true,
+      instructions
+    }, null, 2));
+    return;
+  }
+  printPageTitle("agentlog import", `${instructions.source} export instructions`);
+  printWebExportInstructionBlock(instructions);
+}
+
+function printWebExportInstructionBlock(instructions) {
+  printSection(`${instructions.label} Export`);
+  printMuted(`Request and download the ${instructions.fileDescription}, then import it from disk.`);
+  printCheck("Request page", instructions.requestUrl);
+  printCheck("Help", instructions.helpUrl);
+  printSection("Steps");
+  (instructions.steps || []).forEach((step, index) => {
+    console.log(`  ${index + 1}. ${step}`);
+  });
+  if (instructions.notes?.length) {
+    printSection("Notes");
+    for (const note of instructions.notes) console.log(`  - ${note}`);
+  }
+  printCommand("Import after download", instructions.importCommand);
+}
+
 function printPageTitle(title, subtitle = "") {
   if (!process.stdout.isTTY) {
     console.log(title);
@@ -5085,6 +5151,14 @@ function importSourceOptions(discovered) {
       description: "Codex desktop app conversations from the local Codex state database.",
       defaultSelected: Boolean(discovered.codexDesktop?.sessions)
     },
+    {
+      source: "codex-sdk",
+      label: "Codex SDK jobs",
+      count: discovered.codexSdk?.sessions || 0,
+      summary: sourceSummary(discovered.codexSdk),
+      description: "Codex exec and SDK-style batch runs from the local Codex state database; disabled by default because volume can be high.",
+      defaultSelected: false
+    },
     {
       source: "claude",
       label: "Claude Code CLI",
@@ -5158,12 +5232,28 @@ function importSourceOptions(discovered) {
       defaultSelected: Boolean(discovered.cline?.sessions)
     },
     {
-      source: "opencode",
-      label: "OpenCode",
-      count: discovered.opencode?.sessions || 0,
-      summary: sourceSummary(discovered.opencode),
-      description: "OpenCode JSON session, message, part, and session_diff storage from ~/.local/share/opencode.",
-      defaultSelected: Boolean(discovered.opencode?.sessions)
+      source: "opencode-cli",
+      label: "OpenCode CLI",
+      count: discovered.opencodeCli?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeCli),
+      description: "OpenCode CLI/core SQLite database plus project JSON session, message, part, and session_diff storage from ~/.local/share/opencode.",
+      defaultSelected: Boolean(discovered.opencodeCli?.sessions)
+    },
+    {
+      source: "opencode-desktop",
+      label: "OpenCode Desktop",
+      count: discovered.opencodeDesktop?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeDesktop),
+      description: "OpenCode Desktop app-specific SQLite database and app storage.",
+      defaultSelected: Boolean(discovered.opencodeDesktop?.sessions)
+    },
+    {
+      source: "opencode-web",
+      label: "OpenCode Web",
+      count: discovered.opencodeWeb?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeWeb),
+      description: "OpenCode web sessions from the shared OpenCode SQLite store.",
+      defaultSelected: Boolean(discovered.opencodeWeb?.sessions)
     },
     {
       source: "aider",
@@ -5587,6 +5677,12 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 .unsupported-device-block:last-child{margin-bottom:0}
 .unsupported-device-block:before{content:"";width:6px;height:6px;border-radius:999px;background:#94a3b8;flex:0 0 auto}
 .context-card{margin:4px 0;border:1px solid #e5e7eb;border-left:3px solid #cbd5e1;border-radius:8px;background:#fff;color:#475569;overflow:hidden;transition:border-color .15s ease}
+.context-line{display:flex;align-items:center;gap:8px;min-height:28px;margin:2px 0;color:#64748b;font-size:12px;line-height:1.35}
+.context-line .context-glyph{width:22px;height:22px}
+.context-line .context-title{flex:0 0 auto}
+.context-line .context-meta{flex:1 1 auto}
+.context-line .context-end{margin-left:auto}
+.context-line .message-copy{opacity:1;width:22px;height:22px;color:#94a3b8}
 .session-summary-message{margin-bottom:14px}
 .session-summary-card{border-left-color:#D97757;background:#fff}
 .session-summary-body{padding:11px 13px 12px;color:#334155;font-size:13px;line-height:1.55;background:#fff}
@@ -5628,13 +5724,31 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 .md-table{border-collapse:collapse;width:max-content;max-width:100%;font-size:13px}
 .md-table th,.md-table td{border:1px solid #e5e7eb;padding:5px 7px;text-align:left;vertical-align:top}
 .md-table th{background:#f8fafc;font-weight:600}
-.tool-callout{display:flex;align-items:flex-start;gap:10px;margin:0;padding:8px 11px 9px 11px;border:1px solid #e5e7eb;border-radius:8px;background:#fff;color:#0f172a;transition:background .15s ease}
-.tool-callout:hover{background:#fafbfc}
-.tool-stack{display:grid;gap:5px;margin-top:4px}
+.tool-group-card{margin:0;border:0;background:transparent}
+.tool-group-card > summary{display:flex;align-items:center;gap:8px;min-height:28px;margin:0 0 5px;color:#64748b;font-size:13px;font-weight:600;line-height:1.35;cursor:pointer;list-style:none}
+.tool-group-card > summary::-webkit-details-marker{display:none}
+.tool-group-prefix{display:inline-flex;align-items:center;gap:7px;flex:0 0 auto}
+.tool-group-caret{width:0;height:0;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:5px solid #94a3b8;transition:transform .15s ease}
+.tool-group-card[open] .tool-group-caret{transform:rotate(90deg)}
+.tool-group-title{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.tool-group-card[open] > .tool-stack{gap:0;border:1px solid #e5e7eb;border-radius:8px;background:#fff;overflow:hidden}
+.tool-group-card[open] > .tool-stack > .tool-callout{border:0;border-radius:0;border-bottom:1px solid #eef2f7}
+.tool-group-card[open] > .tool-stack > .tool-callout:last-child{border-bottom:0}
+.tool-group-card[open] > .tool-stack > .tool-callout > summary{min-height:26px;padding:2px 8px}
+.tool-callout{display:block;margin:0;border:1px solid #e5e7eb;border-radius:8px;background:#fff;color:#0f172a;overflow:hidden;transition:border-color .15s ease,background .15s ease}
+.tool-callout > summary{display:flex;align-items:center;gap:7px;min-height:28px;padding:3px 8px;cursor:pointer;list-style:none;transition:background .12s ease}
+.tool-callout > summary::-webkit-details-marker{display:none}
+.tool-callout > summary:before{content:"";flex:0 0 auto;width:0;height:0;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:5px solid #94a3b8;transition:transform .15s ease}
+.tool-callout[open] > summary:before{transform:rotate(90deg)}
+.tool-callout:hover,.tool-callout[open]{border-color:#dbe3ef}
+.tool-callout > summary:hover{background:#fafbfc}
+.tool-callout[open] > summary{border-bottom:1px solid #f1f5f9}
+.tool-stack{display:grid;gap:3px;margin-top:3px}
 .tool-stack:first-child{margin-top:0}
 .tool-body + .tool-stack{margin-top:8px}
-.tool-glyph{display:inline-flex;align-items:center;justify-content:center;flex:0 0 auto;width:26px;height:26px;border-radius:6px;background:#f1f5f9;color:#475569;border:0}
-.tool-glyph svg{width:14px;height:14px}
+.tool-stack-heading{display:flex;align-items:center;min-height:24px;margin:0 0 1px;color:#64748b;font-size:12px;font-weight:600;line-height:1.35}
+.tool-glyph{display:inline-flex;align-items:center;justify-content:center;flex:0 0 auto;width:22px;height:22px;border-radius:6px;background:#f1f5f9;color:#475569;border:0}
+.tool-glyph svg{width:13px;height:13px}
 .tool-callout.shell .tool-glyph{background:#f1f5f9;color:#334155}
 .tool-callout.edit .tool-glyph{background:#fef3c7;color:#92400e}
 .tool-callout.read .tool-glyph{background:#e0f2fe;color:#075985}
@@ -5643,16 +5757,21 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 .tool-callout.task .tool-glyph{background:#dcfce7;color:#166534}
 .tool-callout.mcp .tool-glyph{background:#ffedd5;color:#9a3412}
 .tool-callout.skill .tool-glyph{background:#e0e7ff;color:#3730a3}
-.tool-copy{display:grid;gap:3px;min-width:0;flex:1 1 auto}
-.tool-title{display:flex;align-items:center;gap:6px;flex-wrap:wrap;font-size:13px;font-weight:600;line-height:1.3;color:#0f172a;letter-spacing:-0.005em}
+.tool-call-line{display:flex;align-items:baseline;gap:5px;min-width:0;flex:1 1 auto}
+.tool-action{flex:0 0 auto;color:#0f172a;font-size:12.5px;font-weight:600;line-height:1.3}
+.tool-subject{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#475569;font-size:12.5px;font-weight:500;line-height:1.3}
+.tool-callout.shell .tool-subject{font:12px/1.3 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:#475569}
+.tool-callout-body{display:grid;gap:6px;min-width:0;padding:6px 8px 8px 12px;background:#fff}
+.tool-call-meta{display:flex;align-items:center;gap:5px;flex-wrap:wrap;min-width:0}
 .tool-chip{display:inline-flex;align-items:center;height:18px;padding:0 7px;border-radius:999px;background:#f1f5f9;color:#475569;border:0;font-size:11px;font-weight:500;letter-spacing:.01em}
 .tool-status{display:inline-flex;align-items:center;height:18px;border-radius:999px;padding:0 7px;background:#f1f5f9;color:#64748b;border:0;font-size:11px;font-weight:600}
 .tool-status.completed{background:#dcfce7;color:#166534}
 .tool-status.pending{background:#fef9c3;color:#854d0e}
 .tool-status.failed,.tool-status.error{background:#fee2e2;color:#991b1b}
-.tool-detail{color:#475569;font-size:12px;line-height:1.4;overflow-wrap:anywhere}
-.tool-target{display:block;margin-top:3px;color:#64748b;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:11px}
-.tool-preview{display:block;color:#1e293b;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;white-space:pre-wrap;overflow-wrap:anywhere}
+.tool-preview{display:block;margin:0;padding:6px 7px;border:1px solid #edf2f7;border-radius:7px;background:#fafbfc;color:#1e293b;overflow-x:hidden;overflow-y:visible;font:12px/1.4 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word}
+.tool-paired-result{display:grid;gap:4px;min-width:0}
+.tool-result-meta{display:flex;align-items:center;gap:8px;min-width:0;color:#64748b;font-size:11px;font-weight:600}
+.tool-result-meta span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .tool-diff{display:block;margin-top:6px;border:1px solid #e5e7eb;border-radius:6px;background:#fff;overflow:hidden;font:12px/1.55 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace}
 .tool-diff[open] .tool-diff-summary{border-bottom:1px solid #f1f5f9}
 .tool-diff-summary{display:flex;align-items:center;gap:8px;min-height:28px;padding:4px 10px;cursor:pointer;color:#475569;font-size:11px;font-weight:600;list-style:none;background:#fafbfc}
@@ -5661,24 +5780,28 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 .tool-diff[open] .tool-diff-summary:before{transform:rotate(90deg)}
 .tool-diff-summary .add-count{color:#16a34a}
 .tool-diff-summary .del-count{color:#dc2626}
-.tool-diff-body{display:block;max-height:360px;overflow:auto;background:#f8fafc}
+.tool-diff-body{display:block;overflow-x:hidden;overflow-y:visible;background:#f8fafc}
 .tool-diff-block{display:block}
 .tool-diff-block + .tool-diff-block{border-top:1px solid #e5e7eb;margin-top:4px;padding-top:4px}
-.tool-diff-line{display:block;padding:0 10px;white-space:pre-wrap;overflow-wrap:anywhere;color:#0f172a}
+.tool-diff-line{display:block;padding:0 10px;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;color:#0f172a}
 .tool-diff-line.add{background:#e6ffec;color:#1a7f37}
 .tool-diff-line.del{background:#ffebe9;color:#a40e26}
 .tool-diff-line.ctx{color:#6b7280}
 .tool-diff-line.meta{color:#6b7280;font-weight:600;background:#f1f5f9}
 .tool-diff-line.hunk{color:#7c3aed;background:#faf5ff;font-weight:600}
 .tool-result{margin:0;border:1px solid #e5e7eb;border-radius:8px;background:#fff;overflow:hidden}
+.tool-result.inline{margin-top:1px;border-radius:7px;background:#f8fafc}
 .tool-result summary{display:flex;align-items:center;gap:8px;min-height:34px;padding:6px 10px 6px 11px;cursor:pointer;color:#0f172a;font-weight:600;list-style:none;transition:background .12s ease}
+.tool-result.inline summary{min-height:30px;padding:5px 9px;background:#fafbfc}
 .tool-result summary:hover{background:#fafbfc}
+.tool-result.inline summary:hover{background:#f1f5f9}
 .tool-result[open] summary{border-bottom:1px solid #f1f5f9}
 .tool-result summary::-webkit-details-marker{display:none}
 .tool-result summary:before{content:"";flex:0 0 auto;width:0;height:0;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:5px solid #94a3b8;transition:transform .15s ease}
 .tool-result[open] summary:before{transform:rotate(90deg)}
 .tool-result-kind{display:inline-flex;align-items:center;gap:7px;font-size:13px;font-weight:600;color:#0f172a;letter-spacing:-0.005em;flex:0 0 auto;white-space:nowrap}
-.tool-result-kind .tool-glyph{width:22px;height:22px;border-radius:6px}
+.tool-result-kind .tool-glyph{width:20px;height:20px;border-radius:6px}
+.tool-result.inline .tool-result-kind .tool-glyph{width:20px;height:20px}
 .tool-result-kind .tool-glyph svg{width:12px;height:12px}
 .tool-result[data-category="shell"] .tool-result-kind .tool-glyph{background:#f1f5f9;color:#334155}
 .tool-result[data-category="edit"] .tool-result-kind .tool-glyph{background:#fef3c7;color:#92400e}
@@ -5689,7 +5812,12 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 .tool-result[data-category="mcp"] .tool-result-kind .tool-glyph{background:#ffedd5;color:#9a3412}
 .tool-result-detail{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#64748b;font-size:12px;font-weight:500}
 .tool-result-count{margin-left:auto;flex:0 0 auto;color:#94a3b8;font-size:11px;font-weight:600;letter-spacing:.01em;white-space:nowrap}
-.tool-output{max-width:100%;max-height:520px;margin:0;padding:10px 12px;background:#f8fafc;color:#0f172a;overflow:auto;font:12px/1.55 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;white-space:pre}
+.tool-output{max-width:100%;margin:0;padding:6px 7px;background:#f8fafc;color:#0f172a;overflow-x:hidden;overflow-y:visible;font:12px/1.45 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word}
+.tool-result.inline .tool-output{background:#fff}
+.tool-output-lines{display:grid;gap:0;padding:5px 0}
+.tool-output-line{display:grid;grid-template-columns:minmax(2.4em,max-content) minmax(0,1fr);gap:10px;min-width:0;padding:0 7px}
+.tool-line-number{color:#94a3b8;text-align:right;user-select:none}
+.tool-line-text{min-width:0;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word}
 .skill-link{display:inline-flex;align-items:center;gap:4px;max-width:100%;vertical-align:middle;border:1px solid #c7d2fe;border-radius:999px;background:#eef2ff;color:#1e1b4b;padding:1px 7px 2px;font-size:.93em;line-height:1.35;white-space:nowrap}
 .skill-mark{font:700 11px/1 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:#4338ca}
 .skill-name,.skill-path{min-width:0;overflow:hidden;text-overflow:ellipsis}
@@ -5730,6 +5858,7 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
               <button class="select-option active" type="button" data-value="">All sources</button>
 	              <button class="select-option" type="button" data-value="codex-cli">Codex CLI</button>
 	              <button class="select-option" type="button" data-value="codex-desktop">Codex Desktop</button>
+	              <button class="select-option" type="button" data-value="codex-sdk">Codex SDK jobs</button>
 	              <button class="select-option" type="button" data-value="chatgpt">ChatGPT</button>
 	              <button class="select-option" type="button" data-value="claude">Claude Code CLI</button>
 	              <button class="select-option" type="button" data-value="claude-code-desktop">Claude Code Desktop</button>
@@ -5741,7 +5870,9 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 	              <button class="select-option" type="button" data-value="devin-cli">Devin CLI</button>
 	              <button class="select-option" type="button" data-value="cursor">Cursor</button>
 	              <button class="select-option" type="button" data-value="cline">Cline</button>
-	              <button class="select-option" type="button" data-value="opencode">OpenCode</button>
+	              <button class="select-option" type="button" data-value="opencode-cli">OpenCode CLI</button>
+	              <button class="select-option" type="button" data-value="opencode-desktop">OpenCode Desktop</button>
+	              <button class="select-option" type="button" data-value="opencode-web">OpenCode Web</button>
 	              <button class="select-option" type="button" data-value="aider">Aider</button>
             </div>
           </div>
@@ -5857,6 +5988,11 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
       <div id="statsChatActivitySub" class="stats-card-meta" hidden></div>
       <div id="statsChatHeatmap" class="stats-heatmap-wrap"></div>
     </div>
+    <div class="stats-card stats-card--compact">
+      <div class="stats-card-title">SDK jobs</div>
+      <div id="statsSdkActivitySub" class="stats-card-meta" hidden></div>
+      <div id="statsSdkHeatmap" class="stats-heatmap-wrap"></div>
+    </div>
   </div>
   <div class="stats-section">
     <div class="stats-section-head stats-section-head--breakdown">
@@ -6011,13 +6147,13 @@ function brandIconSvg(kind, className) {
 
 function brandKeyForSourceValue(value) {
   const key = String(value || '').trim().toLowerCase();
-  if (['codex-cli', 'codex-desktop', 'chatgpt'].includes(key)) return 'openai';
+  if (['codex-cli', 'codex-desktop', 'codex-sdk', 'chatgpt'].includes(key)) return 'openai';
   if (['claude', 'claude-code-desktop', 'claude-workspace', 'claude-web', 'claude-sdk'].includes(key)) return 'claude';
   if (['gemini-cli', 'antigravity'].includes(key)) return 'gemini';
   if (key === 'devin-cli') return 'devin';
   if (key === 'cursor') return 'cursor';
   if (key === 'cline') return 'cline';
-  if (key === 'opencode') return 'opencode';
+  if (['opencode-cli', 'opencode-desktop', 'opencode-web'].includes(key)) return 'opencode';
   return '';
 }
 
@@ -6268,6 +6404,21 @@ function providerLabel(provider) {
   return labels[provider] || provider || 'unknown';
 }
 
+function sourceTypeLabel(provider, sourceType) {
+  const labels = {
+    'opencode-cli-history': 'OpenCode CLI',
+    'opencode-cli-sqlite-history': 'OpenCode CLI',
+    'opencode-desktop-history': 'OpenCode Desktop',
+    'opencode-desktop-sqlite-history': 'OpenCode Desktop',
+    'opencode-web-sqlite-history': 'OpenCode Web',
+    'opencode-history': 'OpenCode',
+    'opencode-sqlite-history': 'OpenCode'
+  };
+  if (labels[sourceType]) return labels[sourceType];
+  const providerText = providerLabel(provider);
+  return sourceType ? providerText + ' / ' + sourceType : providerText;
+}
+
 const PROVIDER_COLORS = {
   codex:           '#2563EB',
   chatgpt:         '#10A37F',
@@ -6296,6 +6447,7 @@ const COMPANY_LABELS = {
   google: 'Google',
   cognition: 'Cognition',
   windsurf: 'Cognition',
+  cursor: 'Cursor',
   stealth: 'Stealth',
   unknown: 'Unknown'
 };
@@ -6306,6 +6458,7 @@ const COMPANY_COLORS = {
   google: PROVIDER_COLORS.gemini_cli,
   cognition: PROVIDER_COLORS.devin,
   windsurf: PROVIDER_COLORS.devin,
+  cursor: PROVIDER_COLORS.cursor,
   stealth: PROVIDER_COLORS.unknown,
   unknown: PROVIDER_COLORS.unknown
 };
@@ -6321,8 +6474,8 @@ function companyColor(company) {
 }
 
 const MODEL_COLOR_PALETTES = {
-  openai:      { family: 'openai', light: '#7DD3FC', base: '#0284C7', dark: PROVIDER_COLORS.codex, darker: '#4F46E5', top: '#3730A3' },
-  claude:      { family: 'claude', light: '#FDBA74', base: '#F97316', dark: PROVIDER_COLORS.claude_code, darker: '#B45309', top: '#7F1D1D' },
+  openai:      { family: 'openai', light: '#BAE6FD', base: '#06B6D4', dark: PROVIDER_COLORS.codex, darker: '#1D4ED8', top: '#172554' },
+  claude:      { family: 'claude', light: '#FED7AA', base: '#FB923C', dark: PROVIDER_COLORS.claude_code, darker: '#9A3412', top: '#831843' },
   gemini:      { family: 'gemini', light: '#C4B5FD', base: PROVIDER_COLORS.gemini_cli, dark: '#7E22CE', darker: '#581C87' },
   devin:       { family: 'devin', light: '#5EEAD4', base: PROVIDER_COLORS.devin, dark: '#0F766E', darker: '#115E59' },
   cursor:      { family: 'cursor', light: '#475569', base: PROVIDER_COLORS.cursor, dark: '#020617', darker: '#020617' },
@@ -6370,6 +6523,9 @@ function modelCapabilityColor(text, palette) {
 }
 
 function openAiModelColor(text, palette) {
+  if (text.includes('gpt-5.5') || text.includes('gpt-5-5')) return palette.top;
+  if (text.includes('gpt-5.4') || text.includes('gpt-5-4')) return palette.darker;
+  if (text.includes('gpt-5.3') || text.includes('gpt-5-3')) return palette.dark;
   if (text.includes('gpt-5.1') || text.includes('gpt-5-1')) return palette.top;
   if (text.includes('gpt-5') || modelHasToken(text, ['o3'])) return palette.darker;
   if (text.includes('gpt-4.1') || modelHasToken(text, ['o4'])) return palette.dark;
@@ -6378,10 +6534,12 @@ function openAiModelColor(text, palette) {
 }
 
 function claudeModelColor(text, palette) {
-  if (text.includes('high-thinking') || text.includes('high_thinking')) return palette.top;
-  if (modelHasToken(text, ['opus'])) return palette.darker;
-  if (modelHasToken(text, ['sonnet'])) return palette.dark;
   if (modelHasToken(text, ['haiku'])) return palette.light;
+  if (text.includes('claude-4.6') && modelHasToken(text, ['opus'])) return palette.top;
+  if (text.includes('claude-4.5') && modelHasToken(text, ['opus'])) return palette.darker;
+  if (text.includes('high-thinking') || text.includes('high_thinking')) return palette.darker;
+  if (modelHasToken(text, ['opus'])) return palette.dark;
+  if (modelHasToken(text, ['sonnet'])) return palette.base;
   return palette.base;
 }
 
@@ -6390,6 +6548,91 @@ function modelHasToken(text, tokens) {
   return new RegExp('(^|[^a-z0-9])(' + escaped + ')([^a-z0-9]|$)').test(text);
 }
 
+const CANONICAL_COMPANY_ORDER = ['openai', 'anthropic', 'google', 'cognition', 'cursor', 'stealth', 'unknown'];
+const CANONICAL_PROVIDER_ORDER = ['codex', 'chatgpt', 'claude_code', 'claude_desktop', 'claude_sdk', 'claude_web', 'gemini_cli', 'antigravity', 'devin', 'windsurf', 'cursor', 'cline', 'opencode', 'aider', 'unknown'];
+
+function canonicalCompanyRank(company) {
+  const idx = CANONICAL_COMPANY_ORDER.indexOf(String(company || '').toLowerCase());
+  return idx < 0 ? CANONICAL_COMPANY_ORDER.length : idx;
+}
+
+function canonicalProviderRank(provider) {
+  const idx = CANONICAL_PROVIDER_ORDER.indexOf(String(provider || '').toLowerCase());
+  return idx < 0 ? CANONICAL_PROVIDER_ORDER.length : idx;
+}
+
+function companyForModel(text) {
+  const value = String(text || '').toLowerCase();
+  if (value.startsWith('composer-') || value.startsWith('cursor-') || value === 'auto' || value === 'default') return 'cursor';
+  const palette = modelFamilyPalette(value);
+  if (!palette) return 'unknown';
+  if (palette.family === 'openai') return 'openai';
+  if (palette.family === 'claude') return 'anthropic';
+  if (palette.family === 'gemini' || palette.family === 'antigravity') return 'google';
+  if (palette.family === 'devin' || palette.family === 'windsurf') return 'cognition';
+  if (palette.family === 'cursor') return 'cursor';
+  return 'unknown';
+}
+
+function canonicalModelRank(model) {
+  const text = String(model || '').toLowerCase();
+  const company = companyForModel(text);
+  const companyRank = canonicalCompanyRank(company);
+  let withinRank = 950;
+  if (company === 'openai') {
+    if (modelHasToken(text, ['nano'])) withinRank = 920;
+    else if (modelHasToken(text, ['mini'])) withinRank = 900;
+    else if (text.includes('gpt-4') && !text.includes('gpt-4.1')) withinRank = 700;
+    else if (text.includes('gpt-4.1')) withinRank = 600;
+    else if (modelHasToken(text, ['o1'])) withinRank = 590;
+    else if (modelHasToken(text, ['o3', 'o4'])) withinRank = 580;
+    else if (text.includes('gpt-5.5') || text.includes('gpt-5-5')) withinRank = 100;
+    else if (text.includes('gpt-5.4') || text.includes('gpt-5-4')) withinRank = 200;
+    else if (text.includes('gpt-5.3') || text.includes('gpt-5-3')) withinRank = 300;
+    else if (text.includes('gpt-5.1') || text.includes('gpt-5-1')) withinRank = 400;
+    else if (text.includes('gpt-5')) withinRank = 500;
+  } else if (company === 'anthropic') {
+    if (modelHasToken(text, ['haiku'])) withinRank = 920;
+    else if (text.includes('opus-4-7') || text.includes('claude-4.7')) withinRank = 100;
+    else if (text.includes('claude-4.6') && modelHasToken(text, ['opus'])) withinRank = 200;
+    else if (text.includes('claude-4.5') && modelHasToken(text, ['opus'])) withinRank = 300;
+    else if (text.includes('claude-4') && modelHasToken(text, ['opus'])) withinRank = 400;
+    else if (modelHasToken(text, ['opus'])) withinRank = 500;
+    else if (text.includes('claude-4.5') && modelHasToken(text, ['sonnet'])) withinRank = 600;
+    else if (text.includes('claude-4') && modelHasToken(text, ['sonnet'])) withinRank = 700;
+    else if (modelHasToken(text, ['sonnet'])) withinRank = 800;
+  } else if (company === 'google') {
+    // Major version dictates the bucket (newer first); flash variants get +50 within their generation.
+    let base = 700;
+    if (text.includes('gemini-3')) base = 100;
+    else if (text.includes('gemini-2')) base = 300;
+    else if (text.includes('gemini-1.5')) base = 500;
+    else if (text.includes('gemini-1')) base = 600;
+    let modifier = 0;
+    if (text.includes('flash-lite')) modifier = 80;
+    else if (text.includes('flash')) modifier = 50;
+    withinRank = base + modifier;
+  } else if (company === 'cursor') {
+    if (text === 'composer-1.5') withinRank = 100;
+    else if (text === 'composer-1') withinRank = 200;
+    else if (text.startsWith('composer-')) withinRank = 300;
+    else if (text === 'auto') withinRank = 700;
+    else if (text === 'default') withinRank = 800;
+    else if (text.startsWith('cursor-')) withinRank = 600;
+  }
+  return companyRank * 10000 + withinRank;
+}
+
+function canonicalGroupRank(group) {
+  if (statsBreakdownMode === 'model') return canonicalModelRank(group);
+  if (statsBreakdownMode === 'company') return canonicalCompanyRank(group);
+  return canonicalProviderRank(group);
+}
+
+function statsCanonicalOrderedGroups(groups) {
+  return [...groups].sort((a, b) => canonicalGroupRank(a) - canonicalGroupRank(b) || String(a).localeCompare(String(b)));
+}
+
 function statsBreakdownLabel(group) {
   if (statsBreakdownMode === 'model') return modelLabel(group);
   if (statsBreakdownMode === 'company') return companyLabel(group);
@@ -6788,7 +7031,7 @@ function sessionNode(item, includeExcerpt) {
   button.type = 'button';
   button.dataset.id = item.session_id || '';
   const title = item.title || '(untitled session)';
-  const source = providerLabel(item.provider) + (item.source_type ? ' / ' + item.source_type : '');
+  const source = sourceTypeLabel(item.provider, item.source_type);
   const scope = item.repo_display || item.repo || item.scope || 'unknown repo';
   const folderPath = searchResultFolderPath(item);
   const folderLabel = folderPath || scope;
@@ -7024,7 +7267,7 @@ function renderSession(payload) {
   }
   if (sessionMetaRight) {
     const innerParts = [];
-    if (payload.source_type) innerParts.push('<span class="meta-source">' + esc(payload.source_type) + '</span>');
+    if (payload.source_type) innerParts.push('<span class="meta-source">' + esc(sourceTypeLabel(payload.provider, payload.source_type)) + '</span>');
     const repoRaw = payload.repo_display || payload.repo || payload.scope || '';
     if (repoRaw) {
       if (innerParts.length) innerParts.push('<span class="meta-dot" aria-hidden="true">\u00b7</span>');
@@ -7090,7 +7333,8 @@ function renderMessages(messages, sessionSummary) {
   const visibleMessages = summaryText
     ? (messages || []).filter((message) => message?.metadata?.summaryKind !== 'conversation_summary')
     : (messages || []);
-  if (!visibleMessages.length && !summaryText) {
+  const renderItems = pairedToolRenderItems(visibleMessages);
+  if (!renderItems.length && !summaryText) {
     readableView.className = 'inline-empty';
     readableView.textContent = 'No transcript messages are available for this session.';
     return;
@@ -7105,16 +7349,17 @@ function renderMessages(messages, sessionSummary) {
   const renderChunk = () => {
     if (renderSerial !== renderMessagesSerial) return;
     const fragment = document.createDocumentFragment();
-    const end = Math.min(visibleMessages.length, index + MESSAGE_RENDER_CHUNK_SIZE);
+    const end = Math.min(renderItems.length, index + MESSAGE_RENDER_CHUNK_SIZE);
     for (; index < end; index++) {
-      const message = visibleMessages[index];
+      const item = renderItems[index];
+      const message = item.message;
       const gap = renderTimeGap(previousTimestamp, message.timestamp);
       if (gap) fragment.appendChild(gap);
-      fragment.appendChild(messageElement(message));
-      if (message.timestamp) previousTimestamp = message.timestamp;
+      fragment.appendChild(messageElement(message, item));
+      previousTimestamp = item.lastTimestamp || message.timestamp || previousTimestamp;
     }
     readableView.appendChild(fragment);
-    if (index < visibleMessages.length) {
+    if (index < renderItems.length) {
       scheduleNext(renderChunk);
       return;
     }
@@ -7129,6 +7374,185 @@ function renderMessages(messages, sessionSummary) {
   renderChunk();
 }
 
+function pairedToolRenderItems(messages) {
+  const pairings = pairedToolResultIndexes(messages);
+  const skippedResultIndexes = new Set(pairings.duplicateResultIndexes);
+  const result = [];
+  for (let index = 0; index < messages.length; index++) {
+    if (skippedResultIndexes.has(index)) continue;
+    const message = messages[index];
+    const calls = messageToolCalls(message);
+    if (!calls.length) {
+      result.push({ type: 'message', message });
+      continue;
+    }
+    const pairedResults = (pairings.byCallMessage.get(index) || [])
+      .filter((resultIndex) => !skippedResultIndexes.has(resultIndex))
+      .map((resultIndex) => {
+        skippedResultIndexes.add(resultIndex);
+        return messages[resultIndex];
+      });
+    let next = index + 1;
+    while (pairedResults.length < calls.length && next < messages.length && isPairableToolResultMessage(messages[next])) {
+      if (skippedResultIndexes.has(next)) {
+        next += 1;
+        continue;
+      }
+      pairedResults.push(messages[next]);
+      skippedResultIndexes.add(next);
+      next += 1;
+    }
+    if (pairedResults.length) {
+      result.push({
+        type: 'message',
+        message,
+        pairedToolResults: pairedResults,
+        lastTimestamp: pairedResults[pairedResults.length - 1].timestamp || message.timestamp
+      });
+      index = next - 1;
+    } else {
+      result.push({ type: 'message', message });
+    }
+  }
+  return groupConsecutiveToolItems(result);
+}
+
+function groupConsecutiveToolItems(items) {
+  const grouped = [];
+  let run = [];
+  const flush = () => {
+    if (run.length > 1) {
+      grouped.push({
+        type: 'tool-group',
+        message: run[0].message,
+        items: run,
+        lastTimestamp: run[run.length - 1].lastTimestamp || run[run.length - 1].message.timestamp || run[0].message.timestamp
+      });
+    } else if (run.length === 1) {
+      grouped.push(run[0]);
+    }
+    run = [];
+  };
+  for (const item of items) {
+    if (!isToolActivityRenderItem(item)) {
+      flush();
+      grouped.push(item);
+      continue;
+    }
+    run.push(item);
+  }
+  flush();
+  return grouped;
+}
+
+function isToolActivityRenderItem(item) {
+  if (!item || item.type !== 'message') return false;
+  const message = item.message || {};
+  const role = String(message.role || '').toLowerCase();
+  if (role === 'tool') return Boolean(parseToolResult(message.content || '', message));
+  if (role !== 'assistant') return false;
+  const calls = messageToolCalls(message, item.pairedToolResults || []);
+  if (!calls.length) return false;
+  return !stripToolInvocationLines(message.content || '').trim();
+}
+
+function pairedToolResultIndexes(messages) {
+  const calls = [];
+  const callsByEventId = new Map();
+  const callsById = new Map();
+  const callsByKind = new Map();
+  const addCallKey = (map, key, callIndex) => {
+    if (!key) return;
+    if (!map.has(key)) map.set(key, []);
+    map.get(key).push(callIndex);
+  };
+  for (let messagePosition = 0; messagePosition < messages.length; messagePosition++) {
+    const toolCalls = messageToolCalls(messages[messagePosition]);
+    for (const call of toolCalls) {
+      const callIndex = calls.length;
+      calls.push({ messagePosition, call });
+      addCallKey(callsByEventId, call.eventId || '', callIndex);
+      addCallKey(callsById, normalizedToolId(call.id), callIndex);
+      addCallKey(callsByKind, normalizeToolToken(call.kind || call.name || call.title || ''), callIndex);
+    }
+  }
+
+  const resultRecords = preferredToolResultRecords(messages);
+  const byCallMessage = new Map();
+  const usedCalls = new Set();
+  for (const record of resultRecords.records) {
+    const parentEventId = record.event?.parentEventId || '';
+    let callIndex = firstUnusedIndex(callsByEventId.get(parentEventId), usedCalls);
+    if (callIndex < 0) callIndex = firstUnusedIndex(callsById.get(normalizedToolId(record.result.id)), usedCalls);
+    if (callIndex < 0) callIndex = firstUnusedIndex(callsByKind.get(normalizeToolToken(record.result.name || record.result.kind || record.result.title || '')), usedCalls);
+    if (callIndex < 0) continue;
+    usedCalls.add(callIndex);
+    const messagePosition = calls[callIndex].messagePosition;
+    if (!byCallMessage.has(messagePosition)) byCallMessage.set(messagePosition, []);
+    byCallMessage.get(messagePosition).push(record.index);
+  }
+  return { byCallMessage, duplicateResultIndexes: resultRecords.duplicateResultIndexes };
+}
+
+function preferredToolResultRecords(messages) {
+  const records = [];
+  const byId = new Map();
+  const duplicateResultIndexes = new Set();
+  for (let index = 0; index < messages.length; index++) {
+    if (!isPairableToolResultMessage(messages[index])) continue;
+    const result = parseToolResult(messages[index]?.content || '', messages[index]);
+    if (!result) continue;
+    const event = canonicalEventsForMessage(messages[index], 'tool.completed')[0] || null;
+    const record = { index, result, event };
+    records.push(record);
+    const id = normalizedToolId(result.id);
+    if (!id) continue;
+    const existing = byId.get(id);
+    if (!existing) {
+      byId.set(id, record);
+      continue;
+    }
+    const preferred = preferredToolResultRecord(existing, record);
+    const discarded = preferred === existing ? record : existing;
+    duplicateResultIndexes.add(discarded.index);
+    byId.set(id, preferred);
+  }
+  return {
+    records: records.filter((record) => !duplicateResultIndexes.has(record.index)),
+    duplicateResultIndexes
+  };
+}
+
+function preferredToolResultRecord(left, right) {
+  return toolResultDisplayScore(right.result) > toolResultDisplayScore(left.result) ? right : left;
+}
+
+function toolResultDisplayScore(result) {
+  const rawCategory = normalizeToolToken(result?.rawCategory || '');
+  const kind = normalizeToolToken(result?.kind || '');
+  const category = normalizeToolToken(result?.category || '');
+  let score = 0;
+  if (['exec_command_end', 'patch_apply_end', 'mcp_tool_call_end', 'web_search_end', 'tool_result', 'tool_output'].includes(rawCategory)) score += 2000;
+  if (rawCategory === 'function_call_output' || rawCategory === 'custom_tool_call_output') score -= 1000;
+  if (category && category !== 'function') score += 250;
+  if (kind && !kind.startsWith('call_')) score += 150;
+  if (/^\$\s/.test(String(result?.detail || result?.output || ''))) score += 250;
+  score += Math.min(200, String(result?.output || '').length / 200);
+  return score;
+}
+
+function firstUnusedIndex(indexes, used) {
+  if (!Array.isArray(indexes)) return -1;
+  for (const index of indexes) {
+    if (!used.has(index)) return index;
+  }
+  return -1;
+}
+
+function isPairableToolResultMessage(message) {
+  return String(message?.role || '').toLowerCase() === 'tool' && Boolean(parseToolResult(message?.content || '', message));
+}
+
 function sessionSummaryText(sessionSummary) {
   if (!sessionSummary || typeof sessionSummary !== 'object') return '';
   return String(
@@ -7177,11 +7601,7 @@ function summarySourceLabel(source) {
 }
 
 function renderTimeGap(previous, current) {
-  if (!previous || !current) return null;
-  const prev = new Date(previous).getTime();
-  const next = new Date(current).getTime();
-  if (!Number.isFinite(prev) || !Number.isFinite(next)) return null;
-  const diffSec = (next - prev) / 1000;
+  const diffSec = timeGapSeconds(previous, current);
   if (diffSec < 5) return null;
   const label = formatGapLabel(diffSec);
   if (!label) return null;
@@ -7191,6 +7611,14 @@ function renderTimeGap(previous, current) {
   return node;
 }
 
+function timeGapSeconds(previous, current) {
+  if (!previous || !current) return 0;
+  const prev = new Date(previous).getTime();
+  const next = new Date(current).getTime();
+  if (!Number.isFinite(prev) || !Number.isFinite(next)) return 0;
+  return Math.max(0, (next - prev) / 1000);
+}
+
 function formatGapLabel(diffSec) {
   if (diffSec < 60) return Math.round(diffSec) + 's';
   if (diffSec < 3600) return Math.round(diffSec / 60) + 'm';
@@ -7263,12 +7691,13 @@ function highlightSearchMatches(root, term) {
   walk(root);
 }
 
-function messageElement(message) {
+function messageElement(message, options = {}) {
+  if (options.type === 'tool-group') return toolGroupElement(options);
   const context = generatedContextForMessage(message);
   if (context) return contextMessageElement(message, context);
   const role = String(message.role || 'unknown').toLowerCase();
   const content = String(message.content || '');
-  const toolCalls = messageToolCalls(message);
+  const toolCalls = messageToolCalls(message, options.pairedToolResults || []);
   const toolResult = role === 'tool' ? parseToolResult(content, message) : null;
   const contentWithoutTools = toolCalls.length ? stripToolInvocationLines(content) : content;
   const toolOnly = toolCalls.length && !contentWithoutTools.trim();
@@ -7307,7 +7736,22 @@ function messageElement(message) {
   return row;
 }
 
+function toolGroupElement(group) {
+  const calls = [];
+  for (const item of group.items || []) {
+    calls.push(...toolCardsForRenderItem(item));
+  }
+  const row = document.createElement('article');
+  row.className = 'message tool tool-call-turn tool-group-turn';
+  const bubble = document.createElement('div');
+  bubble.className = 'bubble';
+  bubble.innerHTML = renderToolGroupCard(calls);
+  row.appendChild(bubble);
+  return row;
+}
+
 function contextMessageElement(message, context) {
+  if (context.kind === 'task_notification') return contextLineElement(message, context);
   const row = document.createElement('article');
   row.className = 'message context context-' + escClass(context.kind || 'metadata');
   const bubble = document.createElement('div');
@@ -7332,6 +7776,25 @@ function contextMessageElement(message, context) {
   return row;
 }
 
+function contextLineElement(message, context) {
+  const row = document.createElement('article');
+  row.className = 'message context context-line-turn context-' + escClass(context.kind || 'metadata');
+  const bubble = document.createElement('div');
+  bubble.className = 'bubble';
+  const line = document.createElement('div');
+  line.className = 'context-line';
+  line.innerHTML =
+    '<span class="context-glyph">' + contextIconSvg(context.kind) + '</span>' +
+    '<span class="context-title">' + esc(contextTitle(context.kind)) + '</span>' +
+    '<span class="context-meta">' + context.chips.map((chip) => '<span class="context-chip">' + esc(chip) + '</span>').join('') + '</span>' +
+    '<span class="context-end"><span class="context-time"' + timeAttr(message.timestamp) + '>' + esc(relativeTime(message.timestamp)) + '</span></span>';
+  const end = line.querySelector('.context-end');
+  if (end) end.appendChild(messageCopyButton(message.content || ''));
+  bubble.appendChild(line);
+  row.appendChild(bubble);
+  return row;
+}
+
 function generatedContextForMessage(message) {
   const metadata = message?.metadata || {};
   const content = String(message?.content || '').trim();
@@ -7456,10 +7919,55 @@ function xmlTagText(text, tag) {
 
 function renderMessageBodyWithTools(className, content, toolCalls) {
   const body = className === 'user' ? renderPlainText(content) : renderRichText(content);
-  const stack = toolCalls.length ? '<div class="tool-stack">' + toolCalls.map(renderToolCallout).join('') + '</div>' : '';
+  const stack = toolCalls.length > 1
+    ? renderToolGroupCard(toolCalls)
+    : toolCalls.length
+      ? '<div class="tool-stack">' + toolCalls.map(renderToolCallout).join('') + '</div>'
+      : '';
   return body ? '<div class="tool-body">' + body + '</div>' + stack : stack;
 }
 
+function renderToolGroupCard(calls) {
+  const tools = Array.isArray(calls) ? calls : [];
+  if (!tools.length) return '';
+  return '<details class="tool-group-card">' +
+    '<summary><span class="tool-group-prefix"><span class="tool-group-caret"></span><span class="tool-glyph">' +
+    renderToolIcon({ category: dominantToolCategory(tools), kind: 'Tool activity' }) +
+    '</span></span><span class="tool-group-title">' +
+    esc(toolStackSummary(tools) || 'Used ' + tools.length + ' tools') +
+    '</span></summary>' +
+    '<div class="tool-stack">' + tools.map(renderToolCallout).join('') + '</div></details>';
+}
+
+function toolCardsForRenderItem(item) {
+  const message = item?.message || {};
+  if (String(message.role || '').toLowerCase() === 'tool') {
+    const result = parseToolResult(message.content || '', message);
+    return result ? [toolCardFromResult(result)] : [];
+  }
+  return messageToolCalls(message, item?.pairedToolResults || []);
+}
+
+function toolCardFromResult(result) {
+  const category = normalizedToolCategory(result.category, result.kind);
+  const detail = result.detail || result.summary || firstLine(result.output || '') || result.kind || 'Tool output';
+  return toolCard({
+    kind: result.name || result.kind || 'Tool output',
+    title: result.kind || result.title || '',
+    category,
+    categoryLabel: result.categoryLabel || toolCategoryLabel(category),
+    icon: result.icon || toolIcon(category, result.kind || ''),
+    status: result.status || 'completed',
+    argument: detail,
+    rawInputSummary: detail,
+    inputPreview: '',
+    target: result.target || '',
+    id: result.id || '',
+    result,
+    resultOnly: true
+  });
+}
+
 function copyIconSvg() {
   return '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="14" height="14" x="8" y="8" rx="2" ry="2"/><path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"/></svg>';
 }
@@ -7508,13 +8016,13 @@ function detectToolName(text) {
   return tool ? tool.label : '';
 }
 
-function messageToolCalls(message) {
+function messageToolCalls(message, pairedResultMessages) {
   const eventCalls = canonicalEventsForMessage(message, 'tool.called').map(toolCallFromEvent).filter(Boolean);
-  if (eventCalls.length) return eventCalls;
+  if (eventCalls.length) return attachPairedToolResults(eventCalls, pairedResultMessages);
   const metadataCalls = Array.isArray(message?.metadata?.toolCalls) ? message.metadata.toolCalls : [];
   const textCalls = toolInvocationsFromText(message?.content || '');
   if (metadataCalls.length) {
-    return metadataCalls.map((meta, index) => {
+    const calls = metadataCalls.map((meta, index) => {
       const text = textCalls[index] || {};
       const kind = meta.displayName || meta.name || text.kind || 'Tool';
       const argument = meta.argument || meta.rawInputSummary || text.argument || '';
@@ -7530,10 +8038,11 @@ function messageToolCalls(message) {
         categoryLabel: meta.categoryLabel || '',
         icon: meta.icon || '',
         rawCategory: meta.rawCategory || '',
-        id: meta.id || '',
+        id: meta.id || meta.callId || meta.call_id || meta.toolCallId || meta.tool_call_id || meta.toolUseId || meta.tool_use_id || '',
         arguments: meta.arguments || null
       });
     }).filter((call) => call.kind || call.title || call.argument);
+    return attachPairedToolResults(calls, pairedResultMessages);
   }
   const total = Math.max(metadataCalls.length, textCalls.length);
   const calls = [];
@@ -7553,11 +8062,67 @@ function messageToolCalls(message) {
       categoryLabel: meta.categoryLabel || '',
       icon: meta.icon || '',
       rawCategory: meta.rawCategory || '',
-      id: meta.id || '',
+      id: meta.id || meta.callId || meta.call_id || meta.toolCallId || meta.tool_call_id || meta.toolUseId || meta.tool_use_id || '',
       arguments: meta.arguments || null
     }));
   }
-  return calls.filter((call) => call.kind || call.title || call.argument);
+  return attachPairedToolResults(calls.filter((call) => call.kind || call.title || call.argument), pairedResultMessages);
+}
+
+function attachPairedToolResults(calls, pairedResultMessages) {
+  if (!Array.isArray(pairedResultMessages) || !pairedResultMessages.length) return calls;
+  const results = pairedResultMessages
+    .map((message) => parseToolResult(message?.content || '', message))
+    .filter(Boolean);
+  if (!results.length) return calls;
+  const remaining = results.slice();
+  return calls.map((call) => {
+    const matchIndex = pairedToolResultIndex(call, remaining);
+    if (matchIndex < 0) return call;
+    const [result] = remaining.splice(matchIndex, 1);
+    return { ...call, result };
+  });
+}
+
+function pairedToolResultIndex(call, results) {
+  const callId = normalizedToolId(call?.id);
+  if (callId) {
+    const idMatch = results.findIndex((result) => normalizedToolId(result?.id) === callId);
+    if (idMatch >= 0) return idMatch;
+  }
+  const callKind = normalizeToolToken(call?.kind || call?.name || call?.title || '');
+  if (callKind) {
+    const kindMatch = results.findIndex((result) => normalizeToolToken(result?.name || result?.kind || result?.title || '') === callKind);
+    if (kindMatch >= 0) return kindMatch;
+  }
+  return results.length ? 0 : -1;
+}
+
+function toolStackSummary(tools) {
+  const counts = {};
+  for (const tool of tools) {
+    const category = normalizedToolCategory(tool.category, tool.kind);
+    counts[category] = (counts[category] || 0) + 1;
+  }
+  const parts = [];
+  if (counts.read) parts.push('explored ' + counts.read + ' ' + (counts.read === 1 ? 'file' : 'files'));
+  if (counts.search) parts.push('searched ' + counts.search + ' ' + (counts.search === 1 ? 'time' : 'times'));
+  if (counts.shell) parts.push('ran ' + counts.shell + ' ' + (counts.shell === 1 ? 'command' : 'commands'));
+  if (counts.edit) parts.push('edited ' + counts.edit + ' ' + (counts.edit === 1 ? 'file' : 'files'));
+  const known = ['read', 'search', 'shell', 'edit'];
+  const other = Object.entries(counts).filter(([key]) => !known.includes(key)).reduce((sum, [, count]) => sum + count, 0);
+  if (other) parts.push('used ' + other + ' ' + (other === 1 ? 'tool' : 'tools'));
+  const text = parts.join(', ');
+  return text ? text.charAt(0).toUpperCase() + text.slice(1) : '';
+}
+
+function dominantToolCategory(tools) {
+  const counts = {};
+  for (const tool of tools || []) {
+    const category = normalizedToolCategory(tool.category, tool.kind);
+    counts[category] = (counts[category] || 0) + 1;
+  }
+  return Object.entries(counts).sort((a, b) => b[1] - a[1])[0]?.[0] || 'tool';
 }
 
 function toolCallFromEvent(event) {
@@ -7576,7 +8141,8 @@ function toolCallFromEvent(event) {
     categoryLabel: meta.categoryLabel || '',
     icon: meta.icon || event.indexed?.toolIcon || '',
     rawCategory: meta.rawCategory || '',
-    id: meta.id || '',
+    id: meta.id || meta.callId || meta.call_id || meta.toolCallId || meta.tool_call_id || meta.toolUseId || meta.tool_use_id || '',
+    eventId: event.eventId || '',
     arguments: meta.arguments || null
   });
 }
@@ -7643,6 +8209,10 @@ function normalizeToolToken(value) {
   return String(value || '').trim().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '');
 }
 
+function normalizedToolId(value) {
+  return String(value || '').trim().toLowerCase();
+}
+
 function toolCategoryLabel(category) {
   const labels = {
     shell: 'Shell',
@@ -7671,18 +8241,92 @@ function escClass(value) {
 function renderToolCallout(tool) {
   const card = toolCard(tool);
   const isSkill = card.category === 'skill' || card.kind === 'Skill';
-  const title = card.title || (isSkill ? 'Skill loaded' : card.kind);
-  const category = card.category ? '<span class="tool-chip">' + esc(card.categoryLabel || card.category) + '</span>' : '';
-  const statusClass = humanToolStatusClass(card.status);
-  const status = card.status ? '<span class="tool-status' + (statusClass ? ' ' + statusClass : '') + '">' + esc(humanToolStatus(card.status)) + '</span>' : '';
-  const target = card.target ? '<span class="tool-target">' + esc(card.target) + '</span>' : '';
   const diff = renderToolDiff(card);
-  const preview = diff ? '' : '<span class="tool-preview">' + esc(card.inputPreview || card.argument || card.kind) + '</span>';
-  const detail = preview + target + diff;
-  return '<div class="tool-callout ' + escClass(card.category || 'tool') + (isSkill ? ' skill' : '') + '">' +
-    '<span class="tool-glyph">' + renderToolIcon(card) + '</span>' +
-    '<div class="tool-copy"><div class="tool-title">' + esc(title) + category + status + '</div>' +
-    '<div class="tool-detail">' + detail + '</div></div></div>';
+  const category = normalizedToolCategory(card.category, card.kind);
+  return '<details class="tool-callout ' + escClass(category) + (isSkill ? ' skill' : '') + (card.result ? ' has-result' : '') + '" data-category="' + esc(escClass(category)) + '">' +
+    renderToolActivitySummary(card) +
+    renderToolCalloutBody(card, diff) +
+    '</details>';
+}
+
+function renderToolActivitySummary(card) {
+  const label = toolActivityLabel(card);
+  const count = card.result?.count || '';
+  const statusClass = humanToolStatusClass(card.status);
+  const status = !card.result && card.status ? '<span class="tool-status' + (statusClass ? ' ' + statusClass : '') + '">' + esc(humanToolStatus(card.status)) + '</span>' : '';
+  return '<summary><span class="tool-glyph">' + renderToolIcon(card) + '</span>' +
+    '<span class="tool-call-line"><span class="tool-action">' + esc(label.action) + '</span>' +
+    (label.subject ? '<span class="tool-subject">' + esc(label.subject) + '</span>' : '') +
+    '</span>' + status +
+    (count ? '<span class="tool-result-count">' + esc(count) + '</span>' : '') +
+    '</summary>';
+}
+
+function renderToolCalloutBody(card, diff) {
+  const rows = [];
+  const meta = [];
+  if (card.categoryLabel) meta.push(card.categoryLabel);
+  if (card.status) meta.push(humanToolStatus(card.status));
+  if (card.target) meta.push(card.target);
+  if (meta.length) rows.push('<div class="tool-call-meta">' + meta.map((item) => '<span class="tool-chip">' + esc(item) + '</span>').join('') + '</div>');
+  const preview = card.resultOnly ? '' : String(card.inputPreview || card.argument || '').trim();
+  if (preview) rows.push('<pre class="tool-preview">' + esc(preview) + '</pre>');
+  if (diff) rows.push(diff);
+  if (card.result) rows.push(renderPairedToolResult(card.result));
+  return rows.length ? '<div class="tool-callout-body">' + rows.join('') + '</div>' : '';
+}
+
+function renderPairedToolResult(result) {
+  const category = normalizedToolCategory(result.category, result.kind);
+  const meta = [result.kind, result.detail, result.count].filter(Boolean);
+  return '<div class="tool-paired-result" data-category="' + esc(escClass(category)) + '">' +
+    (meta.length ? '<div class="tool-result-meta">' + meta.map((item) => '<span>' + esc(item) + '</span>').join('') + '</div>' : '') +
+    renderToolOutput(result.output || '', { lineStart: result.lineStart }) + '</div>';
+}
+
+function toolActivityLabel(card) {
+  const category = normalizedToolCategory(card.category, card.kind);
+  const fallback = toolSubjectFallback(card);
+  if (category === 'shell') return { action: 'Ran', subject: shellCommandText(card) || fallback };
+  if (category === 'read') return { action: 'Read', subject: compactPathLabel(card.target || fallback) };
+  if (category === 'search') return { action: 'Searched', subject: fallback };
+  if (category === 'edit') return { action: 'Edited', subject: compactPathLabel(card.target || fallback) };
+  if (category === 'web') return { action: webToolVerb(card), subject: fallback };
+  if (category === 'task') return { action: 'Ran', subject: fallback };
+  if (category === 'skill') return { action: 'Loaded', subject: fallback };
+  if (category === 'mcp') return { action: 'Called', subject: fallback };
+  return { action: card.title || card.kind || 'Used', subject: fallback && fallback !== (card.title || card.kind) ? fallback : '' };
+}
+
+function shellCommandText(card) {
+  const args = card.arguments && typeof card.arguments === 'object' && !Array.isArray(card.arguments) ? card.arguments : {};
+  return firstToolString(args.cmd, args.command, args.script, card.inputPreview, card.argument);
+}
+
+function webToolVerb(card) {
+  const key = normalizeToolToken(card.kind || card.title || '');
+  if (key.includes('fetch')) return 'Fetched';
+  if (key.includes('search')) return 'Searched';
+  if (key.includes('open')) return 'Opened';
+  return 'Opened';
+}
+
+function toolSubjectFallback(card) {
+  return firstToolString(card.target, card.inputPreview, card.argument, card.title, card.kind);
+}
+
+function compactPathLabel(value) {
+  const text = String(value || '').trim();
+  if (!text || /\s/.test(text) || !text.includes('/')) return text;
+  return text.split('/').filter(Boolean).pop() || text;
+}
+
+function firstToolString() {
+  for (const value of arguments) {
+    if (typeof value === 'string' && value.trim()) return value.trim();
+    if (Array.isArray(value) && value.length) return value.map((item) => String(item || '').trim()).filter(Boolean).join(' ');
+  }
+  return '';
 }
 
 function hasPatchMarker(value) {
@@ -7779,7 +8423,7 @@ function renderToolDiff(card) {
   if (adds) summaryParts.push('<span class="add-count">+' + adds + '</span>');
   if (dels) summaryParts.push('<span class="del-count">-' + dels + '</span>');
   const summaryLabel = editCount > 1 ? editCount + ' edits' : label;
-  return '<details class="tool-diff" open>' +
+  return '<details class="tool-diff">' +
     '<summary class="tool-diff-summary">' + esc(summaryLabel) + summaryParts.join('') + '</summary>' +
     '<div class="tool-diff-body">' + blocks.join('') + '</div>' +
     '</details>';
@@ -7927,6 +8571,9 @@ function toolResultFromMetadata(result, indexed, fallbackText) {
   if (!output && !result.summary && !indexed.summary) return null;
   const category = normalizedToolCategory(result.category || indexed.toolCategory || result.rawCategory || '', result.kind || indexed.title || '');
   return {
+    id: result.id || result.callId || result.call_id || result.toolCallId || result.tool_call_id || result.toolUseId || result.tool_use_id || '',
+    name: result.name || result.toolName || indexed.toolName || '',
+    rawCategory: result.rawCategory || '',
     header: 'Tool result' + (result.title || indexed.title ? ' · ' + (result.title || indexed.title) : ''),
     kind: result.kind || indexed.title || 'Tool output',
     category,
@@ -7935,6 +8582,7 @@ function toolResultFromMetadata(result, indexed, fallbackText) {
     detail: result.summary || indexed.summary || firstLine(output),
     count: result.lineCount ? result.lineCount + ' line' + (Number(result.lineCount) === 1 ? '' : 's') : lineCountLabel(output || result.summary || indexed.summary || ''),
     output: output || result.summary || indexed.summary || '',
+    lineStart: Number(result.startLine || result.start_line || result.lineStart || result.line_start || 0) || 0,
     collapsed: Boolean(result.collapsed) || String(output).split('\\n').length > 18
   };
 }
@@ -7954,6 +8602,7 @@ function parseFileViewResult(text) {
     detail: [attrs.path || basename, lineLabel].filter(Boolean).join(' · '),
     count: lineCountLabel(code),
     output: code,
+    lineStart: Number(attrs.start_line || 0) || 0,
     collapsed: code.split('\\n').length > 24
   };
 }
@@ -8011,14 +8660,25 @@ function genericToolResult(text) {
   };
 }
 
-function renderToolResult(result) {
-  const open = result.collapsed ? '' : ' open';
+function renderToolResult(result, options) {
+  const inline = Boolean(options && options.inline);
   const category = normalizedToolCategory(result.category, result.kind);
-  return '<details class="tool-result" data-category="' + esc(escClass(category)) + '"' + open + '>' +
+  return '<details class="tool-result' + (inline ? ' inline' : '') + '" data-category="' + esc(escClass(category)) + '">' +
     '<summary><span class="tool-result-kind"><span class="tool-glyph">' + renderToolIcon({ icon: result.icon, category, kind: result.kind }) + '</span>' + esc(result.kind) + '</span>' +
     (result.detail ? '<span class="tool-result-detail">' + esc(result.detail) + '</span>' : '') +
     (result.count ? '<span class="tool-result-count">' + esc(result.count) + '</span>' : '') +
-    '</summary><pre class="tool-output">' + esc(result.output || '') + '</pre></details>';
+    '</summary>' + renderToolOutput(result.output || '', { lineStart: result.lineStart }) + '</details>';
+}
+
+function renderToolOutput(output, options = {}) {
+  const text = String(output || '');
+  const lines = text.split('\\n');
+  if (lines.length <= 1) return '<pre class="tool-output">' + esc(text) + '</pre>';
+  const start = Number(options.lineStart || 0) || 1;
+  return '<div class="tool-output tool-output-lines">' + lines.map((line, index) =>
+    '<div class="tool-output-line"><span class="tool-line-number">' + esc(start + index) + '</span><span class="tool-line-text">' +
+    (line ? esc(line) : '&nbsp;') + '</span></div>'
+  ).join('') + '</div>';
 }
 
 function parseXmlishAttrs(value) {
@@ -8276,7 +8936,7 @@ function sessionDetailsText(payload) {
     'Title: ' + (payload.title || '(untitled session)'),
     'Thread ID: ' + (payload.session_id || ''),
     'Provider: ' + [providerLabel(payload.provider), payload.provider].filter(Boolean).join(' / '),
-    payload.source_type ? 'Source type: ' + payload.source_type : '',
+    payload.source_type ? 'Source: ' + sourceTypeLabel(payload.provider, payload.source_type) + ' (' + payload.source_type + ')' : '',
     payload.repo_display || payload.repo || payload.scope ? 'Repo or path: ' + (payload.repo_display || payload.repo || payload.scope) : '',
     payload.cwd ? 'Working directory: ' + payload.cwd : '',
     payload.started_at ? 'Started: ' + payload.started_at : '',
@@ -8671,7 +9331,7 @@ setupStatsActivityControls();
 setupStatsBreakdownControls();
 
 async function loadStats() {
-  const elements = ['chartTokensPerDay', 'chartSessionsPerDay', 'chartTokensPerRepo', 'chartSessionsPerRepo', 'statsAgentHeatmap', 'statsChatHeatmap'].map((id) => document.getElementById(id));
+  const elements = ['chartTokensPerDay', 'chartSessionsPerDay', 'chartTokensPerRepo', 'chartSessionsPerRepo', 'statsAgentHeatmap', 'statsChatHeatmap', 'statsSdkHeatmap'].map((id) => document.getElementById(id));
   for (const el of elements) {
     if (el) {
       el.classList.add('stats-empty');
@@ -8964,8 +9624,9 @@ function renderStatsDailyCharts() {
     if (empty2) { empty2.classList.add('stats-empty'); empty2.textContent = 'No days in this range.'; }
     return;
   }
-  renderDailyChart('chartTokensPerDay', densified, groups, usageMetric, 336);
-  renderDailyChart('chartSessionsPerDay', densified, groups, activityMetric, 336);
+  const canonicalGroups = statsCanonicalOrderedGroups(groups);
+  renderDailyChart('chartTokensPerDay', densified, canonicalGroups, usageMetric, 336);
+  renderDailyChart('chartSessionsPerDay', densified, canonicalGroups, activityMetric, 336);
 }
 
 function renderStats(payload) {
@@ -8980,8 +9641,9 @@ function renderStats(payload) {
   renderStatsLegend(groups, breakdownTotals);
   renderStatsDailyCharts();
   const repoRows = statsRepoRowsForRange(payload);
-  renderRepoChart('chartTokensPerRepo', repoRows, groups, statsTokenMetric());
-  renderRepoChart('chartSessionsPerRepo', repoRows, groups, statsActivityMetric());
+  const canonicalGroupsForRepo = statsCanonicalOrderedGroups(groups);
+  renderRepoChart('chartTokensPerRepo', repoRows, canonicalGroupsForRepo, statsTokenMetric());
+  renderRepoChart('chartSessionsPerRepo', repoRows, canonicalGroupsForRepo, statsActivityMetric());
 }
 
 function statsTokenMetric() {
@@ -9353,6 +10015,10 @@ function renderStatsMetrics(payload) {
   const totalOutTok = Number(payload.total_output_tokens || 0);
   const totalCacheTok = Number(payload.total_cache_tokens || 0);
   const totalEstimatedTok = Number(payload.total_estimated_tokens || 0);
+  const sdkSessions = Number(payload.sdk_session_count || 0);
+  const sdkTokens = Number(payload.sdk_total_tokens || 0);
+  const sdkInputTokens = Number(payload.sdk_total_input_tokens || 0);
+  const sdkOutputTokens = Number(payload.sdk_total_output_tokens || 0);
   const um = Number(payload.user_message_count || 0);
   const tm = Number(payload.message_count || 0);
   const avgMsgs = Number(payload.avg_messages_per_conversation);
@@ -9377,6 +10043,13 @@ function renderStatsMetrics(payload) {
       value: formatFullNumber(payload.session_count || 0),
       sub: formatFullNumber(payload.agent_session_count || 0) + ' agent · ' + formatFullNumber(payload.chat_session_count || 0) + ' chat'
     },
+    sdkSessions || sdkTokens ? {
+      label: 'SDK jobs',
+      value: formatFullNumber(sdkSessions),
+      sub: (sdkTokens ? formatCompactNumber(sdkTokens) + ' tokens' : '0 tokens') +
+        (sdkInputTokens || sdkOutputTokens ? ' · ' + formatCompactNumber(sdkInputTokens) + ' in / ' + formatCompactNumber(sdkOutputTokens) + ' out' : '') +
+        ' · kept separate'
+    } : null,
     {
       label: 'Messages',
       value: formatFullNumber(tm),
@@ -9433,6 +10106,7 @@ function renderStatsMetrics(payload) {
     }
   ];
   container.innerHTML = metrics
+    .filter(Boolean)
     .map(function (metric) {
       const vt =
         metric.valueHtml == null &&
@@ -9506,7 +10180,11 @@ function renderHeatmapSection(payload) {
   renderSecondaryHeatmap(payload.split_stats && payload.split_stats.agent, 'statsAgentActivitySub', 'statsAgentHeatmap', range, metric);
   renderSecondaryHeatmap(payload.split_stats && payload.split_stats.chat, 'statsChatActivitySub', 'statsChatHeatmap', range, metric, {
     emptySubText: '',
-    emptyText: 'No chat activity yet. Import ChatGPT or Claude.ai exports with agentlog import chatgpt <path> --scope local or agentlog import claude-web <path> --scope local.'
+    emptyText: 'No chat activity yet. Run agentlog import chatgpt or agentlog import claude-web for official export instructions.'
+  });
+  renderSecondaryHeatmap(payload.split_stats && payload.split_stats.sdk, 'statsSdkActivitySub', 'statsSdkHeatmap', range, metric, {
+    emptySubText: '',
+    emptyText: 'No SDK jobs imported.'
   });
 }
 
@@ -9741,15 +10419,11 @@ function renderDailyChart(elementId, daily, providers, metric, height) {
     return '<line class="stats-axis-line" x1="' + padding.left + '" x2="' + (padding.left + innerW) + '" y1="' + y.toFixed(2) + '" y2="' + y.toFixed(2) + '"/>'
       + '<text class="stats-axis-label" x="' + (padding.left - 6) + '" y="' + (y + 3).toFixed(2) + '" text-anchor="end">' + esc(formatCompactNumber(value)) + '</text>';
   }).join('');
-  let prevYm = '';
-  const xLabels = visibleDaily.map((day, idx) => {
-    const ym = day.date.slice(0, 7);
-    if (ym === prevYm) return '';
-    prevYm = ym;
-    const cx = padding.left + idx * xStep + xStep / 2;
-    const tick = formatChartMonthTick(day.date);
-    return '<text class="stats-axis-label" x="' + cx.toFixed(2) + '" y="' + (padding.top + innerH + 18) + '" text-anchor="middle">' + esc(tick) + '</text>';
-  }).join('');
+  const xLabels = dailyChartMonthTicks(visibleDaily, xStep, padding.left, innerW)
+    .map((tickEntry) =>
+      '<text class="stats-axis-label" x="' + tickEntry.x.toFixed(2) + '" y="' + (padding.top + innerH + 18) + '" text-anchor="middle">' + esc(tickEntry.label) + '</text>'
+    )
+    .join('');
   const hits = visibleDaily.map((day, dayIdx) => {
     const xHit = padding.left + dayIdx * xStep;
     return '<rect class="stats-chart-hit" pointer-events="all" x="' + xHit.toFixed(2) + '" y="' + padding.top + '" width="' + xStep.toFixed(2) + '" height="' + innerH.toFixed(2) + '" fill="transparent" data-day-index="' + dayIdx + '"/>';
@@ -9761,6 +10435,33 @@ function renderDailyChart(elementId, daily, providers, metric, height) {
   bindDailyChartHover(el);
 }
 
+function dailyChartMonthTicks(daily, xStep, left, innerW) {
+  const monthStarts = [];
+  let prevYm = '';
+  for (let idx = 0; idx < daily.length; idx += 1) {
+    const day = daily[idx];
+    const ym = String(day?.date || '').slice(0, 7);
+    if (!/^\\d{4}-\\d{2}$/.test(ym) || ym === prevYm) continue;
+    prevYm = ym;
+    monthStarts.push({ idx, date: day.date, ym });
+  }
+  const maxLabels = Math.max(2, Math.floor(innerW / 58));
+  const step = Math.max(1, Math.ceil(monthStarts.length / maxLabels));
+  const selected = [];
+  for (let idx = 0; idx < monthStarts.length; idx += step) selected.push(monthStarts[idx]);
+  const last = monthStarts[monthStarts.length - 1];
+  if (last && selected[selected.length - 1] !== last) {
+    const previous = selected[selected.length - 1];
+    if (previous && monthStarts.indexOf(previous) >= monthStarts.length - step) selected[selected.length - 1] = last;
+    else selected.push(last);
+  }
+  return selected
+    .map((entry) => ({
+      x: left + entry.idx * xStep + xStep / 2,
+      label: formatChartMonthTick(entry.date)
+    }));
+}
+
 function trimEmptyDailyChartEdges(daily, providers, metric) {
   const rows = Array.isArray(daily) ? daily : [];
   const hasValue = (day) => providers.some((provider) => statsMetricValue(day?.providers?.[provider], metric) > 0);
@@ -10207,8 +10908,8 @@ Start here:
 Archive and import:
   init                                  interactive setup and optional first import
   import                                import local Codex, Claude, Gemini, Devin, Cursor, Cline, OpenCode, Aider, and Antigravity history
-  import chatgpt <path>                 import a ChatGPT export JSON/ZIP/folder
-  import claude-web <path>              import a Claude.ai export JSON/ZIP/folder
+  import chatgpt [path]                 show ChatGPT export instructions; with path, import a ZIP/folder
+  import claude-web [path]              show Claude.ai export instructions; with path, import a ZIP/folder
   import windsurf <path>                import downloaded Windsurf trajectory Markdown file/folder
   import accounts                       list or rename ChatGPT/Claude.ai export accounts
   sync                                  choose a remote, preview, confirm, then upload archive objects
@@ -10264,8 +10965,8 @@ agentlog import
 Usage:
   agentlog import --source <source> [--since 30d|all]
   agentlog import --sources <a,b,c> [--since 30d|all]
-  agentlog import chatgpt <path> [--username <name>] [--scope local|team]
-  agentlog import claude-web <path> [--username <name>] [--scope local|team]
+  agentlog import chatgpt [path] [--username <name>] [--scope local|team]
+  agentlog import claude-web [path] [--username <name>] [--scope local|team]
   agentlog import windsurf <file-or-folder>
   agentlog import accounts list
   agentlog import accounts rename <provider> <account-id-or-username> --display-name <name>
@@ -10273,6 +10974,7 @@ Usage:
 Import sources:
   codex-cli             terminal Codex sessions from Codex state and rollout files
   codex-desktop         Codex desktop app sessions from Codex state and rollout files
+  codex-sdk             high-volume Codex exec/SDK batch jobs; opt-in
   claude                interactive Claude Code CLI JSONL transcripts
   claude-code-desktop   Claude Code sessions launched from the Claude desktop app
   claude-workspace      Claude app workspace/local-agent sessions
@@ -10282,18 +10984,22 @@ Import sources:
   devin-cli             Devin for Terminal sessions from ~/.local/share/devin/cli/sessions.db
   cursor                Cursor SQLite history plus newer agent-transcripts folders
   cline                 Cline task folders from VS Code/JetBrains globalStorage
-  opencode              OpenCode JSON session/message/part storage
+  opencode-cli          OpenCode CLI/core SQLite database plus project JSON session/message/part storage
+  opencode-desktop      OpenCode Desktop app-specific SQLite database and app storage
+  opencode-web          OpenCode web sessions from the shared OpenCode SQLite store
+  opencode              OpenCode CLI, Desktop, and Web aggregate
   aider                 Aider repo-local markdown chat history
   all                   configured default local sources
 
 Web export sources:
-  chatgpt               official ChatGPT export JSON/ZIP
-  claude-web            official Claude.ai export JSON/ZIP
+  chatgpt               instructions for requesting a ChatGPT export; imports downloaded ZIP/folder
+  claude-web            instructions for requesting a Claude.ai export; imports downloaded ZIP/folder
   windsurf              downloaded Cascade trajectory Markdown file/folder
 
 Examples:
   agentlog import --source codex-cli --since 30d
   agentlog import --source codex-desktop --since all
+  agentlog import --source codex-sdk --since all
   agentlog import --source claude --since 30d
   agentlog import --source claude-code-desktop --since all
   agentlog import --source claude-workspace --since all
@@ -10304,11 +11010,13 @@ Examples:
   agentlog import --source cline --since all
   agentlog import --source opencode --since all
   agentlog import --source aider --since all
-  agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode,aider --since all
+  agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode-cli,opencode-desktop,opencode-web,aider --since all
   agentlog import --source all --since all --dry-run
   agentlog import --source cursor --since all --explain-skips
   agentlog import --source cursor --since all --explain-skips --json
   agentlog import status --json
+  agentlog import chatgpt
+  agentlog import claude-web
   agentlog import chatgpt ~/Downloads/chatgpt-export.zip --username you@example.com
   agentlog import claude-web ~/Downloads/claude-export --username brian --display-name Brian --scope local
   agentlog import windsurf ~/Downloads/cascade-chat-conversation.md
@@ -10321,7 +11029,8 @@ Details:
   --dry-run shows what would be imported without writing archive files.
   --explain-skips includes per-session skip reasons for supported sources.
   --json prints machine-readable import results.
-  In a terminal, web and Windsurf imports prompt for the export path when omitted.
+  ChatGPT and Claude.ai imports print export instructions when the path is omitted.
+  Windsurf imports prompt for the export path when omitted in a terminal.
   Windsurf local cache scanning is disabled because current Cascade transcripts are encrypted binary stores. Use the Windsurf "Download trajectory" Markdown export with \`agentlog import windsurf <file-or-folder>\`.
   See docs/history-source-handling.md for source-specific storage paths.
 `;