lark-remote 0.5.6 → 0.5.7

package/dist/platform/spawn.js

@@ -10,7 +10,7 @@
  *   必须经它合并（先按不区分大小写删旧键再设新值）；
  * - isWindowsCommandNotFoundLine：win32 经 cmd 垫片启动失败不是 spawn 的
  *   error 事件 ENOENT，而是子进程往 stderr 打
- *   "'xxx' is not recognized as an internal or external command"（§4.4）。
+ *   "'xxx' is not recognized as an internal or external command"（见本文件 command-not-found 嗅探）。
  */
 import crossSpawn from 'cross-spawn';
 import { currentPlatform, isWin32 } from './select.js';
@@ -68,7 +68,7 @@ export function useDetachedProcessGroup(platform = currentPlatform) {
     return !isWin32(platform);
 }
 /**
- * win32 command-not-found 行嗅探（§4.4）：命中即视为「命令缺失」失败而非
+ * win32 command-not-found 行嗅探：命中即视为「命令缺失」失败而非
  * 普通非零退出。platform 注入使其在任意宿主可测。
  */
 export function isWindowsCommandNotFoundLine(line, platform = currentPlatform) {

package/dist/platform/types.d.ts

@@ -2,7 +2,7 @@
  * 平台 seam 纯类型。
  */
 /**
- * spawn 发现规格 —— resolveExecutable 的产出（v2 §4.3，仅探测/诊断用）。
+ * spawn 发现规格 —— resolveExecutable 的产出（仅探测/诊断用）。
  * v2 收窄：.cmd 垫片命中即报告垫片路径本身，不再解析内容定位入口；
  * 执行统一走 platform/spawn.ts 的 cross-spawn 包装。
  */

package/dist/router/card-helpers.d.ts

@@ -10,22 +10,6 @@ import { markdownDiv } from '../card/collapsible.js';
 import type { AgentSessionContentEvent } from '../runner/index.js';
 import { formatUsageStats } from './usage-format.js';
 type SessionUsageLike = Parameters<typeof formatUsageStats>[0];
-/**
- * Build a collapsible panel for a single session content event.
- *
- * Header carries a type emoji (👤 user / 🤖 assistant·text / 💭 thinking /
- * 🔧 tool_use / 🟢🔴 tool_result) with optional timestamp.
- * Body: the event's content (markdown).
- *
- * The last `tailExpandedCount` events are expanded by default so the user
- * sees the most recent context without clicking; older events are collapsed.
- *
- * @param ev - Session content event
- * @param index - Index in the events array
- * @param totalEvents - Total number of events
- * @param tailExpandedCount - How many events from the end to keep expanded (default 2)
- * @param agentKind - Agent type for display name (e.g. 'claude', 'pi'). Defaults to 'claude'.
- */
 export declare function sessionEventPanel(ev: AgentSessionContentEvent, index: number, totalEvents: number, tailExpandedCount?: number, agentKind?: string): object;
 export { markdownDiv };
 /** 页码输入非法时的统一提示文案（/ls /ws /resume /active /order 共用）。 */
@@ -115,6 +99,19 @@ export declare function searchBar(opts: {
     currentQuery?: string;
     extra?: Record<string, unknown>;
 }): object;
+/**
+ * 选出 resume/历史卡该展示的事件。
+ *
+ * 旧口径是 `events.slice(-max)`：按**原始事件条数**截尾。工具往返（bash 调用 →
+ * job 登记 → 结果）一段就能把窗口占满，于是重返会话的用户真正需要的两条信息
+ * ——最后一句我说了什么、最后一句它答了什么——被挤出窗口。2026-10-19 实测：
+ * 自动恢复卡 5 个面板全是 bash 调用，一条用户消息、一条 assistant 正文都没有。
+ *
+ * 契约：先取最新 `max` 条，再把最后一条 `user` 与最后一条 `assistant`（正文）
+ * 不在窗口内时补进来——补位时淘汰最早的**非锚点**事件。输出保持时间顺序，
+ * 长度不超过 `max`。
+ */
+export declare function pickResumeCardEvents(events: AgentSessionContentEvent[], max: number): AgentSessionContentEvent[];
 /**
  * Build a session-history resume card (shared by auto-restore, /resume <id>,
  * config-switch resume, and run-completion notification).
@@ -145,6 +142,11 @@ export declare function buildSessionHistoryCard(state: {
     emptyPlaceholder?: string;
     /** Hidden earlier-events count (auto-restore only). */
     hiddenCount?: number;
+    /**
+     * 该会话此刻仍有在途 turn（仅 DSH 的 `isSessionActive` 是服务端 running
+     * 事实）。为 true 时卡上显式提示"这是历史快照、实时输出不会落在这张卡上"。
+     */
+    stillRunning?: boolean;
     /** Action buttons to render (already built, protocol-specific). */
     actions?: object[];
     /** Optional card header template (e.g. 'green' for completion cards). */

package/dist/router/card-helpers.js

@@ -8,7 +8,8 @@
  */
 import { agentDisplayName } from '../card/card-shared.js';
 import { collapsibleMarkdownPanel, markdownDiv } from '../card/collapsible.js';
-import { formatTimestamp } from '../card/time.js';
+import { formatMonthDayClock } from '../card/time.js';
+import { displayWidth, truncateMiddleToDisplayWidth } from '../common/text-width.js';
 import { formatUsageStats } from './usage-format.js';
 /**
  * Build a collapsible panel for a single session content event.
@@ -26,10 +27,21 @@ import { formatUsageStats } from './usage-format.js';
  * @param tailExpandedCount - How many events from the end to keep expanded (default 2)
  * @param agentKind - Agent type for display name (e.g. 'claude', 'pi'). Defaults to 'claude'.
  */
+/**
+ * resume / 历史卡片的事件面板标题宽度上限（半角单位）。
+ *
+ * 与 run 卡的工具面板同口径：手机上一行约 42 个半角宽，标题超了会折行。
+ */
+const SESSION_PANEL_TITLE_MAX = 42;
 export function sessionEventPanel(ev, index, totalEvents, tailExpandedCount = 2, agentKind = 'claude') {
-    const label = eventLabel(ev, agentKind);
-    const ts = formatTimestamp(ev.timestamp);
-    const title = ts ? `${label} (${ts})` : label;
+    // reader 可以给事件一个"标题即摘要"的名字（工具调用：`🔧 bash — npm test`）；
+    // 缺省用类型标签。标题连同时间戳一起收进一行显示宽度——手机上折叠面板只有
+    // 一行可用（2026-10-19 工具标题被长 URL 撑成两行那次）。
+    const label = ev.title ?? eventLabel(ev, agentKind);
+    const ts = formatMonthDayClock(ev.timestamp);
+    const suffix = ts ? ` (${ts})` : '';
+    const labelMax = Math.max(8, SESSION_PANEL_TITLE_MAX - displayWidth(suffix));
+    const title = `${truncateMiddleToDisplayWidth(label, labelMax)}${suffix}`;
     const expanded = index >= totalEvents - tailExpandedCount;
     return collapsibleMarkdownPanel({
         title,
@@ -269,6 +281,50 @@ export function searchBar(opts) {
     }
     return { tag: 'column_set', columns };
 }
+/**
+ * 选出 resume/历史卡该展示的事件。
+ *
+ * 旧口径是 `events.slice(-max)`：按**原始事件条数**截尾。工具往返（bash 调用 →
+ * job 登记 → 结果）一段就能把窗口占满，于是重返会话的用户真正需要的两条信息
+ * ——最后一句我说了什么、最后一句它答了什么——被挤出窗口。2026-10-19 实测：
+ * 自动恢复卡 5 个面板全是 bash 调用，一条用户消息、一条 assistant 正文都没有。
+ *
+ * 契约：先取最新 `max` 条，再把最后一条 `user` 与最后一条 `assistant`（正文）
+ * 不在窗口内时补进来——补位时淘汰最早的**非锚点**事件。输出保持时间顺序，
+ * 长度不超过 `max`。
+ */
+export function pickResumeCardEvents(events, max) {
+    if (max <= 0)
+        return [];
+    if (events.length <= max)
+        return events.slice();
+    const picked = new Set();
+    for (let i = events.length - 1; i >= 0 && picked.size < max; i -= 1)
+        picked.add(i);
+    const lastIndexOf = (predicate) => {
+        for (let i = events.length - 1; i >= 0; i -= 1) {
+            const ev = events[i];
+            if (ev && predicate(ev))
+                return i;
+        }
+        return -1;
+    };
+    const anchors = [
+        lastIndexOf((ev) => ev.type === 'user'),
+        lastIndexOf((ev) => ev.type === 'assistant'),
+    ].filter((i) => i >= 0);
+    for (const anchor of anchors) {
+        if (picked.has(anchor))
+            continue;
+        // 腾位置时只淘汰非锚点：两个锚点之间不互相挤掉。
+        const victim = [...picked].filter((i) => !anchors.includes(i)).sort((a, b) => a - b)[0];
+        if (victim === undefined)
+            break;
+        picked.delete(victim);
+        picked.add(anchor);
+    }
+    return [...picked].sort((a, b) => a - b).map((i) => events[i]);
+}
 /**
  * Build a session-history resume card (shared by auto-restore, /resume <id>,
  * config-switch resume, and run-completion notification).
@@ -297,6 +353,11 @@ export function buildSessionHistoryCard(state, opts) {
         header += '\n\n' + sections.join('\n\n──\n\n');
     }
     const elements = [markdownDiv(header), { tag: 'hr' }];
+    // 恢复时该会话仍有一个 turn 在跑（典型来源：上一个桥接实例退出/崩溃后，
+    // turn 留在常驻 host 里继续执行）。卡片只是快照，别让用户以为这就是全部。
+    if (opts.stillRunning) {
+        elements.push(markdownDiv('⚠️ **该会话仍有一个 turn 在运行**（可能来自已退出的实例）：以下内容是历史快照，实时输出不会出现在这张卡上。'));
+    }
     if (opts.hiddenCount && opts.hiddenCount > 0) {
         elements.push(markdownDiv(`📜 还有 ${opts.hiddenCount} 个更早的事件未显示`));
     }

package/dist/router/index.d.ts

@@ -33,6 +33,8 @@ export interface CardActionPayload {
     path?: string;
     name?: string;
     runId?: string;
+    /** 终态卡「停止」的目标后台任务 id（DSH job/list 的 jobId）。 */
+    jobId?: string;
     sessionId?: string;
     /** 目标工作目录（queue.* 卡片动作定位队列；stop 等卡片回传执行目录）。 */
     cwd?: string;
@@ -352,6 +354,13 @@ export declare class CommandRouter {
      * Handle stop card action: interrupt current run.
      */
     private handleCardStop;
+    /**
+     * Handle a terminal card's 「停止」 on one background job.
+     *
+     * 任务跨 run 生命周期，所以卡片按钮是唯一入口；失败必须给出可读原因
+     * （任务已自行结束、服务重启后快照被回收），不能点了没反应。
+     */
+    private handleJobKill;
     /**
      * Resolve an order's text at the enqueue boundary so order.exec can enter
      * the serial queue as an equivalent user message (Plan A) — the same path a

package/dist/router/index.js

@@ -646,6 +646,9 @@ export class CommandRouter {
             case 'stop':
                 await this.handleCardStop(value, ctx);
                 return;
+            case 'job.kill':
+                await this.handleJobKill(value, ctx);
+                return;
             case 'queue.cancel':
                 // 撤销：从队列中删除这个消息
                 await this.handleQueueCancel(value, ctx);
@@ -832,12 +835,17 @@ export class CommandRouter {
         // 2. Stop current running process
         // (Note: queue executing count is reset inside Bridge.interruptCurrentRun
         //  so all stop paths — /stop, /t, card stop, queue.immediate — are covered.)
-        const stopped = await this.bridge.interruptCurrentRun({
+        const interrupt = await this.bridge.interruptCurrentRunDetailed({
             userId: ctx.userId,
             chatId: ctx.chatId,
             cwd,
         });
-        getLogger().info(`[router] queue.immediate: stopped=${stopped}`);
+        const stopped = interrupt.stopped;
+        // A remote (DSH) stop is only a request; when it cannot be confirmed the
+        // target must not be promised "immediate" execution — its prompt would sit
+        // behind the still-running turn with no visible progress.
+        const stopUnconfirmed = interrupt.stop?.status === 'unconfirmed';
+        getLogger().info(`[router] queue.immediate: stopped=${stopped} unconfirmed=${stopUnconfirmed}`);
         // 3. Remove all tasks BEFORE this one (by position in the current queue).
         // The target may have begun while interruptCurrentRun was awaiting (the chain
         // advances concurrently): then it is already out of the snapshot and every
@@ -910,7 +918,14 @@ export class CommandRouter {
             return;
         }
         const workspaceBusy = this.bridge.isBusyFor(cwd);
-        if (!workspaceBusy) {
+        if (stopUnconfirmed) {
+            const name = interrupt.agentKind ? agentDisplayName(interrupt.agentKind) : 'agent';
+            await this.bridge.sendResult({
+                text: `⚠️ 未能确认 ${name} 的 turn 已停止，它可能仍在后台运行。\n` +
+                    `已清除 ${removedCount} 条排队消息；您的消息已提交，但可能要等该 turn 结束后才开始。`,
+            }, ctx);
+        }
+        else if (!workspaceBusy) {
             // Normal path: nothing new began during the stop, the target is next.
             // Mark its own card as executing now so buttons grey out immediately.
             // Done BEFORE any removal so getQueuedTask still returns the task with
@@ -1351,16 +1366,42 @@ export class CommandRouter {
             await this.bridge.sendResult({ text: '⚠️ 无效的停止请求，缺少必要信息' }, ctx);
             return;
         }
-        const stopped = await this.bridge.interruptCurrentRun({
+        const interrupt = await this.bridge.interruptCurrentRunDetailed({
             userId: ctx.userId,
             chatId: ctx.chatId,
             runId: value.runId,
         });
+        const stopped = interrupt.stopped;
         // Regression 2026-06-22: card stop button silently no-op'd when the
         // run had already exited. Give the user a visible result.
         if (!stopped) {
             await this.bridge.sendResult({ text: '该任务已结束，无需终止' }, ctx);
+            return;
         }
+        // DSH: `session/cancel` is only a request. If the host still reports the
+        // turn open, say so instead of letting the card imply a clean stop.
+        if (interrupt.stop?.status === 'unconfirmed') {
+            const name = interrupt.agentKind ? agentDisplayName(interrupt.agentKind) : 'agent';
+            await this.bridge.sendResult({
+                text: `⚠️ 未能确认 ${name} 的 turn 已停止，它可能仍在后台运行。\n` +
+                    '请在 DSH Web UI 检查；需要终止时再点一次停止。',
+            }, ctx);
+        }
+    }
+    /**
+     * Handle a terminal card's 「停止」 on one background job.
+     *
+     * 任务跨 run 生命周期，所以卡片按钮是唯一入口；失败必须给出可读原因
+     * （任务已自行结束、服务重启后快照被回收），不能点了没反应。
+     */
+    async handleJobKill(value, ctx) {
+        const runId = typeof value.runId === 'string' ? value.runId : '';
+        const jobId = typeof value.jobId === 'string' ? value.jobId : '';
+        if (!runId || !jobId)
+            return;
+        if (await this.bridge.killBackgroundJob(runId, jobId, ctx))
+            return;
+        await this.bridge.sendResult({ text: '停止失败：任务可能已自行结束，或记录已回收' }, ctx);
     }
     /**
      * Resolve an order's text at the enqueue boundary so order.exec can enter
@@ -2086,7 +2127,7 @@ export class CommandRouter {
                 switchSessionId = '';
             }
         }
-        // DSH preset 变更 = 下次 run 新建 session（§4.3）：
+        // DSH preset 变更 = 下次 run 新建 session：
         // preset 在 session 创建时固定，中途切换会被服务端拒绝（agent-preset-conflict）。
         // 旧 sessionId 存入 previousSessions 停车位（可手动 /resume，但 /resume 会做
         // preset 一致性校验），当前 sessionId 清空——下次 run 走 session.create 新建。
@@ -2431,11 +2472,20 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         };
     }
     async cmdStop(ctx) {
-        const stopped = await this.bridge.interruptCurrentRun({
+        const interrupt = await this.bridge.interruptCurrentRunDetailed({
             userId: ctx.userId,
             chatId: ctx.chatId,
         });
-        return stopped ? null : { text: '当前没有运行中的进程' };
+        if (!interrupt.stopped)
+            return { text: '当前没有运行中的进程' };
+        if (interrupt.stop?.status === 'unconfirmed') {
+            const name = interrupt.agentKind ? agentDisplayName(interrupt.agentKind) : 'agent';
+            return {
+                text: `⚠️ 未能确认 ${name} 的 turn 已停止，它可能仍在后台运行。\n` +
+                    '请在 DSH Web UI 检查；需要终止时再发一次 /stop。',
+            };
+        }
+        return null;
     }
     async cmdExit() {
         // Signal handle() to invoke exitHandler after the reply is sent.

package/dist/runner/claude/session.d.ts

@@ -147,7 +147,7 @@ export declare class ClaudeSession extends SpawningRunner {
     private consumeTurn;
     /**
      * 构造进程退出且无终态 result 时的统一错误结果（对齐原 SpawningRunner
-     * buildResultEvent 语义，含 §4.4 win32 command-not-found 双条件定性）。
+     * buildResultEvent 语义，含 win32 command-not-found 的双条件定性）。
      */
     private buildStreamEndedError;
     private wakeWaiters;

package/dist/runner/claude/session.js

@@ -306,7 +306,7 @@ export class ClaudeSession extends SpawningRunner {
         this.cwd = opts.cwd;
         this.autoApprove = false;
         this.pendingToolInputs.clear();
-        // §4.4 win32 嗅探嫌疑标记每次 spawn 重置（spawnChild 置位，收尾双条件消费）。
+        // win32 的 command-not-found 嫌疑标记每次 spawn 重置（spawnChild 置位，收尾双条件消费）。
         this.commandNotFoundSeen = false;
         // 每次 run 独立：上次 run 会话内跟踪到的计划文件不得泄漏到本次
         // （否则本次 ExitPlanMode 无 plan/planFilePath 时 resolvePlanContent
@@ -422,7 +422,7 @@ export class ClaudeSession extends SpawningRunner {
     }
     /**
      * 构造进程退出且无终态 result 时的统一错误结果（对齐原 SpawningRunner
-     * buildResultEvent 语义，含 §4.4 win32 command-not-found 双条件定性）。
+     * buildResultEvent 语义，含 win32 command-not-found 的双条件定性）。
      */
     async buildStreamEndedError() {
         // 进程已死但 proc 'close' 事件可能略晚于 stdout 关闭：等退出登记拿可靠
@@ -438,7 +438,7 @@ export class ClaudeSession extends SpawningRunner {
             errorMessage = `${this.binary} killed by signal ${exited.signal}${stderrTail ? `: ${stderrTail}` : ''}`;
         }
         else if (exited.code !== null && exited.code !== 0) {
-            // §4.4 双条件定性：本分支已保证「用户未停 + signal 为 null + 非零退出」，
+            // 双条件定性：本分支已保证「用户未停 + signal 为 null + 非零退出」，
             // 这里只补嗅探嫌疑标记这第二个条件。
             const commandNotFound = this.commandNotFoundSeen;
             if (commandNotFound) {

package/dist/runner/common/jsonrpc/transport.d.ts

@@ -30,7 +30,7 @@ export declare class JsonlRpcTransport {
     /** JSON lines buffered while stdin is under backpressure (bounded by callers). */
     private writeQueue;
     private flushing;
-    /** §4.4 win32 嗅探嫌疑标记（双条件定性见下方 onExit）。 */
+    /** win32 嗅探嫌疑标记（双条件定性见下方 onExit）。 */
     private commandNotFoundSeen;
     constructor(opts: {
         binary: string;

package/dist/runner/common/jsonrpc/transport.js

@@ -34,7 +34,7 @@ export class JsonlRpcTransport {
     /** JSON lines buffered while stdin is under backpressure (bounded by callers). */
     writeQueue = [];
     flushing = false;
-    /** §4.4 win32 嗅探嫌疑标记（双条件定性见下方 onExit）。 */
+    /** win32 嗅探嫌疑标记（双条件定性见下方 onExit）。 */
     commandNotFoundSeen = false;
     constructor(opts) {
         this.binary = opts.binary;
@@ -106,7 +106,7 @@ export class JsonlRpcTransport {
             const text = chunk.toString('utf-8');
             stderrBuf = (stderrBuf + text).slice(-MAX_STDERR_BYTES);
             getLogger().debug(`[jsonrpc-transport] stderr: ${text.trimEnd()}`);
-            // §4.4 win32 command-not-found 嗅探：命中只记嫌疑标记，不立即杀——
+            // win32 command-not-found 嗅探：命中只记嫌疑标记，不立即杀——
             // agent 正常输出可能引用该错误文本（调试 Windows 报错场景），见行即杀
             // 会误杀 run；定性由 onExit 的「标记 + 非零退出」双条件完成，真挂起由
             // 上层超时兜底
@@ -169,7 +169,7 @@ export class JsonlRpcTransport {
                     // ignore trailing incomplete line
                 }
             }
-            // §4.4 双条件定性：嫌疑标记 + 非零正常退出 → command-not-found。
+            // 双条件定性：嫌疑标记 + 非零正常退出 → command-not-found。
             // reason 仅供日志/诊断，消费方不解析该字符串（baseOnClose 无参）。
             let reason = signal ? `signal:${signal}` : `exit:${code}`;
             if (this.commandNotFoundSeen && signal === null && code !== null && code !== 0) {

package/dist/runner/common/spawning-runner.d.ts

@@ -84,7 +84,7 @@ export declare abstract class SpawningRunner {
      */
     protected stoppedByUser: boolean;
     /**
-     * §4.4 win32 command-not-found 嗅探嫌疑标记：stderr 命中特征行时置位，
+     * win32 command-not-found 嗅探嫌疑标记：stderr 命中特征行时置位，
      * 但**不**立即杀进程——agent 正常输出可能引用该错误文本（调试 Windows
      * 报错场景），见行即杀会误杀 run。定性走双条件：子类收尾时「标记在 +
      * 非零退出」才判 command-not-found；真挂起由既有 grace/超时兜底。

package/dist/runner/common/spawning-runner.js

@@ -127,7 +127,7 @@ export class SpawningRunner {
      */
     stoppedByUser = false;
     /**
-     * §4.4 win32 command-not-found 嗅探嫌疑标记：stderr 命中特征行时置位，
+     * win32 command-not-found 嗅探嫌疑标记：stderr 命中特征行时置位，
      * 但**不**立即杀进程——agent 正常输出可能引用该错误文本（调试 Windows
      * 报错场景），见行即杀会误杀 run。定性走双条件：子类收尾时「标记在 +
      * 非零退出」才判 command-not-found；真挂起由既有 grace/超时兜底。
@@ -253,7 +253,7 @@ export class SpawningRunner {
             const text = chunk.toString('utf-8').trim();
             if (text) {
                 this.spawnStderr = (this.spawnStderr + '\n' + text).trim().slice(-STDERR_TAIL_BYTES);
-                // §4.4 win32 command-not-found 嗅探：经 cmd 垫片启动失败不是 spawn 的
+                // win32 command-not-found 嗅探：经 cmd 垫片启动失败不是 spawn 的
                 // ENOENT，而是 stderr 的 "is not recognized..." 行。命中只记嫌疑标记
                 // （双条件之一），不立即杀——定性由子类收尾的「标记 + 非零退出」
                 // 双条件完成；子进程真挂起由既有 grace/超时看门狗兜底。

package/dist/runner/dsh/auth.js

@@ -13,6 +13,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import YAML from 'yaml';
+import { isWin32 } from '../../platform/select.js';
 /** Credential record that owns the browser-cookie signing secret. */
 export const DSH_BROWSER_CREDENTIAL_KEY = 'client-connection/browser-session';
 /** Short lifetime keeps every request safely inside DSH's configurable max age. */
@@ -40,7 +41,7 @@ function assertOwnerOnly(file, stats) {
         throw new Error(`DSH credentials file ${file} is not a regular file`);
     }
     // Windows has no POSIX mode bits; DSH itself skips the same check there.
-    if (process.platform === 'win32')
+    if (isWin32())
         return;
     if ((stats.mode & 0o077) !== 0) {
         throw new Error(`DSH credentials file ${file} is readable beyond its owner ` +

package/dist/runner/dsh/client.d.ts

@@ -19,7 +19,7 @@
  * `sessionEvents()` adds per-session filtering, reconnect + follow-snapshot
  * replay, and seq-based dedup.
  */
-import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshPermissionCatalogValue, DshPresetListValue, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem, DshTokenUsage } from './types.js';
+import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem, DshTokenUsage } from './types.js';
 interface WebSocketMessageEvent {
     data: unknown;
 }
@@ -182,6 +182,68 @@ export declare class DshClient {
         signal?: AbortSignal;
         timeoutMs?: number;
     }): Promise<DshSessionPageValue>;
+    /**
+     * Read the session's exact projection values.
+     *
+     * Returns `null` when the host has no projections for the session (e.g. it was
+     * deleted). A failed unary still throws — callers that only need a
+     * best-effort probe catch it themselves.
+     */
+    projectionSnapshot(sessionId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<DshProjectionSnapshot | null>;
+    /**
+     * Find this run's prompt if it is still sitting in the host's inbox.
+     *
+     * DSH 的 prompt 受理后先进入 inbox，被 turn 取走（claim）就不再出现；停止
+     * 时用它区分“还没开始 → 可以从队列里撤掉”和“已经在跑 → 只能 cancel”。
+     * `source.rpcId` 是 `session/prompt` 的 requestId，归属不会认错。
+     */
+    findPendingPrompt(sessionId: string, requestId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<string | undefined>;
+    /**
+     * Remove one not-yet-claimed inbox occurrence (`session/updateQueue`).
+     *
+     * @returns true when the host removed it; false when it was claimed between
+     *   the projection read and this call (`session/queue-item-not-found`).
+     */
+    removeQueuedPrompt(sessionId: string, itemId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<boolean>;
+    /**
+     * Whether the session still has a running turn.
+     *
+     * 主信号是 `session/list` 的 `running` 字段：服务端权威（会话列表页"运行中"
+     * 用的就是它），一次 unary，投票不受桥接进程内存影响。名单里没有该会话或
+     * 服务端不返回 `running` 时，回退到事件探测（{@link probeOpenTurnByEvents}），
+     * 两者都判不出来就返回 false（fail open，仍由 DSH 自己拒绝）。
+     */
+    hasOpenTurn(sessionId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<boolean>;
+    /**
+     * Tri-state version of {@link hasOpenTurn}.
+     *
+     * Stop verification must distinguish "the host says idle" from "the probe
+     * could not tell" — reporting `closed` on a failed probe would let a still
+     * running turn be reported as stopped. `unknown` is the honest answer there.
+     */
+    openTurnState(sessionId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<DshOpenTurnState>;
+    /**
+     * Fallback probe: the newest durable event's type tells whether a turn is open.
+     *
+     * 只在拿不到 `running` 时用。名单刻意保守——`job/*`（后台任务可在 turn 外
+     * 结算）、`user/message`、`turn/end` 都不算，判不出来就报告 `unknown`。
+     */
+    private probeOpenTurnByEvents;
     /**
      * One logical stream over `/api/remote.mux`. The WebSocket must carry the
      * same auth cookie as unary calls. Ends on the server's `end` frame, socket
@@ -203,9 +265,44 @@ export declare class DshClient {
      * Per-session subscription: yields session events, assistant stream chunks
      * and approval notices for `sessionId`, auto-reconnecting on stream
      * drop/error and replaying the follow snapshot (dedup by seq). Terminates on
-     * turn/end or `signal` abort.
+     * the run's own turn/end or `signal` abort.
+     *
+     * `promptRequestId` binds the stream to this run's prompt. `mode:'queue'`
+     * prompts are accepted while the agent is mid-turn and start a turn only
+     * later, so the first `turn/end` after `initialSeq` can belong to that OTHER
+     * turn. Everything recorded before the prompt's own durable `user/message`
+     * (whose source echoes the request id as `rpcId`) is foreign: dropping it
+     * keeps the card "running" until this run's turn actually finishes.
+     */
+    sessionEvents(sessionId: string, signal: AbortSignal, initialSeq?: number, promptRequestId?: string): AsyncGenerator<DshStreamItem>;
+    /**
+     * Host-wide live projection stream (`session/control`).
+     *
+     * 一份 baseline（当前所有活跃 session 的完整投影值）+ 之后每个投影的变化帧。
+     * 调用方按 sessionId 过滤：这是 DSH 上唯一"服务端变一次推一次"的通道，
+     * 不需要轮询 `session/projections`。
+     *
+     * 失败必须降级为"没有状态条"，不能影响 run：控制流是增强通道，断了运行
+     * 照常（异常在此吞掉并记日志，不向 merge 抛）。
+     */
+    controlFrames(signal: AbortSignal): AsyncGenerator<DshProjectionItem>;
+    /**
+     * One session's current background-job roster.
+     *
+     * `job/list` 是流（生命周期变化时推整份名单），但"此刻有哪些任务在跑"只需
+     * 要第一帧：文档明确首帧就是当前真相（whole-set replacement）。取到即断开，
+     * 不长期持有连接——任务列表只用于收尾时的一句话与停止按钮。
+     *
+     * 失败返回 undefined（与"没有任务"区分）：拿不到就别在卡片上写"0 个后台任务"。
      */
-    sessionEvents(sessionId: string, signal: AbortSignal, initialSeq?: number): AsyncGenerator<DshStreamItem>;
+    jobRows(sessionId: string, opts?: {
+        signal?: AbortSignal;
+        timeoutMs?: number;
+    }): Promise<DshJobView[] | undefined>;
+    /** Kill one background job on the user's behalf (`job/kill`). */
+    jobKill(sessionId: string, jobId: string, opts?: {
+        signal?: AbortSignal;
+    }): Promise<boolean>;
     /** Extract TokenUsage from an assistant/message data payload (absent → undefined). */
     static usageOf(data: Record<string, unknown>): DshTokenUsage | undefined;
 }