@clawos-dev/clawd 0.2.37 → 0.2.38-beta.54.cac95f0

package/dist/cli.cjs

@@ -8738,9 +8738,10 @@ var init_schemas = __esm({
       // NewSessionDialog 勾选 worktree 创建的 session 才会持久化这两个字段
       worktreeRoot: external_exports.string().min(1).optional(),
       worktreeBranch: external_exports.string().min(1).optional(),
-      // 由 session:fork 派生的 session 在 create 时记录源 transcript 的 toolSessionId；
-      // sidebar 据此挂 fork 图标。非 fork session 该字段缺省
-      forkedFromToolSessionId: external_exports.string().min(1).optional(),
+      // 由 session:fork 派生的 session 在 create 时记录源 session 的 sessionId（稳定 key，
+      // 不受 parent clear / re-spawn 影响）；sidebar 据此挂 fork 图标。非 fork session 该字段缺省。
+      // 旧字段 forkedFromToolSessionId 已弃用，daemon 启动时一次性迁移老数据
+      forkedFromSessionId: external_exports.string().min(1).optional(),
       // owner-mode persona session 身份标识；UI 用它在 SessionList 过滤 + jump，
       // daemon 用它做 idempotent dedupe + spawn 时派生 ctx.personaMode='owner'
       ownerPersonaId: external_exports.string().min(1).optional(),
@@ -8955,8 +8956,8 @@ var init_schemas = __esm({
       // NewSessionDialog 勾选 worktree 时由 UI 传入，daemon 原样持久化，不做额外副作用
       worktreeRoot: external_exports.string().min(1).optional(),
       worktreeBranch: external_exports.string().min(1).optional(),
-      // session:fork 派生 session 时由 UI 传入，daemon 写到 SessionFile.forkedFromToolSessionId
-      forkedFromToolSessionId: external_exports.string().min(1).optional(),
+      // session:fork 派生 session 时由 UI 传入源 sessionId，daemon 写到 SessionFile.forkedFromSessionId
+      forkedFromSessionId: external_exports.string().min(1).optional(),
       // owner-mode persona session：传此字段时 daemon 自行派生 cwd 和启动参数，
       // 且按 ownerPersonaId 做 idempotent dedupe（每 persona 永远只有一个 owner session）
       ownerPersonaId: external_exports.string().min(1).optional()
@@ -15522,20 +15523,52 @@ var SessionStore = class {
       if (code === "ENOENT") return [];
       throw err;
     }
-    const out = [];
+    const raws = [];
     for (const name of entries) {
       if (!name.endsWith(".json")) continue;
       if (name.includes(".tmp-")) continue;
       const full = import_node_path3.default.join(this.root, name);
       try {
-        const raw = import_node_fs3.default.readFileSync(full, "utf8");
-        const parsed = JSON.parse(raw);
-        const validated = SessionFileSchema.parse(parsed);
-        out.push(validated);
+        const text = import_node_fs3.default.readFileSync(full, "utf8");
+        const parsed = JSON.parse(text);
+        raws.push({ raw: parsed, path: full });
       } catch {
         continue;
       }
     }
+    const byToolId = /* @__PURE__ */ new Map();
+    for (const { raw } of raws) {
+      const sid = raw["sessionId"];
+      const tsid = raw["toolSessionId"];
+      if (typeof sid === "string" && typeof tsid === "string") byToolId.set(tsid, sid);
+    }
+    const out = [];
+    for (const { raw, path: full } of raws) {
+      const legacy = raw["forkedFromToolSessionId"];
+      const dirty = typeof legacy === "string";
+      if (dirty) {
+        if (raw["forkedFromSessionId"] === void 0) {
+          const parentSid = byToolId.get(legacy);
+          if (typeof parentSid === "string") raw["forkedFromSessionId"] = parentSid;
+        }
+        delete raw["forkedFromToolSessionId"];
+      }
+      let validated;
+      try {
+        validated = SessionFileSchema.parse(raw);
+      } catch {
+        continue;
+      }
+      if (dirty) {
+        try {
+          const tmp = `${full}.tmp-${process.pid}-${Date.now()}`;
+          import_node_fs3.default.writeFileSync(tmp, JSON.stringify(validated, null, 2), { encoding: "utf8", mode: 384 });
+          import_node_fs3.default.renameSync(tmp, full);
+        } catch {
+        }
+      }
+      out.push(validated);
+    }
     return out.sort((a, b) => a.updatedAt > b.updatedAt ? -1 : a.updatedAt < b.updatedAt ? 1 : 0);
   }
 };
@@ -16759,6 +16792,12 @@ var SessionManager = class {
   }
   // ---- 命令方法：均返回 { response, broadcast[] }，由 dispatcher 聚合 ----
   create(args) {
+    if (args.ownerPersonaId) {
+      const existing = this.deps.store.list().find((s) => s.ownerPersonaId === args.ownerPersonaId);
+      if (existing) {
+        return { response: existing, broadcast: [] };
+      }
+    }
     let cwd = args.cwd;
     if (args.ownerPersonaId && !cwd) {
       if (!this.deps.personaRoot) {
@@ -16789,7 +16828,7 @@ var SessionManager = class {
       iconKey: args.iconKey,
       worktreeRoot: args.worktreeRoot,
       worktreeBranch: args.worktreeBranch,
-      forkedFromToolSessionId: args.forkedFromToolSessionId,
+      forkedFromSessionId: args.forkedFromSessionId,
       ownerPersonaId: args.ownerPersonaId,
       createdAt: iso,
       updatedAt: iso

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.37",
+  "version": "0.2.38-beta.54.cac95f0",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",