dsh-workspace-mover 2.2.0 → 2.4.0

package/package.json

@@ -1,99 +1,103 @@
-{
-  "name": "dsh-workspace-mover",
-  "version": "2.2.0",
-  "description": "在 DSH 侧边栏安全迁移会话：真迁移原始档案，支持失联会话恢复、移动历史、一键撤回和 agent 工具。",
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./client/client.js",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "client",
-    "test",
-    "cordis.patch.yml",
-    "README.md",
-    "docs/ARCHITECTURE.md",
-    "docs/media",
-    "LICENSE"
-  ],  "scripts": {
-    "test": "node --test test/core.test.mjs test/e2e-sandbox.test.mjs test/policy.test.mjs test/client-dom.test.mjs test/traffic-badge.test.mjs test/release-downloads.test.mjs",
-    "check:syntax": "node --check lib/index.js && node --check client/client.js",
-    "check:pack": "npm pack --dry-run",
-    "check": "npm run check:syntax && npm test && npm run check:pack"
-  },
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "workspace",
-    "session",
-    "session-migration",
-    "drag-and-drop",
-    "agent-tools"
-  ],
-  "engines": {
-    "node": ">=22",
-    "dsh": ">=0.1.5-rc.1"
-  },
-  "//peerDependencies": "Deliberately `*`. These are OPTIONAL peers: the plugin declares them so storefronts can see the host packages it integrates with, but it fail-softs at runtime (mover.status capabilities + mover_doctor). npm's prerelease rule evaluates each `||` alternative as a set and only admits a prerelease when a comparator in that set shares the version's exact major.minor.patch tuple AND carries a prerelease tag -- so an upper bound like `<0.2.0-0` excludes EVERY 0.2.0 prerelease, which made the host report 2.2.0 as incompatible with 0.2.0-rc.2. Enumerating release lines would keep producing false incompatibilities on each new line; the real floor is engines.dsh, and capability flags report any actual runtime mismatch. Do NOT narrow these to version ranges.",
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "*",
-    "@deepseek-ai/dsh-session": "*",
-    "@deepseek-ai/dsh-tools": "*",
-    "@deepseek-ai/dsh-workspace": "*",
-    "@deepseek-ai/schemastery": "*",
-    "@deepseek-ai/dsh-client-connection": "*",
-    "@deepseek-ai/dsh-client-locale": "*",
-    "@deepseek-ai/dsh-client-ui-slots": "*"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/cordis": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-session": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-tools": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-workspace": {
-      "optional": true
-    },
-    "@deepseek-ai/schemastery": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-connection": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-locale": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-ui-slots": {
-      "optional": true
-    }
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/PianoPrince/dsh-workspace-mover.git"
-  },
-  "bugs": {
-    "url": "https://github.com/PianoPrince/dsh-workspace-mover/issues"
-  },
-  "homepage": "https://github.com/PianoPrince/dsh-workspace-mover#readme",
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-client-ui-slots"
-      ],
-      "platform": "web"
-    }
-  }
-}
+{
+  "name": "dsh-workspace-mover",
+  "version": "2.4.0",
+  "description": "在 DSH 侧边栏安全迁移会话：真迁移原始档案，支持失联会话恢复、移动历史、一键撤回和 agent 工具。",
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./client/client.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "client",
+    "test",
+    "cordis.patch.yml",
+    "README.md",
+    "README_EN.md",
+    "CHANGELOG.md",
+    "docs/ARCHITECTURE.md",
+    "docs/compatibility",
+    "docs/media",
+    "LICENSE"
+  ],  "scripts": {
+    "test": "node --test test/core.test.mjs test/e2e-sandbox.test.mjs test/policy.test.mjs test/client-dom.test.mjs test/traffic-badge.test.mjs test/release-downloads.test.mjs test/workspace-tools.test.mjs test/host-services.test.mjs",
+    "test:installed-host": "node --test test/installed-host.test.mjs",
+    "check:syntax": "node --check lib/index.js && node --check client/client.js",
+    "check:pack": "npm pack --dry-run",
+    "check": "npm run check:syntax && npm test && npm run check:pack"
+  },
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "workspace",
+    "session",
+    "session-migration",
+    "drag-and-drop",
+    "agent-tools"
+  ],
+  "engines": {
+    "node": ">=22",
+    "dsh": ">=0.1.5-rc.1"
+  },
+  "//peerDependencies": "Deliberately `*`. These are OPTIONAL peers: the plugin declares them so storefronts can see the host packages it integrates with, but it fail-softs at runtime (mover.status capabilities + mover_doctor). npm's prerelease rule evaluates each `||` alternative as a set and only admits a prerelease when a comparator in that set shares the version's exact major.minor.patch tuple AND carries a prerelease tag -- so an upper bound like `<0.2.0-0` excludes EVERY 0.2.0 prerelease, which made the host report 2.2.0 as incompatible with 0.2.0-rc.2. Enumerating release lines would keep producing false incompatibilities on each new line; the real floor is engines.dsh, and capability flags report any actual runtime mismatch. Do NOT narrow these to version ranges.",
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "*",
+    "@deepseek-ai/dsh-session": "*",
+    "@deepseek-ai/dsh-tools": "*",
+    "@deepseek-ai/dsh-workspace": "*",
+    "@deepseek-ai/schemastery": "*",
+    "@deepseek-ai/dsh-client-connection": "*",
+    "@deepseek-ai/dsh-client-locale": "*",
+    "@deepseek-ai/dsh-client-ui-slots": "*"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/cordis": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tools": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-workspace": {
+      "optional": true
+    },
+    "@deepseek-ai/schemastery": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    }
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PianoPrince/dsh-workspace-mover.git"
+  },
+  "bugs": {
+    "url": "https://github.com/PianoPrince/dsh-workspace-mover/issues"
+  },
+  "homepage": "https://github.com/PianoPrince/dsh-workspace-mover#readme",
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-slots"
+      ],
+      "platform": "web"
+    }
+  }
+}

