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

package/lib/types/screens/StatusLine.js

@@ -20,7 +20,7 @@ import { ContextBarView } from '../components/ContextBarView.js';
 import { TooltipTarget } from '../components/Tooltip.js';
 import { formatProject } from '../sessions/format.js';
 import { homeDir } from '../utils/paths.js';
-import { FREE_SEGMENT_FILL, USED_SEGMENTS, contextBarBreakdown, renderMiniContextBar, renderTpsGauge, renderTpsSparkline, speedColor, tpsStats, } from './StatusMetrics.js';
+import { FREE_SEGMENT_FILL, USED_SEGMENTS, channelContextOccupancy, contextBarBreakdown, renderMiniContextBar, renderTpsGauge, renderTpsSparkline, speedColor, tpsStats, } from './StatusMetrics.js';
 /**
  * The footer under the prompt input: the segmented context progress bar on
  * its own first line, the
@@ -93,9 +93,15 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         ? formatProject(channel.displayCwd, homeDir())
         : channel.displayCwd;
     const usage = channel.lastUsage;
-    const contextUsed = usage === undefined
-        ? undefined
-        : usage.input + usage.cacheRead + usage.cacheWrite;
+    // ONE occupancy reading behind every ctx surface in this footer (the field,
+    // its hover gauge, the segmented bar, the working line's pressure prefix):
+    // DSH's own `contextPressure` projection when the composition mounts the
+    // token meter, else the last request's billed sample. `usage` above stays the
+    // source for the cache/cost fields — "what the last request cost" and "how
+    // full the window is now" are different questions.
+    const occupancy = channelContextOccupancy(channel);
+    const contextUsed = occupancy?.usedTokens;
+    const contextWindow = occupancy?.contextWindow;
     const contextParts = [];
     if (statusBar.thinking && channel.reasoningEffort !== undefined) {
         contextParts.push({
@@ -113,7 +119,7 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         });
     }
     const formattedContext = statusBar.contextUsage
-        ? formatContextUsage(contextUsed, channel.contextWindow, statusBar.compact)
+        ? formatContextUsage(contextUsed, contextWindow, statusBar.compact)
         : undefined;
     // The ctx field's two faces: the idle readout, and the hover state — an
     // in-place pressure bar (the user-liked "text becomes a bar" morph).
@@ -146,8 +152,8 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
             ctxParts !== undefined &&
             ctxHoverBarWidth > 0 &&
             contextUsed !== undefined &&
-            channel.contextWindow !== undefined
-            ? (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), renderMiniContextBar(contextUsed, channel.contextWindow, ctxHoverBarWidth), ' ', ctxParts.percent] }))
+            contextWindow !== undefined
+            ? (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), renderMiniContextBar(contextUsed, contextWindow, ctxHoverBarWidth), ' ', ctxParts.percent] }))
             : (_jsxs(Text, { color: "inactiveShimmer", children: [_jsx(Text, { dimColor: true, children: "ctx " }), formattedContext] }));
     if (statusBar.cache) {
         const cacheRate = formatCacheHitRate(usage);
@@ -324,11 +330,11 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
     const barVisible = statusBar.contextBar &&
         channel.contextBarEnabled &&
         barWidth >= 14 &&
-        usage !== undefined &&
-        channel.contextWindow !== undefined;
+        contextUsed !== undefined &&
+        contextWindow !== undefined;
     // The supplemental-row readout for the hovered field: replaces the idle
     // hint (never the activity line) while the pointer dwells on a field.
-    const detail = buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors);
+    const detail = buildHoverDetail(hover, channel, occupancy, usage, columns, barColors);
     const trailer = detail !== null
         ? detail
         : hint !== ''
@@ -351,7 +357,7 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
         showActivity ||
         showTrajectory ||
         hint !== '';
-    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [barVisible ? (_jsx(ContextBarView, { segments: channel.contextSegments, usedTokens: contextUsed ?? 0, contextWindow: channel.contextWindow ?? 0, width: barWidth, colors: barColors, onHover: hovered => setHover(current => hovered ? 'bar' : current === 'bar' ? null : current) })) : null, hasStatusFields ? statusBar.compact ? (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: compactFields, hoverProps: hoverProps }) }), ctxNode !== undefined ? (_jsx(Box, { flexShrink: 0, ...hoverProps('ctx'), children: _jsx(Text, { wrap: "truncate", children: ctxNode }) })) : null] })) : (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: fullLeftFields, hoverProps: hoverProps }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: rightFields, hoverProps: hoverProps }) })] })) : null, showSupplementalRow ? _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, justifyContent: showActivity && trailer !== null ? 'space-between' : 'flex-start', gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(usage, channel.contextWindow), warnDanger: (contextPressurePct(usage, channel.contextWindow) ?? 0) >= 95 })) : trailer, showActivity ? trailer : null] }), showTrajectory && wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick, onOpen: wake.onOpen, hoverHint: wake.hoverHint })) : null] }) : null] }) }));
+    return (_jsx(Box, { paddingX: 1, width: columns, flexShrink: 0, children: _jsxs(Box, { flexDirection: "column", width: "100%", children: [barVisible ? (_jsx(ContextBarView, { segments: channel.contextSegments, usedTokens: contextUsed ?? 0, contextWindow: contextWindow ?? 0, width: barWidth, colors: barColors, onHover: hovered => setHover(current => hovered ? 'bar' : current === 'bar' ? null : current) })) : null, hasStatusFields ? statusBar.compact ? (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: compactFields, hoverProps: hoverProps }) }), ctxNode !== undefined ? (_jsx(Box, { flexShrink: 0, ...hoverProps('ctx'), children: _jsx(Text, { wrap: "truncate", children: ctxNode }) })) : null] })) : (_jsxs(Box, { flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsx(Box, { flexGrow: 1, flexShrink: 1, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: fullLeftFields, hoverProps: hoverProps }) }), _jsx(Box, { justifyContent: "flex-end", flexShrink: 2, flexDirection: "row", overflow: "hidden", children: _jsx(FieldLine, { parts: rightFields, hoverProps: hoverProps }) })] })) : null, showSupplementalRow ? _jsxs(Box, { height: 1, overflow: "hidden", flexDirection: "row", justifyContent: "space-between", gap: 2, children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, justifyContent: showActivity && trailer !== null ? 'space-between' : 'flex-start', gap: 2, children: [showActivity && activity !== undefined ? (_jsx(ActivityLine, { activity: activity, activityFrames: channel.activityFrames, warnPct: contextPressurePct(occupancy), warnDanger: (contextPressurePct(occupancy) ?? 0) >= 95 })) : trailer, showActivity ? trailer : null] }), showTrajectory && wake !== undefined ? (_jsx(MiniWake, { band: wake.band, hint: wake.hint, tick: wake.tick, onOpen: wake.onOpen, hoverHint: wake.hoverHint })) : null] }) : null] }) }));
 }
 /**
  * The supplemental-row readout for a hovered footer field. Technical label
@@ -360,10 +366,13 @@ export function StatusLine({ channel, selectionActive = false, helpOpen = false,
  * hovered (or the hover outlived its data, which the field gating makes
  * near-impossible).
  */
