opencode-subagent-magazine 1.6.0-beta.2 → 1.6.0-beta.4

package/src/v2/index.tsx

@@ -1,98 +1,102 @@
-/** @jsxImportSource @opentui/solid */
-
-import { createSignal } from "solid-js"
-import type { Context, PluginModule } from "./types"
-import { createPanelApi } from "./v2-panel-api"
-import { makeCommands } from "./commands"
-import { mapTheme } from "./theme"
-import { SubAgentPanel } from "../panel/SubAgentPanel"
-import type { PanelApi } from "../panel/panel-api"
-import type { Lang, SortOrder, ScrollMode, SharedSignals } from "../core/types"
-import { SETTING_KEYS } from "../core/kv"
-import { LANG_META, detectLang } from "../i18n"
-
-/** 面板根组件：keymap.layer 必须在组件渲染上下文注册（setup 内调用报
- *  Keymap.Provider missing），再渲染共享 SubAgentPanel。 */
-function PluginRoot(props: {
-  context: Context
-  api: PanelApi
-  signals: SharedSignals
-  sessionID: string
-}) {
-  props.context.keymap.layer(() => ({
-    mode: "global" as const,
-    commands: makeCommands(props.context, props.api, props.signals),
-  }))
-  return (
-    <SubAgentPanel
-      api={props.api}
-      theme={mapTheme(props.context.theme)}
-      lang={props.signals.lang}
-      maxEntries={props.signals.maxEntries}
-      sortOrder={props.signals.sortOrder}
-      scrollMode={props.signals.scrollMode}
-      sessionId={props.sessionID}
-    />
-  )
-}
-
-/** V2 入口：setup 创建共享信号 + PanelApi + 命令 layer + 侧边栏槽位。
- *  行为对齐 V1 tui()（信号初始值从 KV 恢复；侧边栏渲染共享 SubAgentPanel）。 */
-const mod: PluginModule & { server: () => Promise<Record<string, never>> } = {
-  id: "opencode-subagent-magazine",
-  setup(context: Context) {
-    // settings 惰性 getter（闭包引用信号变量——运行时已赋值）
-    let lang!: () => Lang
-    let maxEntries!: () => number
-    let sortOrder!: () => SortOrder
-    let scrollMode!: () => ScrollMode
-    const api = createPanelApi(context, {
-      lang: () => lang(),
-      maxEntries: () => maxEntries(),
-      sortOrder: () => sortOrder(),
-      scrollMode: () => scrollMode(),
-    })
-
-    // 信号初始值从 KV 恢复（对齐 V1 tui()）
-    const storedLang = String(api.kv.get(SETTING_KEYS.lang, ""))
-    const initialLang: Lang =
-      LANG_META.some((m) => m.code === storedLang) ? (storedLang as Lang) : detectLang()
-    const [langSignal, setLang] = createSignal<Lang>(initialLang)
-    const [maxSignal, setMaxEntries] = createSignal<number>(Number(api.kv.get(SETTING_KEYS.maxEntries, "10")) || 10)
-    const [orderSignal, setSortOrder] = createSignal<SortOrder>(
-      String(api.kv.get(SETTING_KEYS.order, "desc")) === "asc" ? "asc" : "desc",
-    )
-    const [scrollSignal, setScrollMode] = createSignal<ScrollMode>(
-      String(api.kv.get(SETTING_KEYS.scrollMode, "wheel")) === "click" ? "click" : "wheel",
-    )
-    lang = langSignal
-    maxEntries = maxSignal
-    sortOrder = orderSignal
-    scrollMode = scrollSignal
-
-    const signals: SharedSignals = {
-      lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, sessionId: "",
-    }
-
-    // 命令 layer（组件内注册——见 PluginRoot）
-    // 侧边栏面板（共享 SubAgentPanel——V1/V2 同一组件）
-    context.ui.slot({
-      prepend: "sidebar.content",
-      render: (props) => {
-        signals.sessionId = String(props.sessionID ?? "")
-        return (
-          <PluginRoot
-            context={context}
-            api={api}
-            signals={signals}
-            sessionID={String(props.sessionID ?? "")}
-          />
-        )
-      },
-    })
-  },
-  // V1 server 空实现（兼容标记）：v2 加载 setup，V1 检测需要 server 字段识别为插件
-  server: async () => ({}),
-}
-
-export default mod
+/** @jsxImportSource @opentui/solid */
+
+import { createSignal } from "solid-js"
+import type { Context, PluginModule } from "./types"
+import { createPanelApi } from "./v2-panel-api"
+import { makeCommands } from "./commands"
+import { mapTheme } from "./theme"
+import { SubAgentPanel } from "../panel/SubAgentPanel"
+import type { PanelApi } from "../panel/panel-api"
+import type { Lang, SortOrder, ScrollMode, SharedSignals } from "../core/types"
+import { SETTING_KEYS } from "../core/kv"
+import { LANG_META, detectLang } from "../i18n"
+
+/** 面板根组件：keymap.layer 必须在组件渲染上下文注册（setup 内调用报
+ *  Keymap.Provider missing），再渲染共享 SubAgentPanel。 */
+function PluginRoot(props: {
+  context: Context
+  api: PanelApi
+  signals: SharedSignals
+  sessionID: string
+}) {
+  props.context.keymap.layer(() => ({
+    mode: "global" as const,
+    commands: makeCommands(props.context, props.api, props.signals),
+  }))
+  return (
+    <SubAgentPanel
+      api={props.api}
+      theme={mapTheme(props.context.theme)}
+      lang={props.signals.lang}
+      maxEntries={props.signals.maxEntries}
+      sortOrder={props.signals.sortOrder}
+      scrollMode={props.signals.scrollMode}
+      borderVisible={props.signals.borderVisible}
+      sessionId={props.sessionID}
+    />
+  )
+}
+
+/** V2 入口：setup 创建共享信号 + PanelApi + 命令 layer + 侧边栏槽位。
+ *  行为对齐 V1 tui()（信号初始值从 KV 恢复；侧边栏渲染共享 SubAgentPanel）。 */
+const mod: PluginModule & { server: () => Promise<Record<string, never>> } = {
+  id: "opencode-subagent-magazine",
+  setup(context: Context) {
+    // settings 惰性 getter（闭包引用信号变量——运行时已赋值）
+    let lang!: () => Lang
+    let maxEntries!: () => number
+    let sortOrder!: () => SortOrder
+    let scrollMode!: () => ScrollMode
+    const api = createPanelApi(context, {
+      lang: () => lang(),
+      maxEntries: () => maxEntries(),
+      sortOrder: () => sortOrder(),
+      scrollMode: () => scrollMode(),
+    })
+
+    // 信号初始值从 KV 恢复（对齐 V1 tui()）
+    const storedLang = String(api.kv.get(SETTING_KEYS.lang, ""))
+    const initialLang: Lang =
+      LANG_META.some((m) => m.code === storedLang) ? (storedLang as Lang) : detectLang()
+    const [langSignal, setLang] = createSignal<Lang>(initialLang)
+    const [maxSignal, setMaxEntries] = createSignal<number>(Number(api.kv.get(SETTING_KEYS.maxEntries, "10")) || 10)
+    const [orderSignal, setSortOrder] = createSignal<SortOrder>(
+      String(api.kv.get(SETTING_KEYS.order, "desc")) === "asc" ? "asc" : "desc",
+    )
+    const [scrollSignal, setScrollMode] = createSignal<ScrollMode>(
+      String(api.kv.get(SETTING_KEYS.scrollMode, "wheel")) === "click" ? "click" : "wheel",
+    )
+    const [borderSignal, setBorderVisible] = createSignal<boolean>(
+      (api.kv.get(SETTING_KEYS.border, false) as boolean) === true,
+    )
+    lang = langSignal
+    maxEntries = maxSignal
+    sortOrder = orderSignal
+    scrollMode = scrollSignal
+
+    const signals: SharedSignals = {
+      lang, setLang, maxEntries, setMaxEntries, sortOrder, setSortOrder, scrollMode, setScrollMode, borderVisible: borderSignal, setBorderVisible, sessionId: "",
+    }
+
+    // 命令 layer（组件内注册——见 PluginRoot）
+    // 侧边栏面板（共享 SubAgentPanel——V1/V2 同一组件）
+    context.ui.slot({
+      prepend: "sidebar.content",
+      render: (props) => {
+        signals.sessionId = String(props.sessionID ?? "")
+        return (
+          <PluginRoot
+            context={context}
+            api={api}
+            signals={signals}
+            sessionID={String(props.sessionID ?? "")}
+          />
+        )
+      },
+    })
+  },
+  // V1 server 空实现（兼容标记）：v2 加载 setup，V1 检测需要 server 字段识别为插件
+  server: async () => ({}),
+}
+
+export default mod

