@xmoon76/dsh-pi-tui 0.3.3 → 0.3.4

package/README.md

@@ -338,9 +338,11 @@ the Advanced/Unstable roadmap).
   searchable list (type to filter rows by kind/label/status — `subagent`,
   `bash`, `failed`…). Subagent rows show their mode as part of the label
   (`subagent · <label> · continuable` / `… · one-shot`) — you know before
-  Enter whether the viewer will be interactive. `Enter` opens the detail
-  (child viewer for a subagent, status viewer for a job), `i` interrupts
-  the selected subagent. `/subagents` is an alias.
+  Enter whether the viewer will be interactive — and the durable descendant
+  tree renders as indented rows (`├─` per depth), so a subagent's subagent
+  is visible here without entering its parent. `Enter` opens the detail
+  (child viewer for a subagent — nested rows read-only — status viewer for
+  a job), `i` interrupts the selected subagent. `/subagents` is an alias.
 - `/yolo` — switch to `danger-full-access` (alias of `/permission danger-full-access`).
 - `/status` — show the current session's stats and identity (turn counts,
   token usage, workspace, installed dsh version).
@@ -370,6 +372,23 @@ the Advanced/Unstable roadmap).
   draft, if any) into the running turn at once; otherwise sends the draft
   alone. An idle agent starts a fresh turn with everything.
 - `Alt+↑` — dequeue: pull every queued message back into the editor draft.
+- `Ctrl+O` — expand/collapse the most recent turns' collapsible entries
+  (tool and system cards). The same master switch expands the local
+  `!`/`!!` shell cards (see Local shell below). In Focus Mode (regular
+  surface) it derives a full reveal of the recent Thoughts; the
+  fullscreen Focus secondary cards are mouse-owned and Ctrl+O does not
+  expand them. Thinking detail has its own owner — see `Alt+T`.
+- `Alt+T` — collapse/expand every Thinking block (compact: the latest
+  reasoning line as a preview; full: the whole reasoning body). Thinking
+  blocks are disclosure, never visibility: a block stays present
+  whenever the model produced reasoning and the current projection
+  contains it, in Focus ON/OFF and both surfaces alike. In fullscreen a
+  click toggles a single Thinking card on top of this bulk level, and
+  `Ctrl+O` never touches Thinking detail (it owns only tool/system
+  cards). `/settings` → `Thinking detail` is the same state.
+- `Alt+K` — dismiss the SETTLED local `!`/`!!` shell cards from the live
+  view; a RUNNING card is never dismissed and the process is not
+  cancelled (Esc owns that). See Local shell below.
 - `Ctrl+T` — toggle the full todo list (in fullscreen, clicking the panel
   expands it to the full list and back); the dock above the editor always
   shows the todo summary and background tasks, and queued input renders
@@ -379,20 +398,26 @@ the Advanced/Unstable roadmap).
   fallback otherwise). The literal `@path` is submitted and the model reads
   the file itself. With background work running, an empty editor's `↓` opens
   the same merged task browser as `/tasks`:
-  - **subagent rows** (live children, labeled with their catalog mode:
-    `continuable` or `one-shot`) — `Enter` opens the child's viewer:
-    a **continuable** child's viewer is **interactive** — type a
-    follow-up and press Enter, and it is delivered as the child's NEXT
-    turn through `ctx.subagents.followup` (FIFO — a running child is
-    never interrupted or steered; an inactive child cold-resumes
+  - **subagent rows** (the durable descendant tree, labeled with their
+    catalog mode: `continuable` or `one-shot`, indented by depth with a
+    `├─` connector — a subagent's subagent is visible right here, in
+    stable pre-order) — `Enter` opens the child's viewer:
+    a **direct (depth-1) continuable** child's viewer is **interactive**
+    — type a follow-up and press Enter, and it is delivered as the
+    child's NEXT turn through `ctx.subagents.followup` (FIFO — a running
+    child is never interrupted or steered; an inactive child cold-resumes
     automatically), while `Esc` returns to your session. A **one-shot**