-function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors) {
+function buildHoverDetail(hover, channel, occupancy, usage, columns, barColors) {
     if (hover === null)
         return null;
-    const window = channel.contextWindow;
+    const contextUsed = occupancy?.usedTokens;
+    // The hover surfaces report the SAME occupancy the field/bar above show; the
+    // 'model' chip below stays a pure route-capacity readout.
+    const window = occupancy?.contextWindow;
     const dim = (label) => _jsx(Text, { dimColor: true, children: label });
     if (hover === 'bar') {
         if (window === undefined || window <= 0 || contextUsed === undefined)
@@ -390,7 +399,16 @@ function buildHoverDetail(hover, channel, usage, contextUsed, columns, barColors
             const rate = formatCacheHitRate(usage);
             if (usage === undefined || rate === undefined)
                 return null;
-            return (_jsxs(Text, { wrap: "truncate", children: [dim('cache '), rate, " \u00B7 ", dim('read '), formatTokens(usage.cacheRead), " \u00B7", ' ', dim('write '), formatTokens(usage.cacheWrite), " \u00B7 ", dim('input '), formatTokens(usage.input)] }));
+            // The cache split is optional on the wire (`cacheReadTokens?` /
+            // `cacheWriteTokens?`), and a route that never writes the prompt cache
+            // reports a zero or omits the field — every DeepSeek route does one or
+            // the other. A zero component says nothing the rate does not, and
+            // rendering the absence as `0` asserts a number no provider sent.
+            return (_jsxs(Text, { wrap: "truncate", children: [dim('cache '), rate, usage.cacheRead > 0
+                        ? _jsxs(_Fragment, { children: [' · ', dim('read '), formatTokens(usage.cacheRead)] })
+                        : null, usage.cacheWrite > 0
+                        ? _jsxs(_Fragment, { children: [' · ', dim('write '), formatTokens(usage.cacheWrite)] })
+                        : null, ' · ', dim('input '), formatTokens(usage.input)] }));
         }
         case 'tps': {
             if (channel.tps === undefined)

package/lib/types/screens/StatusMetrics.d.ts

@@ -8,6 +8,28 @@
  *    yellow ≥ 20, red below.
  */
 import type { Color } from '../ink/styles.js';
+import type { ContextOccupancy } from '../adapter/ports/channel-view.js';
+/**
+ * The occupancy reading a screen renders.
+ *
+ * The channel publishes `contextOccupancy` (see
+ * `dsh-adapter/context-occupancy.ts`); this resolves the same reading for ports
+ * that do not carry the member — the partial channel literals the verify/repro
+ * harnesses hand the real screens, and third-party scenes built against an
+ * older port. The channel itself always publishes it, so a production render
+ * has exactly one source, and a member that IS present is never second-guessed.
+ * @param channel - The channel surface (or a partial one).
+ * @returns Occupancy for the footer/bar/warning, or `undefined` when unknown.
+ */
+export declare function channelContextOccupancy(channel: {
+    readonly contextOccupancy?: ContextOccupancy | undefined;
+    readonly lastUsage?: {
+        input: number;
+        cacheRead: number;
+        cacheWrite: number;
+    } | undefined;
+    readonly contextWindow: number | undefined;
+}): ContextOccupancy | undefined;
 /** Context bar segments — DeepSeek blue family (dark-theme friendly: deep
  *  navy → brand blue, neutral grey free segment).
  *

package/lib/types/screens/StatusMetrics.d.ts.map

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

package/lib/types/screens/StatusMetrics.js

@@ -1,4 +1,24 @@
 import { stringWidth } from '../ink/stringWidth.js';
+import { resolveContextOccupancy } from '../dsh-adapter/context-occupancy.js';
+/**
+ * The occupancy reading a screen renders.
+ *
+ * The channel publishes `contextOccupancy` (see
+ * `dsh-adapter/context-occupancy.ts`); this resolves the same reading for ports
+ * that do not carry the member — the partial channel literals the verify/repro
+ * harnesses hand the real screens, and third-party scenes built against an
+ * older port. The channel itself always publishes it, so a production render
+ * has exactly one source, and a member that IS present is never second-guessed.
+ * @param channel - The channel surface (or a partial one).
+ * @returns Occupancy for the footer/bar/warning, or `undefined` when unknown.
+ */
+export function channelContextOccupancy(channel) {
+    if (channel.contextOccupancy !== undefined)
+        return channel.contextOccupancy;
+    // Same formula the channel's own accessor uses; no projection value can be
+    // shadowed here because this branch only runs when the port has none.
+    return resolveContextOccupancy(undefined, channel.lastUsage, channel.contextWindow);
+}
 /** Context bar segments — DeepSeek blue family (dark-theme friendly: deep
  *  navy → brand blue, neutral grey free segment).
  *

package/lib/types/screens/chatOverlay.d.ts

@@ -96,6 +96,11 @@ export type ChatOverlay = {
 } | {
     kind: 'lang';
     index: number;
+}
+/** `/panel` 无参的选择器：列出「已启用 ∩ 已注册」的面板（含插件）。 */
+ | {
+    kind: 'panel';
+    index: number;
 } | {
     kind: 'history';
     query: string;
@@ -113,6 +118,17 @@ export type ChatOverlay = {
 } | {
     kind: 'tips';
 }
+/**
+ * 帮助菜单（第八版：用户实测——启动页点「帮助」直接进了聊天页 ✗）。这个
+ * variant 只在**落地页**上打开：HelpMenu 经 Chat 的 pickerPanels 挂进
+ * OverlayAbove，盖在启动页之上（与参数选择器/工作区菜单同一姿态），
+ * Esc / 点空白 / 再点帮助入口收回，回到启动页（草稿/参数/焦点原样）。
+ * 聊天页的 `?`//help` 不走这里：那边的 helpOpen 状态与 PromptInput 内
+ * 渲染保持原样（另一个屏的事，刻意不改）。
+ */
+ | {
+    kind: 'help';
+}
 /**
  * Click-to-act file menu: opened by clicking a file path in the
  * transcript (tool cards, markdown code spans / plain text, file://
@@ -195,7 +211,7 @@ export type ChatOverlayAction =
  *  flow). Ignored unless that panel is still up. */
  | {
     type: 'set-index';
-    kind: 'model' | 'preset' | 'effort' | 'permission' | 'workspace-flow' | 'rewind' | 'file-actions';
+    kind: 'model' | 'preset' | 'effort' | 'permission' | 'workspace-flow' | 'rewind' | 'file-actions' | 'panel';
     index: number;
 }
 /** Edit the history-search draft (query text, caret, focused match). */
@@ -263,5 +279,6 @@ export declare function dialogOverlayVisible(overlay: ChatOverlay, gates: {
     workspaceTargetCount: number;
     effortOptionCount: number;
     presetOptionCount: number;
+    panelCount?: number;
 }): boolean;
 //# sourceMappingURL=chatOverlay.d.ts.map

package/lib/types/screens/chatOverlay.d.ts.map

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

package/lib/types/screens/chatOverlay.js

@@ -59,6 +59,7 @@ export function chatOverlayReducer(state, action) {
                 || state.kind === 'permission'
                 || state.kind === 'plan'
                 || state.kind === 'lang'
+                || state.kind === 'panel'
                 || state.kind === 'file-actions') {
                 return { ...state, index: wrapIndex(state.index, action.delta, action.count) };
             }
@@ -124,6 +125,8 @@ export function dialogOverlayVisible(overlay, gates) {
             return gates.effortOptionCount > 1;
         case 'preset':
             return gates.presetOptionCount > 0;
+        case 'panel':
+            return (gates.panelCount ?? 1) > 0;
         case 'permission':
             return overlay.snapshot.options.length > 0;
         default:

package/lib/types/screens/sessionSupervisor/model.d.ts

@@ -41,9 +41,8 @@ export declare const NOTICE_MAX_LINES = 3;
 export declare function noticeLines(text: string | undefined, width: number): string[];
 export type MenuAction = 'edit' | 'new' | 'rename' | 'remove';
 export declare const MENU_ACTIONS: readonly MenuAction[];
+export declare function menuActionsFor(entry: RailEntry): readonly MenuAction[];
 export declare const MENU_WIDTH = 30;
-/** One confirm line + its explanation. */
-export declare const MENU_HEIGHT: number;
 export declare const MENU_LABEL_KEYS: {
     readonly edit: "home-menu-edit";
     readonly new: "home-menu-new";

package/lib/types/screens/sessionSupervisor/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/screens/sessionSupervisor/model.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAM5D;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,IAAI,CAAA;AACpC,+EAA+E;AAC/E,eAAO,MAAM,sBAAsB,KAAK,CAAA;AACxC,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAClC,0FAA0F;AAC1F,eAAO,MAAM,wBAAwB,IAAI,CAAA;AACzC;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAS7E;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAC7D,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAAwC,CAAA;AACtF,eAAO,MAAM,UAAU,KAAK,CAAA;AAC5B,0CAA0C;AAC1C,eAAO,MAAM,WAAW,QAA0B,CAAA;AAElD,eAAO,MAAM,eAAe;;;;;CAKlB,CAAA;AAEV;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,kEAAkE;IAClE,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;IACxF,oEAAoE;IACpE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,iCAAiC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,SAAS,GAAG,iBAAiB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAAA;CAAE,CAAA;AAE1F,iEAAiE;AACjE,eAAO,MAAM,oBAAoB,sBAAsB,CAAA;AAEvD,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9C;AAED,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAUpF"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../src/screens/sessionSupervisor/model.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAM5D;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAA;AACjC,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,IAAI,CAAA;AACpC,+EAA+E;AAC/E,eAAO,MAAM,sBAAsB,KAAK,CAAA;AACxC,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,eAAO,MAAM,cAAc,KAAK,CAAA;AAChC,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAClC,0FAA0F;AAC1F,eAAO,MAAM,wBAAwB,IAAI,CAAA;AACzC;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAA;AAEjC;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAS7E;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAC7D,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAAwC,CAAA;AAEtF,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,UAAU,EAAE,CAEtE;AACD,eAAO,MAAM,UAAU,KAAK,CAAA;AAE5B,eAAO,MAAM,eAAe;;;;;CAKlB,CAAA;AAEV;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,kEAAkE;IAClE,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;IACxF,oEAAoE;IACpE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;IACtB,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,iCAAiC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,SAAS,GAAG,iBAAiB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAAA;CAAE,CAAA;AAE1F,iEAAiE;AACjE,eAAO,MAAM,oBAAoB,sBAAsB,CAAA;AAEvD,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9C;AAED,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAUpF"}

package/lib/types/screens/sessionSupervisor/model.js

@@ -53,9 +53,11 @@ export function noticeLines(text, width) {
     return kept;
 }
 export const MENU_ACTIONS = ['edit', 'new', 'rename', 'remove'];
+const HISTORY_MENU_ACTIONS = ['edit', 'new'];
+export function menuActionsFor(entry) {
+    return entry.from === 'unregistered' ? HISTORY_MENU_ACTIONS : MENU_ACTIONS;
+}
 export const MENU_WIDTH = 30;
-/** One confirm line + its explanation. */
-export const MENU_HEIGHT = MENU_ACTIONS.length + 2;
 export const MENU_LABEL_KEYS = {
     edit: 'home-menu-edit',
     new: 'home-menu-new',

package/lib/types/screens/sessionSupervisor/useSessionSupervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionSupervisor.d.ts","sourceRoot":"","sources":["../../../../src/screens/sessionSupervisor/useSessionSupervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAiD,MAAM,OAAO,CAAA;AAOrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAEvE,OAAO,EAA+N,mBAAmB,EAAE,SAAS,EAAgE,MAAM,YAAY,CAAA;AAiDtV,+DAA+D;AAC/D,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,mDAAmD;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,mEAAmE;IACnE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACvD,wDAAwD;IACxD,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1D,6EAA6E;IAC7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD,6EAA6E;IAC7E,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;IAC/D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,sBAAsB;;;;;;cAmBnB,MAAM;cAAQ,MAAM,GAAG,OAAO;;;cAA9B,MAAM;cAAQ,MAAM,GAAG,OAAO;;;;0BAwB7D,MAAM,KAAG,MAAM,GAAG,SAAS;;;qBA6F/B,SAAS,KAAG,MAAM;;;;;;;cA6Ca,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;cAA9C,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;cAC1C,MAAM;eAAS,MAAM;;;cAArB,MAAM;eAAS,MAAM;;;;;;cADzB,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;;kBA0ClD,OAAO,CAAC,IAAI,CAAC;;;;;uBAgLxC,MAAM,KAAG,cAAc,GAAG,SAAS;wBAWR,IAAI;wBAOJ,IAAI;;;;;;;qBAoCL,MAAM,UAAU,OAAO,KAAG,IAAI;yBAS1B,SAAS,KAAG,IAAI;2BAed,cAAc,KAAG,IAAI;0BAqBtB,iBAAiB,KAAG,IAAI;wBAgB1B,MAAM,SAAS,MAAM,KAAG,IAAI;wBAe5B,MAAM,KAAG,IAAI;2BAWV,cAAc,KAAG,IAAI;qBAiB7B,IAAI;0BAKG,SAAS,QAAQ,MAAM,KAAG,IAAI;mBAarC,CAAC,GAAG,CAAC,CAAC,KAAG,IAAI;sBAWV,CAAC,GAAG,CAAC,CAAC,KAAG,IAAI;;EAuEnD"}
+{"version":3,"file":"useSessionSupervisor.d.ts","sourceRoot":"","sources":["../../../../src/screens/sessionSupervisor/useSessionSupervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAiD,MAAM,OAAO,CAAA;AAOrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAEvE,OAAO,EAA2K,mBAAmB,EAAE,SAAS,EAAgE,MAAM,YAAY,CAAA;AAiDlS,+DAA+D;AAC/D,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,mDAAmD;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,mEAAmE;IACnE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACvD,wDAAwD;IACxD,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1D,6EAA6E;IAC7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD,6EAA6E;IAC7E,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAA;IAC/D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,sBAAsB;;;;;;cAmBnB,MAAM;cAAQ,MAAM,GAAG,OAAO;;;cAA9B,MAAM;cAAQ,MAAM,GAAG,OAAO;;;;0BAwB7D,MAAM,KAAG,MAAM,GAAG,SAAS;;;qBA6F/B,SAAS,KAAG,MAAM;;;;;;;cA6Ca,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;cAA9C,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;cAC1C,MAAM;eAAS,MAAM;;;cAArB,MAAM;eAAS,MAAM;;;;;;cADzB,MAAM;aAAO,MAAM;aAAO,MAAM;cAAQ,MAAM;;;;kBA0ClD,OAAO,CAAC,IAAI,CAAC;;;;;uBAgLxC,MAAM,KAAG,cAAc,GAAG,SAAS;wBAWR,IAAI;wBAOJ,IAAI;;;;;;;qBAoCL,MAAM,UAAU,OAAO,KAAG,IAAI;yBAS1B,SAAS,KAAG,IAAI;2BAed,cAAc,KAAG,IAAI;0BAqBtB,iBAAiB,KAAG,IAAI;wBAgB1B,MAAM,SAAS,MAAM,KAAG,IAAI;wBAe5B,MAAM,KAAG,IAAI;2BAcV,cAAc,KAAG,IAAI;qBAiB7B,IAAI;0BAKG,SAAS,QAAQ,MAAM,KAAG,IAAI;mBAcrC,CAAC,GAAG,CAAC,CAAC,KAAG,IAAI;sBAWV,CAAC,GAAG,CAAC,CAAC,KAAG,IAAI;;EAuEnD"}

package/lib/types/screens/sessionSupervisor/useSessionSupervisor.js

@@ -18,7 +18,7 @@ import { normalizeWorkspaceCwd } from '../../sessions/view.js';
 import { readSessionPins, setSessionPinned } from '../../sessionPins.js';
 import { readSessionOwners } from '../../sessionMounts.js';
 import { resumeFailureText } from '../../sessions/resumeFailure.js';
-import { RAIL_CHROME_ROWS, WORKSPACE_ROW_LINES, RAIL_MIN_TOTAL_COLUMNS, RAIL_WIDTH_MIN, RAIL_WIDTH_MAX, SESSION_ROW_LINES, SESSION_PANE_CHROME_ROWS, noticeLines, MENU_ACTIONS, UNREGISTERED_RAIL_ID, message, samePath, sessionMatchesQuery } from './model.js';
+import { RAIL_CHROME_ROWS, WORKSPACE_ROW_LINES, RAIL_MIN_TOTAL_COLUMNS, RAIL_WIDTH_MIN, RAIL_WIDTH_MAX, SESSION_ROW_LINES, SESSION_PANE_CHROME_ROWS, noticeLines, menuActionsFor, UNREGISTERED_RAIL_ID, message, samePath, sessionMatchesQuery } from './model.js';
 const listingSnapshots = new WeakMap();
 /**
  * The snapshot slot for one channel, created on first use.
@@ -550,8 +550,10 @@ export function useSessionSupervisor(input) {
     const removeEntry = useCallback((path) => {
         void channel.removeWorkspace(path)
             .then((ok) => {
-            if (ok)
+            if (ok) {
+                report(t('supervisor-workspace-removed'), 'info');
                 return reload();
+            }
             report(t('workspace-remove-unknown', { target: path }), 'error');
             return undefined;
         })
@@ -578,7 +580,9 @@ export function useSessionSupervisor(input) {
     }, []);
     const activateMenu = useCallback((entry, item) => {
         closeMenu();
-        const action = MENU_ACTIONS[item] ?? 'edit';
+        const action = menuActionsFor(entry)[item];
+        if (action === undefined)
+            return;
         if (action === 'edit')
             selectEntry(entry);
         else if (action === 'new')

package/lib/types/settings/definitions.d.ts

@@ -13,6 +13,25 @@ import type { TuiSettingsField } from '../adapter/ports/channel-settings.js';
 import type { ShortcutActionId } from '../utils/keymap.js';
 export type SettingDefinition = Pick<TuiSettingsField, 'label' | 'descriptions' | 'hint' | 'hintDescriptions' | 'kind' | 'group' | 'options'>;
 export declare const SETTING_DEFINITIONS: {
+    'companion.skin': {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "select";
+        options: {
+            value: string;
+            label: string;
+            descriptions: {
+                zh: string;
+            };
+        }[];
+    };
     diffLayout: {
         label: string;
         descriptions: {
@@ -106,6 +125,25 @@ export declare const SETTING_DEFINITIONS: {
             };
         }[];
     };
+    jobGroupFold: {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "select";
+        options: {
+            value: string;
+            label: string;
+            descriptions: {
+                zh: string;
+            };
+        }[];
+    };
     lang: {
         label: string;
         descriptions: {
@@ -268,6 +306,54 @@ export declare const SETTING_DEFINITIONS: {
             };
         }[];
     };
+    'sidePanel.open': {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "boolean";
+    };
+    'sidePanel.panels': {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "text";
+    };
+    'sidePanel.ratio': {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "number";
+    };
+    'sidePanel.splitEnabled': {
+        label: string;
+        descriptions: {
+            zh: string;
+        };
+        group: string;
+        hint: string;
+        hintDescriptions: {
+            zh: string;
+        };
+        kind: "boolean";
+    };
     smoothStreaming: {
         label: string;
         descriptions: {
@@ -649,6 +735,13 @@ export declare const SETTING_GROUPS: readonly [{
     readonly descriptions: {
         readonly zh: "底栏设置";
     };
+}, {
+    readonly id: "side-panel";
+    readonly mode: "page";
+    readonly title: "Side panel";
+    readonly descriptions: {
+        readonly zh: "侧栏";
+    };
 }, {
     readonly id: "shortcuts";
     readonly mode: "page";

package/lib/types/settings/definitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../../src/settings/definitions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAE5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,cAAc,GAAG,MAAM,GAAG,kBAAkB,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;AAE7I,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyYa,CAAA;AAE7C,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,mBAAmB,CAAA;AAEzD;;;;;;;;;yCASyC;AACzC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQjB,CAAA;AAEV;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAEjD,CAAA;AAED,sEAAsE;AACtE,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,iBAAiB,GAAG;IAAE,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAE7F;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,gBAAgB,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,CA+EnK,CAAA"}
+{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../../src/settings/definitions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAE5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,cAAc,GAAG,MAAM,GAAG,kBAAkB,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;AAE7I,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmca,CAAA;AAE7C,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,mBAAmB,CAAA;AAEzD;;;;;;;;;yCASyC;AACzC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASjB,CAAA;AAEV;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAEjD,CAAA;AAED,sEAAsE;AACtE,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,GAAG,iBAAiB,GAAG;IAAE,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAE7F;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,gBAAgB,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,CAuGnK,CAAA"}

package/lib/types/settings/definitions.js

@@ -1,5 +1,18 @@
 import { SPLASH_FONT_OPTIONS } from '../components/splashFonts.js';
 export const SETTING_DEFINITIONS = {
+    'companion.skin': {
+        label: 'Companion skin',
+        descriptions: { zh: '宠物皮肤' },
+        group: 'splash',
+        hint: 'Look of the companion panel pet (enable the panel by adding \'companion\' to sidePanel.panels): deepy (default, the deepy whale kit), whale (the same layered pixel whale as the splash) or whaleGirl (the user-provided whale-girl sticker pack, 22 animations). Applies immediately.',
+        hintDescriptions: { zh: '伙伴面板里宠物的外形（面板需在 sidePanel.panels 里加入 companion 启用）：deepy（默认，deepy 小鲸鱼素材包）、whale（与开屏同款的分层像素鲸鱼）或 whaleGirl（用户提供的鲸娘表情包，22 个动画）。立即生效。' },
+        kind: 'select',
+        options: [
+            { value: 'deepy', label: 'Deepy', descriptions: { zh: 'Deepy 小鲸鱼' } },
+            { value: 'whaleGirl', label: 'Whale girl', descriptions: { zh: '鲸娘' } },
+            { value: 'whale', label: 'Whale', descriptions: { zh: '像素鲸鱼' } },
+        ],
+    },
     'diffLayout': {
         label: 'Diff layout',
         descriptions: { zh: 'diff 布局' },
@@ -64,6 +77,19 @@ export const SETTING_DEFINITIONS = {
             { value: 'terminal', label: 'Terminal colour', descriptions: { zh: '合成到终端底色' } },
         ],
     },
+    'jobGroupFold': {
+        label: 'Job card groups',
+        descriptions: { zh: '后台任务分组' },
+        group: 'conversation',
+        hint: 'Consecutive background-job cards render as one group with a summary header. Auto folds a run of 3+ once every job settled; Always folds any run of 2+ right away; Never keeps every card (click the header to fold one run by hand, Ctrl+O to expand all).',
+        hintDescriptions: { zh: '连续的后台任务卡渲染成一组并带汇总头。自动：整组落定且 3 个以上时折叠成一行；总是：2 个以上立即折叠；从不：每张卡都留着（点组头可手工折叠单组，Ctrl+O 展开全部）。' },
+        kind: 'select',
+        options: [
+            { value: 'auto', label: 'Auto (3+ settled)', descriptions: { zh: '自动（落定 3 个以上）' } },
+            { value: 'always', label: 'Always (2+)', descriptions: { zh: '总是（2 个以上）' } },
+            { value: 'never', label: 'Never fold', descriptions: { zh: '从不折叠' } },
+        ],
+    },
     'lang': {
         label: 'Language',
         descriptions: { zh: '界面语言' },
@@ -174,6 +200,38 @@ export const SETTING_DEFINITIONS = {
             { value: 'hidden', label: 'Hidden', descriptions: { zh: '隐藏' } },
         ],
     },
+    'sidePanel.open': {
+        label: 'Side panel starts open',
+        descriptions: { zh: '启动时展开侧栏' },
+        group: 'side-panel',
+        hint: 'Whether a session opens with the sidebar already expanded (Ctrl+B or /panel toggles it any time). Off by default, so the upgrade leaves the layout exactly as it was until asked; the in-session toggle is not persisted. Applies immediately.',
+        hintDescriptions: { zh: '打开会话时侧栏是否已展开（随时可用 Ctrl+B 或 /panel 切换）。默认关闭，升级后界面与原来完全一致，除非主动开启；会话内的切换不会写回设置。立即生效。' },
+        kind: 'boolean',
+    },
+    'sidePanel.panels': {
+        label: 'Enabled panels',
+        descriptions: { zh: '启用的面板' },
+        group: 'side-panel',
+        hint: 'Comma-separated panel ids in PanelBar order (default `todo,jobs,agents`). Ids are lowercase words (a-z, 0-9, _, -) or a `plugin:panel` namespace; a well-formed id no panel claims yet stays in the bar for a plugin that registers it later, while a malformed entry is refused. Add `companion` to enable the pet panel. Applies immediately.',
+        hintDescriptions: { zh: '按标签栏顺序排列的面板 id，逗号分隔（默认 `todo,jobs,agents`）。id 为小写词组（a-z、0-9、_、-）或 `plugin:panel` 命名空间；格式合法但尚无面板认领的 id 会留在标签栏，等插件稍后注册，格式非法的输入会被直接拒绝。加上 `companion` 可启用宠物面板。立即生效。' },
+        kind: 'text',
+    },
+    'sidePanel.ratio': {
+        label: 'Chat column width',
+        descriptions: { zh: '聊天列占比' },
+        group: 'side-panel',
+        hint: 'Chat column as a fraction of the content width: 0.1-0.95, default 0.68. Type a decimal such as `0.6`; while the panel has focus the +/- shortcuts nudge it live for the current session. Applies immediately.',
+        hintDescriptions: { zh: '聊天列占内容宽度的比例：0.1-0.95，默认 0.68。输入小数如 `0.6`；面板获得焦点时可用 +/- 在会话内实时微调。立即生效。' },
+        kind: 'number',
+    },
+    'sidePanel.splitEnabled': {
+        label: 'Split layout',
+        descriptions: { zh: '分栏布局' },
+        group: 'side-panel',
+        hint: 'Master switch of the split layout: on (default) Ctrl+B and /panel open the side column next to the chat; off makes both fall back to the fullscreen panels. Applies immediately.',
+        hintDescriptions: { zh: '分栏总开关：开启（默认）时 Ctrl+B 与 /panel 在聊天右侧展开侧栏；关闭时两者都退回整屏面板。立即生效。' },
+        kind: 'boolean',
+    },
     'smoothStreaming': {
         label: 'Smooth streaming',
         descriptions: { zh: '流式平滑输出' },
@@ -410,6 +468,7 @@ export const SETTING_GROUPS = [
     { id: 'rendering', mode: 'inline', title: 'Rendering', descriptions: { zh: '图表与图片' } },
     { id: 'math', mode: 'page', title: 'Formula', descriptions: { zh: '公式设置' } },
     { id: 'status-bar', mode: 'page', title: 'Status bar', descriptions: { zh: '底栏设置' } },
+    { id: 'side-panel', mode: 'page', title: 'Side panel', descriptions: { zh: '侧栏' } },
     { id: 'shortcuts', mode: 'page', title: 'Shortcuts', descriptions: { zh: '快捷键' } },
 ];
 /**
@@ -472,6 +531,12 @@ export const SHORTCUT_FIELD_META = {
         hintEn: d => `Toggle the startup loaded-context panel. Default: ${d}.`,
         hintZh: d => `切换启动时的已加载上下文面板。默认 ${d}。`,
     },
+    continue: {
+        label: 'Continue last session shortcut',
+        zh: '继续上次会话快捷键',
+        hintEn: d => `On the launchpad, resume the most recent session. Default: ${d}. Only bound while the launchpad is up.`,
+        hintZh: d => `在启动页上继续最近一条会话。默认 ${d}。仅在启动页生效。`,
+    },
     showAll: {
         label: 'Show-all shortcut',
         zh: '显示全部消息快捷键',
@@ -508,4 +573,22 @@ export const SHORTCUT_FIELD_META = {
         hintEn: d => `Star the project via the gh CLI (same action as /star and the splash line's click). Default: ${d}.`,
         hintZh: d => `用 gh 给项目点 star（与 /star、开屏标语点击同一个动作）。默认 ${d}。`,
     },
+    undo: {
+        label: 'Draft undo shortcut',
+        zh: '草稿撤销快捷键',
+        hintEn: d => `Undo the prompt draft one word-level step at a time (text, caret and images together). Draft-only: submitted or history-recalled text is out of scope (Esc Esc rewinds turns, Ctrl+R recalls history). Default: ${d}.`,
+        hintZh: d => `按词撤销输入框草稿（文本、光标、图片一起回退）。只作用于草稿：提交或用历史召回后不可撤销；与 Esc Esc 回溯、Ctrl+R 历史召回不是一回事。默认 ${d}。`,
+    },
+    sidePanel: {
+        label: 'Side panel shortcut',
+        zh: '侧栏快捷键',
+        hintEn: d => `Smart three-state sidebar toggle: closed → open+focus → focus chat → closed. Default: ${d}. tmux users should remap it (the prefix eats Ctrl+B).`,
+        hintZh: d => `侧栏智能三态：关闭 → 打开并聚焦 → 焦点回聊天 → 关闭。默认 ${d}。tmux 用户请改键（前缀会吞掉它）。`,
+    },
+    sidePanelZoom: {
+        label: 'Side panel zoom shortcut',
+        zh: '侧栏缩放快捷键',
+        hintEn: d => `Zoom the active side panel (chat keeps its minimum width). Default: ${d}.`,
+        hintZh: d => `缩放当前侧栏面板（聊天列保留最小宽度）。默认 ${d}。`,
+    },
 };

package/lib/types/tips.js

@@ -26,8 +26,8 @@ export const TIPS = [
     {
         id: 'keys-esc-levels',
         group: 'keys',
-        zh: 'Esc 逐层收：帮助 → 图片预览 → 命令/文件菜单 → 清选区 → 清空',
-        en: 'Esc peels layers: help → image preview → command/file menus → selection → clear input',
+        zh: 'Esc 逐层收：帮助 → 图片预览 → 命令/文件菜单 → 清选区 → 清附加 → 清空',
+        en: 'Esc peels layers: help → preview → menus → selection → context chip → clear input',
     },
     {
         id: 'keys-ctrl-o',
@@ -539,7 +539,7 @@ export const TIPS = [
         id: 'flow-question-arrows',
         group: 'workflow',
         zh: '多题问卷用 ←/→ 换题，不提交；输入行要先把光标移到行首或行尾',
-        en: 'In a multi-question ask, ←/→ switches questions without submitting; on the input row the caret must already be at the edge',
+        en: 'In a multi-question ask, ←/→ switches questions; on the input row the caret must be at the edge',
     },
     {
         id: 'flow-question-fold',
@@ -852,8 +852,8 @@ export const TIPS = [
     {
         id: 'pit-minimal',
         group: 'pitfalls',
-        zh: '内核「极简模式」预设下 /compact 与问卷不可用（与「极简界面」无关）',
-        en: 'Under the kernel Minimal preset /compact and questions are off (not the Minimal UI switch)',
+        zh: '内核「极简模式」预设不压缩、不剪枝：长会话可能撞上限，/compact 与问卷也不可用（与「极简界面」无关）',
+        en: 'Minimal preset: no compaction or pruning — long sessions can hit the limit (not the Minimal UI)',
     },
     {
         id: 'pit-mouse-mode',