@clawos-dev/clawd 0.2.65-beta.107.ac81439 → 0.2.65-beta.108.410b956

package/dist/cli.cjs

@@ -22121,6 +22121,16 @@ function nowIso2(deps) {
 function newSessionId() {
   return v4_default().replace(/-/g, "").slice(0, 16);
 }
+function derivePersonaSpawnCwd(file, personaRoot) {
+  const personaId = file.ownerPersonaId;
+  if (!personaId) return file.cwd;
+  if (!personaRoot) {
+    throw new Error(
+      `derivePersonaSpawnCwd: personaRoot missing for owner session ${file.sessionId} (ownerPersonaId=${personaId})`
+    );
+  }
+  return import_node_path6.default.join(personaRoot, safeFileName(personaId));
+}
 function makeInitialState(file, subSessionMeta) {
   return {
     file,
@@ -22279,6 +22289,24 @@ var SessionManager = class {
     const adapter = this.deps.getAdapter(file.tool ?? "claude");
     const store = this.storeFor(scope);
     const subSessionMeta = metaFromScope(scope, this.deps.personaRoot ?? "");
+    const correctedCwd = derivePersonaSpawnCwd(file, this.deps.personaRoot);
+    if (correctedCwd !== file.cwd) {
+      this.deps.logger?.warn("owner session cwd drifted from persona dir; auto-correcting", {
+        sessionId: file.sessionId,
+        ownerPersonaId: file.ownerPersonaId,
+        stale: file.cwd,
+        corrected: correctedCwd
+      });
+      file = { ...file, cwd: correctedCwd, updatedAt: nowIso2(this.deps) };
+      try {
+        store.write(file);
+      } catch (err) {
+        this.deps.logger?.warn("failed to persist auto-corrected owner cwd", {
+          sessionId: file.sessionId,
+          error: err.message
+        });
+      }
+    }
     const attachmentGroup = this.deps.attachmentGroup;
     const runner = new SessionRunner(makeInitialState(file, subSessionMeta), {
       broadcastFrame: (frame, target) => this.routeFromRunner(frame, target),
@@ -22388,14 +22416,31 @@ var SessionManager = class {
   }
   // ---- 命令方法：均返回 { response, broadcast[] }，由 dispatcher 聚合 ----
   create(args) {
-    let cwd = args.cwd;
-    if (args.ownerPersonaId && !cwd) {
-      if (!this.deps.personaRoot) {
-        throw new Error("personaRoot required to derive cwd from ownerPersonaId");
-      }
-      cwd = import_node_path6.default.join(this.deps.personaRoot, safeFileName(args.ownerPersonaId));
-    }
-    if (!cwd) {
+    this.deps.logger?.warn("[spawn-cwd-debug] manager.create entry", {
+      argsOwnerPersonaId: args.ownerPersonaId,
+      argsCwd: args.cwd,
+      personaRoot: this.deps.personaRoot
+    });
+    let cwd;
+    if (args.ownerPersonaId) {
+      cwd = derivePersonaSpawnCwd(
+        {
+          sessionId: "",
+          cwd: args.cwd ?? "",
+          tool: "claude",
+          ownerPersonaId: args.ownerPersonaId,
+          createdAt: "",
+          updatedAt: ""
+        },
+        this.deps.personaRoot
+      );
+      this.deps.logger?.warn("[spawn-cwd-debug] derived persona cwd", { derivedCwd: cwd });
+    } else if (args.cwd) {
+      cwd = args.cwd;
+      this.deps.logger?.warn("[spawn-cwd-debug] using args.cwd (no ownerPersonaId)", {
+        cwd
+      });
+    } else {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, "cwd required when ownerPersonaId is absent");
     }
     try {

package/package.json

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