fix(migrate): respect status:'done' in pendingOf() to stop false re-prompts after migration

The migration prompt detection compared per-file sizes against the convert
state but ignored state.status === 'done'. After migration completes, the
active V1 log continues growing (dual-write), causing a size mismatch that
re-triggered the prompt even though new entries already land in V2.

pendingOf() now short-circuits when status is 'done', treating the completed
migration as definitive. The per-file trust rule still applies for
non-done states (running/stopped/error).

Author: weiesky.wangc

history.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- fix(migrate): **迁移完成后仍反复提示迁移** — `pendingOf()` 仅按文件大小比对判断是否需要迁移，忽略了 `wire-v2-convert-state.json` 中的 `status: 'done'` 标记。迁移完成后活跃的 v1 日志继续增长（双写），大小不匹配导致误判为待迁移。修复：`pendingOf()` 检测到 `status === 'done'` 时直接返回无需迁移。
+
 - fix(ccswitch-import): **running cc-switch → `database is locked`** — importing from cc-switch *while it is open* failed with `导入失败（未检测到 cc-switch 或读取出错）: query failed: database is locked` because the read-only connection's first query contends with cc-switch's `BEGIN EXCLUSIVE` write lock (its real contention mode: a valid hot journal under an EXCLUSIVE transaction blocks even read-only readers, unlike `BEGIN IMMEDIATE`). The prior malformed-journal fix only caught `SQLITE_BUSY` on its own escalation path; on the main read path `BUSY` escaped to the catch-all and surfaced as the opaque `query failed: database is locked`. Fix in `server/lib/ccswitch-import.js`: detect `SQLITE_BUSY` on **every** path (the read-only open and the providers query), retry once after a 200ms backoff (cc-switch's write transactions are short — transient locks usually clear), and if still held surface the friendly `cc-switch db is locked (cc-switch may be running); retry shortly` instead of the raw wrapper. New `test/ccswitch-import.test.js` cases use a child process holding `BEGIN EXCLUSIVE` to deterministically reproduce both the held-lock (→ friendly message) and transient-lock (→ retry recovers providers) paths.
 
 - fix(ccswitch-import): **malformed leftover journal → `attempt to write a readonly database`** — importing from cc-switch failed with `导入失败（未检测到 cc-switch 或读取出错）: query failed: attempt to write a readonly database` when cc-switch had been killed mid-write and left a **malformed** `cc-switch.db-journal` (truncated/corrupt rollback journal) behind. SQLite must discard a malformed journal to open the DB, which is a write; the read-only connection (`readOnly:true`) refused it → `SQLITE_READONLY`. Root cause locked deterministically: a malformed journal trips recovery; the trigger is a torn/partial journal from an unclean crash. Fix in `server/lib/ccswitch-import.js`: keep the default read-only open, but on `SQLITE_READONLY` escalate **once** to a read-write open guarded by `PRAGMA query_only = ON` (lets SQLite recover/discard the corrupt journal, blocks our own writes), then retry — mirroring what cc-switch itself does on its next normal launch. `SQLITE_BUSY` on the escalation path surfaces a clear "db is locked; retry shortly" message; all other errors still surface their real cause (`query failed: …`, e.g. "file is not a database"). New `test/ccswitch-import.test.js` cases plant a garbage `-journal` next to a valid DB and assert recovery reads providers + cleans the journal, with a follow-up plain read-only read proving the DB is left clean.

server/lib/v2/migrate-prompt.js

@@ -12,6 +12,9 @@ import { listV1Files, listConvertibleProjects, readConvertState } from './conver
 /** Pending v1 files + bytes of ONE project dir. */
 function pendingOf(projectDir) {
   const state = readConvertState(projectDir);
+  // Migration already completed — don't re-prompt, even if v1 files grew
+  // (dual-write captures new entries in v2).
+  if (state && state.status === 'done') return { files: 0, totalBytes: 0 };
   const doneAtSize = new Map(
     (state && Array.isArray(state.files) ? state.files : [])
       .filter((f) => f && f.done)

test/migrate-prompt.test.js

@@ -4,8 +4,9 @@
  *
  * Trigger matrix pinned here:
  *   - v1 files present & unconverted → pending (files/bytes counted)
+ *   - status:'done' short-circuits → not pending (dual-write covers tail growth)
  *   - convert state marks a file done AT ITS SIZE → not pending
- *   - a grown "done" file (active log era) → pending again
+ *   - a grown "done" file when status != 'done' → pending again
  *   - empty v1 shells are ignored; other projects with pending logs counted
  *   - /events emits the migrate_prompt frame only when pending, carrying
  *     `continued` from isContinuedLaunch()
@@ -19,7 +20,7 @@
 import { describe, it, before } from 'node:test';
 import assert from 'node:assert/strict';
 import { EventEmitter } from 'node:events';
-import { mkdtempSync, mkdirSync, writeFileSync, statSync } from 'node:fs';
+import { mkdtempSync, mkdirSync, writeFileSync, statSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 
@@ -61,7 +62,7 @@ describe('migrationStatus', () => {
     assert.equal(st.totalBytes, 128);
   });
 
-  it('convert state marks files done at size → not pending; a grown file re-pends', () => {
+  it('convert state marks files done at size → not pending; status done prevents re-pend from growth', () => {
     const f1 = `${PROJECT}_20260101_000000.jsonl`;
     const f2 = `${PROJECT}_20260102_000000.jsonl`;
     const sizeOf = (n) => statSync(join(projectDir(), n)).size;
@@ -77,7 +78,26 @@ describe('migrationStatus', () => {
 
     writeFileSync(join(projectDir(), f2), 'x'.repeat(128)); // grew after conversion
     const st = migrationStatus(tmpDir, PROJECT);
-    assert.equal(st.pending, true, 'a grown done-file is pending again (converter trust rule)');
+    assert.equal(st.pending, false, 'a grown file after status:done does not re-prompt (migration complete)');
+  });
+
+  it('a grown done-file re-pends when status is not done (converter trust rule)', () => {
+    const f1 = `${PROJECT}_20260101_000000.jsonl`;
+    const f2 = `${PROJECT}_20260102_000000.jsonl`;
+    const sizeOf = (n) => statSync(join(projectDir(), n)).size;
+    writeFileSync(join(projectDir(), 'wire-v2-convert-state.json'), JSON.stringify({
+      version: 1,
+      // No status field — simulates an in-progress/interrupted state file
+      files: [
+        { name: f1, size: sizeOf(f1), done: true },
+        { name: f2, size: sizeOf(f2), done: true },
+      ],
+    }));
+    assert.equal(migrationStatus(tmpDir, PROJECT).pending, false, 'files match recorded sizes at pre-grow');
+
+    writeFileSync(join(projectDir(), f2), 'x'.repeat(256)); // grew beyond the 128 left by previous test
+    const st = migrationStatus(tmpDir, PROJECT);
+    assert.equal(st.pending, true, 'a grown done-file re-pends when status is not done');
     assert.equal(st.files, 1);
   });
 
@@ -181,6 +201,9 @@ describe('/events migrate_prompt frame', () => {
   }
 
   it('emits the frame when the CURRENT project has pending v1 logs, with continued flag', async () => {
+    // The previous test left a convert state with status:'done' — remove it so
+    // this test sees genuinely pending (never-migrated) v1 files.
+    try { rmSync(join(tmpDir, PROJECT, 'wire-v2-convert-state.json')); } catch {}
     // Bind the interceptor to the fixture project (workspace mode boots bare;
     // initForWorkspace derives the project name from the path's basename).
     interceptor.initForWorkspace(join(tmpDir, 'ws', PROJECT));