@xmoon76/dsh-pi-tui 0.2.1 → 0.2.2

package/README.md

@@ -327,19 +327,20 @@ the Advanced/Unstable roadmap).
   read. Enter switches to the selected session.
 - `/search <query>` — full-text search over persisted session logs, then
   switch to a hit.
-- `/title [title]` / `/rename [title]` — with an argument, set the current
-  session's title (pins it against automatic generation; titles appear in
-  the `/sessions` picker); **without an argument, regenerate the title from
-  the conversation — this overwrites the current title, including one you
-  pinned earlier**.
+- `/title [title]` — with an argument, set the current session's title
+  (pins it against automatic generation; titles appear in the `/sessions`
+  picker); **without an argument, regenerate the title from the
+  conversation — this overwrites the current title, including one you
+  pinned earlier** (`/rename` is an alias).
+- `/tasks` — the merged task browser: background jobs AND subagents in one
+  searchable list (type to filter rows by kind/label/status — `subagent`,
+  `bash`, `failed`…). `Enter` opens the detail (child transcript for a
+  subagent, 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`).
-- `/queue` — per-item queue management: edit, delete, steer one, or insert a
-  message into the agent's inbox (the queue pane above the editor shows
-  pending messages; `Ctrl+S` steers them all at once, `Alt+↑` pulls them all
-  back into the editor).
 - `/status` — show the current session's stats and identity (turn counts,
   token usage, workspace, installed dsh version).
-- `/preset`, `/model`, `/settings`, `/export`, `/fork`, `/subagents` — see
+- `/preset`, `/model`, `/settings`, `/export`, `/fork` — see
   `dsh --profile pi-tui`'s command autocomplete (`/` + Tab).
 
 ## Keybindings (selection)
@@ -354,23 +355,30 @@ 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+T` — toggle the full todo list; the dock above the editor always shows
-  the todo summary and background tasks, and queued input renders between
-  them.
+- `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
+  between them.
 - `@` — file/folder mentions in the editor: `@` + Tab completes files from the
   whole workspace (fd-backed when `fd` is on PATH, with a built-in recursive
   fallback otherwise). The literal `@path` is submitted and the model reads
-  the file itself. With background work running, an empty editor's `↓` or
-  `Ctrl+J` opens the task browser over both surfaces:
+  the file itself. With background work running, an empty editor's `↓` opens
+  the same merged task browser as `/tasks`:
   - **subagent rows** (live continuable children) — `Enter` opens the child's
-    transcript read-only (`Esc` returns); they never register jobs records, so
-    this browser is their only glanceable home.
+    transcript read-only (`Esc` returns); `i` interrupts the selected child.
+    They never register jobs 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
-    id, so the transcript is reached via `/subagents` (`s` stops a job).
+    id, so a subagent job's transcript is reached through `/tasks` by picking
+    the child by its label.
   The footer badge shows `[N tasks running · M agents · ↓ view]` while any
-  background work is live.
+  background work is live. The queue pane above the editor shows pending
+  input: user messages as `❯` rows, everything else (job notices, subagent
+  reports, injected instructions) as `⏳` notices that fold into a
+  `+N more` line beyond five — and disappear once the agent has received
+  them.
 
 ## Launch options
 

package/README.zh-CN.md

@@ -292,18 +292,19 @@ SDK。原始终端访问、pre-host 输入拦截与完整输入所有权**不属
   边输入边搜索,行按工作区分组并实时显示 `filtered/total` 计数,标题在
   后台按需加载。回车切换到所选会话。
 - `/search <query>` — 在持久化的会话日志中全文搜索,然后跳转到命中项。
-- `/title [title]` / `/rename [title]` — 带参数时设置当前会话的标题
-  (固定标题,防止自动生成;标题会出现在 `/sessions` 选择器中);
-  **不带参数时根据对话重新生成标题——这会覆盖当前标题,包括你之前
-  固定的标题**。
+- `/title [title]` — 带参数时设置当前会话的标题(固定标题,防止自动
+  生成;标题会出现在 `/sessions` 选择器中);**不带参数时根据对话重新
+  生成标题——这会覆盖当前标题,包括你之前固定的标题**(`/rename` 是
+  别名)。
+- `/tasks` — 合并任务浏览器:后台 job 与子代理在同一个可搜索列表中
+  (直接输入过滤行——`subagent`、`bash`、`failed`…)。`Enter` 打开详情
+  (子代理为子转录,job 为状态查看器),`i` 中断选中的子代理。
+  `/subagents` 是别名。
 - `/yolo` — 切换到 `danger-full-access`(`/permission danger-full-access`
   的别名)。
-- `/queue` — 逐条管理队列:编辑、删除、单条 steer,或向 agent 的 inbox
-  插入消息(编辑器上方的队列窗格显示待处理消息;`Ctrl+S` 一次性全部
-  steer,`Alt+↑` 把全部消息拉回编辑器)。
 - `/status` — 显示当前会话的统计与身份信息(回合数、token 用量、
   工作区、已安装的 dsh 版本)。
-- `/preset`、`/model`、`/settings`、`/export`、`/fork`、`/subagents` —
+- `/preset`、`/model`、`/settings`、`/export`、`/fork` —
   见 `dsh --profile pi-tui` 的命令自动补全(`/` + Tab)。
 
 ## 快捷键(节选)
@@ -317,20 +318,25 @@ SDK。原始终端访问、pre-host 输入拦截与完整输入所有权**不属
   送入正在运行的回合;否则只发送草稿。空闲的 agent 会用全部内容开启
   新回合。
 - `Alt+↑` — 出队:把所有排队消息拉回编辑器草稿。
-- `Ctrl+T` — 切换完整待办列表;编辑器上方的 dock 始终显示待办摘要与
-  后台任务,排队的输入渲染在两者之间。
+- `Ctrl+T` — 切换完整待办列表(全屏时点击面板可在完整列表与折叠之间
+  切换);编辑器上方的 dock 始终显示待办摘要与后台任务,排队的输入渲染
+  在两者之间。
 - `@` — 编辑器中的文件/文件夹提及:`@` + Tab 从整个工作区补全文件
   (`fd` 在 PATH 上时以其为后端,否则使用内置的递归回退)。字面
   `@path` 会被提交,由模型自行读取文件。有后台工作时,空编辑器的 `↓`
-  或 `Ctrl+J` 会打开覆盖两种表面的任务浏览器:
+  会打开与 `/tasks` 相同的合并任务浏览器:
   - **子代理行**(可继续的实时子任务)——`Enter` 以只读方式打开子代理
-    的转录(`Esc` 返回);它们从不注册 job 记录,所以此浏览器是它们唯一
-    可一览的归宿。
+    的转录(`Esc` 返回);`i` 中断选中的子代理。它们从不注册 job 记录,
+    所以此浏览器是它们唯一可一览的归宿。
   - **job 行**(bash 与一次性子代理 job)——`Enter` 只显示状态查看器:
     bash job 的输出读取游标属于模型的 `job_output`,而一次性子代理 job
-    记录不带子会话 id,因此转录需通过 `/subagents` 访问(`s` 停止 job)。
+    记录不带子会话 id,因此子代理 job 的转录需通过 `/tasks` 按标签
+    挑选子代理访问。
   只要有后台工作处于活动状态,页脚徽章就会显示
-  `[N tasks running · M agents · ↓ view]`。
+  `[N tasks running · M agents · ↓ view]`。编辑器上方的队列窗格显示
+  待处理输入:用户消息为 `❯` 行,其余(任务通知、子代理汇报、注入的
+  指令)为 `⏳` 通知行,超过五条折叠为 `+N more`——并在主 agent 接收
+  后消失。
 
 ## 启动选项
 

package/dist/builtins.mjs

@@ -1,5 +1,5 @@
 import { TUI_STARTUP_SERVICE } from "./startup.mjs";
-import { M as PI_TUI_EXTENSIONS_SERVICE } from "./src-C_RdKmcj.mjs";
+import { N as PI_TUI_EXTENSIONS_SERVICE } from "./src-BsSlpFFF.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 { A as inject, M as PI_TUI_EXTENSIONS_SERVICE, N as API_VERSION, P as describeKey, j as name, k as apply } from "./src-C_RdKmcj.mjs";
+import { A as apply, F as describeKey, M as name, N as PI_TUI_EXTENSIONS_SERVICE, P as API_VERSION, j as inject } from "./src-BsSlpFFF.mjs";
 export { API_VERSION, PI_TUI_EXTENSIONS_SERVICE, apply, describeKey, inject, name };

package/dist/index.d.mts

@@ -262,7 +262,22 @@ interface QueueNoticeSource {
   readonly form?: string;
   readonly kind?: string;
   readonly summary?: string;
+  /** The reporting child's session id (subagent-report relays). */
+  readonly senderSessionId?: string;
 }
+/**
+ * Whether an inbox message is USER-ORIGIN input — the queue pane's steerable
+ * `❯` rows. Everything else is injected context, not the user's own queued
+ * input, and must never read as one: plugin notices (background-job
+ * completions), `subagent-report` relays (a child's active report, e.g.
+ * "Background subagent X reported:"), injected skill/agent instructions,
+ * goal messages. The web makes the same cut (`placement: source.kind ===
+ * 'user' ? 'steering' : 'context'`), and this deployment's queue pane has
+ * the same rule: only user-origin rows are steerable. A sourceless row
+ * (undefined) is treated as user input — plain rows never carry a source.
+ * @param source - the message source projection, or undefined for a plain row.
+ */
+declare function isUserQueueInput(source: QueueNoticeSource | undefined): boolean;
 /**
  * Whether a plain submitted draft is the quit word: exactly `exit` (trimmed,
  * lowercase). The runner intercepts this BEFORE any session creation or
@@ -483,4 +498,4 @@ declare function recomposeBlank(ctx: Context, agent: {
  */
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { AgentComposition, CompactionFold, Config, HOST_COMMAND_CATALOG, InitialCatalogResolution, LOCAL_COMMANDS, PendingSubagentCall, QueueFoldResult, QueueInboxMessage, QueueNoticeSource, RecomposableSession, RecomposeOutcome, ResolveInitialCatalogOptions, SESSIONLESS_COMMANDS, SessionLockRefusedError, apply, busyAfterTurnBoundary, compactingFromLog, composeAgent, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, isPlainExitPrompt, isSubagentSettlementNotice, matchPendingSubagentCall, name, recomposeBlank, recordedPreset, resolveInitialCatalog, resumeCommand, runningProfile, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure };
+export { AgentComposition, CompactionFold, Config, HOST_COMMAND_CATALOG, InitialCatalogResolution, LOCAL_COMMANDS, PendingSubagentCall, QueueFoldResult, QueueInboxMessage, QueueNoticeSource, RecomposableSession, RecomposeOutcome, ResolveInitialCatalogOptions, SESSIONLESS_COMMANDS, SessionLockRefusedError, apply, busyAfterTurnBoundary, compactingFromLog, composeAgent, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, isPlainExitPrompt, isSubagentSettlementNotice, isUserQueueInput, matchPendingSubagentCall, name, recomposeBlank, recordedPreset, resolveInitialCatalog, resumeCommand, runningProfile, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure };

package/dist/index.mjs

@@ -1,3 +1,3 @@
 import "./startup.mjs";
-import { C as shouldConsumeAdvertisedMiss, D as subagentNoticeIsFailure, E as subagentJobViewHint, O as forkSeed, S as runningProfile, T as subagentJobTranscriptId, _ as name, a as SessionLockRefusedError, b as resolveInitialCatalog, c as compactingFromLog, d as foldCompactionEvent, f as foldQueueRows, g as matchPendingSubagentCall, h as isSubagentSettlementNotice, i as SESSIONLESS_COMMANDS, l as composeAgent, m as isPlainExitPrompt, n as HOST_COMMAND_CATALOG, o as apply, p as inject, r as LOCAL_COMMANDS, s as busyAfterTurnBoundary, t as Config, u as dangerCommand, v as recomposeBlank, w as shouldSteerOnEnter, x as resumeCommand, y as recordedPreset } from "./src-C_RdKmcj.mjs";
-export { Config, HOST_COMMAND_CATALOG, LOCAL_COMMANDS, SESSIONLESS_COMMANDS, SessionLockRefusedError, apply, busyAfterTurnBoundary, compactingFromLog, composeAgent, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, isPlainExitPrompt, isSubagentSettlementNotice, matchPendingSubagentCall, name, recomposeBlank, recordedPreset, resolveInitialCatalog, resumeCommand, runningProfile, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure };
+import { C as runningProfile, D as subagentJobViewHint, E as subagentJobTranscriptId, O as subagentNoticeIsFailure, S as resumeCommand, T as shouldSteerOnEnter, _ as matchPendingSubagentCall, a as SessionLockRefusedError, b as recordedPreset, c as compactingFromLog, d as foldCompactionEvent, f as foldQueueRows, g as isUserQueueInput, h as isSubagentSettlementNotice, i as SESSIONLESS_COMMANDS, k as forkSeed, l as composeAgent, m as isPlainExitPrompt, n as HOST_COMMAND_CATALOG, o as apply, p as inject, r as LOCAL_COMMANDS, s as busyAfterTurnBoundary, t as Config, u as dangerCommand, v as name, w as shouldConsumeAdvertisedMiss, x as resolveInitialCatalog, y as recomposeBlank } from "./src-BsSlpFFF.mjs";
+export { Config, HOST_COMMAND_CATALOG, LOCAL_COMMANDS, SESSIONLESS_COMMANDS, SessionLockRefusedError, apply, busyAfterTurnBoundary, compactingFromLog, composeAgent, dangerCommand, foldCompactionEvent, foldQueueRows, forkSeed, inject, isPlainExitPrompt, isSubagentSettlementNotice, isUserQueueInput, matchPendingSubagentCall, name, recomposeBlank, recordedPreset, resolveInitialCatalog, resumeCommand, runningProfile, shouldConsumeAdvertisedMiss, shouldSteerOnEnter, subagentJobTranscriptId, subagentJobViewHint, subagentNoticeIsFailure };