@toddzheng024/dscode-bundle 0.7.11 → 0.7.13

package/THIRD_PARTY_NOTICES.md

@@ -13,9 +13,6 @@ Local changes: DSCODE effort, shell control, TUI commands and footer.
 @deepseek-ai/dsh-subagent-fork-in-process@0.1.5-rc.2: MIT; {"type":"git","url":"git+https://github.com/deepseek-ai/deepseek-harness.git","directory":"packages/subagent/subagent-fork-in-process"}
 Local changes: DSCODE effort, shell control, TUI commands and footer.
 
-dsh-code@1.2.0: MIT; {"type":"git","url":"git+https://github.com/unlinearity/dsh-code.git"}
-Local changes: DSCODE effort, shell control, TUI commands and footer.
-
 @deepseek-ai/dsh-llm-deepseek@0.1.5-rc.2: MIT; {"type":"git","url":"git+https://github.com/deepseek-ai/deepseek-harness.git","directory":"packages/llm/llm-deepseek"}
 Local changes: DSCODE effort, shell control, TUI commands and footer.
 
@@ -30,3 +27,6 @@ Local changes: DSCODE effort, shell control, TUI commands and footer.
 
 @deepseek-ai/dsh-compaction-basic@0.1.5-rc.2: MIT; {"type":"git","url":"git+https://github.com/deepseek-ai/deepseek-harness.git","directory":"packages/compaction/compaction-basic"}
 Local changes: DSCODE effort, shell control, TUI commands and footer.
+
+dsh-code (DSCODE vendored terminal, forked from dsh-code@1.2.0): MIT; https://github.com/unlinearity/dsh-code
+Local changes: DSCODE UI (welcome header, activity line, footer telemetry, effort bar), commands, panels and paste handling.

package/cordis.patch.yml

@@ -652,7 +652,7 @@
     # base row above: same SQLite FTS5 service, observation loop patched to
     # skip unreadable sources instead of failing every search.
     - id: session-query-skip
-      name: 'dsh-code/session-query'
+      name: '@toddzheng024/dscode-bundle/session-query'
       config:
         path: ':memory:'
         openAt: first-search

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.11",
+  "version": "0.7.13",
   "type": "module",
   "license": "MIT",
   "author": "Todd Zheng",
@@ -41,8 +41,10 @@
     "./subagent-spawn": "./vendor/subagent-spawn/index.js",
     "./subagent-fork": "./vendor/subagent-fork/index.js",
     "./bootstrap": "./bootstrap.mjs",
-    "./tui": "./vendor/tui/index.mjs",
-    "./startup": "./vendor/tui/startup.mjs",
+    "./tui": "./vendor/tui/lib/index.mjs",
+    "./startup": "./vendor/tui/lib/startup.mjs",
+    "./session-query": "./vendor/tui/lib/session-query.mjs",
+    "./invariant": "./vendor/tui/lib/invariant.mjs",
     "./deepseek": "./vendor/deepseek/index.js",
     "./bash": "./vendor/bash/index.js",
     "./persistent": "./vendor/persistent/index.js",
@@ -301,7 +303,6 @@
     "@deepseek-ai/schemastery": "3.18.2",
     "@anionex/dsh-computer-use": "0.3.2",
     "chrome-devtools-mcp": "1.9.0",
-    "dsh-code": "1.2.0",
     "imapflow": "2.0.2",
     "mailparser": "3.9.26",
     "nodemailer": "10.0.9",

package/plugins/i18n/messages.mjs

