dsh-workspace-mover 2.4.2 → 2.4.3

package/lib/index.js

@@ -1550,6 +1550,13 @@ async function scanSessions(ctx) {
 	}
 
 	const ghosts = [];
+	// Include all discovered archives, even those outside the parsed scan limit.
+	const archiveLocations = new Map();
+	for (const { idDir, artifact } of metas) {
+		const paths = archiveLocations.get(String(idDir)) ?? [];
+		paths.push(artifact);
+		archiveLocations.set(String(idDir), paths);
+	}
 	for (const entity of entities) {
 		let ids = [];
 		// 幽灵正是「有账无档」的 id，而官方公开的 sessionIds getter 会把它们
@@ -1557,7 +1564,11 @@ async function scanSessions(ctx) {
 		try { ids = rawRecordSessionIds(entity); } catch { continue; }
 		for (const id of ids) {
 			try {
-				if (!existsSync(artifactPath(root, entity.path, id, compression))) ghosts.push({ workspaceId: entity.id, sessionId: String(id) });
+				if (!existsSync(artifactPath(root, entity.path, id, compression))) {
+					const locations = archiveLocations.get(String(id)) ?? [];
+					ghosts.push({ workspaceId: entity.id, sessionId: String(id), locations,
+						status: locations.length ? 'found-elsewhere' : 'location-unknown', archived: archived.has(String(id)) });
+				}
 			} catch { /* skip */ }
 		}
 	}
@@ -3337,7 +3348,26 @@ async function deleteSessionToTrash(ctx, payload = {}, hooks = {}) {
 	const sessionId = validId(payload?.sessionId, 'sessionId');
 	const release = acquireLocks(`session:${sessionId}`);
 	try {
-		return await deleteSessionToTrashLocked(ctx, sessionId, { ...hooks, purgeBackups: payload?.purgeBackups === true });
+		assertNotRunning(ctx, sessionId);
+		if (peekService(ctx, 'sessions')?.get?.(sessionId) !== undefined && !lifecycleFor(ctx, sessionId)) {
+			throw new Error('session is resident in memory without a tracked lifecycle handle; restart the harness before deleting');
+		}
+		// Disposing the Agent may remove its projection; preserve display metadata first.
+		const projection = captureProjection(ctx, sessionId);
+		const title = readSessionTitle(ctx, sessionId, null);
+		return await withReleasedSession(ctx, sessionId, false,
+			() => deleteSessionToTrashLocked(ctx, sessionId, { ...hooks, projection, title, purgeBackups: payload?.purgeBackups === true }), {
+				reloadOnSuccess: false,
+				// A failed rollback must never resume a missing archive as a blank session.
+				canReload: async () => {
+					try {
+						const location = await locateArtifact(ctx, sessionId);
+						const storage = createPersistenceAdapter(ctx);
+						const header = readHeader(await storage.read(location), storage.compression);
+						return String(header?.id) === String(sessionId);
+					} catch { return false; }
+				}
+			});
 	} finally {
 		release();
 	}
@@ -3357,7 +3387,7 @@ async function deleteSessionToTrashLocked(ctx, sessionId, hooks = {}) {
 	const { artifact, cwd: artifactCwd } = location;
 	const header = readHeader(await storage.read(location), storage.compression);
 	const archived = readArchivedIds(registry).includes(sessionId);
-	const projection = captureProjection(ctx, sessionId);
+	const projection = hooks.projection ?? captureProjection(ctx, sessionId);
 	const owners = listOwners(registry, sessionId);
 	const entryDir = join(recycleDir(), `${Date.now()}-${String(sessionId).replace(/[^A-Za-z0-9._-]/g, '_')}`);
 	mkdirSync(entryDir, { recursive: true });
@@ -3372,7 +3402,7 @@ async function deleteSessionToTrashLocked(ctx, sessionId, hooks = {}) {
 	const manifest = {
 		version: 1,
 		sessionId: String(sessionId),
-		title: typeof header?.title === 'string' && header.title.trim() ? header.title.trim() : null,
+		title: hooks.title ?? (typeof header?.title === 'string' && header.title.trim() ? header.title.trim() : null),
 		cwd: artifactCwd ?? header?.cwd ?? null,
 		ownerWorkspaceId: owners[0]?.id ?? null,
 		ownerTitle: owners[0]?.title ?? null,
@@ -3393,6 +3423,7 @@ async function deleteSessionToTrashLocked(ctx, sessionId, hooks = {}) {
 				lastError: `manifest write failed (${err?.message ?? err}) AND move-back failed (${backErr?.message ?? backErr}) — files remain under ${entryDir}`
 			});
 			ctx.logger?.warn?.(`workspace-mover: manifest write failed AND move-back failed for ${sessionId}: ${backErr?.message ?? backErr} — files remain under ${entryDir}`);
+			throw new Error(`manifest write failed AND rollback failed; session files preserved under ${entryDir}: ${backErr?.message ?? backErr}`);
 		}
 		try { rmSync(entryDir, { recursive: true, force: true }); } catch { /* ignore */ }
 		throw new Error(`manifest write failed, session moved back: ${err?.message ?? err}`);
@@ -3506,7 +3537,7 @@ async function restoreFromTrashLocked(ctx, sessionId, targetWorkspaceId) {
 	}
 	// 先移回原位（头 cwd 与原位一致，attach 校验天然通过）
 	await storage.relocate(trashLocation, dirname(originalLocation.artifact));
-	let restored = { restored: true, sessionId: String(sessionId), cwd: originalCwd, workspaceId: targetEntity?.id ?? null, moved: null };
+	let restored = { restored: true, sessionId: String(sessionId), cwd: originalCwd, workspaceId: targetEntity?.id ?? null, archived: Boolean(manifest.archived), moved: null };
 	try {
 		if (targetEntity && !samePath(originalCwd, destPath)) {
 			// 原位只是中转：直接走现有 moveSession 全管线（备份/改写/热修/记账全套）

package/lib/lifecycle.js

@@ -65,7 +65,7 @@ export function lifecycleFor(ctx, id) {
 	return entry && raw(agents.get(id)) === entry.agent ? { ...entry, runtime, agents } : null;
 }
 
-export async function withReleasedSession(ctx, id, stopRunning, operation) {
+export async function withReleasedSession(ctx, id, stopRunning, operation, { reloadOnSuccess = true, canReload = () => true } = {}) {
 	const owned = lifecycleFor(ctx, id);
 	if (!owned) return operation();
 	const { handle, agent, runtime } = owned;
@@ -89,7 +89,7 @@ export async function withReleasedSession(ctx, id, stopRunning, operation) {
 		runtime.handles.delete(id);
 		try {
 			const controller = ctx.get?.('sessionController');
-			if (typeof controller?.resolveAgent === 'function') {
+			if ((failure || reloadOnSuccess) && await canReload() && typeof controller?.resolveAgent === 'function') {
 				const restored = await migrationContext.run(runtime, () => controller.resolveAgent(id));
 				if (restored?.error) throw restored.error;
 			}

package/package.json

@@ -1,104 +1,104 @@
-{
-  "name": "dsh-workspace-mover",
-  "version": "2.4.2",
-  "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/live-migration.test.mjs",
-    "test:installed-host": "node --test test/installed-host.test.mjs test/live-migration.test.mjs",
-    "check:syntax": "node --check lib/index.js && node --check client/client.js && node --check lib/lifecycle.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.3",
+  "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/live-migration.test.mjs",
+    "test:installed-host": "node --test test/installed-host.test.mjs test/live-migration.test.mjs",
+    "check:syntax": "node --check lib/index.js && node --check client/client.js && node --check lib/lifecycle.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

@@ -493,6 +493,104 @@ test('模块导出 apply / inject，且 apply 不抛错', () => {
   assert.deepEqual(mod.inject, ['connection', 'slots']);
 });
 
+test('locale service wins over browser language, switches live and releases registrations', async () => {
+  resetDom();
+  let language = 'en';
+  let dicts;
+  let unregisters = 0;
+  const listeners = new Set();
+  const locale = {
+    register(ns, values) {
+      assert.equal(ns, 'workspace-mover'); dicts = values;
+      return () => { unregisters++; };
+    },
+    bind() { return (key) => dicts[language][key] ?? key; },
+    subscribe(fn) { listeners.add(fn); return () => listeners.delete(fn); }
+  };
+  ctx = makeCtx();
+  ctx.get = (key) => key === 'locale' ? locale : undefined;
+  mod.apply(ctx);
+  const row = sessionRow('Locale test', 'session-aaa');
+  const beta = header('proj-beta');
+  fixture({ rows: [row] }); attach(beta);
+  await dragDrop(row, beta, 'session-aaa', { confirm: false });
+  assert.equal(doc._body.querySelector('.wsm-title').textContent, 'Move session across workspaces');
+  dispatch({ type: 'click', target: doc._body.querySelector('.wsm-cancel') });
+  language = 'zh'; for (const fn of listeners) fn();
+  await dragDrop(row, beta, 'session-aaa', { confirm: false });
+  assert.equal(doc._body.querySelector('.wsm-title').textContent, '跨工作区移动会话');
+  dispatch({ type: 'click', target: doc._body.querySelector('.wsm-cancel') });
+  unmount();
+  assert.equal(unregisters, 1);
+  assert.equal(listeners.size, 0);
+});
+
+test('late locale service is disposed even when unavailable at initial mount', () => {
+  resetDom();
+  ctx = makeCtx();
+  let arrive;
+  ctx.inject = (keys, callback) => { assert.deepEqual(keys, ['locale']); arrive = callback; };
+  mod.apply(ctx);
+  let disposed = 0;
+  const locale = { register: () => () => disposed++, bind: () => () => 'translated' };
+  arrive({ get: () => locale, effect(fn) { effects.push(fn()); } });
+  unmount();
+  assert.equal(disposed, 1);
+});
+
+test('deleting selected conversation clears its view without reopening; later selection is preserved', async () => {
+  for (const navigate of [false, true]) {
+    resetDom();
+    ctx = makeCtx();
+    let selected = 'session-delete';
+    let cleared = 0;
+    let rpc;
+    const ui = {
+      selection: { getSnapshot: () => ({ sessionId: selected }) },
+      clearMain() { selected = null; cleared++; },
+      openSession() { assert.fail('must not reload deleted conversation'); }
+    };
+    ctx.get = (key) => key === 'uiWorkspace' ? ui : undefined;
+    ctx.slots = {
+      inject(_name, fn) { fn(); },
+      register(options) { rpc = options.inject().rpcCall; }
+    };
+    ctx.connection.rpc.call = async () => {
+      if (navigate) selected = 'session-other';
+      return { ok: true, value: { deleted: true } };
+    };
+    mod.apply(ctx);
+    await rpc('mover.session.delete', { sessionId: 'session-delete' });
+    assert.equal(cleared, navigate ? 0 : 1);
+    assert.equal(selected, navigate ? 'session-other' : null);
+  }
+});
+
+test('restore refreshes the real session baseline once; refresh failure never repeats file restoration', async () => {
+  for (const endpoint of ['mover.trash.restore', 'mover.backups.restore', 'mover.unarchive']) {
+    for (const brokenRefresh of [false, true]) {
+      resetDom();
+      ctx = makeCtx();
+      let rpc;
+      const actions = [];
+      ctx.slots = { inject(_name, fn) { fn(); }, register(options) { rpc = options.inject().rpcCall; } };
+      ctx.get = (key) => key === 'sessions' ? {
+        async refresh() { actions.push('refresh'); if (brokenRefresh) throw new Error('list unavailable'); }
+      } : undefined;
+      ctx.connection.rpc.call = async (_channel, method) => {
+        actions.push(method);
+        return { ok: true, value: { restored: true } };
+      };
+      mod.apply(ctx);
+      actions.length = 0; // discard the initial status probe
+      const result = await rpc(endpoint, { sessionId: 'session-restored' });
+      assert.equal(result.ok, true, 'do not label completed restore as failed');
+      assert.deepEqual(actions, [endpoint, 'refresh']);
+      if (brokenRefresh) assert.match(doc._body.querySelector('.wsm-toast')?.textContent, /无需重复还原/);
+    }
+  }
+});
+
 test('热重载：卸载再装载不得让 document 监听器净增长（teardown 回归）', () => {
   resetDom();
   mount();

package/test/core.test.mjs

@@ -1,55 +1,55 @@
-// 核心纯函数单元测试：帧扫描 / 头部读写 / 存储路径编码。
-// 运行：npm test（或 node --test test/）
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { zstdCompressSync, constants } from 'node:zlib';
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { scanFrames, readHeader, rewriteHeaderCwd, generationLogFilename, parseGenerationLogFilename, findHighestArtifact, artifactPath, sessionDir } from '../lib/index.js';
-
-const OPTS = { params: { [constants.ZSTD_c_checksumFlag]: 1 } };
-
-/** 构造一个「头 + N 个事件帧」的合成档案。 */
-function makeArtifact(header, events) {
-  const head = zstdCompressSync(Buffer.from(JSON.stringify(header) + '\n', 'utf8'), OPTS);
-  const rest = events.map((e) => zstdCompressSync(Buffer.from(JSON.stringify(e) + '\n', 'utf8'), OPTS));
-  return Buffer.concat([head, ...rest]);
-}
-
-test('scanFrames 定位全部帧边界', () => {
-  const buf = makeArtifact({ type: 'session', id: 's1', cwd: 'E:\\a' }, [{ seq: 1 }, { seq: 2 }]);
-  const frames = scanFrames(buf);
-  assert.equal(frames.length, 3);
-  for (const [s, e] of frames) assert.ok(e > s && e <= buf.length);
-});
-
-test('readHeader 解出首行会话头', () => {
-  const buf = makeArtifact({ type: 'session', id: 'session-x', cwd: 'C:\\work' }, [{ seq: 1 }]);
-  const header = readHeader(buf);
-  assert.equal(header.type, 'session');
-  assert.equal(header.id, 'session-x');
-  assert.equal(header.cwd, 'C:\\work');
-});
-
-test('rewriteHeaderCwd 只改头部，其余帧字节不变', () => {
-  const ev = [{ seq: 1, text: 'hello 世界' }, { seq: 2 }];
-  const original = makeArtifact({ type: 'session', id: 'session-y', cwd: 'E:\\old\\path' }, ev);
-  const rewritten = rewriteHeaderCwd(original, 'E:\\new\\home');
-  // 头部已更新
-  const header = readHeader(rewritten);
-  assert.equal(header.cwd, 'E:\\new\\home');
-  assert.equal(header.id, 'session-y');
-  // 其余事件帧逐字节保留
-  const of = scanFrames(original), nf = scanFrames(rewritten);
-  assert.equal(nf.length, of.length);
-  assert.ok(of.slice(1).every(([, e], i) => original.subarray(of[i + 1][0], e).equals(rewritten.subarray(nf[i + 1][0], nf[i + 1][1]))));
-});
-
+// 核心纯函数单元测试：帧扫描 / 头部读写 / 存储路径编码。
+// 运行：npm test（或 node --test test/）
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { zstdCompressSync, constants } from 'node:zlib';
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { scanFrames, readHeader, rewriteHeaderCwd, generationLogFilename, parseGenerationLogFilename, findHighestArtifact, artifactPath, sessionDir } from '../lib/index.js';
+
+const OPTS = { params: { [constants.ZSTD_c_checksumFlag]: 1 } };
+
+/** 构造一个「头 + N 个事件帧」的合成档案。 */
+function makeArtifact(header, events) {
+  const head = zstdCompressSync(Buffer.from(JSON.stringify(header) + '\n', 'utf8'), OPTS);
+  const rest = events.map((e) => zstdCompressSync(Buffer.from(JSON.stringify(e) + '\n', 'utf8'), OPTS));
+  return Buffer.concat([head, ...rest]);
+}
+
+test('scanFrames 定位全部帧边界', () => {
+  const buf = makeArtifact({ type: 'session', id: 's1', cwd: 'E:\\a' }, [{ seq: 1 }, { seq: 2 }]);
+  const frames = scanFrames(buf);
+  assert.equal(frames.length, 3);
+  for (const [s, e] of frames) assert.ok(e > s && e <= buf.length);
+});
+
+test('readHeader 解出首行会话头', () => {
+  const buf = makeArtifact({ type: 'session', id: 'session-x', cwd: 'C:\\work' }, [{ seq: 1 }]);
+  const header = readHeader(buf);
+  assert.equal(header.type, 'session');
+  assert.equal(header.id, 'session-x');
+  assert.equal(header.cwd, 'C:\\work');
+});
+
+test('rewriteHeaderCwd 只改头部，其余帧字节不变', () => {
+  const ev = [{ seq: 1, text: 'hello 世界' }, { seq: 2 }];
+  const original = makeArtifact({ type: 'session', id: 'session-y', cwd: 'E:\\old\\path' }, ev);
+  const rewritten = rewriteHeaderCwd(original, 'E:\\new\\home');
+  // 头部已更新
+  const header = readHeader(rewritten);
+  assert.equal(header.cwd, 'E:\\new\\home');
+  assert.equal(header.id, 'session-y');
+  // 其余事件帧逐字节保留
+  const of = scanFrames(original), nf = scanFrames(rewritten);
+  assert.equal(nf.length, of.length);
+  assert.ok(of.slice(1).every(([, e], i) => original.subarray(of[i + 1][0], e).equals(rewritten.subarray(nf[i + 1][0], nf[i + 1][1]))));
+});
+
 test('损坏档案被拒绝而不是静默通过', () => {
-  const buf = makeArtifact({ type: 'session', id: 's', cwd: 'x' }, []);
-  buf.writeUInt32LE(0x12345678, 8); // 破坏第一帧内部
-  assert.throws(() => readHeader(buf));
+  const buf = makeArtifact({ type: 'session', id: 's', cwd: 'x' }, []);
+  buf.writeUInt32LE(0x12345678, 8); // 破坏第一帧内部
+  assert.throws(() => readHeader(buf));
 });
 
 test('readHeader and rewriteHeaderCwd support uncompressed JSONL', () => {
@@ -67,29 +67,29 @@ test('readHeader and rewriteHeaderCwd support uncompressed JSONL', () => {
 
 
 test('generationLogFilename prefers v3 zstd names', () => {
-  assert.equal(generationLogFilename(0, 'zstd'), 'session.jsonl.zstd');
-  assert.equal(generationLogFilename(3, 'zstd'), 'session.v3.jsonl.zstd');
-  assert.equal(parseGenerationLogFilename('session.jsonl.zstd')?.version, 0);
-  assert.equal(parseGenerationLogFilename('session.v3.jsonl.zstd')?.version, 3);
-  assert.equal(parseGenerationLogFilename('session.migration.tmp.jsonl.zstd'), null);
-});
-
+  assert.equal(generationLogFilename(0, 'zstd'), 'session.jsonl.zstd');
+  assert.equal(generationLogFilename(3, 'zstd'), 'session.v3.jsonl.zstd');
+  assert.equal(parseGenerationLogFilename('session.jsonl.zstd')?.version, 0);
+  assert.equal(parseGenerationLogFilename('session.v3.jsonl.zstd')?.version, 3);
+  assert.equal(parseGenerationLogFilename('session.migration.tmp.jsonl.zstd'), null);
+});
+
 test('findHighestArtifact picks the newest canonical generation', () => {
-  const root = mkdtempSync(join(tmpdir(), 'wsm-gen-'));
-  try {
-    const dir = join(root, 'sess');
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(join(dir, 'session.jsonl.zstd'), Buffer.from('old'));
-    writeFileSync(join(dir, 'session.v2.jsonl.zstd'), Buffer.from('mid'));
-    writeFileSync(join(dir, 'session.v3.jsonl.zstd'), Buffer.from('new'));
-    writeFileSync(join(dir, 'session.migration.abc.jsonl.zstd'), Buffer.from('tmp'));
-    const found = findHighestArtifact(dir);
-    assert.equal(found?.version, 3);
-    assert.equal(found?.name, 'session.v3.jsonl.zstd');
-    assert.equal(artifactPath(root, 'E:\\proj', 'session-x'), join(sessionDir(root, 'E:\\proj', 'session-x'), 'session.v3.jsonl.zstd'));
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
+  const root = mkdtempSync(join(tmpdir(), 'wsm-gen-'));
+  try {
+    const dir = join(root, 'sess');
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(join(dir, 'session.jsonl.zstd'), Buffer.from('old'));
+    writeFileSync(join(dir, 'session.v2.jsonl.zstd'), Buffer.from('mid'));
+    writeFileSync(join(dir, 'session.v3.jsonl.zstd'), Buffer.from('new'));
+    writeFileSync(join(dir, 'session.migration.abc.jsonl.zstd'), Buffer.from('tmp'));
+    const found = findHighestArtifact(dir);
+    assert.equal(found?.version, 3);
+    assert.equal(found?.name, 'session.v3.jsonl.zstd');
+    assert.equal(artifactPath(root, 'E:\\proj', 'session-x'), join(sessionDir(root, 'E:\\proj', 'session-x'), 'session.v3.jsonl.zstd'));
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
 });
 
 test('findHighestArtifact supports the official uncompressed encoding', () => {

package/test/e2e-sandbox.test.mjs

@@ -931,7 +931,7 @@ test('mover.scan 分类 orphaned / unregistered / ok，并检出幽灵记账', a
   assert.equal(byId['session-unreg'].status, 'unregistered');
   assert.equal(byId['session-unreg'].targetWorkspaceId, 'wid-a');
   assert.equal(byId['session-orphan'].status, 'orphaned');
-  assert.deepEqual(res.value.ghosts, [{ workspaceId: 'wid-b', sessionId: 'session-ghost' }]);
+  assert.deepEqual(res.value.ghosts, [{ workspaceId: 'wid-b', sessionId: 'session-ghost', locations: [], status: 'location-unknown', archived: false }]);
   assert.equal(res.value.scanned, 3);
 });
 
@@ -1935,6 +1935,40 @@ test('mover.session.delete：manifest 写失败时原样搬回，状态零变化
   assert.ok(!existsSync(recycle) || readdirSync(recycle).length === 0, 'no invisible recycle entries');
 });
 
+test('delete failed rollback preserves relocated archive for recovery instead of removing it', async () => {
+  apply(ctx);
+  entityA.record.sessionIds.push('session-aaa');
+  const source = artifactPath(root, A, 'session-aaa');
+  const bytes = readFileSync(source);
+  // A successful relocation followed by a new destination file blocks move-back.
+  await assert.rejects(deleteSessionToTrash(ctx, { sessionId: 'session-aaa' }, {
+    writeManifestImpl() {
+      mkdirSync(dirname(source), { recursive: true });
+      writeFileSync(source, 'concurrent destination');
+      throw new Error('manifest disk failure');
+    }
+  }), /rollback failed; session files preserved/);
+  const recycle = join(root, 'workspace-mover', 'recycle');
+  const entry = readdirSync(recycle)[0];
+  assert.deepEqual(readFileSync(join(recycle, entry, 'session', source.split(/[\\/]/).at(-1))), bytes);
+  assert.deepEqual(entityA.record.sessionIds, ['session-aaa']);
+});
+
+test('scan distinguishes misplaced membership from unknown archive location without detaching', async () => {
+  apply(ctx);
+  entityB.record.sessionIds.push('session-aaa', 'session-missing');
+  ctx.workspaceRegistry.archivedSessionIds = ['session-missing'];
+  const res = await call('mover.scan');
+  assert.equal(res.ok, true);
+  const found = res.value.ghosts.find((g) => g.sessionId === 'session-aaa');
+  assert.equal(found.status, 'found-elsewhere');
+  assert.deepEqual(found.locations, [artifactPath(root, A, 'session-aaa')]);
+  const unknown = res.value.ghosts.find((g) => g.sessionId === 'session-missing');
+  assert.equal(unknown.status, 'location-unknown');
+  assert.equal(unknown.archived, true);
+  assert.deepEqual(entityB.record.sessionIds, ['session-aaa', 'session-missing']);
+});
+
 test('mover.session.delete：归档会话删除时同步移出归档集', async () => {
   apply(ctx);
   sharedIndex.sessionPaths.set('session-aaa', A);
@@ -1962,6 +1996,7 @@ test('mover.trash.restore：还原到原路径并回写记账、投影标题、
   const res = await call('mover.trash.restore', { sessionId: 'session-aaa' });
   assert.equal(res.ok, true, JSON.stringify(res));
   assert.equal(res.value.workspaceId, 'wid-a');
+  assert.equal(res.value.archived, true, 'recycle restore explicitly reports preserved archived visibility');
   assert.ok(existsSync(artifactPath(root, A, 'session-aaa')), 'artifact back at A');
   assert.equal(readHeader(readFileSync(artifactPath(root, A, 'session-aaa'))).cwd, A);
   assert.deepEqual(entityA.record.sessionIds, ['session-aaa'], 're-attached to A');