@askdkc/dsh-cli 0.11.6 → 0.12.0

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

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA6BzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAwB,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,aAAa,EAAe,MAAM,kCAAkC,CAAA;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAkB3D,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAyNxE,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,EAClC,mBAAmB,EACnB,mBAAmB,EAAE,uBAAuB,EAC5C,WAAW,EACX,cAAc,GACf,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IAC/D,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,yDAAyD;IACzD,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,+EAA+E;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,uEAAuE;IACvE,SAAS,CAAC,EAAE,YAAY,CAAA;IACxB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;IAC9D;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC/D,4BAilJA"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA8BzB,OAAO,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAwB,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,aAAa,EAAe,MAAM,kCAAkC,CAAA;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAkB3D,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAyNxE,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,EAClC,mBAAmB,EACnB,mBAAmB,EAAE,uBAAuB,EAC5C,WAAW,EACX,cAAc,GACf,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAA;IAC/D,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,yDAAyD;IACzD,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,+EAA+E;IAC/E,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,uEAAuE;IACvE,SAAS,CAAC,EAAE,YAAY,CAAA;IACxB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;IAC9D;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC/D,4BAklJA"}

package/lib/types/screens/Chat.js

@@ -18,7 +18,7 @@ import { homeDir } from '../utils/paths.js';
 import { execFileNoThrow } from '../utils/execFileNoThrow.js';
 import { cleanRenderText, cleanScalarText } from '../dsh-adapter/sanitize.js';
 import { nextModelQueryBoundary, previousModelQueryBoundary } from './modelSearchInput.js';
-import { deriveModelGroups, filterModels, modelPickerLanding, recentCatalogModels, RECENTS_GROUP_PROVIDER, } from '../modelGroups.js';
+import { deriveModelGroups, filterModels, modelPickerFlatIndex, modelPickerLanding, recentCatalogModels, RECENTS_GROUP_PROVIDER, } from '../modelGroups.js';
 import { readModelRecents, recordModelUse } from '../modelRecents.js';
 import { TuiDialogStore } from '../dsh-adapter/dialogs.js';
 import { TuiStatusStore } from '../dsh-adapter/status.js';
@@ -348,14 +348,10 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     const [providerInfos, setProviderInfos] = React.useState([]);
     /** /model 最近使用分组：成功切换即记录（去重置顶，上限 10），重启保留。 */
     const [modelRecents, setModelRecents] = React.useState(() => readModelRecents());
-    /** Two-level /model: the drilled-in provider route; undefined = group level.
-     *  Reset on open; stale ids resolve back to the group level via `activeModelGroup`. */
+    /** Optional provider-group drill-down; undefined in the default flat list. */
     const [modelGroup, setModelGroup] = React.useState(undefined);
-    /** True while the picker sits in the single-provider fast path (drilled in
-     *  at open, the group level never shown): Esc closes directly and no back
-     *  hint renders — a pinned recents pseudo-group must not fake a two-level
-     *  walk the user never saw (issue #527 regression: repro-picker-windowing). */
-    const [modelPickerDirect, setModelPickerDirect] = React.useState(false);
+    /** Open /model on the complete, immediately searchable model list. */
+    const [modelPickerFlat, setModelPickerFlat] = React.useState(true);
     /** Group rows over the current catalog, first-appearance (registry) order,
      *  with the pinned recents pseudo-group first when any entry is catalogued. */
     const modelGroups = React.useMemo(() => deriveModelGroups(models, providerInfos, modelRecents), [models, providerInfos, modelRecents]);
@@ -373,8 +369,8 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     const modelQuery = overlay.kind === 'model' ? (overlay.query ?? '') : '';
     const modelSearchActive = modelQuery.trim() !== '';
     const visibleModelRows = React.useMemo(() => filterModels(activeModelGroup === undefined ? models : groupModels, modelQuery, providerInfos), [activeModelGroup, groupModels, models, modelQuery, providerInfos]);