package/src/v2/theme.ts

@@ -1,14 +1,14 @@
-import type { Context } from "./types"
-
-/** V2 theme → V1 形状映射（组件按 primary/text/textMuted/… 字段消费）。 */
-export function mapTheme(theme: Context["theme"]): Record<string, unknown> {
-  return {
-    primary: theme.hue.interactive[300],
-    text: theme.text.default,
-    textMuted: theme.text.subdued,
-    success: theme.text.feedback.success.default,
-    warning: theme.text.feedback.warning.default,
-    error: theme.text.feedback.error.default,
-    border: theme.text.subdued,
-  }
-}
+import type { Context } from "./types"
+
+/** V2 theme → V1 形状映射（组件按 primary/text/textMuted/… 字段消费）。 */
+export function mapTheme(theme: Context["theme"]): Record<string, unknown> {
+  return {
+    primary: theme.hue.interactive[300],
+    text: theme.text.default,
+    textMuted: theme.text.subdued,
+    success: theme.text.feedback.success.default,
+    warning: theme.text.feedback.warning.default,
+    error: theme.text.feedback.error.default,
+    border: theme.text.subdued,
+  }
+}

package/src/v2/types.ts

@@ -1,165 +1,165 @@
-/**
- * V2 (opencode2) TUI plugin API — 最小本地类型（实验版）。
- * 运行时由 opencode2 提供，此处仅用于本地类型检查；
- * 结构对应 v2 分支 packages/plugin/src/tui/context.ts。
- */
-
-export interface App {
-  readonly version: string
-  readonly channel: string
-}
-
-export interface Theme {
-  readonly hue: {
-    readonly interactive: { readonly 300: string }
-    readonly accent: { readonly 500: string }
-  }
-  readonly text: {
-    readonly default: string
-    readonly subdued: string
-    readonly feedback: {
-      readonly success: { readonly default: string }
-      readonly error: { readonly default: string }
-      readonly warning: { readonly default: string }
-    }
-  }
-}
-
-export interface TokenUsage {
-  input?: number
-  output?: number
-  reasoning?: number
-  cache?: { read?: number; write?: number }
-}
-
-export interface MessageInfo {
-  readonly id: string
-  readonly type: string
-  readonly agent?: string
-  readonly model?: string
-  readonly time: { readonly created: number; readonly completed?: number }
-  readonly cost?: unknown
-  readonly tokens?: TokenUsage
-  readonly content?: unknown[]
-}
-
-export interface SessionInfo {
-  readonly id: string
-  readonly title?: string
-  readonly time?: { readonly created: number; readonly updated: number }
-  readonly model?: string
-  readonly agent?: string
-  readonly parentID?: string
-  readonly cost?: number
-  readonly tokens?: TokenUsage
-}
-
-export interface Data {
-  readonly session: {
-    get(sessionID: string): SessionInfo | undefined
-    list(): SessionInfo[]
-    cost(sessionID: string): number
-    status(sessionID: string): string
-    interrupt(sessionID: string): Promise<void>
-    readonly message: {
-      list(sessionID: string): MessageInfo[]
-      sync(sessionID: string): Promise<void>
-    }
-  }
-  readonly location: {
-    readonly provider: { list(location?: unknown): unknown[] }
-    readonly model: { list(location?: unknown): unknown[] }
-    readonly mcp: { readonly server: { list(location?: unknown): unknown[] } }
-  }
-  readonly on: (type: string, handler: (event: unknown) => void) => () => void
-  readonly listen: (handler: (event: unknown) => void) => () => void
-}
-
-export interface Storage {
-  store<Value extends object>(
-    key: string,
-    options: { readonly initial: Value },
-  ): readonly [Value, (mutation: (draft: Value) => void) => Promise<void>]
-  memory<Value extends object>(
-    key: string,
-    options: { readonly initial: Value },
-  ): readonly [Value, (mutation: (draft: Value) => void) => void]
-}
-
-export type SlotClaim = {
-  readonly render: (input: Record<string, any>) => unknown
-} & (
-  | { readonly append: string; readonly prepend?: never; readonly before?: never; readonly after?: never; readonly replace?: never }
-  | { readonly prepend: string; readonly append?: never; readonly before?: never; readonly after?: never; readonly replace?: never }
-  | { readonly before: string; readonly append?: never; readonly prepend?: never; readonly after?: never; readonly replace?: never }
-  | { readonly after: string; readonly append?: never; readonly prepend?: never; readonly before?: never; readonly replace?: never }
-  | { readonly replace: string; readonly append?: never; readonly prepend?: never; readonly before?: never; readonly after?: never }
-)
-
-export interface KeymapCommand {
-  readonly id?: string
-  readonly title?: string
-  readonly description?: string
-  readonly group?: string
-  readonly palette?: true
-  readonly slash?: { readonly name: string; readonly aliases?: string[]; readonly arguments?: true }
-  readonly namespace?: string
-  readonly name?: string
-  readonly desc?: string
-  readonly category?: string
-  readonly slashName?: string
-  readonly slashAliases?: string[]
-  readonly run: (input?: string) => void | false | Promise<void>
-}
-
-/** 最小 client 面（运行时由 V2 提供——取消走 session.interrupt）。 */
-export interface ClientLike {
-  readonly session: {
-    interrupt(input: { sessionID: string; continue?: boolean }): Promise<unknown>
-  }
-}
-
-export interface Context {
-  readonly app: App
-  readonly options: Record<string, any>
-  readonly location: { readonly directory?: string } | undefined
-  readonly renderer: { readonly terminalWidth: number }
-  readonly theme: Theme
-  readonly data: Data
-  readonly client: ClientLike
-  readonly storage: Storage
-  readonly ui: {
-    slot(claim: SlotClaim): () => void
-    readonly toast: {
-      show(options: { readonly message: string; readonly title?: string; readonly variant?: string }): void
-    }
-    readonly dialog: {
-      prompt(options: { readonly title: string; readonly message?: string; readonly placeholder?: string }): Promise<string | undefined>
-      select<Value>(options: {
-        readonly title: string
-        readonly placeholder?: string
-        readonly options: readonly {
-          readonly title: string
-          readonly value: Value
-          readonly description?: string
-          readonly category?: string
-          readonly disabled?: boolean
-        }[]
-        readonly current?: Value
-      }): Promise<Value | undefined>
-    }
-    readonly router: {
-      current(): { readonly type?: string; readonly sessionID?: string; readonly params?: Record<string, unknown> }
-      navigate(route: { type: string; sessionID?: string; params?: Record<string, unknown> }): void
-    }
-  }
-  readonly keymap: {
-    layer(input: () => { readonly commands?: readonly KeymapCommand[] }): void
-    shortcuts(id: string): readonly string[]
-  }
-}
-
-export type PluginModule = {
-  readonly id: string
-  readonly setup: (context: Context) => void | (() => void | Promise<void>) | Promise<void | (() => void | Promise<void>)>
-}
+/**
+ * V2 (opencode2) TUI plugin API — 最小本地类型（实验版）。
+ * 运行时由 opencode2 提供，此处仅用于本地类型检查；
+ * 结构对应 v2 分支 packages/plugin/src/tui/context.ts。
+ */
+
+export interface App {
+  readonly version: string
+  readonly channel: string
+}
+
+export interface Theme {
+  readonly hue: {
+    readonly interactive: { readonly 300: string }
+    readonly accent: { readonly 500: string }
+  }
+  readonly text: {
+    readonly default: string
+    readonly subdued: string
+    readonly feedback: {
+      readonly success: { readonly default: string }
+      readonly error: { readonly default: string }
+      readonly warning: { readonly default: string }
+    }
+  }
+}
+
+export interface TokenUsage {
+  input?: number
+  output?: number
+  reasoning?: number
+  cache?: { read?: number; write?: number }
+}
+
+export interface MessageInfo {
+  readonly id: string
+  readonly type: string
+  readonly agent?: string
+  readonly model?: string
+  readonly time: { readonly created: number; readonly completed?: number }
+  readonly cost?: unknown
+  readonly tokens?: TokenUsage
+  readonly content?: unknown[]
+}
+
+export interface SessionInfo {
+  readonly id: string
+  readonly title?: string
+  readonly time?: { readonly created: number; readonly updated: number }
+  readonly model?: string
+  readonly agent?: string
+  readonly parentID?: string
+  readonly cost?: number
+  readonly tokens?: TokenUsage
+}
+
+export interface Data {
+  readonly session: {
+    get(sessionID: string): SessionInfo | undefined
+    list(): SessionInfo[]
+    cost(sessionID: string): number
+    status(sessionID: string): string
+    interrupt(sessionID: string): Promise<void>
+    readonly message: {
+      list(sessionID: string): MessageInfo[]
+      sync(sessionID: string): Promise<void>
+    }
+  }
+  readonly location: {
+    readonly provider: { list(location?: unknown): unknown[] }
+    readonly model: { list(location?: unknown): unknown[] }
+    readonly mcp: { readonly server: { list(location?: unknown): unknown[] } }
+  }
+  readonly on: (type: string, handler: (event: unknown) => void) => () => void
+  readonly listen: (handler: (event: unknown) => void) => () => void
+}
+
+export interface Storage {
+  store<Value extends object>(
+    key: string,
+    options: { readonly initial: Value },
+  ): readonly [Value, (mutation: (draft: Value) => void) => Promise<void>]
+  memory<Value extends object>(
+    key: string,
+    options: { readonly initial: Value },
+  ): readonly [Value, (mutation: (draft: Value) => void) => void]
+}
+
+export type SlotClaim = {
+  readonly render: (input: Record<string, any>) => unknown
+} & (
+  | { readonly append: string; readonly prepend?: never; readonly before?: never; readonly after?: never; readonly replace?: never }
+  | { readonly prepend: string; readonly append?: never; readonly before?: never; readonly after?: never; readonly replace?: never }
+  | { readonly before: string; readonly append?: never; readonly prepend?: never; readonly after?: never; readonly replace?: never }
+  | { readonly after: string; readonly append?: never; readonly prepend?: never; readonly before?: never; readonly replace?: never }
+  | { readonly replace: string; readonly append?: never; readonly prepend?: never; readonly before?: never; readonly after?: never }
+)
+
+export interface KeymapCommand {
+  readonly id?: string
+  readonly title?: string
+  readonly description?: string
+  readonly group?: string
+  readonly palette?: true
+  readonly slash?: { readonly name: string; readonly aliases?: string[]; readonly arguments?: true }
+  readonly namespace?: string
+  readonly name?: string
+  readonly desc?: string
+  readonly category?: string
+  readonly slashName?: string
+  readonly slashAliases?: string[]
+  readonly run: (input?: string) => void | false | Promise<void>
+}
+
+/** 最小 client 面（运行时由 V2 提供——取消走 session.interrupt）。 */
+export interface ClientLike {
+  readonly session: {
+    interrupt(input: { sessionID: string; continue?: boolean }): Promise<unknown>
+  }
+}
+
+export interface Context {
+  readonly app: App
+  readonly options: Record<string, any>
+  readonly location: { readonly directory?: string } | undefined
+  readonly renderer: { readonly terminalWidth: number }
+  readonly theme: Theme
+  readonly data: Data
+  readonly client: ClientLike
+  readonly storage: Storage
+  readonly ui: {
+    slot(claim: SlotClaim): () => void
+    readonly toast: {
+      show(options: { readonly message: string; readonly title?: string; readonly variant?: string }): void
+    }
+    readonly dialog: {
+      prompt(options: { readonly title: string; readonly message?: string; readonly placeholder?: string }): Promise<string | undefined>
+      select<Value>(options: {
+        readonly title: string
+        readonly placeholder?: string
+        readonly options: readonly {
+          readonly title: string
+          readonly value: Value
+          readonly description?: string
+          readonly category?: string
+          readonly disabled?: boolean
+        }[]
+        readonly current?: Value
+      }): Promise<Value | undefined>
+    }
+    readonly router: {
+      current(): { readonly type?: string; readonly sessionID?: string; readonly params?: Record<string, unknown> }
+      navigate(route: { type: string; sessionID?: string; params?: Record<string, unknown> }): void
+    }
+  }
+  readonly keymap: {
+    layer(input: () => { readonly commands?: readonly KeymapCommand[] }): void
+    shortcuts(id: string): readonly string[]
+  }
+}
+
+export type PluginModule = {
+  readonly id: string
+  readonly setup: (context: Context) => void | (() => void | Promise<void>) | Promise<void | (() => void | Promise<void>)>
+}

package/tui/index.js

@@ -1,11 +1,11 @@
-// tui/index.js——V1/V2 共用入口（双格式）
-// - V1（opencode）：exports["./tui"] → 本文件——readV1Plugin 读 tui 字段（V1 面板）
-// - V2（opencode2）：exports["./tui"] → 本文件——isPlugin 读 setup 字段（V2 面板）
-import tuiMod from "./../dist/tui.js"
-import v2Mod from "./../dist/v2.js"
-
-export default {
-  id: "opencode-subagent-magazine",
-  tui: tuiMod.tui,
-  setup: v2Mod.setup,
-}
+// tui/index.js——V1/V2 共用入口（双格式）
+// - V1（opencode）：exports["./tui"] → 本文件——readV1Plugin 读 tui 字段（V1 面板）
+// - V2（opencode2）：exports["./tui"] → 本文件——isPlugin 读 setup 字段（V2 面板）
+import tuiMod from "./../dist/tui.js"
+import v2Mod from "./../dist/v2.js"
+
+export default {
+  id: "opencode-subagent-magazine",
+  tui: tuiMod.tui,
+  setup: v2Mod.setup,
+}