dsh-code 0.4.0 → 0.6.0

package/src/render/text.ts

@@ -23,12 +23,9 @@ export function displayText(text: string): string {
   return text.replace(CONTROL_ESCAPE, char => `\\x${char.charCodeAt(0).toString(16).padStart(2, '0')}`)
 }
 
-/** A display-safe suffix bounded by terminal rows and columns. */
-export interface DisplayTail {
-  /** Sanitized suffix suitable for direct terminal rendering. */
-  text: string
-  /** Whether content before the returned suffix was omitted. */
-  truncated: boolean
+/** Collapse external text to one terminal-safe logical row. */
+export function singleLineText(text: string): string {
+  return displayText(text).replace(/\r?\n/gu, ' ↵ ').replace(/\t/gu, '  ')
 }
 
 /** Terminal-cell width matching the TUI's existing CJK-aware wrapping rule. */
@@ -40,6 +37,37 @@ function cellWidth(text: string): number {
   return columns
 }
 
+/**
+ * Truncate one display-safe row without ever exceeding its physical-column
+ * budget. The ellipsis is included inside the budget, matching Codex's popup
+ * truncation contract; the previous app-local helper appended it after the
+ * row was already full and could force an extra terminal wrap.
+ */
+export function truncateColumns(text: string, columns: number): string {
+  const limit = Math.max(0, Math.floor(columns))
+  if (limit === 0) return ''
+  if (cellWidth(text) <= limit) return text
+
+  const contentLimit = limit - 1
+  let used = 0
+  let result = ''
+  for (const char of text) {
+    const width = cellWidth(char)
+    if (used + width > contentLimit) break
+    result += char
+    used += width
+  }
+  return `${result}…`
+}
+
+/** A display-safe suffix bounded by terminal rows and columns. */
+export interface DisplayTail {
+  /** Sanitized suffix suitable for direct terminal rendering. */
+  text: string
+  /** Whether content before the returned suffix was omitted. */
+  truncated: boolean
+}
+
 /** Read one Unicode character immediately before `end`. */
 function previousCharacter(text: string, end: number): { char: string; start: number } {
   const last = text.charCodeAt(end - 1)

package/src/session-directory.ts

@@ -0,0 +1,102 @@
+/** Lightweight session-directory projection for the /resume picker. */
+
+import { basename, resolve } from 'node:path'
+import type { SessionEvent, SessionHeader } from '@deepseek-ai/dsh-session'
+
+export interface SessionRecord {
+  readonly header: SessionHeader
+  readonly live: boolean
+  readonly persisted: boolean
+}
+
+export interface TitleObservationResult {
+  readonly sessionId: string
+  readonly status: 'fulfilled' | 'rejected'
+  readonly value?: { readonly title?: { readonly title?: string; readonly text?: string } }
+}
+
+export interface SessionLogSnapshot {
+  readonly session: SessionHeader
+  readonly events: SessionEvent[]
+}
+
+/** Structural upstream SessionQuery surface used by the TUI. */
+export interface SessionQueryService {
+  listSessions(signal?: AbortSignal): Promise<SessionRecord[]>
+  readTitleSnapshots(ids: readonly string[], signal?: AbortSignal): Promise<TitleObservationResult[]>
+  readSession(id: string, signal?: AbortSignal): Promise<SessionLogSnapshot>
+}
+
+export type SessionScope = 'roots' | 'all'
+export type CwdScope = 'all' | 'current'
+export type SessionSort = 'newest' | 'oldest'
+
+export interface SessionDirectoryOptions {
+  readonly sessions: SessionScope
+  readonly cwd: CwdScope
+  readonly sort: SessionSort
+  readonly currentCwd: string
+  readonly query: string
+}
+
+export interface SessionRow {
+  readonly id: string
+  readonly createdAt: number
+  readonly cwd: string
+  readonly workspace: string
+  readonly parent?: string
+  readonly subagent: boolean
+  readonly resumable: boolean
+  readonly live: boolean
+  readonly persisted: boolean
+  readonly preset: string
+  readonly title?: string
+}
+
+function samePath(left: string | undefined, right: string): boolean {
+  if (left === undefined) return false
+  return resolve(left).toLowerCase() === resolve(right).toLowerCase()
+}
+
+/** Filter/sort header-only records. No session log is loaded here. */
+export function projectSessionRows(records: readonly SessionRecord[], options: SessionDirectoryOptions): SessionRow[] {
+  const needle = options.query.trim().toLowerCase()
+  return records
+    .filter(record => options.sessions === 'all'
+      || (record.header.parentSession === undefined && record.header.origin !== 'subagent'))
+    .filter(record => options.cwd === 'all' || samePath(record.header.cwd, options.currentCwd))
+    .map(record => {
+      const cwd = record.header.cwd ?? ''
+      const subagent = record.header.origin === 'subagent' || record.header.parentSession !== undefined
+      return {
+        id: record.header.id,
+        createdAt: record.header.createdAt,
+        cwd,
+        workspace: cwd === '' ? '(no workspace)' : basename(cwd),
+        parent: record.header.parentSession,
+        subagent,
+        resumable: !subagent,
+        live: record.live,
+        persisted: record.persisted,
+        preset: record.header.agentPreset ?? 'standard',
+      }
+    })
+    .filter(row => needle === '' || `${row.id} ${row.cwd} ${row.workspace} ${row.preset}`.toLowerCase().includes(needle))
+    .sort((left, right) => options.sort === 'newest'
+      ? right.createdAt - left.createdAt
+      : left.createdAt - right.createdAt)
+}
+
+/** Merge page-local title observations without disturbing directory order. */
+export function mergeSessionTitles(
+  rows: readonly SessionRow[],
+  observations: readonly TitleObservationResult[],
+): SessionRow[] {
+  const titles = new Map<string, string>()
+  for (const observation of observations) {
+    if (observation.status !== 'fulfilled') continue
+    const title = observation.value?.title?.title ?? observation.value?.title?.text
+    if (title !== undefined && title.trim() !== '') titles.set(observation.sessionId, title)
+  }
+  return rows.map(row => titles.has(row.id) ? { ...row, title: titles.get(row.id) } : row)
+}

package/src/session-switch.ts

@@ -0,0 +1,58 @@
+/** Latest-wins, idle-bound queue for safe Agent session changes. */
+
+export interface IdleActivity {
+  readonly status: 'idle' | 'running'
+  whenIdle(): Promise<void>
+}
+
+interface Request<T> {
+  readonly activity: IdleActivity
+  readonly value: T
+}
+
+export class SessionSwitchQueue<T> {
+  private pending: Request<T> | undefined
+  private pumping = false
+
+  constructor(
+    private readonly execute: (value: T) => Promise<void>,
+    private readonly failed: (error: unknown) => void,
+  ) {}
+
+  /** Queue a request; a later request replaces any request still waiting. */
+  request(activity: IdleActivity, value: T): 'queued' | 'started' {
+    this.pending = { activity, value }
+    const outcome = activity.status === 'running' || this.pumping ? 'queued' : 'started'
+    if (!this.pumping) void this.pump()
+    return outcome
+  }
+
+  /** Cancel only work that has not begun activation. */
+  cancel(): boolean {
+    if (this.pending === undefined) return false
+    this.pending = undefined
+    return true
+  }
+
+  private async pump(): Promise<void> {
+    this.pumping = true
+    try {
+      while (this.pending !== undefined) {
+        const observed = this.pending
+        await observed.activity.whenIdle()
+        // Another request replaced this one while the turn was converging.
+        if (this.pending !== observed) continue
+        this.pending = undefined
+        try {
+          await this.execute(observed.value)
+        } catch (error: unknown) {
+          this.failed(error)
+        }
+      }
+    } finally {
+      this.pumping = false
+      // A request may land between the loop condition and finally.
+      if (this.pending !== undefined) void this.pump()
+    }
+  }
+}

package/src/skills.ts

@@ -28,6 +28,8 @@ export interface SkillRow {
 export interface SkillsView {
   /** Name-sorted user-invocable rows; empty until the first load lands. */
   readonly rows: readonly SkillRow[]
+  /** Latest catalog-read failure; the help panel exposes it in place. */
+  readonly error?: string
   /** Subscribe to catalog changes; returns the unsubscribe function. */
   subscribe(listener: () => void): () => void
   /** Retarget the agent whose workspace the catalog is read for. */
@@ -63,21 +65,29 @@ export function watchSkills(ctx: Context): SkillsWatch {
   const skills = ctx.get('skills')
   let agent: Agent | undefined
   let rows: readonly SkillRow[] = []
+  let error: string | undefined
   const listeners = new Set<() => void>()
 
   const reload = (): void => {
-    if (skills === undefined || agent === undefined) return
-    skills.list({
-      cwd: agent.session.header.cwd,
-      scope: agent,
-    }).then((summaries: readonly SkillSummary[]) => {
+    const currentAgent = agent
+    if (skills === undefined || currentAgent === undefined) return
+    Promise.resolve().then(() => skills.list({
+      cwd: currentAgent.session.header.cwd,
+      scope: currentAgent,
+    })).then((summaries: readonly SkillSummary[]) => {
       const next = toRows(summaries)
-      if (next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name)) return
+      const unchanged = next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name)
       rows = next
+      const recovered = error !== undefined
+      error = undefined
+      if (unchanged && !recovered) return
       for (const listener of listeners) listener()
-    }, () => {
+    }).catch((cause: unknown) => {
       // Discovery failure keeps the last good rows; the next skills/change
       // notification is the retry surface (mirrors the web directory).
+      rows = [...rows]
+      error = cause instanceof Error ? cause.message : String(cause)
+      for (const listener of listeners) listener()
     })
   }
 
@@ -89,6 +99,9 @@ export function watchSkills(ctx: Context): SkillsWatch {
     get rows(): readonly SkillRow[] {
       return rows
     },
+    get error(): string | undefined {
+      return error
+    },
     subscribe(listener: () => void): () => void {
       listeners.add(listener)
       return () => {

package/src/startup.ts

@@ -1,6 +1,6 @@
 /**
  * The interactive terminal app's command-line provider: parses `--resume`,
- * `--continue`, `--session`, and `--help`, then publishes
+ * `--continue`, `--session`, `--mode`, and `--help`, then publishes
  * {@link TUI_STARTUP_SERVICE} for the runner to consume lazily. Follows the
  * headless bundle's startup shape (a commander action publishing a service
  * through {@link parseCmdline}).
@@ -33,11 +33,37 @@ export const TUI_STARTUP_SERVICE = 'tuiStartup'
 
 /** How the runner obtains its session identity. */
 export type TuiStartup =
-  | { readonly kind: 'fresh' }
-  | { readonly kind: 'named'; readonly sessionId: string }
+  | { readonly kind: 'fresh'; readonly mode?: string }
+  | { readonly kind: 'named'; readonly sessionId: string; readonly mode?: string }
   | { readonly kind: 'resume'; readonly sessionId: string }
   | { readonly kind: 'latest' }
 
+export interface TuiStartupOptions {
+  readonly resume?: string
+  readonly continue?: boolean
+  readonly session?: string
+  readonly mode?: string
+}
+
+/** Pure option policy shared by Commander and tests. */
+export function resolveTuiStartup(options: TuiStartupOptions): TuiStartup {
+  const selected = [options.resume !== undefined, options.continue === true, options.session !== undefined]
+  if (selected.filter(Boolean).length > 1) throw new Error('--resume, --continue, and --session are mutually exclusive')
+  if (options.session === '') throw new Error('--session needs an id')
+  if (options.resume === '') throw new Error('--resume needs a session id or id prefix')
+  if (options.mode === '') throw new Error('--mode needs a preset id')
+  if (options.mode !== undefined && (options.resume !== undefined || options.continue === true)) {
+    throw new Error('--mode applies only to a new session; it cannot be combined with --resume or --continue')
+  }
+  return options.resume !== undefined
+    ? { kind: 'resume', sessionId: options.resume }
+    : options.continue === true
+      ? { kind: 'latest' }
+      : options.session !== undefined
+        ? { kind: 'named', sessionId: options.session, ...options.mode === undefined ? {} : { mode: options.mode } }
+        : { kind: 'fresh', ...options.mode === undefined ? {} : { mode: options.mode } }
+}
+
 /**
  * This app's command: the launcher's flags this app owns, its description,
  * and its help text.
@@ -51,11 +77,13 @@ function tuiCommand(): Command {
     .option('-r, --resume <session>', 'resume the persisted session with this id (or unique id prefix)')
     .option('-c, --continue', 'resume the most recent persisted session for this working directory')
     .option('--session <id>', 'create a new session under this explicit id')
+    .option('--mode <preset>', 'agent preset for a newly created session')
     .addHelpText('after', `
 Examples:
   dsh --profile cli                       fresh session, minted id
   dsh --profile cli --resume abc123       resume session by id prefix
   dsh --profile cli --continue            resume the latest local session
+  dsh --profile cli --mode minimal        fresh session using the minimal preset
 `)
 }
 
@@ -67,24 +95,14 @@ Examples:
 export function apply(ctx: Context): void {
   const program = tuiCommand()
   program.action(() => {
-    const options = program.opts<{ resume?: string; continue?: boolean; session?: string }>()
-    const selected = [options.resume !== undefined, options.continue === true, options.session !== undefined]
-    if (selected.filter(Boolean).length > 1) {
-      program.error('error: --resume, --continue, and --session are mutually exclusive')
-    }
-    if (options.session !== undefined && options.session === '') {
-      program.error('error: --session needs an id')
-    }
-    if (options.resume !== undefined && options.resume === '') {
-      program.error('error: --resume needs a session id or id prefix')
+    const options = program.opts<TuiStartupOptions>()
+    let startup: TuiStartup | undefined
+    try {
+      startup = resolveTuiStartup(options)
+    } catch (error: unknown) {
+      program.error(`error: ${error instanceof Error ? error.message : String(error)}`)
     }
-    const startup: TuiStartup = options.resume !== undefined
-      ? { kind: 'resume', sessionId: options.resume }
-      : options.continue === true
-        ? { kind: 'latest' }
-        : options.session !== undefined
-          ? { kind: 'named', sessionId: options.session }
-          : { kind: 'fresh' }
+    if (startup === undefined) return
     ctx.provide(TUI_STARTUP_SERVICE, { startup } satisfies { startup: TuiStartup })
   })
   parseCmdline(ctx, program)

package/src/whale-glyph.ts

@@ -1,23 +1,23 @@
-// GENERATED by scripts/gen-whale-glyph.ts — do not edit by hand. Rerun the
-// generator after changing the FishLogo path. Half-block rendering of the
-// DeepSeek fish logo (figma I39:24057;88:8943 fillGeometry, exact extract;
-// native 23.16x17.04 → 26 columns × 8 half-block rows).
-// Blank cells are part of the glyph's fixed 26-column grid: pad, never trim.
-
-/** Half-block whale glyph rows; render with the brand color. */
-export const WHALE_GLYPH: readonly string[] = [
-  '    ▄▄▄▄▄▄▄▄█    ▄█▄     ▄',
-  ' ▄▄██████████▄▄  ▀███▄████',
-  '▄███████████████▄  ███▀▀▀ ',
-  '██     ▀▀█████▄▀██████    ',
-  '██▄       ▀████▄▄████     ',
-  ' ██▄        ▀██████▀      ',
-  '  ▀██▄▄  ██▄  ▀███▄▄      ',
-  '     ▀▀███████▀▀ ▀▀▀      ',
-]
-
-/** Fixed glyph width in terminal columns. */
-export const WHALE_GLYPH_COLUMNS = 26
-
-/** Fixed glyph height in half-block rows. */
-export const WHALE_GLYPH_ROWS = 8
+// GENERATED by scripts/gen-whale-glyph.ts — do not edit by hand. Rerun the
+// generator after changing the FishLogo path. Half-block rendering of the
+// DeepSeek fish logo (figma I39:24057;88:8943 fillGeometry, exact extract;
+// native 23.16x17.04 → 26 columns × 8 half-block rows).
+// Blank cells are part of the glyph's fixed 26-column grid: pad, never trim.
+
+/** Half-block whale glyph rows; render with the brand color. */
+export const WHALE_GLYPH: readonly string[] = [
+  '    ▄▄▄▄▄▄▄▄█    ▄█▄     ▄',
+  ' ▄▄██████████▄▄  ▀███▄████',
+  '▄███████████████▄  ███▀▀▀ ',
+  '██     ▀▀█████▄▀██████    ',
+  '██▄       ▀████▄▄████     ',
+  ' ██▄        ▀██████▀      ',
+  '  ▀██▄▄  ██▄  ▀███▄▄      ',
+  '     ▀▀███████▀▀ ▀▀▀      ',
+]
+
+/** Fixed glyph width in terminal columns. */
+export const WHALE_GLYPH_COLUMNS = 26
+
+/** Fixed glyph height in half-block rows. */
+export const WHALE_GLYPH_ROWS = 8

package/README.zh.md

@@ -1,65 +0,0 @@
-# dsh-code
-
-[English](README.md) | 中文
-
-为 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness)(`dsh`)打造的 Claude-Code 式交互终端(TUI)bundle,以树外插件 bundle 的形式组合在官方 `@deepseek-ai/dsh-base` 之上——与官方 Web 界面同一套插件生态,零 fork。
-
-## 功能
-
-- DeepSeek 蓝横幅:鲸鱼字标由官方 FishLogo 精确路径半块栅格化,头部贴内容宽度、紧凑不占满
-- 实时会话流:直接从持久会话日志投影——用户输入、流式助手文本、紧凑工具调用/斜杠命令行(运行/完成/出错标记)、todo 快照
-- **工具审批 y/n 条**:agent 请求许可时(sandbox 升级、hook 的 ask 决策),琥珀色审批条显示原因与配对命令行;`y` 允许一次、`n` 拒绝
-- **`/model` 面板**:列出 `llm` 注册表的全部 provider 路由,为下一步切换会话模型;恢复的会话自动还原其上次的模型
-- **会话恢复**:`--resume <id|前缀>` 续接持久会话,`--continue` 取当前目录最新一个;完整转录从日志重放,续写同一持久会话
-- **斜杠命令透传**:共享 `ctx.commands` 注册表(Web 作曲栏同一分发面)里的命令都可在终端执行,`/` 弹出补全菜单;用户可调用技能也进同一菜单(标注 `skill`),未知 `/name` 回退为普通提示词、由 host 的技能注入接管
-- **todo 面板**:实时 todo 列表内联渲染,含 done/active/pending 计数与三态标记,每个新 turn 清空(对齐 Web TodoPanel)
-- **思考行**:模型推理以 Claude Code 式 `✻` 折叠呈现——默认收起为 dim 标记 + 字符数,展开为 dim 斜体,模型思考时流式显示;Ctrl+R 全局切换
-- **终端 markdown**:助手回复经纯 GFM 子集渲染器(标题/围栏与行内代码/强调/列表/引用/链接)按终端宽度排版;流式阶段保持纯文本直到消息落定
-- **Ctrl+O 历史检查器**:逐条浏览保留的完整转录,同时保留输入框与状态栏;←/→ 切换条目,↑/↓ 与 PageUp/PageDown 滚动全部内容,`g`/`G` 跳到两端
-- **结构化工具详情**:持久化的 edit/write diff、带行号 read 窗口、web 搜索来源、fetch 摘要与有界原始输出在普通转录中保持紧凑,并可在 Ctrl+O 中展开查看完整展示
-- **ask_user_question 问答条**:模型提问呈现为选项菜单(↑/↓ 移动、space 多选、`c` 自定义答案、Esc 中断);计划评审(exit_plan_mode)走同一条并高亮 approve 选项
-- **@ 补全**:`@` 触发工作区文件与持久会话补全;会话引用展开为有界只读快照,以带来源的上下文注入到提示词之前
-- **plan 与权限**:状态栏 `⧉ plan` 与 `⛨ <preset>` 徽章;`/permission <name>` 切换会话预设,Shift+Tab 循环切换(registry 自带的 `/plan` 命令启用 plan 模式)
-- **终端本地工作流**:`/help` 打开完整按键/命令/技能说明,`/export` 将折叠转录写为 Markdown,`/title` 固定会话标题,Ctrl+K 删除到行尾,Ctrl+L 重绘终端,裸工作区路径参与 Tab 补全
-- 输入组件:历史(↑/↓)、光标编辑(←/→、Ctrl+A/E/U)、斜杠命令/技能/@ 补全 Tab 补全;运行中提交即 steering(下一个 step 边界消费),`Esc` 或 Ctrl+C 中断本轮,Ctrl+C 在空闲空输入时退出,Ctrl+D 运行中拒绝退出
-- 融合型状态栏:Claude Code 式身份信息(模型、工作目录、git 分支、标题/会话、plan、权限预设、goal 与 sandbox 覆盖)+ Web 作曲栏指标(轮数/步数、llm 与 tool 累计时长、TTFT、解码 tok/s、上下文占用、缓存命中、token 总量)
-- 有界动态渲染:流式输出、Ctrl+O、`/help`、`/model`、审批与问题/计划评审面板均受终端视口约束;输入框始终位于状态栏正上方,连续缩放只在最终宽度执行一次防抖重排
-
-## 安装
-
-需要 Node `^22.19 || >=24` 与 `dsh` CLI(`npm i -g @deepseek-ai/dsh@next`)。
-
-```sh
-dsh plugin --profile cli add dsh-code       # npm 发布后
-dsh plugin --profile cli add github:unlinearity/dsh-code  # 跟踪本仓库
-dsh plugin --profile cli add file:C:/path/to/dsh-code     # 本地目录
-```
-
-然后:
-
-```sh
-dsh --profile cli                    # 全新会话
-dsh --profile cli --continue         # 恢复本目录最新的会话
-dsh --profile cli --resume abc123    # 按会话 id 或唯一前缀恢复
-dsh --profile cli --session my-id    # 以显式 id 建新会话
-```
-
-在环境变量(或启动目录 / `$DSH_HOME` 的 `.env`)里设置 `DEEPSEEK_API_KEY`。
-
-git 安装会在安装期执行构建脚本,pnpm 会先行拦截:若 `add` 失败,按提示把对应键加入 `~/.dsh/profiles/cli/pnpm-workspace.yaml` 的 `allowBuilds` 后重试。
-
-## 开发
-
-```sh
-pnpm install
-pnpm test         # vitest 单元测试
-pnpm typecheck
-pnpm build        # tsdown 打包 lib/*.mjs,tsc 产出 lib/types
-pnpm run gen:whale   # 从 vendor 的官方路径重新生成 src/whale-glyph.ts
-```
-
-鲸鱼点阵由 `scripts/fish-logo.ts` 中 vendor 的 DeepSeek 鱼形 Logo 路径生成(来源:[deepseek-harness](https://github.com/deepseek-ai/deepseek-harness),MIT)。
-
-## 许可
-
-[MIT](LICENSE)。vendor 的鱼形 Logo 几何数据来自 DeepSeek Harness(MIT)。