-    const visibleModelGroups = activeModelGroup === undefined && !modelSearchActive ? modelGroups : [];
-    const modelRowsAreGroups = activeModelGroup === undefined && !modelSearchActive;
+    const visibleModelGroups = activeModelGroup === undefined && !modelSearchActive && !modelPickerFlat ? modelGroups : [];
+    const modelRowsAreGroups = activeModelGroup === undefined && !modelSearchActive && !modelPickerFlat;
     const modelRowCount = modelRowsAreGroups ? visibleModelGroups.length : visibleModelRows.length;
     const modelFocus = overlay.kind === 'model'
         ? Math.max(0, Math.min(overlay.index, modelRowCount - 1))
@@ -384,6 +380,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         modelFocusedRef.current = overlay.kind === 'model' ? {
             query: modelQuery,
             group: activeModelGroup,
+            rowsAreGroups: modelRowsAreGroups,
             provider: modelRowsAreGroups ? undefined : visibleModelRows[modelFocus]?.provider,
             id: modelRowsAreGroups ? undefined : visibleModelRows[modelFocus]?.id,
             groupKey: modelRowsAreGroups ? visibleModelGroups[modelFocus]?.provider : undefined,
@@ -404,7 +401,6 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                     const freshGroups = deriveModelGroups(list, providerInfos, modelRecents);
                     if (focused.group !== undefined && !freshGroups.some(group => group.provider === focused.group)) {
                         setModelGroup(undefined);
-                        setModelPickerDirect(false);
                         dispatchOverlay({ type: 'model-edit', query: '', cursor: 0 });
                         dispatchOverlay({ type: 'set-index', kind: 'model', index: 0 });
                     }
@@ -413,7 +409,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                             : focused.group === RECENTS_GROUP_PROVIDER ? recentCatalogModels(modelRecents, list)
                                 : list.filter(model => model.provider === focused.group);
                         const rows = filterModels(scope, focused.query, providerInfos);
-                        const index = focused.group === undefined && focused.query.trim() === ''
+                        const index = focused.rowsAreGroups
                             ? freshGroups.findIndex(group => group.provider === focused.groupKey)
                             : rows.findIndex(model => model.provider === focused.provider && model.id === focused.id);
                         dispatchOverlay({ type: 'set-index', kind: 'model', index: Math.max(0, index) });
@@ -1855,15 +1851,12 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                     recentsNow = recordModelUse({ provider: channel.provider, id: channel.model });
                     setModelRecents(recentsNow);
                 }
-                // Two-level landing: recents (when catalogued) focus their pinned
-                // row; else multi-provider catalogs focus the current provider's
-                // group row; a single-provider catalog without a meaningful recents
-                // list drills straight into its model list (pre-grouping UX).
+                // Search-first landing: show every available model immediately and
+                // focus the current one. Tab still opens the provider groups.
                 {
-                    const landing = modelPickerLanding(models, channel.provider, channel.model, recentsNow);
-                    setModelGroup(landing.group);
-                    setModelPickerDirect(landing.group !== undefined);
-                    dispatchOverlay({ type: 'open', overlay: { kind: 'model', index: landing.index, query: '', cursor: 0 } });
+                    setModelGroup(undefined);
+                    setModelPickerFlat(true);
+                    dispatchOverlay({ type: 'open', overlay: { kind: 'model', index: modelPickerFlatIndex(models, channel.provider, channel.model), query: '', cursor: 0 } });
                 }
                 const modelRequest = ++modelRequestRef.current;
                 setModelCatalogStatus('loading');
@@ -1871,17 +1864,13 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                     if (modelRequest !== modelRequestRef.current)
                         return;
                     const focused = modelFocusedRef.current;