-    child's viewer stays **read-only** (`Esc` returns; the editor shows
-    the read-only placeholder). While a viewer is open the footer
-    switches to the CHILD's own identity (`[subagent · continuable]`
-    badge, label, activity, cwd, the child's own turns/steps/stats) and
-    returns to your session's on exit. `i` interrupts the selected
-    child. They never register job records, so this browser is their
-    only glanceable home.
+    child's viewer stays **read-only**, and so does any **nested
+    (depth > 1)** descendant — even a continuable one (`<mode> · nested ·
+    read-only from this parent`, the real mode always shown): the root
+    may only continue its own direct children. A FINISHED one-shot child stays in the
+    browser — `inactive` is live-store presence, not an outcome — and
+    Enter opens its persisted transcript. While a viewer is open the
+    footer switches to the CHILD's own identity (`[subagent ·
+    continuable]` badge, label, activity, cwd, the child's own
+    turns/steps/stats) and returns to your session's on exit. `i`
+    interrupts the selected child. They never register job records, so
+    this browser is their only glanceable home.
   - **job rows** (bash and one-shot subagent jobs) — `Enter` shows the status
     viewer only: a bash job's output read cursor belongs to the model's
     `job_output`, and a one-shot subagent job record carries no child session
@@ -420,6 +445,20 @@ user message (text, slash command, `Ctrl+S` steer, or `!` shell) starts it
 lazily. `--session <id>` still resumes immediately, and a local `!!` command
 runs without needing a session.
 
+## Local shell (`!` / `!!`)
+
+`! command` runs the command locally and submits the completed command +
+output to the session as an ordinary user message; `!! command` runs purely
+locally — the card is the only record (never sent to the model). The card
+is COLLAPSED by default so a long log cannot fill the TUI: a running card
+shows the newest 5 lines, a settled card at most 20 visual rows (long
+lines wrap and count as several), each with an honest hidden-line marker.
+`Ctrl+O` (the same master switch as the recent-turn fold) expands the card
+to the retained buffer — live while the command still streams; `Alt+K`
+quick-dismisses the SETTLED cards (a running card is never dismissed, the
+process is not cancelled, and an already-submitted `!` context payload is
+untouched).
+
 ## Verified in the P0 spike
 
 - Vendored pi-tui: the fork's own suite passes under `node --test` (run it as

package/README.zh-CN.md

@@ -301,9 +301,10 @@ SDK。原始终端访问、pre-host 输入拦截与完整输入所有权**不属
 - `/tasks` — 合并任务浏览器:后台 job 与子代理在同一个可搜索列表中
   (直接输入过滤行——`subagent`、`bash`、`failed`…)。子代理行把 mode
   写进主标签(`subagent · <label> · continuable` / `… · one-shot`),
-  按下 `Enter` 之前就能知道查看器是否可交互。`Enter` 打开详情
-  (子代理为子查看器,job 为状态查看器),`i` 中断选中的子代理。
-  `/subagents` 是别名。
+  按下 `Enter` 之前就能知道查看器是否可交互;durable 后代树以缩进行
+  渲染(`├─` 按深度缩进),子代理的子代理无需进入父节点就能在这里
+  看到。`Enter` 打开详情(子代理为子查看器——嵌套行只读——job 为
+  状态查看器),`i` 中断选中的子代理。`/subagents` 是别名。
 - `/yolo` — 切换到 `danger-full-access`(`/permission danger-full-access`
   的别名)。
 - `/status` — 显示当前会话的统计与身份信息(回合数、token 用量、
@@ -330,6 +331,21 @@ SDK。原始终端访问、pre-host 输入拦截与完整输入所有权**不属
   送入正在运行的回合;否则只发送草稿。空闲的 agent 会用全部内容开启
   新回合。
 - `Alt+↑` — 出队:把所有排队消息拉回编辑器草稿。
+- `Ctrl+O` — 展开/折叠最近回合的可折叠条目(工具、system 卡片);
+  同一个主开关也展开本地 `!`/`!!` shell 卡片(默认折叠——见下文
+  "本地 shell")。在 Focus 模式(常规表面)下它派生展开最近几个
+  Thought 的完整过程;全屏 Focus 的二级卡片由鼠标控制,Ctrl+O 不会
+  展开它们。Thinking 的 detail 有自己的拥有者——见 `Alt+T`。
+- `Alt+T` — 折叠/展开所有 Thinking 块(折叠:最新一行推理作为
+  preview;展开:完整推理正文)。Thinking 块是 disclosure,不是
+  visibility:只要模型产生过 reasoning 且当前 projection 包含该块,
+  它就始终存在——Focus 开/关、两种表面完全一致。全屏下点击可在该
+  bulk 级别之上单独切换单个 Thinking 卡片;`Ctrl+O` 绝不触碰
+  Thinking detail(它只拥有 tool/system 卡片)。`/settings` 的
+  `Thinking detail` 与它共享同一状态。
+- `Alt+K` — 从实时视图快速清除**已结束**的本地 `!`/`!!` shell 卡片;
+  **运行中**的卡片绝不会被清除,进程也不会被取消(那是 Esc 的职责)。
+  见下文"本地 shell"。
 - `Ctrl+T` — 切换完整待办列表(全屏时点击面板可在完整列表与折叠之间
   切换);编辑器上方的 dock 始终显示待办摘要与后台任务,排队的输入渲染
   在两者之间。
@@ -337,16 +353,22 @@ SDK。原始终端访问、pre-host 输入拦截与完整输入所有权**不属
   (`fd` 在 PATH 上时以其为后端,否则使用内置的递归回退)。字面
   `@path` 会被提交,由模型自行读取文件。有后台工作时,空编辑器的 `↓`
   会打开与 `/tasks` 相同的合并任务浏览器:
-  - **子代理行**(实时子任务,标签携带目录 mode:`continuable` 或
-    `one-shot`)——`Enter` 打开子代理查看器:**continuable** 子代理的
-    查看器是**可交互的**——输入后续消息并回车,它会作为子代理的
-    **下一回合**通过 `ctx.subagents.followup` 投递(FIFO——运行中的
-    子代理不会被中断或 steer;非活跃的子代理会自动冷恢复),`Esc` 返回
-    主会话。**one-shot** 子代理的查看器保持**只读**(`Esc` 返回,编辑器
-    显示只读占位符)。查看器打开期间,页脚切换为**子代理自己的身份**
-    (`[subagent · continuable]` 徽章、标签、activity、cwd 与子代理自己的
-    turns/steps/stats),退出后恢复主会话页脚。`i` 中断选中的子代理。
-    它们从不注册 job 记录,所以此浏览器是它们唯一可一览的归宿。
+  - **子代理行**(durable 后代树,标签携带目录 mode:`continuable` 或
+    `one-shot`,按深度缩进并带 `├─` 连接符——子代理的子代理在这里
+    直接可见,顺序为稳定的 pre-order)——`Enter` 打开子代理查看器:
+    **直接(深度 1)continuable** 子代理的查看器是**可交互的**——输入
+    后续消息并回车,它会作为子代理的**下一回合**通过
+    `ctx.subagents.followup` 投递(FIFO——运行中的子代理不会被中断或
+    steer;非活跃的子代理会自动冷恢复),`Esc` 返回主会话。**one-shot**
+    子代理的查看器保持**只读**,任何**嵌套(深度 > 1)**后代也一样
+    ——即使它是 continuable(`<mode> · nested · read-only from this
+    parent`,始终显示真实 mode):根会话只能继续自己的直接子代理。已结束的 one-shot
+    子代理仍留在浏览器里——`inactive` 只是 live-store 的存在状态,
+    不是结果——Enter 依然能打开其持久化 transcript。查看器打开期间,
+    页脚切换为**子代理自己的身份**(`[subagent · continuable]` 徽章、
+    标签、activity、cwd 与子代理自己的 turns/steps/stats),退出后恢复
+    主会话页脚。`i` 中断选中的子代理。它们从不注册 job 记录,所以此
+    浏览器是它们唯一可一览的归宿。
   - **job 行**(bash 与一次性子代理 job)——`Enter` 只显示状态查看器:
     bash job 的输出读取游标属于模型的 `job_output`,而一次性子代理 job
     记录不带子会话 id,因此子代理 job 的转录需通过 `/tasks` 按标签
@@ -370,6 +392,17 @@ TUI 的启动行新增了 `--preset <id>`——新会话启动时使用的 agent
 斜杠命令、`Ctrl+S` steer 或 `!` shell)才会惰性启动会话。`--session <id>`
 仍然立即恢复会话,本地 `!!` 命令无需会话即可运行。
 
+## 本地 shell(`!` / `!!`)
+
+`! command` 在本地运行命令,并把完成后的命令 + 输出作为普通用户消息
+提交给会话;`!! command` 完全本地运行——卡片是唯一记录(绝不发给模型)。
+卡片**默认折叠**,长日志不会塞满 TUI:运行中的卡片显示最新 5 行,
+已结束的卡片最多显示 20 个视觉行(超长行会换行并按多行计),各自带
+诚实的隐藏行数标记。`Ctrl+O`(与折叠最近工具回合的同一个主开关)把
+卡片展开到 retained buffer——命令仍在跑时实时跟随;`Alt+K` 快速清除
+**已结束**的卡片(运行中的卡片绝不会被清除,进程不会被取消,已经
+提交的 `!` context payload 不受影响)。
+
 ## 在 P0 spike 中验证过的事项
 
 - 内置 pi-tui:fork 自带的套件在 `node --test` 下通过(每次重新

package/dist/builtins.mjs

@@ -1,5 +1,5 @@
 import { TUI_STARTUP_SERVICE } from "./startup.mjs";
-import { H as PI_TUI_EXTENSIONS_SERVICE, L as dshVersion } from "./src-Txng8gIG.mjs";
+import { H as PI_TUI_EXTENSIONS_SERVICE, L as dshVersion } from "./src-B1uP5j0d.mjs";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 //#region src/builtins.ts

package/dist/extensions.mjs

@@ -1,3 +1,3 @@
 import "./startup.mjs";
-import { B as inject, H as PI_TUI_EXTENSIONS_SERVICE, U as API_VERSION, V as name, W as describeKey, z as apply } from "./src-Txng8gIG.mjs";
+import { B as inject, H as PI_TUI_EXTENSIONS_SERVICE, U as API_VERSION, V as name, W as describeKey, z as apply } from "./src-B1uP5j0d.mjs";
 export { API_VERSION, PI_TUI_EXTENSIONS_SERVICE, apply, describeKey, inject, name };

package/dist/index.d.mts

@@ -321,6 +321,9 @@ declare function shouldConsumeAdvertisedMiss(execution: {
 /** The live-agent surface {@link interruptAgent} needs (structural — the
  * TUI never imports the agent runtime for this call). */
 interface InterruptAgentLike {
+  readonly session: {
+    readonly id: string;
+  };
   readonly status: string;
   cancel(cause: {
     kind: 'user';
@@ -328,6 +331,16 @@ interface InterruptAgentLike {
     keepInbox?: boolean;
   }): void;
 }
+/** The writer surface {@link interruptAgent} needs (structural — a LOCAL
+ * type so the public declaration never inlines internal runtime modules;
+ * the runner's SessionWriter satisfies it). */
+interface InterruptWriterLike {
+  cancel(sessionId: string, reason: {
+    kind: 'user';
+  }, options: {
+    keepInbox: boolean;
+  }): void;
+}
 /**
  * Interrupt the live agent (web Stop parity): abort the current
  * turn/tool run while PRESERVING the pending queue. dsh's DEFAULT
@@ -347,7 +360,7 @@ interface InterruptAgentLike {
  * log, which the design explicitly rejects — the parked queue is the
  * agreed web-parity behavior until upstream lands the capability.
  */
-declare function interruptAgent(agent: InterruptAgentLike | undefined): void;
+declare function interruptAgent(agent: InterruptAgentLike | undefined, writer: InterruptWriterLike): void;
 /** One unsettled subagent delegation, in tool/call order. */
 interface PendingSubagentCall {
   readonly callId: string;
@@ -732,4 +745,4 @@ declare function recomposeBlank(ctx: Context, agent: {
  */
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { AgentComposition, CompactionFold, CompactionSettleSurface, Config, HOST_COMMAND_CATALOG, InitialCatalogResolution, InterruptAgentLike, LOCAL_COMMANDS, PendingSubagentCall, QueueFoldResult, QueueInboxMessage, QueueNoticeSource, RecomposableSession, RecomposeOutcome, ResolveInitialCatalogOptions, SESSIONLESS_COMMANDS, SessionLockRefusedError, ViewerOpenToken, apply, busyAfterTurnBoundary, commandRejectsImages, compactingFromLog, composeAgent, createViewerOpenToken, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, interruptAgent, isPlainExitPrompt, isSubagentSettlementNotice, isUserQueueInput, matchPendingSubagentCall, name, normalizeSkillInvocation, recomposeBlank, recordedPreset, registerCredentialSurfaceRefresh, resolveInitialCatalog, resumeCommand, runningProfile, settleCompactionSurface, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure, teardownViewerForSessionSwap, viewerActionCapability };
+export { AgentComposition, CompactionFold, CompactionSettleSurface, Config, HOST_COMMAND_CATALOG, InitialCatalogResolution, InterruptAgentLike, InterruptWriterLike, LOCAL_COMMANDS, PendingSubagentCall, QueueFoldResult, QueueInboxMessage, QueueNoticeSource, RecomposableSession, RecomposeOutcome, ResolveInitialCatalogOptions, SESSIONLESS_COMMANDS, SessionLockRefusedError, ViewerOpenToken, apply, busyAfterTurnBoundary, commandRejectsImages, compactingFromLog, composeAgent, createViewerOpenToken, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, interruptAgent, isPlainExitPrompt, isSubagentSettlementNotice, isUserQueueInput, matchPendingSubagentCall, name, normalizeSkillInvocation, recomposeBlank, recordedPreset, registerCredentialSurfaceRefresh, resolveInitialCatalog, resumeCommand, runningProfile, settleCompactionSurface, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure, teardownViewerForSessionSwap, viewerActionCapability };

package/dist/index.mjs

@@ -1,3 +1,3 @@
 import "./startup.mjs";
-import { A as shouldConsumeAdvertisedMiss, C as recomposeBlank, D as resumeCommand, E as resolveInitialCatalog, F as teardownViewerForSessionSwap, I as viewerActionCapability, M as subagentJobTranscriptId, N as subagentJobViewHint, O as runningProfile, P as subagentNoticeIsFailure, R as forkSeed, S as normalizeSkillInvocation, T as registerCredentialSurfaceRefresh, _ as isPlainExitPrompt, a as SessionLockRefusedError, b as matchPendingSubagentCall, c as commandRejectsImages, d as createViewerOpenToken, f as dangerCommand, g as interruptAgent, h as inject, i as SESSIONLESS_COMMANDS, j as shouldSteerOnEnter, k as settleCompactionSurface, l as compactingFromLog, m as foldQueueRows, n as HOST_COMMAND_CATALOG, o as apply, p as foldCompactionEvent, r as LOCAL_COMMANDS, s as busyAfterTurnBoundary, t as Config, u as composeAgent, v as isSubagentSettlementNotice, w as recordedPreset, x as name, y as isUserQueueInput } from "./src-Txng8gIG.mjs";
+import { A as shouldConsumeAdvertisedMiss, C as recomposeBlank, D as resumeCommand, E as resolveInitialCatalog, F as teardownViewerForSessionSwap, I as viewerActionCapability, M as subagentJobTranscriptId, N as subagentJobViewHint, O as runningProfile, P as subagentNoticeIsFailure, R as forkSeed, S as normalizeSkillInvocation, T as registerCredentialSurfaceRefresh, _ as isPlainExitPrompt, a as SessionLockRefusedError, b as matchPendingSubagentCall, c as commandRejectsImages, d as createViewerOpenToken, f as dangerCommand, g as interruptAgent, h as inject, i as SESSIONLESS_COMMANDS, j as shouldSteerOnEnter, k as settleCompactionSurface, l as compactingFromLog, m as foldQueueRows, n as HOST_COMMAND_CATALOG, o as apply, p as foldCompactionEvent, r as LOCAL_COMMANDS, s as busyAfterTurnBoundary, t as Config, u as composeAgent, v as isSubagentSettlementNotice, w as recordedPreset, x as name, y as isUserQueueInput } from "./src-B1uP5j0d.mjs";
 export { Config, HOST_COMMAND_CATALOG, LOCAL_COMMANDS, SESSIONLESS_COMMANDS, SessionLockRefusedError, apply, busyAfterTurnBoundary, commandRejectsImages, compactingFromLog, composeAgent, createViewerOpenToken, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, interruptAgent, isPlainExitPrompt, isSubagentSettlementNotice, isUserQueueInput, matchPendingSubagentCall, name, normalizeSkillInvocation, recomposeBlank, recordedPreset, registerCredentialSurfaceRefresh, resolveInitialCatalog, resumeCommand, runningProfile, settleCompactionSurface, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure, teardownViewerForSessionSwap, viewerActionCapability };