dsh-plugin-bridge 0.2.10 → 0.2.11

package/README.md

@@ -5,6 +5,7 @@
 </p>
 
 [![dsh-plugin](https://img.shields.io/badge/dsh-plugin-blue)](https://github.com/deepseek-ai/deepseek-harness)
+[![npm](https://img.shields.io/npm/v/dsh-plugin-bridge?color=cb3837)](https://www.npmjs.com/package/dsh-plugin-bridge)
 [![ci](https://github.com/Totoro-qaq/dsh-plugin-bridge/actions/workflows/ci.yml/badge.svg)](https://github.com/Totoro-qaq/dsh-plugin-bridge/actions/workflows/ci.yml)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![node ≥22](https://img.shields.io/badge/node-%E2%89%A522-339933)](package.json)

package/README.zh.md

@@ -5,6 +5,7 @@
 </p>
 
 [![dsh-plugin](https://img.shields.io/badge/dsh-plugin-blue)](https://github.com/deepseek-ai/deepseek-harness)
+[![npm](https://img.shields.io/npm/v/dsh-plugin-bridge?color=cb3837)](https://www.npmjs.com/package/dsh-plugin-bridge)
 [![ci](https://github.com/Totoro-qaq/dsh-plugin-bridge/actions/workflows/ci.yml/badge.svg)](https://github.com/Totoro-qaq/dsh-plugin-bridge/actions/workflows/ci.yml)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![node ≥22](https://img.shields.io/badge/node-%E2%89%A522-339933)](package.json)

package/lib/cli.js

@@ -279,6 +279,7 @@ async function main(argv) {
             const source = await findSession(rpc, sessionId).catch(() => undefined);
             const result = await executeMigration(rpc, {
                 sessionId,
+                sourceSession: source,
                 to,
                 summary,
                 goalRounds: num(args, 'goal-rounds'),
@@ -322,9 +323,9 @@ async function main(argv) {
                 ...(num(args, 'worker-timeout') === undefined ? {} : { workerTimeoutMs: num(args, 'worker-timeout') }),
                 onProgress: progress,
             });
-            const source = await findSession(rpc, sessionId).catch(() => undefined);
             const result = await executeMigration(rpc, {
                 sessionId,
+                sourceSession: preview.sourceSession,
                 to,
                 summary: preview.summary,
                 lang: preview.lang,
@@ -332,7 +333,7 @@ async function main(argv) {
                 inject: injectOf(args),
                 kickoff: !bool(args, 'no-kickoff'),
                 autoContinue: bool(args, 'continue'),
-                title: str(args, 'title') ?? migratedTitle(titleOf(source), to),
+                title: str(args, 'title') ?? migratedTitle(titleOf(preview.sourceSession), to),
                 onProgress: progress,
             });
             out({ ...result, summary: preview.summary, source: preview.source }, () => `已迁移到 ${result.agentPreset}：${result.sessionId}\n\n${preview.summary}\n`);

package/lib/command.js

@@ -171,10 +171,12 @@ export function createBridgeCommand(deps) {
             const rpc = deps.rpcFor(invocation.signal);
             const config = deps.config;
             let presets;
+            let sourceSession;
             let current;
             try {
                 presets = await listPresets(rpc);
-                current = (await findSession(rpc, sessionId))?.agentPreset;
+                sourceSession = await findSession(rpc, sessionId);
+                current = sourceSession?.agentPreset;
             }
             catch (error) {
                 return { kind: 'error', text: describe(error) };
@@ -258,11 +260,11 @@ export function createBridgeCommand(deps) {
                     };
                 }
                 try {
-                    const row = await findSession(rpc, sessionId).catch(() => undefined);
-                    const sourceTitle = titleOf(row);
+                    const sourceTitle = titleOf(sourceSession);
                     const targetTitle = sourceTitle ? migratedTitle(sourceTitle, target) : (runLang === 'en' ? `Migrated to ${target}` : migratedTitle(sourceTitle, target));
                     const result = await executeMigration(rpc, {
                         sessionId,
+                        sourceSession,
                         to: target,
                         summary,
                         goalRounds: parsed.goalRounds ?? config.goalRounds,
@@ -311,6 +313,7 @@ export function createBridgeCommand(deps) {
             try {
                 const preview = await previewMigration(rpc, {
                     sessionId,
+                    sourceSession,
                     tier: parsed.tier ?? config.modelTier,
                     sourceCharBudget: config.sourceCharBudget,
                     summaryCharBudget: config.summaryCharBudget,

package/lib/migrate.d.ts

@@ -69,16 +69,18 @@ export declare function resolveWorkerModel(rpc: Rpc, sessionId: string, tier: Mo
 export declare function resolveWorkerPreset(rpc: Rpc): Promise<string | undefined>;
 export interface WaitOptions {
     timeoutMs?: number;
-    /** 等「开始跑」的宽限期；超过还没 running 就当它已经跑完了。 */
+    /** 等待新 `turn/start` 的宽限期；超过仍未出现就按未启动处理。 */
     startGraceMs?: number;
     pollMs?: number;
+    /** 只观察这个事件序号之后的新一轮；worker 新建后通常为 0。 */
+    afterSeq?: number;
 }
 /**
- * 等一个会话回到空闲。
+ * 等一个会话的新一轮写入 `turn/end`。
  *
- * 旧实现是「先 sleep 2s，再看 running 是不是 false」——host 排队稍慢一点，
- * 第一次轮询就会把「还没开始」误判成「已经跑完」，取到的是上一轮的回答。
- * 这里先等它真的 running 起来（有宽限期），再等它落回 false。
+ * `session.list` 是全局列表，拿它每两秒轮询一个 worker 会把会话总量放大成
+ * O(会话数 × 轮询次数)。`session.history` 则只读目标会话；用 prompt 前的事件
+ * 水位隔开旧轮次后，`turn/start` / `turn/end` 也比易过期的 running 快照更可靠。
  */
 export declare function waitIdle(rpc: Rpc, sessionId: string, options?: WaitOptions): Promise<{
     idle: boolean;
@@ -93,6 +95,8 @@ export declare function foldedHistory(rpc: Rpc, sessionId: string, options?: {
 export declare function lastAssistantText(rpc: Rpc, sessionId: string): Promise<string>;
 export interface PreviewOptions {
     sessionId: string;
+    /** 同一命令已经读取过的源会话行，避免重复扫描全局列表。 */
+    sourceSession?: SessionRow;
     tier?: ModelTier;
     provider?: string;
     model?: string;
@@ -125,6 +129,8 @@ export interface PreviewResult {
 export declare function previewMigration(rpc: Rpc, options: PreviewOptions): Promise<PreviewResult>;
 export interface MigrateOptions {
     sessionId: string;
+    /** 同一流程已经读取过的源会话行，避免重复扫描全局列表。 */
+    sourceSession?: SessionRow;
     to: string;
     summary: string;
     lang?: 'zh' | 'en';

package/lib/migrate.js

@@ -95,31 +95,40 @@ export async function resolveWorkerPreset(rpc) {
     return presets.find((preset) => preset.isDefault)?.id;
 }
 /**
- * 等一个会话回到空闲。
+ * 等一个会话的新一轮写入 `turn/end`。
  *
- * 旧实现是「先 sleep 2s，再看 running 是不是 false」——host 排队稍慢一点，
- * 第一次轮询就会把「还没开始」误判成「已经跑完」，取到的是上一轮的回答。
- * 这里先等它真的 running 起来（有宽限期），再等它落回 false。
+ * `session.list` 是全局列表，拿它每两秒轮询一个 worker 会把会话总量放大成
+ * O(会话数 × 轮询次数)。`session.history` 则只读目标会话；用 prompt 前的事件
+ * 水位隔开旧轮次后，`turn/start` / `turn/end` 也比易过期的 running 快照更可靠。
  */
 export async function waitIdle(rpc, sessionId, options = {}) {
     const pollMs = options.pollMs ?? 2000;
     const deadline = Date.now() + (options.timeoutMs ?? 360_000);
     const startBy = Date.now() + (options.startGraceMs ?? 25_000);
+    const afterSeq = options.afterSeq ?? 0;
     let started = false;
     while (Date.now() < deadline) {
         await sleep(pollMs);
-        const row = await findSession(rpc, sessionId).catch(() => undefined);
-        if (row?.running) {
+        const events = await tailSessionEvents(rpc, sessionId).catch(() => []);
+        const fresh = events.filter((event) => typeof event.seq === 'number' && event.seq > afterSeq);
+        if (fresh.some((event) => event.type === 'turn/start'))
             started = true;
-            continue;
-        }
-        if (started)
+        if (fresh.some((event) => event.type === 'turn/end'))
             return { idle: true, started: true };
-        if (Date.now() > startBy)
+        if (!started && Date.now() > startBy)
             return { idle: true, started: false };
     }
     return { idle: false, started };
 }
+/** 读取单个会话的尾页；不触发全局 session.list 扫描。 */
+async function tailSessionEvents(rpc, sessionId) {
+    const res = await rpc('session.history', { sessionId, maxMessages: 2 }, 60_000);
+    return (res.events ?? []).map((entry) => entry.event);
+}
+async function latestSessionSeq(rpc, sessionId) {
+    const events = await tailSessionEvents(rpc, sessionId);
+    return events.reduce((max, event) => (typeof event.seq === 'number' && event.seq > max ? event.seq : max), 0);
+}
 /** 拉取并折叠会话历史（按需翻页）。 */
 export async function foldedHistory(rpc, sessionId, options = {}) {
     const pageMessages = options.pageMessages ?? HISTORY_PAGE_MESSAGES;
@@ -149,7 +158,7 @@ export async function lastAssistantText(rpc, sessionId) {
 /** 生成交接摘要：取材 → 起临时工人 → 收摘要 → 归档工人。 */
 export async function previewMigration(rpc, options) {
     const progress = options.onProgress ?? (() => { });
-    const sourceSession = await findSession(rpc, options.sessionId);
+    const sourceSession = options.sourceSession ?? await findSession(rpc, options.sessionId);
     progress('拉取并折叠会话历史…');
     const messages = await foldedHistory(rpc, options.sessionId);
     const source = buildBridgeSource(messages, { sourceCharBudget: options.sourceCharBudget });
@@ -179,6 +188,7 @@ export async function previewMigration(rpc, options) {
             });
         }
         const instruction = buildBridgeInstruction(lang, { summaryCharBudget: options.summaryCharBudget });
+        const workerBaselineSeq = await latestSessionSeq(rpc, worker.sessionId).catch(() => 0);
         await rpc('session.prompt', {
             sessionId: worker.sessionId,
             mode: 'queue',
@@ -187,6 +197,7 @@ export async function previewMigration(rpc, options) {
         progress('等待摘要…');
         const settled = await waitIdle(rpc, worker.sessionId, {
             timeoutMs: options.workerTimeoutMs ?? 360_000,
+            afterSeq: workerBaselineSeq,
             ...(options.pollMs === undefined ? {} : { pollMs: options.pollMs, startGraceMs: options.pollMs * 6 }),
         });
         if (!settled.idle) {
@@ -280,7 +291,7 @@ export async function executeMigration(rpc, options) {
     const summary = options.summary.trim();
     if (!summary)
         throw new RpcError('bridge.migrate', 'empty-summary', '摘要为空，拒绝迁移。');
-    const sourceSession = await findSession(rpc, options.sessionId);
+    const sourceSession = options.sourceSession ?? await findSession(rpc, options.sessionId);
     const where = await placement(rpc, sourceSession, options.sessionId);
     let sourceModel;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-bridge",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Previewable cross-preset session migration for DeepSeek Harness with bounded, fixed-schema handoffs",
   "type": "module",
   "main": "lib/index.js",