bosun 0.29.2 → 0.29.4

package/setup.mjs

@@ -1500,6 +1500,15 @@ const EXECUTOR_PRESETS = {
       role: "primary",
     },
   ],
+  "claude-only": [
+    {
+      name: "claude-default",
+      executor: "CLAUDE",
+      variant: "CLAUDE_OPUS_4",
+      weight: 100,
+      role: "primary",
+    },
+  ],
   triple: [
     {
       name: "copilot-claude",
@@ -1817,6 +1826,16 @@ function normalizeSetupConfiguration({
     enabled: executor.enabled !== false,
   }));
 
+  // Derive PRIMARY_AGENT from executor config for SDK resolution
+  {
+    const primaryExec = configJson.executors.find((e) => e.role === "primary");
+    if (primaryExec) {
+      const sdkMap = { CODEX: "codex-sdk", COPILOT: "copilot-sdk", CLAUDE: "claude-sdk" };
+      env.PRIMARY_AGENT = env.PRIMARY_AGENT ||
+        sdkMap[String(primaryExec.executor).toUpperCase()] || "codex-sdk";
+    }
+  }
+
   configJson.failover = {
     strategy: normalizeEnum(
       configJson.failover?.strategy || env.FAILOVER_STRATEGY || "next-in-line",
@@ -2460,6 +2479,7 @@ async function main() {
           "Codex only",
           "Copilot + Codex (50/50 split)",
           "Copilot only (Claude Opus 4.6)",
+          "Claude only (direct API)",
           "Triple (Copilot Claude 40%, Codex 35%, Copilot GPT 25%)",
           "Custom — I'll define my own executors",
         ]
@@ -2467,6 +2487,7 @@ async function main() {
           "Codex only",
           "Copilot + Codex (50/50 split)",
           "Copilot only (Claude Opus 4.6)",
+          "Claude only (direct API)",
           "Triple (Copilot Claude 40%, Codex 35%, Copilot GPT 25%)",
         ];
 
@@ -2477,8 +2498,8 @@ async function main() {
     );
 
     const presetNames = isAdvancedSetup
-      ? ["codex-only", "copilot-codex", "copilot-only", "triple", "custom"]
-      : ["codex-only", "copilot-codex", "copilot-only", "triple"];
+      ? ["codex-only", "copilot-codex", "copilot-only", "claude-only", "triple", "custom"]
+      : ["codex-only", "copilot-codex", "copilot-only", "claude-only", "triple"];
     const presetKey = presetNames[presetIdx] || "codex-only";
 
     if (presetKey === "custom") {
@@ -2629,92 +2650,140 @@ async function main() {
       if (!wantCodexFallback) env.CODEX_SDK_DISABLED = "true";
     }
 
-    // ── Step 5: AI Provider ────────────────────────────────
-    headingStep(5, "AI / Codex Provider", markSetupProgress);
+    // ── Step 5: AI Provider Keys ─────────────────────────────
+    headingStep(5, "AI Provider Keys", markSetupProgress);
     console.log(
-      "  Codex Monitor uses the Codex SDK for crash analysis & autofix.\n",
+      "  Configure API keys for the agent SDKs in your executor preset.\n",
     );
 
-    const providerIdx = await prompt.choose(
-      "Select AI provider:",
-      [
-        "OpenAI (default)",
-        "Azure OpenAI",
-        "Local model (Ollama, vLLM, etc.)",
-        "Other OpenAI-compatible endpoint",
-        "None — disable AI features",
-      ],
-      0,
-    );
-
-    if (providerIdx < 4) {
-      env.OPENAI_API_KEY = await prompt.ask(
-        "API Key",
-        process.env.OPENAI_API_KEY || process.env.AZURE_OPENAI_API_KEY || "",
-      );
+    // Determine which SDK families are needed
+    const needsCodexSdk = usedSdks.has("CODEX") || env.CODEX_SDK_DISABLED !== "true";
+    const needsCopilotSdk = usedSdks.has("COPILOT") || env.COPILOT_SDK_DISABLED !== "true";
+    const needsClaudeSdk = usedSdks.has("CLAUDE") || env.CLAUDE_SDK_DISABLED !== "true";
+
+    // ── 5a. Copilot / GitHub Token ──────────────────────
+    if (needsCopilotSdk) {
+      console.log(chalk.bold("  Copilot SDK") + chalk.dim(" (uses GitHub token)\n"));
+      const existingGhToken = process.env.COPILOT_CLI_TOKEN || process.env.GITHUB_TOKEN || "";
+      if (existingGhToken) {
+        info(`GitHub token detected (${existingGhToken.slice(0, 8)}…). Copilot SDK will use it.`);
+      } else {
+        const ghToken = await prompt.ask(
+          "GitHub Token (GITHUB_TOKEN or COPILOT_CLI_TOKEN, blank to skip)",
+          "",
+        );
+        if (ghToken) env.GITHUB_TOKEN = ghToken;
+      }
+      // Copilot permission defaults
+      env.COPILOT_NO_ALLOW_ALL = env.COPILOT_NO_ALLOW_ALL || "false";
+      env.COPILOT_ENABLE_ASK_USER = env.COPILOT_ENABLE_ASK_USER || "false";
+      env.COPILOT_AGENT_MAX_REQUESTS = env.COPILOT_AGENT_MAX_REQUESTS || "500";
     }
-    if (providerIdx === 1) {
-      // Azure OpenAI also needs AZURE_OPENAI_API_KEY for adapters that check it directly
-      env.AZURE_OPENAI_API_KEY = env.OPENAI_API_KEY;
-      env.OPENAI_BASE_URL = await prompt.ask(
-        "Azure endpoint URL",
-        process.env.OPENAI_BASE_URL || "",
-      );
-      env.CODEX_MODEL = await prompt.ask(
-        "Deployment/model name",
-        process.env.CODEX_MODEL || "",
-      );
-    } else if (providerIdx === 2) {
-      env.OPENAI_API_KEY = env.OPENAI_API_KEY || "ollama";
-      env.OPENAI_BASE_URL = await prompt.ask(
-        "Local API URL",
-        "http://localhost:11434/v1",
-      );
-      env.CODEX_MODEL = await prompt.ask("Model name", "codex");
-    } else if (providerIdx === 3) {
-      env.OPENAI_BASE_URL = await prompt.ask("API Base URL", "");
-      env.CODEX_MODEL = await prompt.ask("Model name", "");
-    } else if (providerIdx === 4) {
-      env.CODEX_SDK_DISABLED = "true";
+
+    // ── 5b. Claude / Anthropic Key ──────────────────────
+    if (needsClaudeSdk) {
+      console.log(chalk.bold("\n  Claude SDK") + chalk.dim(" (uses Anthropic API key)\n"));
+      const existingAnthropicKey = process.env.ANTHROPIC_API_KEY || "";
+      if (existingAnthropicKey) {
+        info(`Anthropic API key detected (${existingAnthropicKey.slice(0, 8)}…). Claude SDK will use it.`);
+      } else {
+        const anthropicKey = await prompt.ask(
+          "Anthropic API Key (ANTHROPIC_API_KEY, blank to skip)",
+          "",
+        );
+        if (anthropicKey) env.ANTHROPIC_API_KEY = anthropicKey;
+      }
+      // Claude always runs in bypass mode under Bosun
+      env.CLAUDE_PERMISSION_MODE = env.CLAUDE_PERMISSION_MODE || "bypassPermissions";
     }
 
-    if (providerIdx < 4) {
-      const configureProfiles = await prompt.confirm(
-        "Configure model profiles (xl/m) for one-click switching?",
-        true,
+    // ── 5c. Codex / OpenAI Key ──────────────────────────
+    if (needsCodexSdk) {
+      console.log(chalk.bold("\n  Codex SDK") + chalk.dim(" (uses OpenAI API key)\n"));
+
+      const providerIdx = await prompt.choose(
+        "Select AI provider for Codex:",
+        [
+          "OpenAI (default)",
+          "Azure OpenAI",
+          "Local model (Ollama, vLLM, etc.)",
+          "Other OpenAI-compatible endpoint",
+          "None — disable Codex SDK",
+        ],
+        0,
       );
-      if (configureProfiles) {
-        const activeProfileIdx = await prompt.choose(
-          "Default active profile:",
-          ["xl (high quality)", "m (faster/cheaper)"],
-          0,
+
+      if (providerIdx < 4) {
+        env.OPENAI_API_KEY = await prompt.ask(
+          "API Key",
+          process.env.OPENAI_API_KEY || process.env.AZURE_OPENAI_API_KEY || "",
         );
-        env.CODEX_MODEL_PROFILE = activeProfileIdx === 0 ? "xl" : "m";
-        env.CODEX_MODEL_PROFILE_SUBAGENT = activeProfileIdx === 0 ? "m" : "xl";
-
-        env.CODEX_MODEL_PROFILE_XL_MODEL = await prompt.ask(
-          "XL profile model",
-          process.env.CODEX_MODEL_PROFILE_XL_MODEL ||
-            process.env.CODEX_MODEL ||
-            "gpt-5.3-codex",
+      }
+      if (providerIdx === 1) {
+        env.AZURE_OPENAI_API_KEY = env.OPENAI_API_KEY;
+        env.OPENAI_BASE_URL = await prompt.ask(
+          "Azure endpoint URL",
+          process.env.OPENAI_BASE_URL || "",
         );
-        env.CODEX_MODEL_PROFILE_M_MODEL = await prompt.ask(
-          "M profile model",
-          process.env.CODEX_MODEL_PROFILE_M_MODEL || "gpt-5.1-codex-mini",
+        env.CODEX_MODEL = await prompt.ask(
+          "Deployment/model name",
+          process.env.CODEX_MODEL || "",
         );
+      } else if (providerIdx === 2) {
+        env.OPENAI_API_KEY = env.OPENAI_API_KEY || "ollama";
+        env.OPENAI_BASE_URL = await prompt.ask(
+          "Local API URL",
+          "http://localhost:11434/v1",
+        );
+        env.CODEX_MODEL = await prompt.ask("Model name", "codex");
+      } else if (providerIdx === 3) {
+        env.OPENAI_BASE_URL = await prompt.ask("API Base URL", "");
+        env.CODEX_MODEL = await prompt.ask("Model name", "");
+      } else if (providerIdx === 4) {
+        env.CODEX_SDK_DISABLED = "true";
+      }
+
+      if (providerIdx < 4) {
+        const configureProfiles = await prompt.confirm(
+          "Configure model profiles (xl/m) for one-click switching?",
+          true,
+        );
+        if (configureProfiles) {
+          const activeProfileIdx = await prompt.choose(
+            "Default active profile:",
+            ["xl (high quality)", "m (faster/cheaper)"],
+            0,
+          );
+          env.CODEX_MODEL_PROFILE = activeProfileIdx === 0 ? "xl" : "m";
+          env.CODEX_MODEL_PROFILE_SUBAGENT = activeProfileIdx === 0 ? "m" : "xl";
+
+          env.CODEX_MODEL_PROFILE_XL_MODEL = await prompt.ask(
+            "XL profile model",
+            process.env.CODEX_MODEL_PROFILE_XL_MODEL ||
+              process.env.CODEX_MODEL ||
+              "gpt-5.3-codex",
+          );
+          env.CODEX_MODEL_PROFILE_M_MODEL = await prompt.ask(
+            "M profile model",
+            process.env.CODEX_MODEL_PROFILE_M_MODEL || "gpt-5.1-codex-mini",
+          );
 
-        const providerName =
-          providerIdx === 1 ? "azure" : providerIdx === 3 ? "compatible" : "openai";
-        env.CODEX_MODEL_PROFILE_XL_PROVIDER =
-          process.env.CODEX_MODEL_PROFILE_XL_PROVIDER || providerName;
-        env.CODEX_MODEL_PROFILE_M_PROVIDER =
-          process.env.CODEX_MODEL_PROFILE_M_PROVIDER || providerName;
+          const providerName =
+            providerIdx === 1 ? "azure" : providerIdx === 3 ? "compatible" : "openai";
+          env.CODEX_MODEL_PROFILE_XL_PROVIDER =
+            process.env.CODEX_MODEL_PROFILE_XL_PROVIDER || providerName;
+          env.CODEX_MODEL_PROFILE_M_PROVIDER =
+            process.env.CODEX_MODEL_PROFILE_M_PROVIDER || providerName;
 
-        if (!env.CODEX_SUBAGENT_MODEL) {
-          env.CODEX_SUBAGENT_MODEL =
-            env.CODEX_MODEL_PROFILE_M_MODEL || "gpt-5.1-codex-mini";
+          if (!env.CODEX_SUBAGENT_MODEL) {
+            env.CODEX_SUBAGENT_MODEL =
+              env.CODEX_MODEL_PROFILE_M_MODEL || "gpt-5.1-codex-mini";
+          }
         }
       }
+    } else {
+      // Codex not needed — skip OpenAI key prompts entirely
+      info("Codex SDK not in executor preset — skipping OpenAI configuration.");
     }
 
     // ── Step 6: Telegram ──────────────────────────────────
@@ -4568,6 +4637,13 @@ async function runNonInteractive({
   env.COPILOT_AGENT_MAX_REQUESTS =
     process.env.COPILOT_AGENT_MAX_REQUESTS || "500";
 
+  // Claude SDK: permission mode and API key passthrough
+  env.CLAUDE_PERMISSION_MODE =
+    process.env.CLAUDE_PERMISSION_MODE || "bypassPermissions";
+  if (process.env.ANTHROPIC_API_KEY) {
+    env.ANTHROPIC_API_KEY = process.env.ANTHROPIC_API_KEY;
+  }
+
   // Parse EXECUTORS env if set, else use default preset
   if (process.env.EXECUTORS) {
     const entries = process.env.EXECUTORS.split(",").map((e) => e.trim());
@@ -4589,7 +4665,33 @@ async function runNonInteractive({
     }
   }
   if (!configJson.executors.length) {
-    configJson.executors = EXECUTOR_PRESETS["codex-only"];
+    // Smart default: pick preset based on available API keys
+    const hasOpenAI = !!process.env.OPENAI_API_KEY;
+    const hasAnthropic = !!process.env.ANTHROPIC_API_KEY;
+    const hasGitHub = !!process.env.GITHUB_TOKEN || !!process.env.COPILOT_CLI_TOKEN;
+    const presetEnv = (process.env.EXECUTOR_PRESET || "").toLowerCase();
+    if (presetEnv && EXECUTOR_PRESETS[presetEnv]) {
+      configJson.executors = EXECUTOR_PRESETS[presetEnv];
+    } else if (hasGitHub) {
+      configJson.executors = hasOpenAI
+        ? EXECUTOR_PRESETS["copilot-codex"]
+        : EXECUTOR_PRESETS["copilot-only"];
+    } else if (hasAnthropic) {
+      configJson.executors = EXECUTOR_PRESETS["claude-only"];
+    } else {
+      configJson.executors = EXECUTOR_PRESETS["codex-only"];
+    }
+  }
+
+  // Derive PRIMARY_AGENT from executor preset's primary role
+  {
+    const primaryExec = (configJson.executors || []).find(
+      (e) => e.role === "primary",
+    );
+    if (primaryExec) {
+      const sdkMap = { CODEX: "codex-sdk", COPILOT: "copilot-sdk", CLAUDE: "claude-sdk" };
+      env.PRIMARY_AGENT = sdkMap[String(primaryExec.executor).toUpperCase()] || "codex-sdk";
+    }
   }
 
   configJson.projectName = env.PROJECT_NAME;
@@ -4803,6 +4905,42 @@ async function writeConfigFiles({ env, configJson, repoRoot, configDir }) {
     warn(`Could not update Copilot MCP config: ${copilotMcpResult.error}`);
   }
 
+  // ── Repo-level AI configs for all workspace repos ──────
+  heading("Repo-Level AI Configs");
+  try {
+    const { ensureRepoConfigs, printRepoConfigSummary } = await import("./repo-config.mjs");
+    // Apply to the primary repo
+    const repoResult = ensureRepoConfigs(repoRoot);
+    printRepoConfigSummary(repoResult, (msg) => console.log(msg));
+
+    // Also apply to all workspace repos under $BOSUN_DIR/workspaces/
+    const bosunDir = env.BOSUN_DIR || configDir || resolve(homedir(), "bosun");
+    const bosunConfigPath = resolve(bosunDir, "bosun.config.json");
+    if (existsSync(bosunConfigPath)) {
+      try {
+        const bosunCfg = JSON.parse(readFileSync(bosunConfigPath, "utf8"));
+        const wsDir = resolve(bosunDir, "workspaces");
+        for (const ws of bosunCfg.workspaces || []) {
+          for (const repo of ws.repos || []) {
+            const wsRepoPath = resolve(wsDir, ws.id || ws.name || "", repo.name);
+            if (wsRepoPath !== repoRoot && existsSync(wsRepoPath)) {
+              const wsResult = ensureRepoConfigs(wsRepoPath);
+              const anyChange = Object.values(wsResult).some((r) => r.created || r.updated);
+              if (anyChange) {
+                info(`Workspace repo: ${repo.name}`);
+                printRepoConfigSummary(wsResult, (msg) => console.log(msg));
+              }
+            }
+          }
+        }
+      } catch (wsErr) {
+        warn(`Could not update workspace repo configs: ${wsErr.message}`);
+      }
+    }
+  } catch (rcErr) {
+    warn(`Could not apply repo-level configs: ${rcErr.message}`);
+  }
+
   // ── Codex CLI config.toml ─────────────────────────────
   heading("Codex CLI Config");
 
@@ -4814,10 +4952,24 @@ async function writeConfigFiles({ env, configJson, repoRoot, configDir }) {
     const kanbanIsVk =
       (env.KANBAN_BACKEND || "internal").toLowerCase() === "vk" ||
       ["vk", "hybrid"].includes((env.EXECUTOR_MODE || "internal").toLowerCase());
+    // Derive primary SDK from executor configuration
+    const primaryExecutor = (configJson.executors || []).find(
+      (e) => e.role === "primary",
+    );
+    const executorToPrimarySdk = {
+      CODEX: "codex",
+      COPILOT: "copilot",
+      CLAUDE: "claude",
+    };
+    const primarySdk = primaryExecutor
+      ? executorToPrimarySdk[String(primaryExecutor.executor).toUpperCase()] || "codex"
+      : "codex";
+
     const tomlResult = ensureCodexConfig({
       vkBaseUrl,
       skipVk: !kanbanIsVk,
       dryRun: false,
+      primarySdk,
       env: {
         ...process.env,
         ...env,

package/task-executor.mjs

@@ -3717,6 +3717,7 @@ class TaskExecutor {
         "BOSUN_TASK_ID", "BOSUN_TASK_TITLE", "BOSUN_TASK_DESCRIPTION",
         "BOSUN_BRANCH_NAME", "BOSUN_WORKTREE_PATH", "BOSUN_SDK", "BOSUN_MANAGED",
         "BOSUN_REPO_ROOT", "BOSUN_REPO_SLUG", "BOSUN_WORKSPACE", "BOSUN_REPOSITORY",
+        "BOSUN_AGENT_REPO_ROOT",
       ];
       const _savedEnv = {};
       for (const k of _savedEnvKeys) _savedEnv[k] = process.env[k];
@@ -3746,6 +3747,9 @@ class TaskExecutor {
       process.env.BOSUN_REPO_SLUG       = executionRepoSlug;
       process.env.BOSUN_WORKSPACE       = taskRepoContext.workspace || "";
       process.env.BOSUN_REPOSITORY      = taskRepoContext.repository || "";
+      // Enforce workspace isolation: agents must resolve repo root from the
+      // workspace-scoped executionRepoRoot, NOT the developer's personal repo.
+      process.env.BOSUN_AGENT_REPO_ROOT = executionRepoRoot;
 
       const attemptId = `${taskId}-${randomUUID()}`;
       const taskMeta = {

package/ui/components/chat-view.js

@@ -4,6 +4,7 @@
  *  tracking, and pending/retry message support.
  * ────────────────────────────────────────────────────────────── */
 import { h } from "preact";
+import { memo } from "preact/compat";
 import { useState, useEffect, useRef, useCallback, useMemo } from "preact/hooks";
 import htm from "htm";
 import { apiFetch } from "../modules/api.js";
@@ -151,8 +152,23 @@ function renderMarkdown(text) {
   return result;
 }
 
+/* ─── Markdown render cache — avoids re-parsing identical content ─── */
+const _mdCache = new Map();
+const MD_CACHE_MAX = 500;
+function cachedRenderMarkdown(text) {
+  if (_mdCache.has(text)) return _mdCache.get(text);
+  const html = renderMarkdown(text);
+  if (_mdCache.size >= MD_CACHE_MAX) {
+    // Evict oldest quarter when full
+    const keys = Array.from(_mdCache.keys()).slice(0, MD_CACHE_MAX >> 2);
+    for (const k of keys) _mdCache.delete(k);
+  }
+  _mdCache.set(text, html);
+  return html;
+}
+
 /* ─── Code block copy button ─── */
-function CodeBlock({ code }) {
+const CodeBlock = memo(function CodeBlock({ code }) {
   const [copied, setCopied] = useState(false);
   const handleCopy = useCallback(() => {
     try {
@@ -170,10 +186,10 @@ function CodeBlock({ code }) {
       <pre><code>${code}</code></pre>
     </div>
   `;
-}
+});
 
 /* ─── Render message content with code block + markdown support ─── */
-function MessageContent({ text }) {
+const MessageContent = memo(function MessageContent({ text }) {
   if (!text) return null;
   const parts = text.split(/(```[\s\S]*?```)/g);
   return html`${parts.map((part, i) => {
@@ -181,9 +197,9 @@ function MessageContent({ text }) {
       const code = part.slice(3, -3).replace(/^\w+\n/, "");
       return html`<${CodeBlock} key=${i} code=${code} />`;
     }
-    return html`<div key=${i} class="md-rendered" dangerouslySetInnerHTML=${{ __html: renderMarkdown(part) }} />`;
+    return html`<div key=${i} class="md-rendered" dangerouslySetInnerHTML=${{ __html: cachedRenderMarkdown(part) }} />`;
   })}`;
-}
+});
 
 /* ─── Stream helpers ─── */
 function categorizeMessage(msg) {
@@ -206,6 +222,42 @@ function formatMessageLine(msg) {
   return `[${timestamp}] ${String(kind).toUpperCase()}: ${content}`;
 }
 
+/* ─── Memoized ChatBubble — only re-renders if msg identity changes ─── */
+const ChatBubble = memo(function ChatBubble({ msg }) {
+  const isTool = msg.type === "tool_call" || msg.type === "tool_result";
+  const isError = msg.type === "error" || msg.type === "stream_error";
+  const role = msg.role ||
+    (isTool || isError ? "system" : msg.type === "system" ? "system" : "assistant");
+  const bubbleClass = isError
+    ? "error"
+    : isTool
+      ? "tool"
+      : role === "user"
+        ? "user"
+        : role === "system"
+          ? "system"
+          : "assistant";
+  const label =
+    isTool
+      ? msg.type === "tool_call" ? "TOOL CALL" : "TOOL RESULT"
+      : isError ? "ERROR" : null;
+  return html`
+    <div class="chat-bubble ${bubbleClass}">
+      ${role === "system" && !isTool
+        ? html`<div class="chat-system-text">${msg.content}</div>`
+        : html`
+            ${label ? html`<div class="chat-bubble-label">${label}</div>` : null}
+            <div class="chat-bubble-content">
+              <${MessageContent} text=${msg.content} />
+            </div>
+            <div class="chat-bubble-time">
+              ${msg.timestamp ? formatRelative(msg.timestamp) : ""}
+            </div>
+          `}
+    </div>
+  `;
+}, (prev, next) => prev.msg === next.msg);
+
 /* ─── Chat View component ─── */
 export function ChatView({ sessionId, readOnly = false, embedded = false }) {
   const [input, setInput] = useState("");
@@ -406,7 +458,9 @@ export function ChatView({ sessionId, readOnly = false, embedded = false }) {
     const newMessages = nextCount > prevCount;
     lastMessageCount.current = nextCount;
     if (!paused && autoScroll) {
-      el.scrollTop = el.scrollHeight;
+      // Use smooth scroll for small increments, instant for large jumps
+      const gap = el.scrollHeight - el.scrollTop - el.clientHeight;
+      el.scrollTo({ top: el.scrollHeight, behavior: gap < 800 ? "smooth" : "instant" });
       return;
     }
     if (newMessages && !autoScroll) {
@@ -484,7 +538,7 @@ export function ChatView({ sessionId, readOnly = false, embedded = false }) {
     setInput(e.target.value);
     const el = e.target;
     el.style.height = 'auto';
-    el.style.height = Math.min(el.scrollHeight, 100) + 'px';
+    el.style.height = Math.min(el.scrollHeight, 120) + 'px';
   }, []);
 
   const toggleFilter = useCallback((key) => {
@@ -754,50 +808,12 @@ export function ChatView({ sessionId, readOnly = false, embedded = false }) {
             </button>
           </div>
         `}
-        ${visibleMessages.map((msg) => {
-          const isTool =
-            msg.type === "tool_call" || msg.type === "tool_result";
-          const isError = msg.type === "error" || msg.type === "stream_error";
-          const role = msg.role ||
-            (isTool || isError ? "system" : msg.type === "system" ? "system" : "assistant");
-          const bubbleClass = isError
-            ? "error"
-            : isTool
-              ? "tool"
-              : role === "user"
-                ? "user"
-                : role === "system"
-                  ? "system"
-                  : "assistant";
-          const label =
-            isTool
-              ? msg.type === "tool_call"
-                ? "TOOL CALL"
-                : "TOOL RESULT"
-              : isError
-                ? "ERROR"
-                : null;
-          return html`
-            <div
-              key=${msg.id || msg.timestamp}
-              class="chat-bubble ${bubbleClass}"
-            >
-              ${role === "system" && !isTool
-                ? html`<div class="chat-system-text">${msg.content}</div>`
-                : html`
-                    ${label
-                      ? html`<div class="chat-bubble-label">${label}</div>`
-                      : null}
-                    <div class="chat-bubble-content">
-                      <${MessageContent} text=${msg.content} />
-                    </div>
-                    <div class="chat-bubble-time">
-                      ${msg.timestamp ? formatRelative(msg.timestamp) : ""}
-                    </div>
-                  `}
-            </div>
-          `;
-        })} 
+        ${visibleMessages.map((msg) => html`
+          <${ChatBubble}
+            key=${msg.id || msg.timestamp}
+            msg=${msg}
+          />`
+        )} 
 
         ${/* Pending messages (optimistic rendering) — use .peek() to avoid
               subscribing ChatView to pendingMessages signal. Pending messages
@@ -844,12 +860,12 @@ export function ChatView({ sessionId, readOnly = false, embedded = false }) {
             class="btn btn-primary btn-sm"
             onClick=${() => {
               const el = messagesRef.current;
-              if (el) el.scrollTop = el.scrollHeight;
+              if (el) el.scrollTo({ top: el.scrollHeight, behavior: "smooth" });
               setAutoScroll(true);
               setUnreadCount(0);
             }}
           >
-            Jump to latest${unreadCount ? ` (${unreadCount})` : ""}
+            ↓ Jump to latest${unreadCount ? ` (${unreadCount})` : ""}
           </button>
         </div>
       `}

package/ui/components/session-list.js

@@ -278,9 +278,9 @@ function SwipeableSessionItem({
     const x = e.clientX || e.touches?.[0]?.clientX || 0;
     currentX.current = x;
     const dx = x - startX.current;
-    // Only allow left swipe (negative), cap at -120
+    // Only allow left swipe (negative), cap at -140
     if (dx < 0) {
-      setOffset(Math.max(dx, -120));
+      setOffset(Math.max(dx, -140));
     } else {
       setOffset(0);
     }
@@ -290,7 +290,7 @@ function SwipeableSessionItem({
     swiping.current = false;
     if (offset < -50) {
       // Snap open to reveal actions
-      setOffset(-120);
+      setOffset(-140);
       if (onToggleActions) onToggleActions(s.id);
     } else {
       setOffset(0);
@@ -440,7 +440,7 @@ function SwipeableSessionItem({
               e.stopPropagation();
               if (onToggleActions) {
                 onToggleActions(s.id);
-                setOffset(-120);
+                setOffset(-140);
               }
             }}
           >

package/ui/components/shared.js

@@ -206,6 +206,8 @@ export function Modal({ title, open = true, onClose, children, contentClassName
   }, []);
 
   const handleTouchStart = useCallback((e) => {
+    // Don't intercept touches on the close button
+    if (e.target.closest?.(".modal-close-btn")) return;
     const el = contentRef.current;
     if (!el) return;
     const rect = el.getBoundingClientRect();
@@ -244,6 +246,8 @@ export function Modal({ title, open = true, onClose, children, contentClassName
 
   const handlePointerDown = useCallback((e) => {
     if (e.pointerType === "touch") return;
+    // Don't intercept clicks on the close button
+    if (e.target.closest?.(".modal-close-btn")) return;
     const el = contentRef.current;
     if (!el) return;
     const rect = el.getBoundingClientRect();