codex-model-change 1.0.3 → 1.0.5

package/README.md

@@ -50,8 +50,8 @@ cd codex-model-change
 | `cx doctor` | 体检：key 有效性 / 直连连通性 / 会话健康 |
 | `cx fix <会话ID>` | 修复某个打不开/报 404 的会话（ID 取 `cx status` 里显示的前 8 位即可） |
 | `cx fix last` | 修复最近一个会话 |
-| `cx fix-all <目标>` | **批量把所有老会话切换到目标模型**（`deepseek` 或 `gpt`，需退 App）；切到 gpt 时自动清理旧代理遗留的不兼容历史条目（`reasoning.content` 等），避免续聊报 `Invalid 'input[..].content'` |
-| `cx fix-all deepseek --limit 20` | 只批量切换最近 20 个会话 |
+| `cx fix-all <目标> [--limit N]` | **批量把所有老会话切换到目标模型**（`deepseek` 或 `gpt`，需退 App）；切到 gpt 时自动清理旧代理遗留的不兼容历史条目（`reasoning.content` 等），避免续聊报 `Invalid 'input[..].content'` |
+| `cx fix-all deepseek --limit 10` | 只处理最近 10 个会话（`--limit` 可按需调整，省略则处理全部） |
 
 **关于老会话**：每个会话记录着自己创建时的模型，`cx use` 只影响新会话——老会话继续用原模型，互不干扰。想把老会话搬到新模型：单个用 `cx fix`，全部用 `cx fix-all`（会先备份数据库和会话文件，确认后执行）。
 

package/cx.py

@@ -9,12 +9,11 @@
   cx key <API_KEY>     保存 deepseek key 并注入 GUI 环境(launchctl setenv)
   cx fix <会话ID>      修复单个会话(续跑一轮写入正确模型)
   cx fix-all <目标>    把所有老会话批量切换到目标模型(需退 App)
-                       例: cx fix-all deepseek / cx fix-all gpt --limit 20
-  cx migrate-sessions  把旧代理时代的 deepseek 会话迁移为直连 id(需退 App)
+                       例: cx fix-all deepseek --limit 10 (只改最近 10 个)
 """
 import json, os, re, glob, sqlite3, subprocess, sys, shutil, time, urllib.request, urllib.error
 
-CX_VERSION = "1.0.3"
+CX_VERSION = "1.0.5"
 
 CODEX_HOME = os.environ.get("CODEX_HOME", os.path.expanduser("~/.codex"))
 CONFIG = os.path.join(CODEX_HOME, "config.toml")
@@ -35,7 +34,6 @@ wire_api = "responses"
 """
 
 GPT_MODEL = "gpt-5.6-sol"
-DS_IDS = ("deepseek/deepseek-v4-flash", "deepseek-v4-flash")
 
 HELP = """cx — Codex 模型直连切换器
 
@@ -49,7 +47,7 @@ HELP = """cx — Codex 模型直连切换器
   fix <会话ID|last>    修复单个会话(ID 取 status 里显示的前 8 位即可)
   fix-all <目标>       批量把所有老会话切换到目标模型(需退 App)
                        用法: cx fix-all deepseek|gpt [--limit N]
-  migrate-sessions     旧代理会话迁移(遗留命令,一般用 fix-all 即可)
+                       例: cx fix-all deepseek --limit 10 (只改最近 10 个)
   version              显示 cx 版本
   help                 显示本帮助
 
@@ -155,6 +153,62 @@ def clean_ocx_injections(text):
         out.append(ln)
     return "\n".join(out)
 