@@ -40,7 +40,7 @@ export const MESSAGES = {
     'language.set': 'language → {name}', 'language.title': '/language — interface language', 'language.currentMark': 'current', 'language.unknown': 'Unknown language "{value}". Choose en, zh-CN, zh-TW, ja, ko or es.',
     'language.saveFailed': 'language save failed: {error}',
     'doctor.logs.new': 'Only warnings/errors since this TUI version started are recorded.',
-    'footer.current': 'current', 'footer.average': 'average', 'footer.context': 'context', 'footer.cache': 'cache hit', 'composer.placeholder': 'type a message',
+    'footer.current': 'current', 'footer.average': 'average', 'footer.context': 'context', 'footer.cache': 'cache hit', 'composer.placeholder': 'type a message', 'composer.shellMode': '! shell mode · esc exits',
     'compaction.running': 'Compacting context, please wait', 'compaction.confirm.title': 'Switching to {model} will compact the conversation',
     'compaction.confirm.usage': 'context {used} ≥ compaction threshold {threshold} ({window} × {ratio})', 'compaction.confirm.next': 'the next step compacts older history first',
     'compaction.confirm.overflow': 'it already exceeds the {window} window: the next request compacts and retries', 'compaction.confirm.hint': 'y switch · n/esc back',
@@ -68,7 +68,7 @@ export const MESSAGES = {
     'language.set': '语言 → {name}', 'language.title': '/language — 界面语言', 'language.currentMark': '当前', 'language.unknown': '未知语言 "{value}"。可选 en、zh-CN、zh-TW、ja、ko、es。',
     'language.saveFailed': '语言设置保存失败：{error}',
     'doctor.logs.new': '仅记录新版 TUI 启动后的 warning/error。',
-    'footer.current': '当前', 'footer.average': '平均', 'footer.context': '上下文', 'footer.cache': '缓存命中', 'composer.placeholder': '输入消息',
+    'footer.current': '当前', 'footer.average': '平均', 'footer.context': '上下文', 'footer.cache': '缓存命中', 'composer.placeholder': '输入消息', 'composer.shellMode': '! shell 模式 · esc 退出',
     'compaction.running': '正在压缩上下文，请稍后', 'compaction.confirm.title': '切换到 {model} 会触发自动压缩',
     'compaction.confirm.usage': '当前上下文 {used} ≥ 压缩阈值 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '下一步开始前会先压缩较早的对话',
     'compaction.confirm.overflow': '已超出新模型的 {window} 上下文窗口：下一次请求会先压缩再重试', 'compaction.confirm.hint': 'y 确认切换 · n/esc 返回',
@@ -96,7 +96,7 @@ export const MESSAGES = {
     'language.set': '語言 → {name}', 'language.title': '/language — 介面語言', 'language.currentMark': '目前', 'language.unknown': '未知語言 "{value}"。可選 en、zh-CN、zh-TW、ja、ko、es。',
     'language.saveFailed': '語言設定儲存失敗：{error}',
     'doctor.logs.new': '僅記錄新版 TUI 啟動後的 warning/error。',
-    'footer.current': '目前', 'footer.average': '平均', 'footer.context': '上下文', 'footer.cache': '快取命中', 'composer.placeholder': '輸入訊息',
+    'footer.current': '目前', 'footer.average': '平均', 'footer.context': '上下文', 'footer.cache': '快取命中', 'composer.placeholder': '輸入訊息', 'composer.shellMode': '! shell 模式 · esc 離開',
     'compaction.running': '正在壓縮上下文，請稍候', 'compaction.confirm.title': '切換到 {model} 會觸發自動壓縮',
     'compaction.confirm.usage': '目前上下文 {used} ≥ 壓縮閾值 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '下一步開始前會先壓縮較早的對話',
     'compaction.confirm.overflow': '已超出新模型的 {window} 上下文視窗：下一次請求會先壓縮再重試', 'compaction.confirm.hint': 'y 確認切換 · n/esc 返回',
@@ -124,7 +124,7 @@ export const MESSAGES = {
     'language.set': '言語 → {name}', 'language.title': '/language — 表示言語', 'language.currentMark': '現在', 'language.unknown': '不明な言語 "{value}"。en、zh-CN、zh-TW、ja、ko、es から選んでください。',
     'language.saveFailed': '言語設定の保存に失敗しました：{error}',
     'doctor.logs.new': 'この TUI バージョンの起動以降の warning/error のみ記録されています。',
-    'footer.current': '現在', 'footer.average': '平均', 'footer.context': 'コンテキスト', 'footer.cache': 'キャッシュヒット', 'composer.placeholder': 'メッセージを入力',
+    'footer.current': '現在', 'footer.average': '平均', 'footer.context': 'コンテキスト', 'footer.cache': 'キャッシュヒット', 'composer.placeholder': 'メッセージを入力', 'composer.shellMode': '! shell モード · esc で終了',
     'compaction.running': 'コンテキストを圧縮しています。しばらくお待ちください', 'compaction.confirm.title': '{model} に切り替えると自動圧縮が実行されます',
     'compaction.confirm.usage': '現在のコンテキスト {used} ≥ 圧縮しきい値 {threshold}（{window} × {ratio}）', 'compaction.confirm.next': '次のステップの前に古い履歴を圧縮します',
     'compaction.confirm.overflow': '新しいモデルの {window} ウィンドウを超えています。次のリクエストで圧縮して再試行します', 'compaction.confirm.hint': 'y 切り替え · n/esc 戻る',
@@ -152,7 +152,7 @@ export const MESSAGES = {
     'language.set': '언어 → {name}', 'language.title': '/language — 인터페이스 언어', 'language.currentMark': '현재', 'language.unknown': '알 수 없는 언어 "{value}". en, zh-CN, zh-TW, ja, ko, es 중에서 선택하세요.',
     'language.saveFailed': '언어 설정 저장 실패: {error}',
     'doctor.logs.new': '이 TUI 버전 시작 이후의 warning/error만 기록됩니다.',
-    'footer.current': '현재', 'footer.average': '평균', 'footer.context': '컨텍스트', 'footer.cache': '캐시 적중', 'composer.placeholder': '메시지를 입력하세요',
+    'footer.current': '현재', 'footer.average': '평균', 'footer.context': '컨텍스트', 'footer.cache': '캐시 적중', 'composer.placeholder': '메시지를 입력하세요', 'composer.shellMode': '! shell 모드 · esc 종료',
     'compaction.running': '컨텍스트를 압축하는 중입니다. 잠시만 기다려 주세요', 'compaction.confirm.title': '{model}(으)로 전환하면 자동 압축이 실행됩니다',
     'compaction.confirm.usage': '현재 컨텍스트 {used} ≥ 압축 임계값 {threshold} ({window} × {ratio})', 'compaction.confirm.next': '다음 단계 전에 이전 대화를 먼저 압축합니다',
     'compaction.confirm.overflow': '새 모델의 {window} 창을 이미 넘었습니다. 다음 요청에서 압축한 뒤 재시도합니다', 'compaction.confirm.hint': 'y 전환 · n/esc 뒤로',
@@ -180,7 +180,7 @@ export const MESSAGES = {
     'language.set': 'idioma → {name}', 'language.title': '/language — idioma de la interfaz', 'language.currentMark': 'actual', 'language.unknown': 'Idioma desconocido "{value}". Elige en, zh-CN, zh-TW, ja, ko o es.',
     'language.saveFailed': 'no se pudo guardar el idioma: {error}',
     'doctor.logs.new': 'Solo se registran los warnings/errores desde que arrancó esta versión del TUI.',
-    'footer.current': 'actual', 'footer.average': 'promedio', 'footer.context': 'contexto', 'footer.cache': 'éxitos de caché', 'composer.placeholder': 'escribe un mensaje',
+    'footer.current': 'actual', 'footer.average': 'promedio', 'footer.context': 'contexto', 'footer.cache': 'éxitos de caché', 'composer.placeholder': 'escribe un mensaje', 'composer.shellMode': '! modo shell · esc sale',
     'compaction.running': 'Compactando el contexto, espera un momento', 'compaction.confirm.title': 'Cambiar a {model} compactará la conversación',
     'compaction.confirm.usage': 'contexto {used} ≥ umbral de compactación {threshold} ({window} × {ratio})', 'compaction.confirm.next': 'el siguiente paso compacta antes el historial antiguo',
     'compaction.confirm.overflow': 'ya supera la ventana de {window}: la siguiente petición compacta y reintenta', 'compaction.confirm.hint': 'y cambiar · n/esc volver',

package/plugins/session-metrics/view.mjs

@@ -34,17 +34,28 @@ export function summarize(rows, events = [], corrupt = false) {
     if (!Number.isFinite(row.cost)) unknown = true;
     else cost += row.cost;
     const u = row.usage;
-    if (!u || !Number.isFinite(u.inputTokens) || !Number.isFinite(u.outputTokens)) { cacheUnknown = true; continue; }
+    // An auxiliary call (memory, review, an aborted stream) can end without a usage chunk: that
+    // call is unaccounted, not a cache miss, so it must not blank the whole session's ratio.
+    if (!u) continue;
+    if (!Number.isFinite(u.inputTokens) || !Number.isFinite(u.outputTokens)) { cacheUnknown = true; continue; }
     const total = u.inputTokens + (u.cacheReadTokens ?? 0) + (u.cacheWriteTokens ?? 0);
     // OpenRouter reports cache reads only when there are some: a missing count is zero, not unknown.
     input += total; hit += u.cacheReadTokens ?? 0;
   }
   return { cost, unknown, calls, pending, cache: input > 0 && !cacheUnknown ? Math.min(100, hit / input * 100) : null };
 }
-/** Terminal columns of a string: East Asian wide characters (such as the cache label's CJK glyphs) take two. */
+/**
+ * Terminal columns of a string: East Asian wide characters (such as the cache label's
+ * CJK glyphs) take two, and zero-width marks take none. The variation selectors matter
+ * here: `❄️` is U+2744 plus U+FE0F, and counting that selector as a column made the
+ * footer's provider budget swing with the DeepSeek pricing window.
+ */
+const WIDE = /[\u1100-\u115f\u2e80-\ua4cf\uac00-\ud7a3\uf900-\ufaff\ufe30-\ufe4f\uff00-\uff60\uffe0-\uffe6\u2600-\u27bf\u{1f300}-\u{1faff}]/u;
+// eslint-disable-next-line no-misleading-character-class -- these are zero width by design
+const ZERO_WIDTH = /[\u0300-\u036f\u200d\ufe00-\ufe0f]/;
 export function displayWidth(text) {
   let width = 0;
-  for (const char of text) width += /[\u1100-\u115f\u2e80-\ua4cf\uac00-\ud7a3\uf900-\ufaff\ufe30-\ufe4f\uff00-\uff60\uffe0-\uffe6\u2600-\u27bf\u{1f300}-\u{1faff}]/u.test(char) ? 2 : 1;
+  for (const char of text) width += ZERO_WIDTH.test(char) ? 0 : WIDE.test(char) ? 2 : 1;
   return width;
 }
 export function formatFooter(metrics, context, columns = 80, rates, locale = 'en', header = '', provider = providerOfHeader(header) ?? 'deepseek-official') {
@@ -60,10 +71,10 @@ export function formatFooter(metrics, context, columns = 80, rates, locale = 'en
     `${label('footer.average')}: ${Number.isFinite(rates.average) ? rates.average.toFixed(1) : '--'} tps`,
     `${label('footer.context')}: ${ctx}`, dollars, `${label('footer.cache')}: ${cache}`,
   ] : [`${label('footer.context')}: ${ctx}`, dollars, `${label('footer.cache')}: ${cache}`];
-  // Narrow terminals shed the quietest figures first: average, cache hit, current. The
+  // Narrow terminals shed the quietest figures first: average, current, context. The
   // model header then falls back to its bare `model @ effort` form, then context goes,
   // and only then the header itself — the running cost is the last thing standing.
-  const drops = rates ? [1, 4, 0, 2] : [2, 0];
+  const drops = rates ? [1, 0, 2, 4] : [0, 2];
   const offset = header === '' ? 0 : 1;
   const parts = header === '' ? base : [header, ...base];
   const short = header.replace(/^[^:]+: /, '');

package/plugins/tui-tools/index.mjs

@@ -4,6 +4,7 @@ import { readLanguage, t } from '../i18n/messages.mjs';
 import { readFile, readdir, access } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
 import { parse } from 'yaml';
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { standingMountFor } from '@deepseek-ai/dsh-agent-presets';
 import { hookEvents, validateHooks } from './hooks.mjs';
 import { redact } from '../auto-review/policy.mjs';
@@ -83,7 +84,19 @@ export function apply(ctx) {
     try { const result = await handler(inv); return { ...result, text: redact(result.text ?? '') }; }
     catch (e) { return fail(redact(`${name}: ${e.message}`)); }
   }});
-  register('shell-exec', 'Run a user shell command (also !command)', ({ rawInput, agent, signal }) => runShell(rawInput, { cwd: agent.session.header.cwd ?? process.cwd(), signal }));
+  register('shell-exec', 'Run a user shell command (also !command)', async ({ rawInput, agent, signal }) => {
+    const result = await runShell(rawInput, { cwd: agent.session.header.cwd ?? process.cwd(), signal });
+    // What the user ran belongs to the conversation: the command and its (redacted) output
+    // are handed to the agent, which then gets a turn to react to them.
+    const handover = redact(`[shell] $ ${rawInput.trim()}\n${result.text}`).slice(0, 8000);
+    try {
+      agent.followup(createUserMessage({ content: [{ type: 'text', text: handover }], source: { kind: 'plugin', plugin: 'dscode-shell-exec' } }));
+      await ctx.get('sessions')?.flush?.(agent.session);
+    } catch (error) {
+      return fail(`shell: the command ran, but its output could not reach the agent (${error.message})`);
+    }
+    return { ...result, text: `${result.text}\n\n[output handed to the agent]` };
+  });
   register('status', 'Session, model, permissions, usage and plugin health', ({ agent }) => {
     const session = agent.session;
     const route = session.requestHeader()?.config ?? agent.options;