opencode-subagent-magazine 1.4.2 → 1.5.0

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.4.2";
+export declare const PLUGIN_VERSION = "1.5.0";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION = "1.4.2";
+export const PLUGIN_VERSION = "1.5.0";

package/dist/clipboard.d.ts

@@ -0,0 +1,7 @@
+export type ClipboardMethod = "pbcopy" | "osascript" | "wl-copy" | "xclip" | "xsel" | "powershell" | "osc52" | "none";
+export interface CopyTextResult {
+    copied: boolean;
+    method: ClipboardMethod;
+    error?: string;
+}
+export declare function copyText(text: string): Promise<CopyTextResult>;

package/dist/clipboard.js

@@ -0,0 +1,85 @@
+import { spawn } from "node:child_process";
+import { platform, release } from "node:os";
+function runWithInput(command, args, input) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, {
+            stdio: ["pipe", "ignore", "ignore"],
+            windowsHide: true,
+        });
+        child.once("error", reject);
+        child.once("close", (code) => {
+            if (code === 0)
+                resolve();
+            else
+                reject(new Error(`${command} exited with code ${code}`));
+        });
+        child.stdin?.end(input);
+    });
+}
+function writeOsc52(text) {
+    if (!process.stdout.isTTY)
+        return false;
+    const payload = Buffer.from(text, "utf8").toString("base64");
+    const sequence = `\x1b]52;c;${payload}\x07`;
+    const wrapped = process.env.TMUX || process.env.STY
+        ? `\x1bPtmux;\x1b${sequence}\x1b\\`
+        : sequence;
+    process.stdout.write(wrapped);
+    return true;
+}
+async function tryCommand(method, command, args, text) {
+    try {
+        await runWithInput(command, args, text);
+        return { copied: true, method };
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function copyText(text) {
+    if (!text)
+        return { copied: false, method: "none", error: "empty_text" };
+    const os = platform();
+    const isWsl = release().toLowerCase().includes("microsoft");
+    const attempts = [];
+    if (os === "darwin") {
+        attempts.push(() => tryCommand("pbcopy", "pbcopy", [], text));
+        attempts.push(() => tryCommand("osascript", "osascript", ["-e", "set the clipboard to (read (POSIX file \"/dev/stdin\") as text)"], text));
+    }
+    if (os === "linux" && isWsl) {
+        attempts.push(() => tryCommand("powershell", "powershell.exe", [
+            "-NonInteractive",
+            "-NoProfile",
+            "-Command",
+            "[Console]::InputEncoding=[Text.Encoding]::UTF8; Set-Clipboard ([Console]::In.ReadToEnd())",
+        ], text));
+    }
+    else if (os === "linux") {
+        if (process.env.WAYLAND_DISPLAY) {
+            attempts.push(() => tryCommand("wl-copy", "wl-copy", [], text));
+        }
+        attempts.push(() => tryCommand("xclip", "xclip", ["-selection", "clipboard"], text));
+        attempts.push(() => tryCommand("xsel", "xsel", ["--clipboard", "--input"], text));
+    }
+    if (os === "win32") {
+        attempts.push(() => tryCommand("powershell", "powershell.exe", [
+            "-NonInteractive",
+            "-NoProfile",
+            "-Command",
+            "[Console]::InputEncoding=[Text.Encoding]::UTF8; Set-Clipboard ([Console]::In.ReadToEnd())",
+        ], text));
+    }
+    for (const attempt of attempts) {
+        const result = await attempt();
+        if (result)
+            return result;
+    }
+    try {
+        if (writeOsc52(text))
+            return { copied: true, method: "osc52" };
+    }
+    catch {
+        // Continue to the explicit failure result.
+    }
+    return { copied: false, method: "none", error: "clipboard_unavailable" };
+}

package/dist/index.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/solid/jsx-runtime";
 import { createMemo, createSignal, createEffect, onMount, onCleanup, untrack, Show, For, } from "solid-js";
 import { PLUGIN_VERSION } from "./_version";
+import { copyText } from "./clipboard";
 /** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
 const SUBAGENT_TOOLS = new Set(["task", "delegate", "call_omo_agent"]);
 // ===================================================================
@@ -19,14 +20,18 @@ const I18N = {
         "todo.label": "进度",
         "session.label": "会话 ID",
         "session.toast.copy": "可手动复制上方 ID",
+        "session.toast.copied": "会话 ID 已复制",
+        "session.toast.copy_failed": "无法访问系统剪贴板，请手动复制上方 ID",
         "open.label": "进入会话",
         "cost.label": "费用",
         "scroll.more": "更多",
         "scroll.top": "回顶",
         "scroll.bottom": "回底",
         "dismiss.label": "标记完成",
+        "cancel.label": "取消",
         "status.running": "运行中",
         "status.done": "已完成",
+        "status.cancelled": "已取消",
         "status.error": "错误",
         "order.desc": "降序（最新在前）",
         "order.asc": "升序（最早在前）",
@@ -45,6 +50,14 @@ const I18N = {
         "clear.prompt_running": "当前有 {n} 个运行中的子代理，清除后将不可恢复。确定继续？",
         "clear.done": "已清除 {n} 条子代理记录",
         "clear.empty": "当前会话无子代理记录",
+        "cancel.no_session": "子会话 ID 不可用",
+        "cancel.not_child": "目标不是子会话",
+        "cancel.read_error": "无法读取会话信息",
+        "cancel.outside_tree": "目标不在当前监控会话树中",
+        "cancel.already_ended": "会话已结束，无需取消",
+        "cancel.status_error": "无法查询会话状态",
+        "cancel.sent": "已发送取消指令",
+        "cancel.failed": "取消失败",
     },
     en: {
         "panel.title": "SubAgent",
@@ -58,14 +71,18 @@ const I18N = {
         "todo.label": "todo",
         "session.label": "session ID",
         "session.toast.copy": "Copy the ID above manually",
+        "session.toast.copied": "Session ID copied",
+        "session.toast.copy_failed": "Cannot access the system clipboard; copy the ID above manually",
         "open.label": "Open session",
         "cost.label": "cost",
         "scroll.more": "more",
         "scroll.top": "Top",
         "scroll.bottom": "Bottom",
         "dismiss.label": "dismiss",
+        "cancel.label": "Cancel",
         "status.running": "running",
         "status.done": "done",
+        "status.cancelled": "cancelled",
         "status.error": "error",
         "order.desc": "Desc (newest first)",
         "order.asc": "Asc (oldest first)",
@@ -84,6 +101,14 @@ const I18N = {
         "clear.prompt_running": "{n} sub-agent(s) are still running. Clearing will discard them permanently. Continue?",
         "clear.done": "Cleared {n} sub-agent record(s)",
         "clear.empty": "No sub-agent records in this session",
+        "cancel.no_session": "Child session ID is unavailable",
+        "cancel.not_child": "Target is not a child session",
+        "cancel.read_error": "Cannot read session info",
+        "cancel.outside_tree": "Target is outside the monitored session tree",
+        "cancel.already_ended": "Session already ended, no need to cancel",
+        "cancel.status_error": "Cannot query session status",
+        "cancel.sent": "Cancel instruction sent",
+        "cancel.failed": "Cancellation failed",
     },
 };
 function detectLang() {
@@ -385,7 +410,7 @@ function SubAgentPanel(props) {
             let needsImmediateFlush = false;
             for (const [id, entry] of next) {
                 const prevEntry = prev.get(id);
-                if (prevEntry?.status === "running" && (entry.status === "done" || entry.status === "error")) {
+                if (prevEntry?.status === "running" && (entry.status === "done" || entry.status === "error" || entry.status === "cancelled")) {
                     needsImmediateFlush = true;
                     break;
                 }
@@ -438,6 +463,7 @@ function SubAgentPanel(props) {
     })());
     const [hoveredOpen, setHoveredOpen] = createSignal(undefined);
     const [hoveredDismiss, setHoveredDismiss] = createSignal(undefined);
+    const [hoveredCancel, setHoveredCancel] = createSignal(undefined);
     const [hoveredTop, setHoveredTop] = createSignal(false);
     const [hoveredMoreAbove, setHoveredMoreAbove] = createSignal(false);
     const [hoveredMoreBelow, setHoveredMoreBelow] = createSignal(false);
@@ -553,7 +579,7 @@ function SubAgentPanel(props) {
             const next = new Map(prev);
             const nowTs = Date.now();
             const e = partial.status;
-            const ended = e === "done" || e === "error";
+            const ended = e === "done" || e === "error" || e === "cancelled";
             next.set(partial.id, {
                 ...(existing ?? { startedAt: nowTs }),
                 ...partial,
@@ -563,6 +589,107 @@ function SubAgentPanel(props) {
             return next;
         });
     };
+    // ── cancel helpers ──
+    const isDescendantOf = (childId, rootId) => {
+        const visited = new Set();
+        try {
+            let current = props.api.state.session.get(childId);
+            while (current?.parentID) {
+                if (visited.has(current.id))
+                    return false;
+                visited.add(current.id);
+                if (current.parentID === rootId)
+                    return true;
+                current = props.api.state.session.get(current.parentID);
+            }
+        }
+        catch { }
+        return false;
+    };
+    const settleOnIdle = (entry) => {
+        if (entry.status === "cancel_requested" && entry.abortAccepted)
+            return "cancelled";
+        return "done";
+    };
+    const cancelEntry = async (entry) => {
+        const childId = entry.sessionId;
+        if (!childId) {
+            props.api.ui.toast({
+                title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.no_session"] ?? "Child session ID is unavailable"),
+            });
+            return;
+        }
+        try {
+            const child = props.api.state.session.get(childId);
+            if (!child?.parentID) {
+                props.api.ui.toast({
+                    title: entry.title || entry.agent,
+                    message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.not_child"] ?? "Target is not a child session"),
+                });
+                return;
+            }
+        }
+        catch {
+            props.api.ui.toast({
+                title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.read_error"] ?? "Cannot read session info"),
+            });
+            return;
+        }
+        if (!isDescendantOf(childId, props.sessionId)) {
+            props.api.ui.toast({
+                title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.outside_tree"] ?? "Target is outside the monitored session tree"),
+            });
+            return;
+        }
+        try {
+            const st = props.api.state.session.status(childId);
+            if (st?.type !== "busy") {
+                const tokens = readSessionTokens(childId);
+                const cost = readSessionCost(childId);
+                upsertEntry({
+                    id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt,
+                    status: "done", sessionId: entry.sessionId,
+                    tokens, cost,
+                });
+                return;
+            }
+        }
+        catch {
+            props.api.ui.toast({
+                title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.status_error"] ?? "Cannot query session status"),
+            });
+            return;
+        }
+        upsertEntry({
+            id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt,
+            status: "cancel_requested", sessionId: entry.sessionId,
+            cancelRequestedAt: Date.now(), abortAccepted: false, cancelReason: "manual",
+        });
+        try {
+            await props.api.client.session.abort({ sessionID: childId });
+            upsertEntry({
+                id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt,
+                status: "cancel_requested", sessionId: entry.sessionId,
+                abortAccepted: true,
+            });
+            props.api.ui.toast({ message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.sent"] ?? "Cancel instruction sent") });
+        }
+        catch (err) {
+            upsertEntry({
+                id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt,
+                status: "error", sessionId: entry.sessionId,
+                error: String(err),
+            });
+            props.api.ui.toast({
+                title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + (I18N[props.lang()]["cancel.failed"] ?? "Cancellation failed"),
+            });
+        }
+    };
     // ── event handlers ──
     const handlePartUpdated = (event) => {
         const e = event;
@@ -670,10 +797,11 @@ function SubAgentPanel(props) {
         // 在给定的 entries Map 中查找并更新匹配的子代理 entry。
         // 返回 true 表示找到并更新了，false 表示未找到。
         const tryMatchAndUpdate = (entriesMap, targetSid, targetStatus, nowTs) => {
-            // 精确匹配：sessionId 对得上 + 状态为 running
+            // 精确匹配：sessionId 对得上 + 状态为 running / cancel_requested
             for (const [, entry] of entriesMap) {
-                if (entry.sessionId === targetSid && entry.status === "running") {
-                    entry.status = targetStatus;
+                if (entry.sessionId === targetSid && (entry.status === "running" || entry.status === "cancel_requested")) {
+                    const finalStatus = targetStatus === "error" ? "error" : settleOnIdle(entry);
+                    entry.status = finalStatus;
                     entry.endedAt = nowTs;
                     entry.tokens = entry.tokens ?? sessionTokens;
                     entry.cost = entry.cost ?? sessionCost;
@@ -684,13 +812,13 @@ function SubAgentPanel(props) {
                     return true;
                 }
             }
-            // 回退：sessionId 未关联但 agent 名匹配 + 状态为 running
+            // 回退：sessionId 未关联但 agent 名匹配 + 状态为 running / cancel_requested
             if (sessionAgent) {
                 const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9-]/g, "");
                 const saNorm = normalize(sessionAgent);
                 let best = null;
                 for (const [, entry] of entriesMap) {
-                    if (entry.status !== "running")
+                    if (entry.status !== "running" && entry.status !== "cancel_requested")
                         continue;
                     const eaNorm = normalize(entry.agent);
                     if (!eaNorm || !saNorm)
@@ -703,7 +831,7 @@ function SubAgentPanel(props) {
                 }
                 if (!best) {
                     for (const [, entry] of entriesMap) {
-                        if (entry.status !== "running")
+                        if (entry.status !== "running" && entry.status !== "cancel_requested")
                             continue;
                         if (entry.sessionId)
                             continue;
@@ -713,7 +841,8 @@ function SubAgentPanel(props) {
                     }
                 }
                 if (best) {
-                    best.entry.status = targetStatus;
+                    const finalStatus = targetStatus === "error" ? "error" : settleOnIdle(best.entry);
+                    best.entry.status = finalStatus;
                     best.entry.endedAt = nowTs;
                     best.entry.tokens = best.entry.tokens ?? sessionTokens;
                     best.entry.cost = best.entry.cost ?? sessionCost;
@@ -733,16 +862,17 @@ function SubAgentPanel(props) {
             for (const [id, entry] of next) {
                 if (entry.sessionId !== sid)
                     continue;
-                if (entry.status !== "running" && entry.status !== "done")
+                if (entry.status !== "running" && entry.status !== "done" && entry.status !== "cancel_requested")
                     continue;
                 // Skip parent session idle — subagent entries belong to child sessions only
                 if (sid === props.sessionId)
                     continue;
                 // For "done" entries (sync tasks completed before session.idle), only backfill tokens/cost
-                const alreadySettled = entry.status !== "running";
+                const alreadySettled = entry.status !== "running" && entry.status !== "cancel_requested";
+                const finalStatus = status === "error" ? "error" : settleOnIdle(entry);
                 next.set(id, {
                     ...entry,
-                    ...(alreadySettled ? {} : { status, endedAt: Date.now() }),
+                    ...(alreadySettled ? {} : { status: finalStatus, endedAt: Date.now() }),
                     tokens: entry.tokens ?? sessionTokens,
                     cost: entry.cost ?? sessionCost,
                     model: entry.model ?? sessionModel,
@@ -759,7 +889,7 @@ function SubAgentPanel(props) {
                 let best = null;
                 // Phase 1: try matching by agent name（agent 名有交集）
                 for (const [id, entry] of next) {
-                    if (entry.status !== "running")
+                    if (entry.status !== "running" && entry.status !== "cancel_requested")
                         continue;
                     const eaNorm = normalize(entry.agent);
                     if (!eaNorm || !saNorm)
@@ -774,7 +904,7 @@ function SubAgentPanel(props) {
                 // fall back to time proximity for entries that have no sessionId yet
                 if (!best) {
                     for (const [id, entry] of next) {
-                        if (entry.status !== "running")
+                        if (entry.status !== "running" && entry.status !== "cancel_requested")
                             continue;
                         if (entry.sessionId)
                             continue;
@@ -785,8 +915,9 @@ function SubAgentPanel(props) {
                 }
                 if (best) {
                     const entry = next.get(best.id);
+                    const finalStatus = status === "error" ? "error" : settleOnIdle(entry);
                     next.set(best.id, {
-                        ...entry, status, endedAt: nowTs,
+                        ...entry, status: finalStatus, endedAt: nowTs,
                         tokens: sessionTokens || entry.tokens,
                         cost: sessionCost || entry.cost,
                         sessionId: sid,
@@ -1022,7 +1153,7 @@ function SubAgentPanel(props) {
                                                 status = "running";
                                         }
                                         // Already settled → skip
-                                        if (exists && exists.status !== "running")
+                                        if (exists && exists.status !== "running" && exists.status !== "cancel_requested")
                                             continue;
                                         // Running entry with no explicit status improvement from part:
                                         // try message-level heuristics first, then time-based fallback.
@@ -1081,7 +1212,7 @@ function SubAgentPanel(props) {
                     let changed = false;
                     const next = new Map(prev);
                     for (const [id, entry] of next) {
-                        if (entry.status !== "running" || !entry.sessionId)
+                        if ((entry.status !== "running" && entry.status !== "cancel_requested") || !entry.sessionId)
                             continue;
                         try {
                             const st = props.api.state.session.status(entry.sessionId);
@@ -1089,8 +1220,11 @@ function SubAgentPanel(props) {
                                 continue;
                             const tokens = readSessionTokens(entry.sessionId);
                             const cost = readSessionCost(entry.sessionId);
+                            const finalStatus = entry.status === "cancel_requested" && entry.abortAccepted
+                                ? "cancelled"
+                                : "done";
                             next.set(id, {
-                                ...entry, status: "done", endedAt: Date.now(),
+                                ...entry, status: finalStatus, endedAt: Date.now(),
                                 tokens: tokens ?? entry.tokens,
                                 cost: cost ?? entry.cost,
                             });
@@ -1196,8 +1330,8 @@ function SubAgentPanel(props) {
             elapsed: (e.endedAt ?? nowVal) - e.startedAt,
         }));
     });
-    const doneCount = createMemo(() => entryList().filter((e) => e.status === "done").length);
-    const runningCount = createMemo(() => entryList().filter((e) => e.status === "running").length);
+    const doneCount = createMemo(() => entryList().filter((e) => e.status === "done" || e.status === "cancelled").length);
+    const runningCount = createMemo(() => entryList().filter((e) => e.status === "running" || e.status === "cancel_requested").length);
     const errCount = createMemo(() => entryList().filter((e) => e.status === "error").length);
     const anyEntry = () => entryList().length > 0;
     const totalTokens = createMemo(() => {
@@ -1341,11 +1475,16 @@ function SubAgentPanel(props) {
                                         }, children: _jsxs("span", { style: { fg: hoveredMoreAbove() ? pal().warning : pal().muted }, children: ["  ", "\u2191 ", hiddenAbove(), " ", t("scroll.more")] }) }) }), _jsx(For, { each: visibleList(), children: (entry) => {
                                         const isExpanded = () => expanded() === entry.id;
                                         const isRunning = entry.status === "running";
+                                        const isCancelRequested = entry.status === "cancel_requested";
+                                        const isCancelled = entry.status === "cancelled";
                                         const isError = entry.status === "error";
+                                        const isActiveRunning = isRunning || isCancelRequested;
                                         const elapsed = () => (entry.endedAt ?? now()) - entry.startedAt;
                                         const statusDot = () => "\u25cf";
                                         const statusColor = () => {
-                                            if (!isRunning)
+                                            if (isCancelled)
+                                                return pal().muted;
+                                            if (!isActiveRunning)
                                                 return isError ? pal().error : pal().success;
                                             const t = (Math.sin(((now() % 2000) / 2000) * Math.PI * 2 - Math.PI / 2) + 1) / 2;
                                             const a = rgb(pal().muted), b = rgb(pal().warning);
@@ -1356,13 +1495,13 @@ function SubAgentPanel(props) {
                                             const bl = Math.round(a.b + (b.b - a.b) * t);
                                             return "#" + [r, g, bl].map((v) => Math.max(0, Math.min(255, v)).toString(16).padStart(2, "0")).join("");
                                         };
-                                        const timeColor = () => isRunning ? pal().warning : isError ? pal().error : pal().muted;
+                                        const timeColor = () => isActiveRunning ? pal().warning : isError ? pal().error : pal().muted;
                                         // Entry label: collapsed shows title only, expanded shows title only too
                                         const tokenText = () => !isExpanded() && entry.tokens !== undefined && entry.tokens > 0
                                             ? ` ${fmtTokens(entry.tokens)}`
                                             : "";
                                         const timeText = () => !isExpanded() && (elapsed() >= 2000 || entry.endedAt !== undefined)
-                                            ? fmtDurationShort(elapsed(), isRunning)
+                                            ? fmtDurationShort(elapsed(), isActiveRunning)
                                             : "";
                                         const suffixW = () => {
                                             let w = 0;
@@ -1382,30 +1521,44 @@ function SubAgentPanel(props) {
                                             const pad = Math.max(0, max - visualWidth(truncated));
                                             return truncated + " ".repeat(pad);
                                         };
-                                        return (_jsxs(_Fragment, { children: [_jsxs("text", { onMouseUp: () => toggleExpand(entry.id), children: [_jsx("span", { style: { fg: pal().muted }, children: isExpanded() ? "\u25bc" : "\u25b6" }), " ", _jsx("span", { style: { fg: statusColor() }, children: statusDot() }), " ", _jsx("span", { style: { fg: pal().text }, children: labelText() }), timeText() ? (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { fg: timeColor() }, children: timeText() })] })) : null, tokenText() ? (_jsx("span", { style: { fg: pal().muted }, children: tokenText() })) : null] }), _jsxs(Show, { when: isExpanded(), children: [_jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("agent.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("agent.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: entry.agent })] }), _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("status.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("status.label"))) }), _jsx("span", { style: { fg: isRunning ? pal().warning : isError ? pal().error : pal().success }, children: isRunning ? t("status.running") : isError ? t("status.error") : t("status.done") })] }), _jsx(Show, { when: elapsed() >= 2000 || entry.endedAt !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("time.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("time.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtDurationShort(elapsed(), isRunning) })] }) }), _jsx(Show, { when: entry.tokens !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("tokens.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("tokens.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtTokens(entry.tokens) })] }) }), _jsx(Show, { when: entry.error, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().error }, children: [t("error.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("error.label"))) }), _jsx("span", { style: { fg: pal().error }, children: truncate(String(entry.error), expandedValAvail()) })] }) }), _jsx(Show, { when: entry.cost !== undefined, children: (() => {
+                                        return (_jsxs(_Fragment, { children: [_jsxs("text", { onMouseUp: () => toggleExpand(entry.id), children: [_jsx("span", { style: { fg: pal().muted }, children: isExpanded() ? "\u25bc" : "\u25b6" }), " ", _jsx("span", { style: { fg: statusColor() }, children: statusDot() }), " ", _jsx("span", { style: { fg: pal().text }, children: labelText() }), timeText() ? (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { fg: timeColor() }, children: timeText() })] })) : null, tokenText() ? (_jsx("span", { style: { fg: pal().muted }, children: tokenText() })) : null] }), _jsxs(Show, { when: isExpanded(), children: [_jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("agent.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("agent.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: entry.agent })] }), _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("status.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("status.label"))) }), _jsx("span", { style: { fg: isActiveRunning ? pal().warning : isCancelled ? pal().muted : isError ? pal().error : pal().success }, children: isActiveRunning ? t("status.running") : isCancelled ? t("status.cancelled") : isError ? t("status.error") : t("status.done") })] }), _jsx(Show, { when: elapsed() >= 2000 || entry.endedAt !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("time.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("time.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtDurationShort(elapsed(), isActiveRunning) })] }) }), _jsx(Show, { when: entry.tokens !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("tokens.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("tokens.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: fmtTokens(entry.tokens) })] }) }), _jsx(Show, { when: entry.error, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().error }, children: [t("error.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("error.label"))) }), _jsx("span", { style: { fg: pal().error }, children: truncate(String(entry.error), expandedValAvail()) })] }) }), _jsx(Show, { when: entry.cost !== undefined, children: (() => {
                                                                 const cost = entry.cost;
                                                                 return (_jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("cost.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("cost.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: ["$", cost.toFixed(4)] })] }));
-                                                            })() }), _jsx(Show, { when: entry.model, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("model.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("model.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: truncate(entry.model, expandedValAvail()) })] }) }), _jsx(Show, { when: entry.todoTotal !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("todo.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("todo.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: [entry.todoDone, "/", entry.todoTotal] })] }) }), _jsx(Show, { when: entry.sessionId, children: _jsxs("text", { onMouseUp: () => {
-                                                                    if (entry.sessionId) {
+                                                            })() }), _jsx(Show, { when: entry.model, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("model.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("model.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: truncate(entry.model, expandedValAvail()) })] }) }), _jsx(Show, { when: entry.todoTotal !== undefined, children: _jsxs("text", { children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("todo.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("todo.label"))) }), _jsxs("span", { style: { fg: pal().muted }, children: [entry.todoDone, "/", entry.todoTotal] })] }) }), _jsx(Show, { when: entry.sessionId, children: _jsxs("text", { onMouseUp: async () => {
+                                                                    const sessionId = entry.sessionId;
+                                                                    if (!sessionId)
+                                                                        return;
+                                                                    const result = await copyText(sessionId);
+                                                                    if (result.copied) {
                                                                         props.api.ui.toast({
+                                                                            variant: "success",
                                                                             title: entry.title || entry.agent,
-                                                                            message: `${entry.sessionId}\n\n${t("session.toast.copy")}`,
-                                                                            duration: 8000,
+                                                                            message: t("session.toast.copied"),
+                                                                            duration: 2500,
                                                                         });
+                                                                        return;
                                                                     }
+                                                                    props.api.ui.toast({
+                                                                        variant: "warning",
+                                                                        title: entry.title || entry.agent,
+                                                                        message: `${sessionId}\n\n${t("session.toast.copy_failed")}`,
+                                                                        duration: 8000,
+                                                                    });
                                                                 }, children: ["  ", _jsxs("span", { style: { fg: pal().primary }, children: [t("session.label"), ": "] }), _jsx("span", { style: { fg: pal().muted }, children: " ".repeat(expandedPad(t("session.label"))) }), _jsx("span", { style: { fg: pal().muted }, children: truncate(entry.sessionId, expandedValAvail() - visualWidth(" ⎘")) }), _jsx("span", { style: { fg: pal().warning }, children: " \u2398" })] }) }), _jsx(Show, { when: entry.sessionId || isRunning, children: (() => {
-                                                                const dismissLabel = () => `- ${t("dismiss.label")}`;
                                                                 const openPrefix = () => "  \u2192 ";
                                                                 const openFull = () => entry.sessionId ? openPrefix() + t("open.label") : "";
                                                                 const openW = () => entry.sessionId ? visualWidth(openFull()) : 0;
-                                                                const spacerW = () => Math.max(1, panelWidth() - openW() - visualWidth(dismissLabel()) - 2 /* indent */);
-                                                                return (_jsxs("box", { flexDirection: "row", children: [_jsx(Show, { when: entry.sessionId, fallback: _jsx("text", { children: "  " }), children: _jsxs("text", { onMouseOver: () => setHoveredOpen(entry.id), onMouseOut: () => setHoveredOpen(undefined), onMouseUp: () => {
+                                                                const cancelLabel = () => ` ${t("cancel.label")}`;
+                                                                const dismissLabel = () => ` ${t("dismiss.label")}`;
+                                                                const rightW = (isRunning ? visualWidth(dismissLabel()) : 0) + (isRunning && entry.sessionId ? visualWidth(cancelLabel()) : 0);
+                                                                const spacerW = () => Math.max(1, panelWidth() - openW() - rightW - 2);
+                                                                return (_jsxs("box", { flexDirection: "row", children: [_jsx(Show, { when: entry.sessionId, children: _jsxs("text", { onMouseOver: () => setHoveredOpen(entry.id), onMouseOut: () => setHoveredOpen(undefined), onMouseUp: () => {
                                                                                     if (entry.sessionId) {
                                                                                         props.api.route.navigate("session", { sessionID: entry.sessionId });
                                                                                     }
-                                                                                }, children: [_jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: openPrefix() }), _jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: t("open.label") })] }) }), _jsx(Show, { when: isRunning, children: _jsxs(_Fragment, { children: [_jsx("text", { style: { fg: pal().muted }, children: " ".repeat(spacerW()) }), _jsx("text", { onMouseOver: () => setHoveredDismiss(entry.id), onMouseOut: () => setHoveredDismiss(undefined), onMouseUp: () => {
-                                                                                            upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" });
-                                                                                        }, children: _jsx("span", { style: { fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }, children: dismissLabel() }) })] }) })] }));
+                                                                                }, children: [_jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: openPrefix() }), _jsx("span", { style: { fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }, children: t("open.label") })] }) }), _jsx("text", { style: { fg: pal().muted }, children: " ".repeat(spacerW()) }), _jsx(Show, { when: isRunning && entry.sessionId, children: _jsx("text", { onMouseOver: () => setHoveredCancel(entry.id), onMouseOut: () => setHoveredCancel(undefined), onMouseUp: () => cancelEntry(entry), children: _jsx("span", { style: { fg: hoveredCancel() === entry.id ? pal().warning : pal().error }, children: cancelLabel() }) }) }), _jsx(Show, { when: isRunning, children: _jsx("text", { onMouseOver: () => setHoveredDismiss(entry.id), onMouseOut: () => setHoveredDismiss(undefined), onMouseUp: () => {
+                                                                                    upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" });
+                                                                                }, children: _jsx("span", { style: { fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }, children: dismissLabel() }) }) })] }));
                                                             })() })] })] }));
                                     } }), _jsx(Show, { when: hiddenBelow() > 0 || (props.sortOrder() === "desc" ? scrollOffset() > 0 : entryList().length > max() && clampedOffset() < entryList().length - max()), children: (() => {
                                         const showMore = hiddenBelow() > 0;
@@ -1580,7 +1733,7 @@ const tui = async (api) => {
                 }
                 let count = 0;
                 for (const [, entry] of entries) {
-                    if (entry.status === "running") {
+                    if (entry.status === "running" || entry.status === "cancel_requested") {
                         entry.status = "done";
                         entry.endedAt = Date.now();
                         count++;