+
+# ---------- App 投影缓存对齐 ----------
+# 背景(踩过的坑,务必保留):
+#   rollout 每条记录带顶层 "ordinal" 字段,且 App 要求它从 0 起、逐条 +1 连续。
+#   cx fix-all 会两处改动 rollout:
+#     1) rewrite_rollout 重新序列化 turn_context/session_meta → 整文件字节偏移漂移;
+#     2) sanitize_rollout 删除 reasoning 行 → ordinal 出现缺口。
+#   而 App 的投影(thread_history_1.sqlite)按 ordinal + 字节偏移增量推进,一旦遇到缺口
+#   就永久卡死("expected ordinal N, got N+1"),新内容再也进不了投影缓存 ——
+#   表现就是"跑完 fix-all 后重开 App,今天聊的内容消失了"(live 会话内存里其实还在)。
+# 因此 fix-all 必须:先重编号 ordinal 消除缺口,再清掉该会话的投影缓存,
+#   让 App 下次打开时从(已连续的)rollout 完整重建。重建是唯一 100% 安全的做法。
+import re as _re
+_ORD_PAT = _re.compile(rb'"ordinal":\s*(\d+)')
+_ORD_SUB = _re.compile(rb'"ordinal":\s*\d+')
+
+def read_ordinals(path):
+    """按行序读出每行顶层 ordinal 值(缺失为 None)"""
+    out = []
+    for ln in open(path, "rb"):
+        m = _ORD_PAT.search(ln)
+        out.append(int(m.group(1)) if m else None)
+    return out
+
+def renumber_ordinals(path):
+    """把每行 ordinal 重写为行号,消除删行造成的缺口。返回改写行数。
+    正常 rollout 每行都有 ordinal 且原本 ordinal==行号,故以行号为准可完美复原连续性。"""
+    lines = open(path, "rb").readlines()
+    changed = 0
+    for i, ln in enumerate(lines):
+        new = _ORD_SUB.sub(b'"ordinal":' + str(i).encode(), ln, count=1)
+        if new != ln:
+            lines[i] = new; changed += 1
+    if changed:
+        open(path, "wb").writelines(lines)
+    return changed
+
+def reset_app_projection(thread_id):
+    """清掉 App 对某会话的投影缓存,强制其下次打开时从 rollout 重建。
+    rollout 被改写/删行后这是唯一安全做法:避免 ordinal 缺口与字节偏移错位残留。
+    (thread_history_projection_state 上有 DELETE 触发器,会连带清 thread_realtime_items)"""
+    db_path = os.path.join(CODEX_HOME, "thread_history_1.sqlite")
+    if not (thread_id and os.path.exists(db_path)):
+        return False
+    db = sqlite3.connect(db_path)
+    try:
+        has = lambda t: db.execute(
+            "SELECT 1 FROM sqlite_master WHERE type='table' AND name=?", (t,)).fetchone()
+        for t in ("thread_items", "thread_turns", "thread_history_projection_state"):
+            if has(t):
+                db.execute(f"DELETE FROM {t} WHERE thread_id=?", (thread_id,))
+        db.commit()
+        return True
+    finally:
+        db.close()
+
 # ---------- 命令 ----------
 def cmd_use(which):
     if which not in ("deepseek", "gpt"): err("用法: cx use deepseek|gpt")
@@ -263,9 +317,6 @@ def cmd_fix():
     print(tail)
     ok("修复完成") if r.returncode == 0 else err(f"修复失败 exit={r.returncode}")
 