-                    if (models.length === 0 && (focused === null || (focused.group === undefined && focused.query === ''))) {
-                        const landing = modelPickerLanding(list, channel.provider, channel.model, recentsNow);
-                        setModelGroup(landing.group);
-                        setModelPickerDirect(landing.group !== undefined);
-                        dispatchOverlay({ type: 'set-index', kind: 'model', index: landing.index });
+                    if (models.length === 0 && (focused === null || (!focused.rowsAreGroups && focused.group === undefined && focused.query === ''))) {
+                        dispatchOverlay({ type: 'set-index', kind: 'model', index: modelPickerFlatIndex(list, channel.provider, channel.model) });
                     }
                     else if (focused !== null) {
                         const freshGroups = deriveModelGroups(list, providerInfos, recentsNow);
                         if (focused.group !== undefined && !freshGroups.some(group => group.provider === focused.group)) {
                             setModelGroup(undefined);
-                            setModelPickerDirect(false);
                             dispatchOverlay({ type: 'model-edit', query: '', cursor: 0 });
                             dispatchOverlay({ type: 'set-index', kind: 'model', index: 0 });
                         }
@@ -1890,7 +1879,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 : focused.group === RECENTS_GROUP_PROVIDER ? recentCatalogModels(recentsNow, list)
                                     : list.filter(model => model.provider === focused.group);
                             const rows = filterModels(scope, focused.query, providerInfos);
-                            const index = focused.group === undefined && focused.query.trim() === ''
+                            const index = focused.rowsAreGroups
                                 ? freshGroups.findIndex(group => group.provider === focused.groupKey)
                                 : rows.findIndex(model => model.provider === focused.provider && model.id === focused.id);
                             dispatchOverlay({ type: 'set-index', kind: 'model', index: Math.max(0, index) });
@@ -3266,16 +3255,27 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         }
         if (overlay.kind === 'model') {
             event.stopImmediatePropagation();
-            // Two-level picker: group rows at the top (Enter drills in), one
-            // provider's models below (Enter switches, the same live-fork path as
-            // the flat picker always had). Esc/⌫ climbs one level and only closes
-            // at the top; a single-group catalog never shows the group level, so
-            // Esc there closes directly.
+            // Search-first model list; Tab toggles the optional provider groups.
             const rowCount = modelRowCount;
             const query = overlay.query ?? '';
             const cursor = overlay.cursor ?? query.length;
             const editModelQuery = (value, nextCursor) => dispatchOverlay({ type: 'model-edit', query: value, cursor: nextCursor });
-            if (key.upArrow || key.downArrow) {
+            if (key.tab && !key.shift && modelGroups.length > 1) {
+                if (modelPickerFlat) {
+                    const landing = modelPickerLanding(models, channel.provider, channel.model, modelRecents);
+                    setModelPickerFlat(false);
+                    setModelGroup(landing.group);
+                    dispatchOverlay({ type: 'model-edit', query: '', cursor: 0 });
+                    dispatchOverlay({ type: 'set-index', kind: 'model', index: landing.index });
+                }
+                else {
+                    setModelPickerFlat(true);
+                    setModelGroup(undefined);
+                    dispatchOverlay({ type: 'model-edit', query: '', cursor: 0 });
+                    dispatchOverlay({ type: 'set-index', kind: 'model', index: modelPickerFlatIndex(models, channel.provider, channel.model) });
+                }
+            }
+            else if (key.upArrow || key.downArrow) {
                 dispatchOverlay({ type: 'move', delta: key.upArrow ? -1 : 1, count: rowCount });
             }
             else if (plainReturn) {
@@ -3324,7 +3324,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                 editModelQuery(query, query.length);
             }
             else if (key.escape || (key.backspace && query === '')) {
-                if (activeModelGroup !== undefined && modelGroups.length > 1 && !modelPickerDirect) {
+                if (activeModelGroup !== undefined && modelGroups.length > 1) {
                     setModelGroup(undefined);
                     const groupIndex = Math.max(0, modelGroups.findIndex(group => group.provider === activeModelGroup));
                     dispatchOverlay({ type: 'model-edit', query: '', cursor: 0 });
@@ -3334,7 +3334,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                     dispatchOverlay({ type: 'close' });
                 }
             }
-            else if (input.length > 0 && !key.ctrl && !key.meta && !key.super) {
+            else if (input.length > 0 && !key.ctrl && !key.meta && !key.super && !key.tab) {
                 const inserted = input.replace(/[\r\n\t]+/gu, ' ');
                 editModelQuery(query.slice(0, cursor) + inserted + query.slice(cursor), cursor + inserted.length);
             }
@@ -4179,7 +4179,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 // the animated chars/4 estimate, matching the classic
                                 // spinner's counter (the suffix used raw chars before,
                                 // inflating the reading next to a real upload number).
-                                suffix: `${lastUploadTokens > 0 ? ` · ↑ ${formatTokens(lastUploadTokens)}` : ''} · ↓ ${formatTokens(Math.round(channel.responseChars / 4))} tokens` }) })) : (_jsx(WorkingSpinner, { mode: channel.spinnerMode, hasActiveTools: channel.activeToolCount > 0, responseLengthRef: responseLengthRef, uploadTokensRef: uploadTokensRef, loadingStartTimeRef: loadingStartTimeRef, totalPausedMsRef: totalPausedMsRef, pauseStartTimeRef: pauseStartTimeRef, thinkingStatus: thinkingStatus }))), _jsx(GoalTodoPanel, { channel: channel, collapsed: todoCollapsed, onToggle: () => setTodoCollapsed(previous => !previous) }), recap !== null && recap.auto && !recap.expanded && (_jsx(AutoRecapRow, { summary: recap.summary, streaming: !recap.done, onExpand: () => setRecap(prev => (prev ? { ...prev, expanded: true } : prev)), onDismiss: () => closeRecap() })), balance !== null && (_jsx(BalanceReportRow, { result: balance.result, refreshing: balance.refreshing, tokens: channel.tokens, model: channel.model, onRefresh: runBalance, onDismiss: () => setBalance(null) })), statusEntries.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate", children: statusEntries.map(entry => entry.text).join(' · ') })), activePreview === null && statusViews.map(view => (_jsx(PluginStatusViewBoundary, { viewKey: view.key, onError: (key, error) => statusContributions.reportViewError(key, error), children: _jsx(Box, { flexDirection: "column", flexShrink: 0, maxHeight: view.maxRows, overflow: "hidden", children: _jsx(Box, { flexDirection: "column", flexShrink: 0, children: React.createElement(view.component, {
+                                suffix: `${lastUploadTokens > 0 ? ` · ↑ ${formatTokens(lastUploadTokens)}` : ''} · ↓ ${formatTokens(Math.round(channel.responseChars / 4))} tokens` }) })) : (_jsx(WorkingSpinner, { mode: channel.spinnerMode, progressLanguage: channel.progressLanguage ?? getLang(), hasActiveTools: channel.activeToolCount > 0, responseLengthRef: responseLengthRef, uploadTokensRef: uploadTokensRef, loadingStartTimeRef: loadingStartTimeRef, totalPausedMsRef: totalPausedMsRef, pauseStartTimeRef: pauseStartTimeRef, thinkingStatus: thinkingStatus }))), _jsx(GoalTodoPanel, { channel: channel, collapsed: todoCollapsed, onToggle: () => setTodoCollapsed(previous => !previous) }), recap !== null && recap.auto && !recap.expanded && (_jsx(AutoRecapRow, { summary: recap.summary, streaming: !recap.done, onExpand: () => setRecap(prev => (prev ? { ...prev, expanded: true } : prev)), onDismiss: () => closeRecap() })), balance !== null && (_jsx(BalanceReportRow, { result: balance.result, refreshing: balance.refreshing, tokens: channel.tokens, model: channel.model, onRefresh: runBalance, onDismiss: () => setBalance(null) })), statusEntries.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate", children: statusEntries.map(entry => entry.text).join(' · ') })), activePreview === null && statusViews.map(view => (_jsx(PluginStatusViewBoundary, { viewKey: view.key, onError: (key, error) => statusContributions.reportViewError(key, error), children: _jsx(Box, { flexDirection: "column", flexShrink: 0, maxHeight: view.maxRows, overflow: "hidden", children: _jsx(Box, { flexDirection: "column", flexShrink: 0, children: React.createElement(view.component, {
                                     React,
                                     ui: STATUS_VIEW_UI,
                                 }) }) }) }, `${view.key}:${view.registrationId}`))), _jsxs(Box, { flexDirection: "column", flexShrink: 0, children: [approvalPanelNode !== null ? (approvalPanelNode) : dialogSnapshot !== null ? (_jsx(ExtensionDialog, { dialog: dialogSnapshot, onDecide: value => dialogs.decide(dialogSnapshot.key, value), onCancel: () => dialogs.cancel(dialogSnapshot.key) }, dialogSnapshot.key)) : overlay.kind === 'tips' ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(TipsPanel, { onClose: () => dispatchOverlay({ type: 'close-if', kind: 'tips' }) }) })) : recap !== null && (!recap.auto || recap.expanded) ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(RecapPanel, { summary: recap.summary, title: recap.title, error: recap.error, streaming: !recap.done, titleApplied: recap.titleApplied, onClose: () => {
@@ -4268,7 +4268,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                                 dispatchOverlay({ type: 'set-index', kind: 'model', index: landing.index });
                                             } })) : (_jsx(ModelPicker, { models: visibleModelRows, query: modelQuery, cursor: overlay.cursor ?? modelQuery.length, emptyReason: modelCatalogStatus === 'loading' && models.length === 0 ? 'loading' : modelCatalogStatus === 'error' ? 'error' : models.length === 0 ? 'empty' : 'no-match', groupLabel: activeModelGroup === RECENTS_GROUP_PROVIDER
                                                 ? t('picker-group-recent')
-                                                : modelGroups.find(group => group.provider === activeModelGroup)?.label, showBack: modelGroups.length > 1 && !modelPickerDirect, showProviderPrefix: activeModelGroup === RECENTS_GROUP_PROVIDER || activeModelGroup === undefined, focusIndex: modelFocus, currentModel: `${channel.provider}/${channel.model}`, onPick: (index) => {
+                                                : modelGroups.find(group => group.provider === activeModelGroup)?.label, showBack: activeModelGroup !== undefined && modelGroups.length > 1, showGroups: modelPickerFlat && modelGroups.length > 1, showProviderPrefix: activeModelGroup === RECENTS_GROUP_PROVIDER || activeModelGroup === undefined, focusIndex: modelFocus, currentModel: `${channel.provider}/${channel.model}`, onPick: (index) => {
                                                 // 点击行 = 应用该行模型（与 Enter 同一条路径）
                                                 const model = visibleModelRows[index];
                                                 if (!model)

package/node_modules/@askdkc/dsh-auth/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2026 ccch1mneyyy
+Copyright (c) 2026 dkc (askdkc)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/node_modules/@askdkc/dsh-auth/README.ja.md

@@ -2,18 +2,18 @@
 
 [English](README.md) | 日本語
 
-> [dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) と
+> [dsh-cli](https://github.com/askdkc/dsh-cli) と
 > [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 向けのプロバイダー認証
 
 **ChatGPT、Claude、SuperGrok、OpenCode Zen/Go、OrcaRouter、OpenRouter、
 Nous Portal、Infron** をモデルの提供元として利用できます。プロバイダーに応じて
 OAuth、デバイスコード、API キーで認証します。dsh 本体のソース修正は不要です。
 このプラグインは DeepSeek Harness のターミナル UI である
-[dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) とともに開発され、dsh-TUI に同梱されています。
+[dsh-cli](https://github.com/askdkc/dsh-cli) とともに開発され、dsh-cli に同梱されています。
 任意の dsh プロファイルへ単独でインストールすることもできます。
 
 ```
-dsh-tui → /provider → Provider authentication → sign in
+dsh-cli → /provider → Provider authentication → sign in
           /auth login openai-codex                     ← the plugin command
           /model → OpenAI Codex → gpt-5.6-sol          ← routes & models
 ```
@@ -27,8 +27,8 @@ TUI と Web クライアントで使えます。対話画面のないホスト
 
 ## インストール
 
-**dsh-TUI と一緒に使う場合** — 追加作業は不要です。dsh-auth は dsh-tui パッケージに
-依存関係として同梱されています。dsh-tui を更新すると、`/provider` のウィザードに
+**dsh-cli と一緒に使う場合** — 追加作業は不要です。dsh-auth は dsh-cli パッケージに
+依存関係として同梱されています。dsh-cli を更新すると、`/provider` のウィザードに
 プロバイダー認証の項目が追加されます。
 
 **任意の dsh プロファイルへ単独でインストールする場合：**
@@ -70,7 +70,7 @@ dsh plugin --profile <name> add @askdkc/dsh-auth
   更新は認証情報ストアのロックでプロバイダーごとに直列化されるため、
   並行するリクエストが更新済みトークンを重複して更新することはありません。
 - `/auth status` と `/auth logout <provider>` を使えます。`ctx.dshAuth` サービスも
-  UI 向けに同じ API を公開しており、dsh-tui の `/provider` ウィザードと
+  UI 向けに同じ API を公開しており、dsh-cli の `/provider` ウィザードと
   `/login` はこのサービスを利用します。
 
 ## 使い方
@@ -126,7 +126,7 @@ dsh plugin --profile <name> add @askdkc/dsh-auth
   内容をログやステータス画面に出すことはありません
   （`/auth status` に表示するのは有効期限の情報だけです）。
   ファイルが壊れている場合は、上書きせず明示的に失敗します。
-- dsh-TUI は API キーの入力をマスクし、質問への回答の要約からも伏せます。
+- dsh-cli は API キーの入力をマスクし、質問への回答の要約からも伏せます。
 - 対話画面が登録されていない環境ではログインを拒否します。
   ブラウザーや GUI があるとは仮定しません。リモート環境やヘッドレス環境では
   明確なエラーを返します（エコシステム仕様のリモート決定性規則 TUI-RUN-001）。
@@ -143,14 +143,18 @@ pnpm verify     # build + headless smoke (credential store, refresh
 ```
 
 smoke テストは cordis や Harness を起動せずに、純粋なモジュールを直接検査します。
-実際のログインを通す E2E 確認には対話可能なホスト（dsh-tui）が必要で、
+実際のログインを通す E2E 確認には対話可能なホスト（dsh-cli）が必要で、
 リリースごとに手動で検証します。このプラグインは
-[dsh-TUI リポジトリ](https://github.com/ccch1mneyyy/dsh-TUI) の
-`dsh-auth/` サブモジュールとして開発され、このリポジトリにも反映されます。
+[dsh-cli リポジトリ](https://github.com/askdkc/dsh-cli) 内の通常の
+`dsh-auth/` ディレクトリとして開発します。認証側と CLI 側を同じ commit にできます。
+このリポジトリへ取り込んだ最初の版は
+[dsh-auth-fork](https://github.com/askdkc/dsh-auth-fork) の commit
+`a48e59ec502fa0a3238c78955ffcffdfa8ae5abb` です。
+この版の開発とリリースは今後 dsh-cli リポジトリで管理します。
 
 ## ロードマップ
 
-- **M2** *（実装済み）* — dsh-tui との連携：`/provider` の OAuth 項目、
+- **M2** *（実装済み）* — dsh-cli との連携：`/provider` の OAuth 項目、
   `/login` のアカウント欄、最近使ったモデルを固定表示するグループを備えた
   2 階層の `/model` 選択画面。
 - **M3** — `dsh-ecosystem-spec` への準拠（マニフェストの検証、
@@ -161,4 +165,5 @@ smoke テストは cordis や Harness を起動せずに、純粋なモジュー
 
 ## ライセンス
 
-MIT
+[MIT](LICENSE)。元の ccch1mneyyy の著作権表示を残し、独自開発分について
+dkc の著作権表示を追加しています。

package/node_modules/@askdkc/dsh-auth/README.md

@@ -2,18 +2,18 @@
 
 English | [日本語](README.ja.md)
 
-> Provider authentication for [dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI) and
+> Provider authentication for [dsh-cli](https://github.com/askdkc/dsh-cli) and
 > [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness)
 
 Use **ChatGPT, Claude, SuperGrok, OpenCode Zen/Go, OrcaRouter, OpenRouter,
 Nous Portal, and Infron** as model providers with OAuth, device code, or an
 API key according to the provider. No dsh source patch is needed. This plugin is developed alongside (and
-bundled into) [dsh-TUI](https://github.com/ccch1mneyyy/dsh-TUI), the
-Claude Code style terminal front door for DeepSeek Harness; it also installs
+bundled into) [dsh-cli](https://github.com/askdkc/dsh-cli), the
+terminal front door for DeepSeek Harness; it also installs
 standalone into any dsh profile.
 
 ```
-dsh-tui → /provider → Provider authentication → sign in
+dsh-cli → /provider → Provider authentication → sign in
           /auth login openai-codex                     ← the plugin command
           /model → OpenAI Codex → gpt-5.6-sol          ← routes & models
 ```
@@ -27,8 +27,8 @@ the TUI, the web client, and refuses cleanly on headless hosts.
 
 ## Install
 
-**With dsh-TUI** — nothing to do: dsh-auth ships inside the dsh-tui package
-(bundled dependency). Update dsh-tui and the `/provider` wizard gains its
+**With dsh-cli** — nothing to do: dsh-auth ships inside the dsh-cli package
+(bundled dependency). Update dsh-cli and the `/provider` wizard gains its
 provider authentication branch automatically.
 
 **Standalone, into any dsh profile:**
@@ -70,7 +70,7 @@ signed-in providers' catalogs (credential-gated — see below).
   per provider under the credential store's lock — concurrent requests never
   double-refresh a rotated token.
 - `/auth status` / `/auth logout <provider>`; the `ctx.dshAuth` service
-  exposes the same api for UIs (the dsh-tui `/provider` wizard and `/login`
+  exposes the same api for UIs (the dsh-cli `/provider` wizard and `/login`
   ride it).
 
 ## Usage
@@ -125,7 +125,7 @@ the `/auth login <provider>` hint — never silently.
   logged, never echoed through status surfaces (`/auth status` shows expiry
   metadata only), and a corrupt file fails loudly instead of being
   overwritten.
-- dsh-TUI masks API-key input and redacts it from questionnaire summaries.
+- dsh-cli masks API-key input and redacts it from questionnaire summaries.
 - Login refuses to run where no interactive surface is registered (no
   browser/GUI assumptions — remote and headless hosts get a clear error,
   per the ecosystem spec's remote-determinism rule, TUI-RUN-001).
@@ -143,13 +143,17 @@ pnpm verify     # build + headless smoke (credential store, refresh
 
 The smoke suite runs without cordis or a harness: the pure modules are
 exercised directly. Real end-to-end login needs an interactive host
-(dsh-tui) and is verified manually per release. The plugin is developed in
-the [dsh-TUI repository](https://github.com/ccch1mneyyy/dsh-TUI) as the
-`dsh-auth/` submodule and mirrors to this repository.
+(dsh-cli) and is verified manually per release. The plugin is developed in
+the [dsh-cli repository](https://github.com/askdkc/dsh-cli) in the tracked
+`dsh-auth/` directory. Auth and CLI changes can be committed together.
+The initial in-repository snapshot came from
+[dsh-auth-fork](https://github.com/askdkc/dsh-auth-fork) commit
+`a48e59ec502fa0a3238c78955ffcffdfa8ae5abb`.
+Development and releases of this copy are now managed in dsh-cli.
 
 ## Roadmap
 
-- **M2** *(landed)* — dsh-tui integration: `/provider` OAuth branch, `/login`
+- **M2** *(landed)* — dsh-cli integration: `/provider` OAuth branch, `/login`
   account section, two-level `/model` picker with a pinned recently-used
   group.
 - **M3** — `dsh-ecosystem-spec` conformance (manifest validation, admission
@@ -160,4 +164,5 @@ the [dsh-TUI repository](https://github.com/ccch1mneyyy/dsh-TUI) as the
 
 ## License
 
-MIT
+[MIT](LICENSE). The original ccch1mneyyy copyright notice is retained; dkc is
+listed for the fork's independent development.

package/node_modules/@askdkc/dsh-auth/lib/profiles.js

@@ -9,6 +9,7 @@
  *
  * @module dsh-auth/profiles
  */
+import { randomUUID } from 'node:crypto';
 import { resolveRetryPolicy } from '@deepseek-ai/dsh-llm';
 import { adapterBuiltinProviders } from './pi-ai.js';
 /** Provider routes this build mounts, in picker order. */
@@ -40,6 +41,23 @@ function catalogProviderOf(id) {
     }
     return found;
 }
+/** Add the per-request routing header that the installed pi-ai catalog omits. */
+function withOpenCodeSessionHeader(catalog) {
+    return {
+        ...catalog,
+        streamSimple(model, context, options) {
+            return catalog.streamSimple(model, context, {
+                ...options,
+                headers: {
+                    ...options?.headers,
+                    // Agent turns keep their durable id; direct calls without one still
+                    // need a distinct routing identity instead of a gateway 400.
+                    'x-opencode-session': options?.sessionId || randomUUID(),
+                },
+            });
+        },
+    };
+}
 /** The OAuth flow object for one mounted route (login/refresh/toAuth live here). */
 export function oauthOf(route) {
     const oauth = route.auth.oauth;
@@ -91,7 +109,8 @@ export function buildOAuthProfile(id, modelOverrides) {
     if (!CATALOG_PROVIDER_IDS.includes(id)) {
         throw new Error(`dsh-auth: "${id}" is not a catalog provider this build mounts (${CATALOG_PROVIDER_IDS.join(', ')})`);
     }
-    const catalog = withModelOverrides(catalogProviderOf(id), modelOverrides);
+    const provider = catalogProviderOf(id);
+    const catalog = withModelOverrides(id === 'opencode' || id === 'opencode-go' ? withOpenCodeSessionHeader(provider) : provider, modelOverrides);
     return {
         provider: id,
         displayName: catalog.name,

package/node_modules/@askdkc/dsh-auth/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@askdkc/dsh-auth",
-  "version": "0.1.0",
-  "description": "Provider authentication and model routes for DeepSeek Harness — no dsh source patch, bundled with dsh-tui",
+  "version": "0.1.1",
+  "description": "Provider authentication and model routes for DeepSeek Harness — no dsh source patch, bundled with dsh-cli",
   "license": "MIT",
+  "author": {
+    "name": "dkc",
+    "url": "https://github.com/askdkc"
+  },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/askdkc/dsh-auth-fork.git"
+    "url": "git+https://github.com/askdkc/dsh-cli.git",
+    "directory": "dsh-auth"
   },
   "publishConfig": {
     "access": "public"

package/node_modules/dsh-working-activity/LICENSE

@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2026, chimney (ccch1mneyyy)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/node_modules/dsh-working-activity/README.md

@@ -0,0 +1,16 @@
+# dsh-working-activity input-language fork
+
+This local fork starts from `dsh-working-activity` 0.5.0 (BSD-3-Clause).
+It adds Japanese progress copy and a per-session `lang: input` mode. The original
+`auto`, `zh`, and `en` modes retain their behavior.
+
+The dsh-cli workspace links this package locally; its source manifest names
+`@askdkc/dsh-working-activity@0.5.0-input.0` through an npm alias. Build with
+`npm run build:working-activity` from the dsh-cli root. The publish-manifest
+helper bundles the compiled fork under the runtime dependency name, so an
+external dsh-cli installation does not need a separate fork release.
+
+`client-snapshot/` is the unchanged 0.5.0 Web client bundle and declarations.
+The build copies it into `lib/` after compiling the server side, so a fresh
+checkout still has the existing optional Web entry. This change targets the
+TUI; Web client language-aware ticking is not expanded here.

package/node_modules/dsh-working-activity/cordis.patch.yml

@@ -0,0 +1,19 @@
+# dsh-working-activity bundle patch: mount the plugin itself into the
+# profile composition tree.
+#
+# `dsh plugin --profile <name> add dsh-working-activity` auto-initializes the
+# profile (first layer @deepseek-ai/dsh-base), pnpm-installs this package into
+# the profile, and the CLI's reconcile step appends it to the profile's
+# dsh.profile.bundles because this package.json declares `dsh.bundle.patch`.
+# At boot, app-boot applies every bundle's patch list in bundle order over the
+# empty root; this insert list is what actually mounts the working-activity
+# row — no manual configuration is needed.
+#
+# All row config stays at schema defaults (phrases/publish/tickMs/
+# publishIntervalMs/detailLimit/customActions/narrate). To tune a value (for
+# dsh-cc, set publishIntervalMs to 500), override this row's config by id in
+# the profile's own cordis.patch.yml user layer — do NOT insert a second
+# same-id row.
+- insert:
+    - id: working-activity
+      name: 'dsh-working-activity'