@deepseek-harness-tui/dsh-tui 0.12.0 → 0.13.0

package/lib/types/dsh-adapter/contract.js

@@ -186,6 +186,30 @@ export function installedUpstreamVersions() {
 export function installedUpstreamVersion(packageName) {
     return parseUpstreamVersion(installedUpstreamVersions()[packageName]);
 }
+/**
+ * 内核（dsh）版本的铭牌来源（第七版：落地页右下角双版本号）。
+ *
+ * 真实来源两级，都不造假：
+ * 1. **宿主 CLI** `@deepseek-ai/dsh` 的 package.json——TUI 作为插件跑在 dsh
+ *    宿主进程里时它一定可解析（`bin/dsh-tui.js` 委托 `dsh --profile` 启动）；
+ *    孤立回归/源码 checkout 里解析不到就落到第 2 级。
+ * 2. **内核线包** `@deepseek-ai/dsh-agent`（与内核同线发版、由本仓直接依赖，
+ *    `installedUpstreamVersions` 的既有清单成员）的已装版本——它就是
+ *    upstreamDriftSummary 用来判定「内核在不在验证线」的同一份数据。
+ *
+ * 两级都读不到 → undefined（调用方只画 TUI 版本，不编造）。
+ */
+export function installedKernelVersion() {
+    try {
+        const hostManifest = JSON.parse(readFileSync(fileURLToPath(import.meta.resolve('@deepseek-ai/dsh/package.json')), 'utf8'));
+        if (typeof hostManifest.version === 'string' && hostManifest.version !== '')
+            return hostManifest.version;
+    }
+    catch {
+        // 宿主包不在解析半径内（孤立测试/源码运行）——落到内核线包。
+    }
+    return installedUpstreamVersions()['@deepseek-ai/dsh-agent'];
+}
 /**
  * Whether the installed version of `packageName` is at or beyond `minimum`
  * (a literal like `'0.1.0-rc.8'`). Unparseable or older installs return

package/lib/types/dsh-adapter/index.d.ts

@@ -96,6 +96,12 @@ export interface Config {
      *  preview and folds each step when it settles; `full` keeps thinking
      *  expanded until the whole turn ends. Editable live from `/settings`. */
     thinkingFold?: 'preview' | 'full';
+    /** Grouping/folding of consecutive background-job cards: `auto` (default)
+     *  groups any run of ≥2 adjacent job cards and folds a run of 3+ into its
+     *  summary line once every member settled; `always` folds any run of 2+
+     *  immediately; `never` never folds on its own (a click on the group
+     *  header still folds one run). Editable live from `/settings`. */
+    jobGroupFold?: 'auto' | 'always' | 'never';
     /** Tool-card background strength; defaults to no added background. */
     toolBackground?: ToolBackground;
     /** What the fullscreen transcript's right gutter shows (settings
@@ -162,6 +168,32 @@ export interface Config {
     recapOnOpen?: boolean;
     /** Status-footer field visibility and compact presentation preferences. */
     statusBar?: Partial<StatusBarConfig>;
+    /** Side panel (settings `dsh-tui.sidePanel.*`): the two-column layout's
+     *  master switch, its startup state, the chat-column fraction, and the
+     *  enabled panels in PanelBar order. Every member is normalized at parse
+     *  time, so a hand-edited value can never wedge the layout. */
+    sidePanel?: {
+        /** Master switch of the split layout; on by default. Off makes /panel
+         *  and Ctrl+B fall back to the fullscreen panels. */
+        splitEnabled?: boolean;
+        /** Whether a session opens with the sidebar expanded (off by default, so
+         *  the upgrade leaves the layout alone); Ctrl+B toggles it live. */
+        open?: boolean;
+        /** Chat column as a fraction of the content width, clamped to 0.1–0.95
+         *  (default 0.68); +/- while the panel is focused nudges it live. */
+        ratio?: number;
+        /** Enabled panel ids, comma-separated, in PanelBar order (default
+         *  `todo,jobs,agents`; add `companion` to enable the pet panel). A
+         *  malformed id is dropped, an unknown one survives for a plugin. */
+        panels?: string;
+    };
+    /** Companion pet (settings `dsh-tui.companion.*`): which skin the panel
+     *  pet wears. */
+    companion?: {
+        /** 'deepy' (default, the deepy whale kit) or 'whale' (the splash's
+         *  layered pixel whale). Unknown ids normalize to deepy. */
+        skin?: string;
+    };
     /** Built-in action-shortcut overrides (`paste: 'alt+v'`), keyed by action
      *  id (see the keymap utility). Combos are `ctrl+`/`alt+`/`shift+` plus a
      *  key; several combos may be comma-separated. Unset actions keep their

package/lib/types/dsh-adapter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/index.ts"],"names":[],"mappings":"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"}

package/lib/types/dsh-adapter/index.js

@@ -1,5 +1,5 @@
 import Schema from '@deepseek-ai/schemastery';
-import { DEFAULT_STATUS_BAR, normalizePageMargin } from '../tuiDisplayPrefs.js';
+import { DEFAULT_COMPANION_SKIN, DEFAULT_SIDE_PANEL_IDS, DEFAULT_STATUS_BAR, normalizeCompanionSkin, normalizePageMargin, normalizeSidePanelPanels, normalizeSidePanelRatio } from '../tuiDisplayPrefs.js';
 import { SHORTCUT_ACTIONS } from '../utils/keymap.js';
 import { normalizeSplashFont } from '../components/splashFonts.js';
 import { editableConfig } from './compat/settings.js';
@@ -48,6 +48,7 @@ export const Config = editableConfig(Schema.object({
     preset: Schema.string().required(false),
     diffLayout: Schema.union(['auto', 'split', 'unified']).default('auto'),
     thinkingFold: Schema.union(['preview', 'full']).default('preview'),
+    jobGroupFold: Schema.union(['auto', 'always', 'never']).default('auto'),
     toolBackground: Schema.union(['none', 'subtle', 'strong']).default('none'),
     scrollGutter: Schema.union(['timeline', 'scrollbar', 'hidden']).default('timeline'),
     // Preset names AND custom `NxM` specs must survive validation (a custom
@@ -77,6 +78,11 @@ export const Config = editableConfig(Schema.object({
         contextUsage: Schema.boolean().default(DEFAULT_STATUS_BAR.contextUsage),
         cache: Schema.boolean().default(DEFAULT_STATUS_BAR.cache),
         tokens: Schema.boolean().default(DEFAULT_STATUS_BAR.tokens),
+        // Session cost estimate (≈¥) beside the token totals; StatusLine gates the
+        // chip on it. The slot must be declared here: schemastery drops an
+        // undeclared key on the way back in, so the /settings row would read
+        // "(unset)" and every edit would silently revert.
+        cost: Schema.boolean().default(DEFAULT_STATUS_BAR.cost),
         tps: Schema.boolean().default(DEFAULT_STATUS_BAR.tps),
         gitBranch: Schema.boolean().default(DEFAULT_STATUS_BAR.gitBranch),
         sessionTitle: Schema.boolean().default(DEFAULT_STATUS_BAR.sessionTitle),
@@ -88,6 +94,19 @@ export const Config = editableConfig(Schema.object({
         trajectory: Schema.boolean().default(DEFAULT_STATUS_BAR.trajectory),
         shortcutHint: Schema.boolean().default(DEFAULT_STATUS_BAR.shortcutHint),
     }).default({ ...DEFAULT_STATUS_BAR }),
+    // Side-panel preferences, same shape as statusBar: every member carries a
+    // default so an unset cordis.yml block and a partially hand-written one
+    // both resolve, and the transforms keep junk (a string ratio, an id with
+    // illegal characters) out of the live stores.
+    sidePanel: Schema.object({
+        splitEnabled: Schema.boolean().default(true),
+        open: Schema.boolean().default(false),
+        ratio: Schema.transform(Schema.number().default(0.68), value => normalizeSidePanelRatio(value)),
+        panels: Schema.transform(Schema.string().default(DEFAULT_SIDE_PANEL_IDS), value => normalizeSidePanelPanels(value)),
+    }).default({ splitEnabled: true, open: false, ratio: 0.68, panels: DEFAULT_SIDE_PANEL_IDS }),
+    companion: Schema.object({
+        skin: Schema.transform(Schema.string().default(DEFAULT_COMPANION_SKIN), value => normalizeCompanionSkin(value)),
+    }).default({ skin: DEFAULT_COMPANION_SKIN }),
     // One optional combo string per customizable action (no defaults: unset
     // keeps the built-in binding; see Config.shortcuts).
     shortcuts: Schema.object(Object.fromEntries(SHORTCUT_ACTIONS.map(action => [action.id, Schema.string().required(false)]))).required(false),

package/lib/types/dsh-adapter/migrate/sessionize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionize.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/migrate/sessionize.ts"],"names":[],"mappings":"AA0DA,OAAO,EAGL,SAAS,EAET,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAc,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAc9D,yEAAyE;AACzE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;IAC9B,QAAQ,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAA;CACzC;AAgBD;;;;;;;GAOG;AACH;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,iTAAiT,CAAA;AACjV,eAAO,MAAM,gBAAgB,wBAAwB,CAAA;AACrD,eAAO,MAAM,iBAAiB,yBAAyB,CAAA;AAevD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,cAAc,CAmJpG"}
+{"version":3,"file":"sessionize.d.ts","sourceRoot":"","sources":["../../../../src/dsh-adapter/migrate/sessionize.ts"],"names":[],"mappings":"AA0DA,OAAO,EAGL,SAAS,EAET,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAA;AAIjC,OAAO,KAAK,EAAc,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAS9D,yEAAyE;AACzE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;IAC9B,QAAQ,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAA;CACzC;AAgBD;;;;;;;GAOG;AACH;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,iTAAiT,CAAA;AACjV,eAAO,MAAM,gBAAgB,wBAAwB,CAAA;AACrD,eAAO,MAAM,iBAAiB,yBAAyB,CAAA;AAevD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,cAAc,CAqJpG"}

package/lib/types/dsh-adapter/migrate/sessionize.js

@@ -51,11 +51,8 @@
 import { ToolCallId, createAssistantMessage, createSystemMessage, createToolResultMessage, createUserMessage, } from '@deepseek-ai/dsh-llm';
 import { SESSION_FORMAT_VERSION, Session, } from '@deepseek-ai/dsh-session';
 import { userTitleData } from '../compat/sessionLog.js';
+import { estimateTokens } from '../channel/usage.js';
 import { normalizeTitle } from './parse/title.js';
-/** Rough token estimate for shadowed text (the compaction metering field). */
-function estimateTokens(chars) {
-    return Math.ceil(chars / 4);
-}
 /** Blocks for one migrated step, in source order (reasoning before the text
  *  it explains, tool calls where the model made them). A step with no
  *  content keeps one empty text block so the assistant message stays
@@ -130,7 +127,7 @@ export function sessionize(id, agentId, session) {
     const writePrompt = (prompt) => {
         if (prompt === '')
             return;
-        surfaceChars += prompt.length;
+        surfaceTokens += estimateTokens(prompt);
         events.push(model.append('user/message', createUserMessage({
             content: [{ type: 'text', text: prompt }],
             source: { kind: 'user' },
@@ -161,9 +158,11 @@ export function sessionize(id, agentId, session) {
         }
     };
     let compactions = 0;
-    // Text volume on the surface since the last checkpoint, for the summary's
-    // shadowedTokenCount (an estimate, like the live engine's).
-    let surfaceChars = 0;
+    // Estimated model-visible tokens on the surface since the last checkpoint,
+    // for the summary's shadowedTokenCount (an estimate, like the live engine's;
+    // the shared CJK-aware estimator keeps migrated CJK sessions from being
+    // under-counted ~3x the way the old chars/4 did — issue #1170).
+    let surfaceTokens = 0;
     /** Fold every surface node after the head into one checkpoint; false when
      *  there is nothing to fold (the upstream contract needs a non-empty span). */
     const writeCompaction = (summary, summaryModel) => {
@@ -180,7 +179,7 @@ export function sessionize(id, agentId, session) {
             summary: [{ type: 'text', text: summary }],
             shadowedRange: range,
             shadowedSeqs: shadowed,
-            shadowedTokenCount: estimateTokens(surfaceChars),
+            shadowedTokenCount: surfaceTokens,
             provider: `migrated:${agentId}`,
             model: summaryModel ?? agentId,
         }));
