opencode-subagent-magazine 1.4.2 → 1.5.1

package/src/index.tsx

@@ -20,12 +20,14 @@ import {
   For,
 } from "solid-js"
 import { PLUGIN_VERSION } from "./_version"
+import { copyText } from "./clipboard"
+import { LangCode, LANG_META, createT, detectLang } from "./i18n"
 
 // ===================================================================
 // Types
 // ===================================================================
 
-type SubStatus = "running" | "done" | "error"
+type SubStatus = "running" | "done" | "error" | "cancel_requested" | "cancelled"
 
 interface SubEntry {
   id: string
@@ -42,108 +44,18 @@ interface SubEntry {
   model?: string
   todoTotal?: number
   todoDone?: number
+  cancelRequestedAt?: number
+  abortAccepted?: boolean
+  cancelReason?: "manual"
 }
 
-type Lang = "zh" | "en"
+type Lang = LangCode
 type SortOrder = "desc" | "asc"
 type ScrollMode = "wheel" | "click"
 
 /** OpenCode built-in tool names that spawn sub-agents or delegate tasks. */
 const SUBAGENT_TOOLS = new Set(["task", "delegate", "call_omo_agent"])
 
-// ===================================================================
-// i18n
-// ===================================================================
-
-const I18N: Record<Lang, Record<string, string>> = {
-  zh: {
-    "panel.title": "子代理",
-    "status.none": "暂无子代理",
-    "agent.label": "代理",
-    "status.label": "状态",
-    "time.label": "耗时",
-    "tokens.label": "上下文",
-    "error.label": "错误",
-    "model.label": "模型",
-    "todo.label": "进度",
-    "session.label": "会话 ID",
-    "session.toast.copy": "可手动复制上方 ID",
-    "open.label": "进入会话",
-    "cost.label": "费用",
-    "scroll.more": "更多",
-    "scroll.top": "回顶",
-    "scroll.bottom": "回底",
-    "dismiss.label": "标记完成",
-    "status.running": "运行中",
-    "status.done": "已完成",
-    "status.error": "错误",
-    "order.desc": "降序（最新在前）",
-    "order.asc": "升序（最早在前）",
-    "scroll.wheel": "滚轮翻页",
-    "scroll.click": "点击翻页",
-    "ttl.label": "清理周期",
-    "ttl.3d": "3 天",
-    "ttl.7d": "7 天",
-    "ttl.14d": "14 天",
-    "ttl.30d": "30 天",
-    "ttl.unlimited": "无期限",
-    "ttl.toast": "清理周期已设为 {n} 天",
-    "ttl.toast_unlimited": "清理周期已设为无期限",
-    "clear.title": "确认清除",
-    "clear.prompt": "确定清除当前会话所有子代理记录？此操作不可撤销。",
-    "clear.prompt_running": "当前有 {n} 个运行中的子代理，清除后将不可恢复。确定继续？",
-    "clear.done": "已清除 {n} 条子代理记录",
-    "clear.empty": "当前会话无子代理记录",
-  },
-  en: {
-    "panel.title": "SubAgent",
-    "status.none": "No sub-agents yet",
-    "agent.label": "agent",
-    "status.label": "status",
-    "time.label": "time",
-    "tokens.label": "tokens",
-    "error.label": "error",
-    "model.label": "model",
-    "todo.label": "todo",
-    "session.label": "session ID",
-    "session.toast.copy": "Copy the ID above manually",
-    "open.label": "Open session",
-    "cost.label": "cost",
-    "scroll.more": "more",
-    "scroll.top": "Top",
-    "scroll.bottom": "Bottom",
-    "dismiss.label": "dismiss",
-    "status.running": "running",
-    "status.done": "done",
-    "status.error": "error",
-    "order.desc": "Desc (newest first)",
-    "order.asc": "Asc (oldest first)",
-    "scroll.wheel": "Wheel Scroll",
-    "scroll.click": "Click Scroll",
-    "ttl.label": "TTL (Time to Live)",
-    "ttl.3d": "3 days",
-    "ttl.7d": "7 days",
-    "ttl.14d": "14 days",
-    "ttl.30d": "30 days",
-    "ttl.unlimited": "Never",
-    "ttl.toast": "TTL set to {n} days",
-    "ttl.toast_unlimited": "TTL set to Never",
-    "clear.title": "Confirm",
-    "clear.prompt": "Clear all sub-agent records for this session? This cannot be undone.",
-    "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",
-  },
-}
-
-declare const process: { env: Record<string, string | undefined> } | undefined
-
-function detectLang(): Lang {
-  const env = process?.env?.OPENCODE_LANG ?? process?.env?.LANG ?? ""
-  if (env.startsWith("zh")) return "zh"
-  return "en"
-}
-
 // ===================================================================
 // Helpers — visual width
 // ===================================================================
@@ -304,7 +216,7 @@ function SubAgentPanel(props: {
   scrollMode: () => ScrollMode
   sessionId: string
 }): JSX.Element {
-  const t = (key: string) => I18N[props.lang()][key] ?? key
+  const t = createT(() => props.lang())
 
   // ── session data (single-key, true deletion on cleanup) ──
   const SESSION_DATA_KEY = `${KV_PREFIX}.session_data`
@@ -449,7 +361,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
         }
@@ -497,6 +409,7 @@ function SubAgentPanel(props: {
   )
   const [hoveredOpen, setHoveredOpen] = createSignal<string | undefined>(undefined)
   const [hoveredDismiss, setHoveredDismiss] = createSignal<string | undefined>(undefined)
+  const [hoveredCancel, setHoveredCancel] = createSignal<string | undefined>(undefined)
   const [hoveredTop, setHoveredTop] = createSignal(false)
   const [hoveredMoreAbove, setHoveredMoreAbove] = createSignal(false)
   const [hoveredMoreBelow, setHoveredMoreBelow] = createSignal(false)
@@ -602,7 +515,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,
@@ -613,6 +526,108 @@ function SubAgentPanel(props: {
     })
   }
 
+  // ── cancel helpers ──
+  const isDescendantOf = (childId: string, rootId: string): boolean => {
+    const visited = new Set<string>()
+    try {
+      let current = props.api.state.session.get(childId) as any
+      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) as any
+      }
+    } catch {}
+    return false
+  }
+
+  const settleOnIdle = (entry: SubEntry): SubStatus => {
+    if (entry.status === "cancel_requested" && entry.abortAccepted) return "cancelled"
+    return "done"
+  }
+
+  const cancelEntry = async (entry: SubEntry) => {
+    const childId = entry.sessionId
+    if (!childId) {
+      props.api.ui.toast({
+        title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + t("cancel.no_session"),
+      })
+      return
+    }
+
+    try {
+      const child = props.api.state.session.get(childId) as any
+      if (!child?.parentID) {
+        props.api.ui.toast({
+          title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + t("cancel.not_child"),
+        })
+        return
+      }
+    } catch {
+      props.api.ui.toast({
+        title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + t("cancel.read_error"),
+      })
+      return
+    }
+
+    if (!isDescendantOf(childId, props.sessionId)) {
+      props.api.ui.toast({
+        title: entry.title || entry.agent,
+                message: t("cancel.label") + ": " + t("cancel.outside_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") + ": " + t("cancel.status_error"),
+      })
+      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",
+    } as any)
+
+    try {
+      await (props.api as any).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,
+      } as any)
+      props.api.ui.toast({ message: t("cancel.label") + ": " + t("cancel.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") + ": " + t("cancel.failed"),
+      })
+    }
+  }
+
   // ── event handlers ──
   const handlePartUpdated = (event: unknown) => {
     const e = event as Record<string, unknown>
@@ -728,10 +743,11 @@ function SubAgentPanel(props: {
       targetStatus: SubStatus,
       nowTs: number,
     ): boolean => {
-      // 精确匹配：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
@@ -742,13 +758,13 @@ function SubAgentPanel(props: {
           return true
         }
       }
-      // 回退：sessionId 未关联但 agent 名匹配 + 状态为 running
+      // 回退：sessionId 未关联但 agent 名匹配 + 状态为 running / cancel_requested
       if (sessionAgent) {
         const normalize = (s: string) => s.toLowerCase().replace(/[^a-z0-9-]/g, "")
         const saNorm = normalize(sessionAgent)
         let best: { entry: SubEntry; gap: number } | null = null
         for (const [, entry] of entriesMap) {
-          if (entry.status !== "running") continue
+          if (entry.status !== "running" && entry.status !== "cancel_requested") continue
           const eaNorm = normalize(entry.agent)
           if (!eaNorm || !saNorm) continue
           if (!eaNorm.includes(saNorm) && !saNorm.includes(eaNorm)) continue
@@ -757,14 +773,15 @@ function SubAgentPanel(props: {
         }
         if (!best) {
           for (const [, entry] of entriesMap) {
-            if (entry.status !== "running") continue
+            if (entry.status !== "running" && entry.status !== "cancel_requested") continue
             if (entry.sessionId) continue
             const gap = nowTs - (entry.startedAt || 0)
             if (!best || gap > best.gap) best = { entry, gap }
           }
         }
         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
@@ -784,14 +801,15 @@ function SubAgentPanel(props: {
       const next = new Map(prev)
       for (const [id, entry] of next) {
         if (entry.sessionId !== sid) continue
-        if (entry.status !== "running" && entry.status !== "done") continue
+        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,
@@ -809,7 +827,7 @@ function SubAgentPanel(props: {
 
         // Phase 1: try matching by agent name（agent 名有交集）
         for (const [id, entry] of next) {
-          if (entry.status !== "running") continue
+          if (entry.status !== "running" && entry.status !== "cancel_requested") continue
           const eaNorm = normalize(entry.agent)
           if (!eaNorm || !saNorm) continue
           if (!eaNorm.includes(saNorm) && !saNorm.includes(eaNorm)) continue
@@ -821,7 +839,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") continue
+            if (entry.status !== "running" && entry.status !== "cancel_requested") continue
             if (entry.sessionId) continue
             const gap = nowTs - (entry.startedAt || 0)
             if (!best || gap > best.gap) best = { id, gap }
@@ -830,8 +848,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,
@@ -1064,7 +1083,7 @@ function SubAgentPanel(props: {
                     }
 
                     // Already settled → skip
-                    if (exists && exists.status !== "running") continue
+                    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.
                     if (exists && status === "running") {
@@ -1121,14 +1140,17 @@ function SubAgentPanel(props: {
           let changed = false
           const next = new Map(prev)
           for (const [id, entry] of next) {
-            if (entry.status !== "running" || !entry.sessionId) continue
+            if ((entry.status !== "running" && entry.status !== "cancel_requested") || !entry.sessionId) continue
             try {
               const st = props.api.state.session.status(entry.sessionId)
               if (!st || st.type !== "idle") continue
               const tokens = readSessionTokens(entry.sessionId)
               const cost = readSessionCost(entry.sessionId)
+              const finalStatus = entry.status === "cancel_requested" && entry.abortAccepted
+                ? "cancelled" as SubStatus
+                : "done" as SubStatus
               next.set(id, {
-                ...entry, status: "done" as SubStatus, endedAt: Date.now(),
+                ...entry, status: finalStatus, endedAt: Date.now(),
                 tokens: tokens ?? entry.tokens,
                 cost: cost ?? entry.cost,
               })
@@ -1229,8 +1251,8 @@ function SubAgentPanel(props: {
     }))
   })
 
-  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
 
@@ -1421,12 +1443,16 @@ function SubAgentPanel(props: {
               {(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) return isError ? pal().error : pal().success
+                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)
                 if (!a || !b) return pal().warning
@@ -1437,7 +1463,7 @@ function SubAgentPanel(props: {
               }
 
               const timeColor = () =>
-                isRunning ? pal().warning : isError ? pal().error : pal().muted
+                isActiveRunning ? pal().warning : isError ? pal().error : pal().muted
 
               // Entry label: collapsed shows title only, expanded shows title only too
               const tokenText = () =>
@@ -1446,7 +1472,7 @@ function SubAgentPanel(props: {
                   : ""
               const timeText = () =>
                 !isExpanded() && (elapsed() >= 2000 || entry.endedAt !== undefined)
-                  ? fmtDurationShort(elapsed(), isRunning)
+                  ? fmtDurationShort(elapsed(), isActiveRunning)
                   : ""
               const suffixW = () => {
                 let w = 0
@@ -1499,8 +1525,8 @@ function SubAgentPanel(props: {
                       {"  "}
                       <span style={{ fg: pal().primary }}>{t("status.label")}: </span>
                       <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("status.label")))}</span>
-                      <span style={{ fg: isRunning ? pal().warning : isError ? pal().error : pal().success }}>
-                        {isRunning ? t("status.running") : isError ? t("status.error") : t("status.done")}
+                      <span style={{ fg: isActiveRunning ? pal().warning : isCancelled ? pal().muted : isError ? pal().error : pal().success }}>
+                        {isActiveRunning ? t("status.running") : isCancelled ? t("status.cancelled") : isError ? t("status.error") : t("status.done")}
                       </span>
                     </text>
                     <Show when={elapsed() >= 2000 || entry.endedAt !== undefined}>
@@ -1509,7 +1535,7 @@ function SubAgentPanel(props: {
                         <span style={{ fg: pal().primary }}>{t("time.label")}: </span>
                         <span style={{ fg: pal().muted }}>{" ".repeat(expandedPad(t("time.label")))}</span>
                         <span style={{ fg: pal().muted }}>
-                          {fmtDurationShort(elapsed(), isRunning)}
+                          {fmtDurationShort(elapsed(), isActiveRunning)}
                         </span>
                       </text>
                     </Show>
@@ -1560,14 +1586,28 @@ function SubAgentPanel(props: {
                     </Show>
                     <Show when={entry.sessionId}>
                       <text
-                        onMouseUp={() => {
-                          if (entry.sessionId) {
+                        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,
+                          })
                         }}
                       >
                         {"  "}
@@ -1577,19 +1617,19 @@ function SubAgentPanel(props: {
                         <span style={{ fg: pal().warning }}> ⎘</span>
                       </text>
                     </Show>
-                    {/* 进入会话 + 标记完成：同排左右两端，空间隔离防误触 */}
+                    {/* 进入会话 + 取消任务 + 仅清除显示：同排左右两端 */}
                     <Show when={entry.sessionId || isRunning}>
                       {(() => {
-                        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 */)
+                        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 (
                           <box flexDirection="row">
-                            <Show when={entry.sessionId}
-                              fallback={<text>{"  "}</text>}
-                            >
+                            <Show when={entry.sessionId}>
                               <text
                                 onMouseOver={() => setHoveredOpen(entry.id)}
                                 onMouseOut={() => setHoveredOpen(undefined)}
@@ -1603,19 +1643,26 @@ function SubAgentPanel(props: {
                                 <span style={{ fg: hoveredOpen() === entry.id ? pal().warning : pal().primary }}>{t("open.label")}</span>
                               </text>
                             </Show>
+                            <text style={{ fg: pal().muted }}>{" ".repeat(spacerW())}</text>
+                            <Show when={isRunning && entry.sessionId}>
+                              <text
+                                onMouseOver={() => setHoveredCancel(entry.id)}
+                                onMouseOut={() => setHoveredCancel(undefined)}
+                                onMouseUp={() => cancelEntry(entry)}
+                              >
+                                <span style={{ fg: hoveredCancel() === entry.id ? pal().warning : pal().error }}>{cancelLabel()}</span>
+                              </text>
+                            </Show>
                             <Show when={isRunning}>
-                              <>
-                                <text style={{ fg: pal().muted }}>{" ".repeat(spacerW())}</text>
-                                <text
-                                  onMouseOver={() => setHoveredDismiss(entry.id)}
-                                  onMouseOut={() => setHoveredDismiss(undefined)}
-                                  onMouseUp={() => {
-                                    upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" })
-                                  }}
-                                >
-                                  <span style={{ fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }}>{dismissLabel()}</span>
-                                </text>
-                              </>
+                              <text
+                                onMouseOver={() => setHoveredDismiss(entry.id)}
+                                onMouseOut={() => setHoveredDismiss(undefined)}
+                                onMouseUp={() => {
+                                  upsertEntry({ id: entry.id, title: entry.title, agent: entry.agent, prompt: entry.prompt, status: "done" })
+                                }}
+                              >
+                                <span style={{ fg: hoveredDismiss() === entry.id ? pal().warning : pal().muted }}>{dismissLabel()}</span>
+                              </text>
                             </Show>
                           </box>
                         )
@@ -1732,7 +1779,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
   // ── language ──
   const stored = String(api.kv.get(`${KV_PREFIX}.lang`, ""))
   const initialLang: Lang =
-    stored === "zh" || stored === "en" ? stored : detectLang()
+    LANG_META.some((m) => m.code === stored) ? (stored as Lang) : detectLang()
   const [lang, setLang] = createSignal<Lang>(initialLang)
   const [maxEntries, setMaxEntries] = createSignal(
     parseInt(String(api.kv.get(`${KV_PREFIX}.max_entries`, "10")), 10) || 10
@@ -1759,16 +1806,13 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
         dialog?.replace(() => (
           <api.ui.DialogSelect
             title="Language / 语言"
-            options={[
-              { title: "中文", value: "zh" },
-              { title: "English", value: "en" },
-            ]}
+            options={LANG_META.map((m) => ({ title: m.label, value: m.code }))}
             onSelect={(opt) => {
               const l = opt.value as Lang
               setLang(l)
               api.kv.set(`${KV_PREFIX}.lang`, l)
               api.ui.toast({
-                message: l === "zh" ? "语言: 中文" : "Language: English",
+                message: "Language: " + (LANG_META.find((m) => m.code === l)?.label ?? l),
               })
               dialog?.clear()
             }}
@@ -1782,7 +1826,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
       description: "Set sub-agent entry sort order (desc / asc)",
       slash: { name: "subagent-order" },
       onSelect: (dialog) => {
-        const t = (k: string) => I18N[lang()][k] ?? k
+        const t = createT(() => lang())
         dialog?.replace(() => (
           <api.ui.DialogSelect
             title="Sort Order / 排序方式"
@@ -1809,7 +1853,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
       description: "Set scroll mode (wheel / click)",
       slash: { name: "subagent-scroll" },
       onSelect: (dialog) => {
-        const t = (k: string) => I18N[lang()][k] ?? k
+        const t = createT(() => lang())
         dialog?.replace(() => (
           <api.ui.DialogSelect
             title="Scroll Mode / 滚动模式"
@@ -1890,7 +1934,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
         }
         let count = 0
         for (const [, entry] of entries) {
-          if (entry.status === "running") {
+          if (entry.status === "running" || entry.status === "cancel_requested") {
             entry.status = "done" as SubStatus
             entry.endedAt = Date.now()
             count++
@@ -1937,7 +1981,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
       description: "Set session data retention period (days before auto-cleanup)",
       slash: { name: "subagent-ttl" },
       onSelect: (dialog) => {
-        const t = (k: string) => I18N[signals.lang()][k] ?? k
+        const t = createT(() => signals.lang())
         const curRaw = parseInt(String(api.kv.get(`${KV_PREFIX}.ttl_days`, "3")), 10)
         const curDays = Number.isNaN(curRaw) ? 3 : curRaw
         const curLabel = curDays === 0 ? t("ttl.unlimited") : `${curDays}d`
@@ -1954,7 +1998,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
             onSelect={(opt) => {
               const days = parseInt(opt.value, 10)
               api.kv.set(`${KV_PREFIX}.ttl_days`, String(days))
-              const msg = days === 0 ? t("ttl.toast_unlimited") : t("ttl.toast").replace("{n}", String(days))
+              const msg = days === 0 ? t("ttl.toast_unlimited") : t("ttl.toast", { n: days })
               api.ui.toast({ message: msg })
               dialog?.clear()
             }}
@@ -1968,7 +2012,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
       description: "Delete all sub-agent records for the current session (cannot be undone)",
       slash: { name: "subagent-clear-entries" },
       onSelect: (dialog) => {
-        const t = (k: string) => I18N[signals.lang()][k] ?? k
+        const t = createT(() => signals.lang())
         const sid = signals.sessionId
         const sessionObj = api.state.session.get(sid)
         const parentID = (sessionObj as any)?.parentID as string | undefined
@@ -1979,7 +2023,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
           for (const [, e] of cached) { if (e.status === "running") runningCount++ }
         }
         const msg = runningCount > 0
-          ? t("clear.prompt_running").replace("{n}", String(runningCount))
+          ? t("clear.prompt_running", { n: runningCount })
           : t("clear.prompt")
         dialog?.replace(() => (
           <api.ui.DialogConfirm
@@ -2012,7 +2056,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
                 api.kv.set(`${KV_PREFIX}.session_data`, JSON.stringify(data))
                 globalEntryCache.delete(sid)
                 setClearTick((v) => v + 1)
-                const msg = t("clear.done").replace("{n}", String(count))
+                const msg = t("clear.done", { n: count })
                 api.ui.toast({ message: msg })
               } catch {}
               dialog?.clear()