-def is_ds(model):
-    return isinstance(model, str) and (model in DS_IDS or model.startswith("deepseek"))
-
 # ---------- 批量切换老会话 ----------
 def sanitize_rollout(path):
     """移除旧代理时代 OpenAI 不兼容的 reasoning 条目(id 为 rs_ocx_*,或带 content 字段)。
@@ -312,11 +363,14 @@ def rewrite_rollout(path, model, provider):
 
 def cmd_fix_all():
     args = sys.argv[2:]
-    which = args[0] if args else ""
+    which = args[0] if args and not args[0].startswith("-") else ""
     limit = None
-    if "--limit" in args:
-        i = args.index("--limit")
-        limit = int(args[i + 1]) if len(args) > i + 1 else None
+    for i, a in enumerate(args):
+        if a == "--limit" and i + 1 < len(args):
+            limit = int(args[i + 1]) if args[i + 1].isdigit() else None
+        elif a.startswith("--limit="):
+            v = a.split("=", 1)[1]
+            limit = int(v) if v.isdigit() else None
     if which not in ("deepseek", "gpt"):
         err("用法: cx fix-all deepseek|gpt [--limit N]   (--limit N 只改最近 N 个,默认全部)")
     model, provider = (DS_MODEL, "deepseek") if which == "deepseek" else (GPT_MODEL, "openai")
@@ -337,7 +391,8 @@ def cmd_fix_all():
             todo.append((tid, m, p, rp, needs_model))
     if not todo:
         ok(f"所有会话已经是 {model},无需切换"); db.close(); return
-    print(f"待切换 {len(todo)} / {len(rows)} 个会话 → {model} ({provider})")
+    scope = f"最近 {limit} 个中" if limit else ""
+    print(f"{scope}待切换 {len(todo)} / {len(rows)} 个会话 → {model} ({provider})")
     if input("确认执行? [y/N] ").strip().lower() != "y":
         info("已取消"); db.close(); return
     ts = time.strftime("%Y%m%d-%H%M%S")
@@ -349,55 +404,20 @@ def cmd_fix_all():
         if rp and os.path.exists(rp):
             bakj = rp + f".bak.cx-fixall-{ts}"
             if not os.path.exists(bakj): shutil.copy2(rp, bakj)
+            old_ords = read_ordinals(rp)          # 改写前快照(仅用于诊断是否有缺口)
             if needs_model: rewrite_rollout(rp, model, provider)
             if provider == "openai": sanitize_rollout(rp)
+            # 关键:删行会产生 ordinal 缺口 + 重排会移动字节偏移;必须重编号消除缺口,
+            # 并清投影缓存让 App 从 rollout 重建,否则重开 App 后该会话内容会"消失"
+            fixed = renumber_ordinals(rp)
+            reset_app_projection(tid)
+            if fixed: print(f"  · {tid[:8]} 重编号 {fixed} 行并重置 App 投影")
         if needs_model:
             db.execute("UPDATE threads SET model=?, model_provider=? WHERE id=?", (model, provider, tid))
         n += 1
     db.commit(); db.close()
     ok(f"已切换 {n} 个会话 → {model}。重开 App 生效")
 
-def cmd_migrate():
-    force = "--yes" in sys.argv
-    if app_running() and not force:
-        err("请先完全退出 ChatGPT/Codex App(或加 --yes 跳过检查,不推荐)")
-    db = sqlite3.connect(os.path.join(CODEX_HOME, "state_5.sqlite"))
-    rows = db.execute("SELECT id, model, rollout_path FROM threads WHERE model LIKE 'deepseek%'").fetchall()
-    if not rows: ok("没有需要迁移的会话"); return
-    ts = time.strftime("%Y%m%d-%H%M%S")
-    bak = os.path.join(CODEX_HOME, f"state_5.sqlite.bak.cx-migrate-{ts}")
-    shutil.copy2(os.path.join(CODEX_HOME, "state_5.sqlite"), bak)
-    ok(f"数据库已备份: {bak}")
-    n = 0
-    for tid, model, path in rows:
-        if os.path.exists(path):
-            bakj = path + f".bak.cx-{ts}"
-            if not os.path.exists(bakj): shutil.copy2(path, bakj)
-            new_lines = []
-            changed = False
-            for line in open(path, encoding="utf-8"):
-                if '"turn_context"' in line or '"session_meta"' in line:
-                    try:
-                        d = json.loads(line)
-                        pl = d.get("payload", {})
-                        if d.get("type") == "session_meta":
-                            if is_ds(pl.get("model")): pl["model"] = DS_MODEL; changed = True
-                            if pl.get("model_provider") == "openai": pl["model_provider"] = "deepseek"; changed = True
-                        elif d.get("type") == "turn_context":
-                            if is_ds(pl.get("model")): pl["model"] = DS_MODEL; changed = True
-                            cm = pl.get("collaboration_mode") or {}
-                            st = cm.get("settings") or {}
-                            if is_ds(st.get("model")): st["model"] = DS_MODEL; changed = True
-                        if changed: line = json.dumps(d, ensure_ascii=False) + "\n"
-                    except Exception: pass
-                new_lines.append(line)
-            if changed:
-                open(path, "w", encoding="utf-8").writelines(new_lines); n += 1
-    db.execute("UPDATE threads SET model=?, model_provider='deepseek' WHERE model LIKE 'deepseek%'", (DS_MODEL,))
-    db.commit()
-    ok(f"已迁移 {n} 个 rollout / {len(rows)} 条记录 → deepseek-chat")
-    db.close()
-
 def main():
     if len(sys.argv) < 2: cmd_status(); return
     c = sys.argv[1]
@@ -407,7 +427,6 @@ def main():
     elif c == "doctor": cmd_doctor()
     elif c == "fix": cmd_fix()
     elif c == "fix-all": cmd_fix_all()
-    elif c == "migrate-sessions": cmd_migrate()
     elif c in ("version", "-V", "--version"): print(f"cx {CX_VERSION}")
     elif c in ("-h", "--help", "help"): print(HELP)
     else: err(f"未知命令: {c}(cx help 查看用法)")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-model-change",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Switch OpenAI Codex (CLI / desktop app) between DeepSeek direct-connect and native ChatGPT. No proxy, no daemon.",
   "bin": {
     "cx": "bin/cx.js"