@@ -190,7 +189,7 @@ export function sessionize(id, agentId, session) {
             source: { kind: 'compact-checkpoint', compactionId },
         }), { surfaceOp: { op: 'replace', startSeq: range.start, endSeq: range.end }, sourceEventSeqs: shadowed }));
         events.push(untyped.append('compaction/end', { compactionId, turn: null }));
-        surfaceChars = summary.length;
+        surfaceTokens = estimateTokens(summary);
         return true;
     };
     let turnIndex = 0;
@@ -236,9 +235,9 @@ export function sessionize(id, agentId, session) {
             for (const input of imported.inputs)
                 writePrompt(input);
             for (const block of imported.blocks)
-                surfaceChars += block.type === 'tool-call' ? block.arguments.length : block.text.length;
+                surfaceTokens += estimateTokens(block.type === 'tool-call' ? block.arguments : block.text);
             for (const result of imported.results)
-                surfaceChars += result.text.length;
+                surfaceTokens += estimateTokens(result.text);
             events.push(model.append('assistant/message', {
                 turn: turnIndex,
                 step,

package/lib/types/dsh-adapter/panel-runtime-registry.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Host-side per-panel owner registry for ctx.tuiPanels (§18.2).
+ *
+ * The PanelStore owns registration/badges; THIS map owns what only the
+ * Cordis side knows: which activation registered a panel id, its plugin id,
+ * and the lazy bridges the rendered panel's host API needs (toast, scenes,
+ * plugin storage). Kept module-level next to the process-level PanelStore —
+ * a WeakMap on the service would die with the service object while the
+ * PanelStore (and rendered panels) outlive it.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { TuiPluginStorage } from './plugin-storage.js';
+export interface PanelOwnerRecord {
+    /** Canonical activation context (kept alive by the bound effect; the panel
+     * is unregistered before the activation tears down, so late host-API calls
+     * through a disposed ctx degrade, never crash the store). */
+    readonly caller: Context;
+    /** activationFiber identity — ownership check for every mutating call. */
+    readonly owner: object;
+    readonly pluginId: string;
+    /** open() rate limit: at most one open per plugin per 5s (§18.2). */
+    lastOpenAt: number;
+    storage?: TuiPluginStorage;
+}
+export declare function getPanelOwnerRecord(id: string): PanelOwnerRecord | undefined;
+export declare function setPanelOwnerRecord(id: string, record: PanelOwnerRecord): void;
+export declare function deletePanelOwnerRecord(id: string): void;
+export declare function countPanelsOwnedBy(owner: object): number;
+export declare function countPluginPanels(): number;
+/** Plugin Panel 的 toast：经注册激活自己的 tuiToast 服务（无服务时静默
+ * false，与 scenes 降级语义一致）。 */
+export declare function pluginPanelToast(id: string, text: string): boolean;
+/** 打开自己注册的全屏场景：转 tuiScenes（它自己做 owner 校验与降级）。 */
+export declare function pluginPanelOpenScene(id: string, sceneId: string): boolean;
+/** 自己的 tuiPluginStorage 句柄（懒开、每 Panel 一次；无服务时 undefined）。 */
+export declare function pluginPanelStorage(id: string): TuiPluginStorage | undefined;
+/** 侧栏展开且自己是 active 时聚焦（useSidePanel 侧裁决）。 */
+export declare function pluginPanelFocus(id: string): boolean;
+//# sourceMappingURL=panel-runtime-registry.d.ts.map

package/lib/types/dsh-adapter/panel-runtime-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-runtime-registry.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/panel-runtime-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAG3D,MAAM,WAAW,gBAAgB;IAC/B;;iEAE6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IACxB,0EAA0E;IAC1E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,gBAAgB,CAAA;CAC3B;AAID,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAE5E;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAE9E;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAEvD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIxD;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;6BAC6B;AAC7B,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAUlE;AAED,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAUzE;AAED,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAc3E;AAED,6CAA6C;AAC7C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/lib/types/dsh-adapter/panel-runtime-registry.js

@@ -0,0 +1,84 @@
+/**
+ * Host-side per-panel owner registry for ctx.tuiPanels (§18.2).
+ *
+ * The PanelStore owns registration/badges; THIS map owns what only the
+ * Cordis side knows: which activation registered a panel id, its plugin id,
+ * and the lazy bridges the rendered panel's host API needs (toast, scenes,
+ * plugin storage). Kept module-level next to the process-level PanelStore —
+ * a WeakMap on the service would die with the service object while the
+ * PanelStore (and rendered panels) outlive it.
+ */
+import { panelBridgeRequests } from '../components/sidePanel/panelBridge.js';
+const ownerRecords = new Map();
+export function getPanelOwnerRecord(id) {
+    return ownerRecords.get(id);
+}
+export function setPanelOwnerRecord(id, record) {
+    ownerRecords.set(id, record);
+}
+export function deletePanelOwnerRecord(id) {
+    ownerRecords.delete(id);
+}
+export function countPanelsOwnedBy(owner) {
+    let count = 0;
+    for (const record of ownerRecords.values())
+        if (record.owner === owner)
+            count += 1;
+    return count;
+}
+export function countPluginPanels() {
+    return ownerRecords.size;
+}
+/** Plugin Panel 的 toast：经注册激活自己的 tuiToast 服务（无服务时静默
+ * false，与 scenes 降级语义一致）。 */
+export function pluginPanelToast(id, text) {
+    const record = ownerRecords.get(id);
+    if (record === undefined)
+        return false;
+    const toast = record.caller.get('tuiToast');
+    if (toast === undefined || typeof toast.show !== 'function')
+        return false;
+    try {
+        return toast.show(text);
+    }
+    catch {
+        return false;
+    }
+}
+/** 打开自己注册的全屏场景：转 tuiScenes（它自己做 owner 校验与降级）。 */
+export function pluginPanelOpenScene(id, sceneId) {
+    const record = ownerRecords.get(id);
+    if (record === undefined)
+        return false;
+    const scenes = record.caller.get('tuiScenes');
+    if (scenes === undefined || typeof scenes.open !== 'function')
+        return false;
+    try {
+        return scenes.open(sceneId);
+    }
+    catch {
+        return false;
+    }
+}
+/** 自己的 tuiPluginStorage 句柄（懒开、每 Panel 一次；无服务时 undefined）。 */
+export function pluginPanelStorage(id) {
+    const record = ownerRecords.get(id);
+    if (record === undefined)
+        return undefined;
+    if (record.storage !== undefined)
+        return record.storage;
+    const service = record.caller.get('tuiPluginStorage');
+    if (service === undefined || typeof service.open !== 'function')
+        return undefined;
+    try {
+        record.storage = service.open(record.caller);
+        return record.storage;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** 侧栏展开且自己是 active 时聚焦（useSidePanel 侧裁决）。 */
+export function pluginPanelFocus(id) {
+    return panelBridgeRequests.request('focus', id);
+}

package/lib/types/dsh-adapter/panels.d.ts

@@ -0,0 +1,251 @@
+/**
+ * ctx.tuiPanels — 插件侧栏 Panel 服务（设计文档 §8/§18，v2.1 修订，Phase 6）。
+ *
+ * 与 tuiStatus/tuiScenes 同一接缝家族：一份 Cordis-free 的进程级 store
+ * （components/sidePanel/PanelStore，注册/badge/错误隔离）+ 一层薄的
+ * Cordis 服务做准入（requirePluginCaller → activationFiber owner →
+ * bindCallerEffect 撤下 → 能力 shadow policy → 重复 id
+ * DUPLICATE_CONTRIBUTION_ID → Object.freeze descriptor）。
+ *
+ * 本阶段范围（§18.2 简化版）：
+ * - register：宿主自动加 '<pluginId>:' 前缀；mountPolicy 强制 'active'；
+ *   minColumns 默认 28；预算 = 每插件 ≤4 个 / 全局 ≤32 个。
+ * - list：只读摘要（id/title/source，不含组件）。
+ * - open/close：仅自己注册的 id；open 为 mutate 且限速（每插件每 5s 至多
+ *   1 次，超过丢弃并记 ledger）；UI 触达经 panelBridge（useSidePanel 订阅）。
+ * - badge：仅自己注册的 id → panelStore.setBadge。
+ * - subscribe：仅涉及自己 Panel 的事件（本阶段 registered/unregistered/
+ *   badge/error/disabled；opened/closed/focused/blurred/sidebar-toggled 事件
+ *   源在 useSidePanel 侧，留 TODO）。
+ * - compact：descriptor 校验 + 存档，渲染槽不挂载（TODO §18.1）。
+ */
+import type React from 'react';
+import { Context, Service } from '@deepseek-ai/cordis';
+import type { TuiPluginStorage } from './plugin-storage.js';
+/** 插件 Panel API 版本（§18.2）：descriptor.apiVersion 必须精确匹配。 */
+export declare const TUI_PANEL_API_VERSION = 1;
+/** 每插件 Panel 预算（§18.4）。 */
+export declare const MAX_PANELS_PER_PLUGIN = 4;
+/** 全局插件 Panel 注册预算（§18.4）。 */
+export declare const MAX_PLUGIN_PANELS_TOTAL = 32;
+/** open() 限速窗口：每插件每窗口至多 1 次。 */
+export declare const PANEL_OPEN_RATE_LIMIT_MS = 5000;
+type TuiPanelForbiddenBoxProps = 'ref' | 'tabIndex' | 'autoFocus' | 'onContextMenu' | 'onFocus' | 'onFocusCapture' | 'onBlur' | 'onBlurCapture' | 'onKeyDown' | 'onKeyDownCapture';
+/** Box 保留 click/hover/drag/onWheel；焦点/键盘/上下文菜单被收走。 */
+export type TuiPanelBoxProps = Omit<React.ComponentProps<typeof import('../ui.js').Box>, TuiPanelForbiddenBoxProps>;
+export type TuiPanelTextProps = Omit<React.ComponentProps<typeof import('../ui.js').Text>, 'ref'>;
+/** Image 走既有图片预算/协议回退路径（与 status view 的 Image 同一通道）。 */
+export type TuiPanelImageProps = React.ComponentProps<typeof import('../ui.js').Image>;
+export type TuiPanelScrollBoxProps = Omit<React.ComponentProps<typeof import('../ui.js').ScrollBox>, 'ref'>;
+export type TuiPanelDividerProps = React.ComponentProps<typeof import('../components/design-system/Divider.js').Divider>;
+/**
+ * 面板内 UI kit：宿主 React + 收窄组件 + Panel 尺寸感知。钩子和元素
+ * 必须走宿主 React（与 plugin scene 同一 single-React 规则）。
+ */
+export interface TuiPanelUi {
+    readonly Box: React.ComponentType<TuiPanelBoxProps>;
+    readonly Text: React.ComponentType<TuiPanelTextProps>;
+    readonly Image: React.ComponentType<TuiPanelImageProps>;
+    readonly ScrollBox: React.ComponentType<TuiPanelScrollBoxProps>;
+    readonly Divider: React.ComponentType<TuiPanelDividerProps>;
+    /** 恒等于 Panel 的 { width, height }。 */
+    readonly useTerminalSize: () => {
+        readonly columns: number;
+        readonly rows: number;
+    };
+    /**
+     * 面板内唯一合法定时源：内部是 useAnimationFrame(ms) 的时间值（[1]）。
+     * 不暴露 hook 本体是因为其另一个返回值是必须挂到动画元素上的 ref——
+     * 插件乱挂会破坏共享时钟的可见性测度；时间值本身已覆盖面板动画的
+     * 全部需求（传 null 暂停）。
+     */
+    readonly useAnimationTime: (intervalMs: number | null) => number;
+    /** 只读主题。 */
+    readonly useTheme: typeof import('../ui.js').useTheme;
+}
+export type TuiPanelBadgeLevel = 'info' | 'warning' | 'error';
+export type TuiPanelMode = 'split' | 'zoom' | 'fullscreen';
+/** v2.1 键盘契约的插件视图：preventDefault() = 阻止宿主回退键。 */
+export interface TuiPanelKeyEvent {
+    readonly input: string;
+    readonly key: import('../components/sidePanel/types.js').SidePanelKeyFlags;
+    preventDefault(): void;
+}
+/** 策展只读会话快照：SidePanelRuntimeContext 的结构拷贝，不含转录
+ * 正文/凭证/文件内容（§18.2）。 */
+export interface TuiPanelSnapshot {
+    readonly sessionId: string;
+    readonly cwd: string;
+    readonly lang: string;
+    readonly working: boolean;
+    readonly spinnerMode: string;
+    readonly version: number;
+    readonly goal: Readonly<{
+        readonly objective: string;
+        readonly phase: 'active' | 'paused' | 'blocked' | 'complete';
+        readonly roundsStarted: number;
+        readonly maxGoalRounds: number;
+    }> | undefined;
+    readonly todos: readonly Readonly<{
+        readonly content: string;
+        readonly status: string;
+    }>[];
+    readonly backgroundJobs: readonly Readonly<{
+        readonly id: string;
+        readonly kind: string;
+        readonly label: string;
+        readonly status: string;
+        readonly progress?: string;
+        readonly detail?: string;
+        readonly startedAt: number;
+    }>[];
+    readonly subagents: readonly Readonly<{
+        readonly agentId: string;
+        readonly description: string;
+        readonly status: string;
+        readonly mode?: string;
+        readonly model?: string;
+        readonly startedAt: number;
+        readonly completedAt?: number;
+    }>[];
+    readonly attention: Readonly<{
+        readonly approvals: number;
+        readonly questions: number;
+    }>;
+    readonly activity: Readonly<Record<string, unknown>> | undefined;
+}
+/** 面板内 host API（§18.2；sendToChat 本阶段恒 false——授权未落地）。 */
+export interface TuiPanelHostApi {
+    /** 策展只读快照（每次调用结构拷贝）。 */
+    snapshot(): TuiPanelSnapshot;
+    readonly focused: boolean;
+    notify(level: TuiPanelBadgeLevel, unread?: number): void;
+    clearBadge(): void;
+    /** 本阶段返回 false 并 toast 一次：需要 panels.chat.attach 授权（后续版本）。 */
+    sendToChat(payload: {
+        readonly title: string;
+        readonly content: string;
+    }): boolean;
+    /** 仅打开自己注册的全屏场景（tuiScenes 做 owner 校验）。 */
+    openScene(id: string): boolean;
+    toast(text: string): boolean;
+    /** 自己的 tuiPluginStorage 句柄（服务未挂时 undefined）。 */
+    readonly storage: TuiPluginStorage | undefined;
+    /** 仅 focused 期间投递（v2.1 分发器）。 */
+    onKey(listener: (event: TuiPanelKeyEvent) => void): () => void;
+    /** 侧栏展开且自己 active 时聚焦（useSidePanel 侧裁决）。 */
+    focus(): boolean;
+}
+/** 插件 Panel 组件 props。 */
+export interface TuiPanelProps {
+    /** 宿主 React——所有钩子与元素必须经它（single-React 规则）。 */
+    readonly React: typeof React;
+    readonly ui: TuiPanelUi;
+    readonly host: TuiPanelHostApi;
+    readonly width: number;
+    readonly height: number;
+    readonly focused: boolean;
+    readonly visible: boolean;
+    readonly mode: TuiPanelMode;
+}
+/** compact 行 props（本阶段仅校验，不挂载渲染——槽位 TODO §18.1）。 */
+export interface TuiPanelCompactProps {
+    readonly React: typeof React;
+    readonly ui: Pick<TuiPanelUi, 'Box' | 'Text'>;
+    readonly width: number;
+    readonly badge: {
+        readonly level: TuiPanelBadgeLevel;
+        readonly unread: number;
+    } | null;
+}
+/** 注册 descriptor（§18.2）。 */
+export interface TuiPanelDescriptor {
+    readonly apiVersion: typeof TUI_PANEL_API_VERSION;
+    /** 单段小写 slug；宿主自动加 '<pluginId>:' 前缀。 */
+    readonly id: string;
+    readonly title: string;
+    /** 显示宽度必须为 1。 */
+    readonly icon?: string;
+    readonly minColumns?: number;
+    readonly order?: number;
+    readonly component?: React.ComponentType<TuiPanelProps>;
+    readonly compact?: {
+        readonly maxRows: 1 | 2 | 3;
+        readonly component: React.ComponentType<TuiPanelCompactProps>;
+    };
+}
+/** subscribe 的事件（本阶段：注册/撤下/badge/错误/禁用；opened/closed/
+ * focused/blurred/sidebar-toggled 的事件源在 useSidePanel 侧，留 TODO）。 */
+export type TuiPanelEvent = {
+    readonly type: 'registered';
+    readonly id: string;
+} | {
+    readonly type: 'unregistered';
+    readonly id: string;
+} | {
+    readonly type: 'badge';
+    readonly id: string;
+} | {
+    readonly type: 'error';
+    readonly id: string;
+} | {
+    readonly type: 'disabled';
+    readonly id: string;
+};
+/** list() 的只读摘要（不含组件）。 */
+export interface TuiPanelSummary {
+    readonly id: string;
+    readonly title: string;
+    readonly source: 'plugin';
+}
+/** Host-only facade（driver 探针用；不经插件面导出）。 */
+export interface TuiPanelHost {
+    register(descriptor: {
+        readonly id: string;
+        readonly title?: string;
+    }): () => void;
+    list(): readonly TuiPanelSummary[];
+    open(id: string): boolean;
+    close(id: string): boolean;
+    subscribe(listener: (event: TuiPanelEvent) => void): () => void;
+}
+declare module '@deepseek-ai/cordis' {
+    interface Context {
+        tuiPanels: TuiPanelRuntime;
+    }
+}
+export declare const name = "dsh-tui-panels";
+/**
+ * ctx.tuiPanels —— 插件侧栏 Panel 准入服务。拒绝一律 warn + 返回
+ * undefined/false（与 tuiStatus.registerView 同语义），绝不抛给插件。
+ */
+export declare class TuiPanelRuntime extends Service {
+    constructor(ctx: Context);
+    /**
+     * 注册一个侧栏 Panel。成功返回 cleanup-aware disposer；拒绝 warn 并
+     * 返回 undefined（feature-detect 可辨）。identity 语义与 tuiStatus
+     * 相同（只喂 effect ledger 的 pluginId）。
+     */
+    register(descriptor: TuiPanelDescriptor, identity?: Context): (() => void) | undefined;
+    /** 只读摘要（仅自己注册的 Panel；不含组件）。 */
+    list(): readonly TuiPanelSummary[];
+    /**
+     * 打开自己注册的 Panel（展开侧栏并聚焦）。mutate + 限速：每插件每
+     * 5s 至多 1 次，超限丢弃并记 ledger。返回 false = 未注册/不属于自己的
+     * id、超限、或没有活的 Chat 控制器消费请求。
+     */
+    open(id: string): boolean;
+    /** 关闭自己注册的 Panel：若它是当前 active Panel，则收起侧栏。 */
+    close(id: string): boolean;
+    /** 设置/清除自己 Panel 的 badge。 */
+    badge(id: string, badge: {
+        level: TuiPanelBadgeLevel;
+        unread: number;
+    } | null): boolean;
+    /** 订阅涉及自己 Panel 的事件（本阶段 registered/unregistered/badge/
+     * error/disabled；opened/closed/focused/blurred/sidebar-toggled TODO）。 */
+    subscribe(listener: (event: TuiPanelEvent) => void): () => void;
+}
+export declare function getHostPanelRuntime(runtime: TuiPanelRuntime | undefined): TuiPanelHost | undefined;
+export default TuiPanelRuntime;
+//# sourceMappingURL=panels.d.ts.map

package/lib/types/dsh-adapter/panels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panels.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/panels.ts"],"names":[],"mappings":"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"}