package/test/client-dom.test.mjs

@@ -100,6 +100,7 @@ function createElement(tag) {
     tagName: String(tag).toUpperCase(),
     childNodes: [],
     parentNode: null,
+    get parentElement() { return this.parentNode?.nodeType === 1 ? this.parentNode : null; },
     className: '',
     id: '',
     style: {},
@@ -297,12 +298,26 @@ const reactShim = {
 
 let mod = null;
 const rpcCalls = [];
+const animationFrames = new Map();
+let animationFrameId = 0;
+function frame() {
+  const pending = [...animationFrames.values()];
+  animationFrames.clear();
+  for (const callback of pending) callback();
+}
 let rpcResponder = () => ({ ok: true, value: {} });
 
 function setResponder(fn) { rpcResponder = fn; }
 
 before(async () => {
   globalThis.document = doc;
+  globalThis.getComputedStyle = (el) => ({ overflowY: el.style.overflowY ?? 'visible' });
+  globalThis.requestAnimationFrame = (callback) => {
+    const id = ++animationFrameId;
+    animationFrames.set(id, callback);
+    return id;
+  };
+  globalThis.cancelAnimationFrame = (id) => animationFrames.delete(id);
   globalThis.MutationObserver = MutationObserverStub;
   globalThis.Node = { ELEMENT_NODE: 1 };
   globalThis.Element = function Element() {};
@@ -371,6 +386,7 @@ function unmount() {
 
 function resetDom() {
   unmount();
+  animationFrames.clear();
   doc._body.childNodes = [];
   doc._listeners = [];
   rpcCalls.length = 0;
@@ -498,6 +514,44 @@ test('未卸载就重复装载时不得叠加第二份监听器（防重复实
     `重复 apply 不得叠加：${afterFirst} -> ${doc._listeners.length}`);
 });
 
+test('drag autoscroll stops outside sidebar, at bounds, on dragleave/drop/dragend and unload', () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Scroll test', 'session-aaa');
+  const scroller = createElement('div');
+  scroller.style.overflowY = 'auto';
+  Object.assign(scroller, { scrollHeight: 1000, clientHeight: 300, scrollTop: 100,
+    getBoundingClientRect: () => ({ left: 0, right: 200, top: 0, bottom: 300 }) });
+  scroller.appendChild(row);
+  attach(scroller);
+  const start = (x = 100, y = 290) => {
+    dispatch({ type: 'dragstart', target: row });
+    dispatch({ type: 'dragover', target: row, clientX: x, clientY: y });
+  };
+  start(); frame();
+  assert.equal(scroller.scrollTop, 112);
+  dispatch({ type: 'dragover', target: row, clientX: 400, clientY: 290 });
+  frame();
+  assert.equal(scroller.scrollTop, 112);
+  assert.equal(animationFrames.size, 0);
+  start(100, 150); frame();
+  assert.equal(animationFrames.size, 0, 'center does not scroll');
+  scroller.scrollTop = 700;
+  start(); frame();
+  assert.equal(animationFrames.size, 0, 'bottom boundary stops frames');
+  scroller.scrollTop = 0;
+  start(100, 5); frame();
+  assert.equal(animationFrames.size, 0, 'top boundary stops frames');
+  scroller.scrollTop = 100;
+  for (const type of ['dragleave', 'drop', 'dragend']) {
+    start();
+    dispatch({ type, target: doc._body, relatedTarget: null });
+    assert.equal(animationFrames.size, 0, `${type} cancels pending frames`);
+  }
+  start(); unmount();
+  assert.equal(animationFrames.size, 0, 'hot unload cancels frames');
+});
+
 test('拖拽跨组移动：经权威 fiber 通道解析出正确 sessionId', async () => {
   resetDom();
   mount();
@@ -512,6 +566,31 @@ test('拖拽跨组移动：经权威 fiber 通道解析出正确 sessionId', asy
   assert.equal(calls[0].payload.targetWorkspaceId, 'wid-b');
 });
 
+test('迁移标题使用权威预览，不包含侧边栏时间；驻留队列提示可能需重启', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('测试刚刚', 'session-aaa');
+  const beta = header('proj-beta');
+  fixture({ rows: [row] });
+  const prior = rpcResponder;
+  setResponder((endpoint, payload) => endpoint === 'mover.preview' ? {
+    ok: true, value: {
+      title: '测试', status: 'queued', source: { cwd: 'C:/proj-alpha' },
+      target: { path: 'C:/proj-beta' }, estimatedBackupBytes: 0,
+      warnings: ['resident writer; restart required']
+    }
+  } : prior(endpoint, payload));
+  attach(beta);
+  await dragDrop(row, beta, 'session-aaa', { confirm: false });
+  const overlay = doc._body.querySelector('.wsm-overlay');
+  assert.equal(overlay.querySelector('.wsm-session').textContent, '测试');
+  assert.match(overlay.querySelector('.wsm-preview').textContent, /可能需重启/);
+  assert.doesNotMatch(overlay.querySelector('.wsm-preview').textContent, /进入空闲队列/);
+  dispatch({ type: 'click', target: overlay.querySelector('.wsm-ok') });
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  assert.equal(moveCalls()[0].payload.sessionTitle, '测试');
+});
+
 test('兜底映射错配时不得把错配 id 当成真实会话移动（P2 回归）', async () => {
   resetDom();
   mount();
@@ -562,6 +641,135 @@ test('工作区解析必须自证：标题与路径都不匹配时不得按 DOM
   assert.equal(calls.length, 0, '标题与路径都不匹配时必须中止，不得按序号回退');
 });
 
+test('工作区身份优先于标题：移入后仍可拖回原工作区', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-beta');
+  const alpha = header('proj-beta'); // Simulate stale visible text after a sidebar update.
+  Object.defineProperty(alpha, '__reactFiber$t', { value: {
+    memoizedProps: { group: { workspaceId: 'wid-a' } }, return: null
+  } });
+  fixture({ rows: [row] });
+  attach(beta, alpha);
+  await dragDrop(row, beta, 'session-aaa');
+  await dragDrop(row, alpha, 'session-aaa');
+  assert.deepEqual(moveCalls().map((call) => call.payload.targetWorkspaceId), ['wid-b', 'wid-a']);
+});
+
+test('工作区 data-row-key 优先于包含其他工作区名称的文字', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-alpha proj-beta');
+  beta.setAttribute('data-row-key', 'workspace:wid-b');
+  Object.defineProperty(beta, '__reactFiber$t', { value: {
+    memoizedProps: { group: { workspaceId: 'wid-a' } }, return: null
+  } }); // Rendered DOM identity must win over stale React props.
+  fixture({ rows: [row] });
+  attach(beta);
+  await dragDrop(row, beta, 'session-aaa');
+  assert.equal(moveCalls()[0]?.payload.targetWorkspaceId, 'wid-b');
+});
+
+test('嵌套会话标题不会被用作目标工作区名称', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-beta');
+  beta.appendChild(sessionRow('proj-alpha', 'session-other'));
+  fixture({ rows: [row] });
+  attach(beta);
+  await dragDrop(row, beta, 'session-aaa');
+  assert.equal(moveCalls()[0]?.payload.targetWorkspaceId, 'wid-b');
+});
+
+test('工作区文字匹配有歧义时停止迁移', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const ambiguous = header('proj-alpha proj-beta');
+  fixture({ rows: [row] });
+  attach(ambiguous);
+  await dragDrop(row, ambiguous, 'session-aaa');
+  assert.equal(moveCalls().length, 0);
+});
+
+test('落在标题外时不沿用上次悬停的工作区', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-beta');
+  fixture({ rows: [row] });
+  attach(beta);
+  const dt = { getData: () => 'session-aaa' };
+  dispatch({ type: 'dragstart', target: row, dataTransfer: dt });
+  dispatch({ type: 'dragover', target: beta, preventDefault() {} });
+  await new Promise((r) => setTimeout(r, 0));
+  dispatch({ type: 'drop', target: doc._body, dataTransfer: dt, preventDefault() {}, stopImmediatePropagation() {} });
+  await new Promise((r) => setTimeout(r, 0));
+  assert.equal(doc._body.querySelector('.wsm-overlay'), null);
+  assert.equal(moveCalls().length, 0);
+});
+
+test('同工作区预览阻断后可显式选择原工作区并重新预览再移回', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-beta');
+  const { ws } = fixture({ rows: [row] });
+  attach(beta);
+  setResponder((endpoint, payload) => {
+    if (endpoint === 'mover.workspaces') return { ok: true, value: { items: ws } };
+    if (endpoint === 'mover.preview') return { ok: true, value: {
+      status: payload.targetWorkspaceId === 'wid-b' ? 'blocked' : 'safe',
+      source: { cwd: 'C:/proj-beta' },
+      target: { path: ws.find((item) => item.workspaceId === payload.targetWorkspaceId).path },
+      warnings: [], estimatedBackupBytes: 123
+    } };
+    return { ok: true, value: {} };
+  });
+  await dragDrop(row, beta, 'session-aaa', { confirm: false });
+  const select = doc._body.querySelector('.wsm-target-select');
+  const ok = doc._body.querySelector('.wsm-ok');
+  assert.equal(ok.disabled, true);
+  select.value = 'wid-a';
+  dispatch({ type: 'change', target: select });
+  assert.equal(ok.disabled, true, 'Must wait for the new preview');
+  await new Promise((r) => setTimeout(r, 0));
+  assert.equal(ok.disabled, false);
+  assert.match(doc._body.querySelector('.wsm-preview').textContent, /目标路径: C:\/proj-alpha/);
+  dispatch({ type: 'click', target: ok });
+  await new Promise((r) => setTimeout(r, 0));
+  assert.equal(moveCalls()[0]?.payload.targetWorkspaceId, 'wid-a');
+});
+
+test('切换目标后预览失败时禁止按旧预览执行', async () => {
+  resetDom();
+  mount();
+  const row = sessionRow('Alpha discussion', 'session-aaa');
+  const beta = header('proj-beta');
+  const { ws } = fixture({ rows: [row] });
+  attach(beta);
+  setResponder((endpoint, payload) => {
+    if (endpoint === 'mover.workspaces') return { ok: true, value: { items: ws } };
+    if (endpoint === 'mover.preview') return payload.targetWorkspaceId === 'wid-a'
+      ? { ok: false, error: { message: 'preview failed' } }
+      : { ok: true, value: { status: 'safe', source: { cwd: 'C:/proj-alpha' } } };
+    return { ok: true, value: {} };
+  });
+  await dragDrop(row, beta, 'session-aaa', { confirm: false });
+  const select = doc._body.querySelector('.wsm-target-select');
+  select.value = 'wid-a';
+  dispatch({ type: 'change', target: select });
+  await new Promise((r) => setTimeout(r, 0));
+  const ok = doc._body.querySelector('.wsm-ok');
+  assert.equal(ok.disabled, true);
+  dispatch({ type: 'click', target: ok });
+  assert.equal(moveCalls().length, 0);
+  dispatch({ type: 'click', target: doc._body.querySelector('.wsm-cancel') });
+});
+
 test('弹窗 Escape 关闭并释放 keydown 监听器', async () => {
   resetDom();
   mount();