@clawos-dev/clawd 0.2.94 → 0.2.95

package/dist/cli.cjs

@@ -652,8 +652,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path47, errorMaps, issueData } = params;
-      const fullPath = [...path47, ...issueData.path || []];
+      const { data, path: path48, errorMaps, issueData } = params;
+      const fullPath = [...path48, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -964,11 +964,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path47, key) {
+      constructor(parent, value, path48, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path47;
+        this._path = path48;
         this._key = key;
       }
       get path() {
@@ -5636,8 +5636,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path47 = req.path;
-        _req.url = typeof path47 === "string" ? path47 : req.url ? req.url.path || req.url : void 0;
+        const path48 = req.path;
+        _req.url = typeof path48 === "string" ? path48 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -5802,14 +5802,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path47) {
+    function parsePath(path48) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path47.length; i++) {
-        const char = path47[i];
+      for (let i = 0; i < path48.length; i++) {
+        const char = path48[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -5940,10 +5940,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path47 of paths) {
-        const parts = parsePath(path47);
+      for (const path48 of paths) {
+        const parts = parsePath(path48);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path47, remove);
+          redactWildcardPath(obj, parts, censor, path48, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -6028,8 +6028,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path47) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path47];
+            const wrappedCensor = typeof censor === "function" ? (value, path48) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path48];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6064,8 +6064,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path47 of pathsToClone) {
-        const parts = parsePath(path47);
+      for (const path48 of pathsToClone) {
+        const parts = parsePath(path48);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6117,24 +6117,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path47) {
-      if (typeof path47 !== "string") {
+    function validatePath(path48) {
+      if (typeof path48 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path47 === "") {
+      if (path48 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path47.includes("..")) {
-        throw new Error(`Invalid redaction path (${path47})`);
+      if (path48.includes("..")) {
+        throw new Error(`Invalid redaction path (${path48})`);
       }
-      if (path47.includes(",")) {
-        throw new Error(`Invalid redaction path (${path47})`);
+      if (path48.includes(",")) {
+        throw new Error(`Invalid redaction path (${path48})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path47.length; i++) {
-        const char = path47[i];
+      for (let i = 0; i < path48.length; i++) {
+        const char = path48[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -6148,20 +6148,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path47})`);
+            throw new Error(`Invalid redaction path (${path48})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path47})`);
+        throw new Error(`Invalid redaction path (${path48})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path47 of paths) {
-        validatePath(path47);
+      for (const path48 of paths) {
+        validatePath(path48);
       }
     }
     function slowRedact(options = {}) {
@@ -6329,8 +6329,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path47) => {
-            return censor(value, [k2, ...path47]);
+          const wrappedCensor = typeof censor === "function" ? (value, path48) => {
+            return censor(value, [k2, ...path48]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -6551,7 +6551,7 @@ var require_sonic_boom = __commonJS({
     var fs38 = require("fs");
     var EventEmitter2 = require("events");
     var inherits = require("util").inherits;
-    var path47 = require("path");
+    var path48 = require("path");
     var sleep = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -6605,7 +6605,7 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs38.mkdirSync(path47.dirname(file), { recursive: true });
+          if (sonic.mkdir) fs38.mkdirSync(path48.dirname(file), { recursive: true });
           const fd = fs38.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
@@ -6613,7 +6613,7 @@ var require_sonic_boom = __commonJS({
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs38.mkdir(path47.dirname(file), { recursive: true }, (err) => {
+        fs38.mkdir(path48.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
           fs38.open(file, flags, mode, fileOpened);
         });
@@ -10244,11 +10244,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path47, added, removed, oldPosInc, options) {
-        var last = path47.lastComponent;
+      addToPath: function addToPath(path48, added, removed, oldPosInc, options) {
+        var last = path48.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path47.oldPos + oldPosInc,
+            oldPos: path48.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -10258,7 +10258,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path47.oldPos + oldPosInc,
+            oldPos: path48.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -10704,10 +10704,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec = m2;
-      const path47 = typeof rec.path === "string" ? rec.path : null;
+      const path48 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path47 || content == null) return null;
-      const entry = { path: path47, content };
+      if (!path48 || content == null) return null;
+      const entry = { path: path48, content };
       if (typeof rec.mtimeMs === "number") entry.mtimeMs = rec.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -11538,10 +11538,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec = m2;
-      const path47 = typeof rec.path === "string" ? rec.path : null;
+      const path48 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path47 || content == null) return null;
-      const out = { path: path47, content };
+      if (!path48 || content == null) return null;
+      const out = { path: path48, content };
       if (typeof rec.mtimeMs === "number") out.mtimeMs = rec.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -20456,7 +20456,7 @@ var require_websocket_server = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path33.default.dirname(opts.recordPath);
+  const dir = import_node_path34.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -20496,12 +20496,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs30, import_node_path33;
+var import_node_fs30, import_node_path34;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
     import_node_fs30 = __toESM(require("fs"), 1);
-    import_node_path33 = __toESM(require("path"), 1);
+    import_node_path34 = __toESM(require("path"), 1);
   }
 });
 
@@ -20544,7 +20544,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs31.mkdtempSync)(import_node_path34.default.join(import_node_os15.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs31.mkdtempSync)(import_node_path35.default.join(import_node_os15.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -20711,13 +20711,13 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs31, import_node_os15, import_node_path34;
+var import_node_fs31, import_node_os15, import_node_path35;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs31 = require("fs");
     import_node_os15 = __toESM(require("os"), 1);
-    import_node_path34 = __toESM(require("path"), 1);
+    import_node_path35 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -20949,7 +20949,7 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path32 = __toESM(require("path"), 1);
+var import_node_path33 = __toESM(require("path"), 1);
 var import_node_fs29 = __toESM(require("fs"), 1);
 
 // src/logger.ts
@@ -28803,22 +28803,27 @@ async function waitForFrpcReady(proc, timeoutMs) {
 
 // src/tunnel/device-key.ts
 var import_node_os11 = __toESM(require("os"), 1);
+var import_node_path27 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   const hostname = opts.hostname ?? import_node_os11.default.hostname();
   const uid = opts.uid ?? (typeof import_node_os11.default.userInfo === "function" ? import_node_os11.default.userInfo().uid : 0);
-  const input = `${hostname}::${uid}`;
+  const home = opts.home ?? import_node_os11.default.homedir();
+  const defaultDataDir = import_node_path27.default.resolve(import_node_path27.default.join(home, ".clawd"));
+  const normalizedDataDir = opts.dataDir ? import_node_path27.default.resolve(opts.dataDir) : null;
+  const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
+  const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
   return import_node_crypto9.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
 var import_node_fs25 = __toESM(require("fs"), 1);
-var import_node_path27 = __toESM(require("path"), 1);
+var import_node_path28 = __toESM(require("path"), 1);
 var import_node_crypto10 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
-  return import_node_path27.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path28.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthFile(opts) {
   const file = authFilePath(opts.dataDir);
@@ -28868,7 +28873,7 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs25.default.mkdirSync(import_node_path27.default.dirname(file), { recursive: true });
+  import_node_fs25.default.mkdirSync(import_node_path28.default.dirname(file), { recursive: true });
   import_node_fs25.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
     import_node_fs25.default.chmodSync(file, 384);
@@ -28879,11 +28884,11 @@ function writeAuthFile(file, content) {
 // src/owner-profile.ts
 var import_node_fs26 = __toESM(require("fs"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
-var import_node_path28 = __toESM(require("path"), 1);
+var import_node_path29 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
   const fallback = import_node_os12.default.userInfo().username;
-  const profilePath = import_node_path28.default.join(dataDir, PROFILE_FILENAME);
+  const profilePath = import_node_path29.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
     raw = import_node_fs26.default.readFileSync(profilePath, "utf8");
@@ -28917,7 +28922,7 @@ init_protocol();
 // src/session/fork.ts
 var import_node_fs27 = __toESM(require("fs"), 1);
 var import_node_os13 = __toESM(require("os"), 1);
-var import_node_path29 = __toESM(require("path"), 1);
+var import_node_path30 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs27.default.readFileSync(file, "utf8");
@@ -28933,9 +28938,9 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path29.default.join(import_node_os13.default.homedir(), ".claude");
-  const projectDir = import_node_path29.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path29.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  const baseDir = input.baseDir ?? import_node_path30.default.join(import_node_os13.default.homedir(), ".claude");
+  const projectDir = import_node_path30.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  const sourceFile = import_node_path30.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs27.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
@@ -28966,7 +28971,7 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path29.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  const forkedFilePath = import_node_path30.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
   import_node_fs27.default.mkdirSync(projectDir, { recursive: true });
   import_node_fs27.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
@@ -29320,7 +29325,7 @@ function buildPermissionHandlers(deps) {
 }
 
 // src/handlers/history.ts
-var path39 = __toESM(require("path"), 1);
+var path40 = __toESM(require("path"), 1);
 init_protocol();
 
 // src/session/recent-dirs.ts
@@ -29338,7 +29343,7 @@ function listRecentDirs(store, limit = 50) {
 }
 
 // src/permission/persona-paths.ts
-var path38 = __toESM(require("path"), 1);
+var path39 = __toESM(require("path"), 1);
 function getAllowedPersonaIds(grants, action) {
   const ids = /* @__PURE__ */ new Set();
   for (const g2 of grants) {
@@ -29351,26 +29356,26 @@ function getAllowedPersonaIds(grants, action) {
   return ids;
 }
 function isGuestPathAllowed(grants, absPath, personaRoot, action = "read") {
-  const root = path38.resolve(personaRoot);
-  const target = path38.resolve(absPath);
-  const sep3 = root.endsWith(path38.sep) ? "" : path38.sep;
+  const root = path39.resolve(personaRoot);
+  const target = path39.resolve(absPath);
+  const sep3 = root.endsWith(path39.sep) ? "" : path39.sep;
   if (!target.startsWith(root + sep3)) return false;
-  const rel = path38.relative(root, target);
+  const rel = path39.relative(root, target);
   if (!rel || rel.startsWith("..")) return false;
-  const personaId = rel.split(path38.sep)[0];
+  const personaId = rel.split(path39.sep)[0];
   if (!personaId) return false;
   const allowed = getAllowedPersonaIds(grants, action);
   if (allowed === "*") return true;
   return allowed.has(personaId);
 }
 function personaIdFromPath(absPath, personaRoot) {
-  const root = path38.resolve(personaRoot);
-  const target = path38.resolve(absPath);
-  const sep3 = root.endsWith(path38.sep) ? "" : path38.sep;
+  const root = path39.resolve(personaRoot);
+  const target = path39.resolve(absPath);
+  const sep3 = root.endsWith(path39.sep) ? "" : path39.sep;
   if (!target.startsWith(root + sep3)) return null;
-  const rel = path38.relative(root, target);
+  const rel = path39.relative(root, target);
   if (!rel || rel.startsWith("..")) return null;
-  const id = rel.split(path38.sep)[0];
+  const id = rel.split(path39.sep)[0];
   return id || null;
 }
 
@@ -29395,7 +29400,7 @@ function buildHistoryHandlers(deps) {
         if (!pid) return false;
         return isGuestPathAllowed(
           ctx.grants,
-          path39.join(personaRoot, pid),
+          path40.join(personaRoot, pid),
           personaRoot,
           "read"
         );
@@ -29406,7 +29411,7 @@ function buildHistoryHandlers(deps) {
   };
   const list = async (frame, _client, ctx) => {
     const args = HistoryListArgs.parse(frame);
-    assertGuestPath(ctx, path39.resolve(args.projectPath), personaRoot, "history:list");
+    assertGuestPath(ctx, path40.resolve(args.projectPath), personaRoot, "history:list");
     const sessions = await history.listSessions(args);
     return { response: { type: "history:list", sessions } };
   };
@@ -29438,13 +29443,13 @@ function buildHistoryHandlers(deps) {
   };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
-    assertGuestPath(ctx, path39.resolve(args.cwd), personaRoot, "history:subagents");
+    assertGuestPath(ctx, path40.resolve(args.cwd), personaRoot, "history:subagents");
     const subs = await history.listSubagents(args);
     return { response: { type: "history:subagents", subagents: subs } };
   };
   const subagentRead = async (frame, _client, ctx) => {
     const args = HistorySubagentReadArgs.parse(frame);
-    assertGuestPath(ctx, path39.resolve(args.cwd), personaRoot, "history:subagent-read");
+    assertGuestPath(ctx, path40.resolve(args.cwd), personaRoot, "history:subagent-read");
     const res = await history.readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
   };
@@ -29452,7 +29457,7 @@ function buildHistoryHandlers(deps) {
     const dirs = listRecentDirs(store);
     if (ctx?.principal.kind === "guest" && personaRoot) {
       const filtered = dirs.filter(
-        (d) => isGuestPathAllowed(ctx.grants, path39.resolve(d.cwd), personaRoot, "read")
+        (d) => isGuestPathAllowed(ctx.grants, path40.resolve(d.cwd), personaRoot, "read")
       );
       return { response: { type: "history:recentDirs", dirs: filtered } };
     }
@@ -29469,7 +29474,7 @@ function buildHistoryHandlers(deps) {
 }
 
 // src/handlers/workspace.ts
-var path40 = __toESM(require("path"), 1);
+var path41 = __toESM(require("path"), 1);
 var os14 = __toESM(require("os"), 1);
 init_protocol();
 init_protocol();
@@ -29510,22 +29515,22 @@ function buildWorkspaceHandlers(deps) {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
     const fallbackCwd = isGuest && personaRoot ? personaRoot : os14.homedir();
-    const resolvedCwd = path40.resolve(args.cwd ?? fallbackCwd);
-    const target = args.path ? path40.resolve(resolvedCwd, args.path) : resolvedCwd;
+    const resolvedCwd = path41.resolve(args.cwd ?? fallbackCwd);
+    const target = args.path ? path41.resolve(resolvedCwd, args.path) : resolvedCwd;
     assertGuestPath2(ctx, target, personaRoot, "workspace:list");
     const res = workspace.list({ ...args, cwd: resolvedCwd });
     return { response: { type: "workspace:list", ...res } };
   };
   const read = async (frame, _client, ctx) => {
     const args = WorkspaceReadArgs.parse(frame);
-    const target = path40.isAbsolute(args.path) ? path40.resolve(args.path) : path40.resolve(args.cwd, args.path);
+    const target = path41.isAbsolute(args.path) ? path41.resolve(args.path) : path41.resolve(args.cwd, args.path);
     assertGuestPath2(ctx, target, personaRoot, "workspace:read");
     const res = workspace.read(args);
     return { response: { type: "workspace:read", ...res } };
   };
   const skillsList = async (frame, _client, ctx) => {
     const args = SkillsListArgs.parse(frame);
-    const cwdAbs = path40.resolve(args.cwd);
+    const cwdAbs = path41.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list");
     const list2 = skills.list(args);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -29537,7 +29542,7 @@ function buildWorkspaceHandlers(deps) {
   };
   const agentsList = async (frame, _client, ctx) => {
     const args = AgentsListArgs.parse(frame);
-    const cwdAbs = path40.resolve(args.cwd);
+    const cwdAbs = path41.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list");
     const list2 = agents.list(args);
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -29556,18 +29561,18 @@ function buildWorkspaceHandlers(deps) {
 }
 
 // src/handlers/git.ts
-var path42 = __toESM(require("path"), 1);
+var path43 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
 var import_node_child_process6 = require("child_process");
 var import_node_fs28 = __toESM(require("fs"), 1);
-var import_node_path30 = __toESM(require("path"), 1);
+var import_node_path31 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process6.execFile);
 function normalizePath(p2) {
-  const resolved = import_node_path30.default.resolve(p2);
+  const resolved = import_node_path31.default.resolve(p2);
   try {
     return import_node_fs28.default.realpathSync(resolved);
   } catch {
@@ -29642,7 +29647,7 @@ async function listGitBranches(cwd) {
 // src/handlers/git.ts
 function assertGuestCwd(ctx, cwd, personaRoot, method) {
   if (!ctx || ctx.principal.kind !== "guest" || !personaRoot) return;
-  if (!isGuestPathAllowed(ctx.grants, path42.resolve(cwd), personaRoot, "read")) {
+  if (!isGuestPathAllowed(ctx.grants, path43.resolve(cwd), personaRoot, "read")) {
     throw new ClawdError(
       ERROR_CODES.UNAUTHORIZED,
       `guest ${ctx.principal.id} cannot ${method} cwd ${cwd}`
@@ -30129,7 +30134,7 @@ function buildPersonaHandlers(deps) {
 }
 
 // src/handlers/attachment.ts
-var import_node_path31 = __toESM(require("path"), 1);
+var import_node_path32 = __toESM(require("path"), 1);
 init_protocol();
 init_protocol();
 var DEFAULT_TTL_SECONDS = 24 * 3600;
@@ -30183,12 +30188,12 @@ function buildAttachmentHandlers(deps) {
         `session ${args.sessionId} scope unresolved`
       );
     }
-    const cwdAbs = import_node_path31.default.resolve(sessionFile.cwd);
-    const candidateAbs = import_node_path31.default.isAbsolute(args.relPath) ? import_node_path31.default.resolve(args.relPath) : import_node_path31.default.resolve(cwdAbs, args.relPath);
+    const cwdAbs = import_node_path32.default.resolve(sessionFile.cwd);
+    const candidateAbs = import_node_path32.default.isAbsolute(args.relPath) ? import_node_path32.default.resolve(args.relPath) : import_node_path32.default.resolve(cwdAbs, args.relPath);
     assertGuestAttachmentPath(ctx, candidateAbs, deps.personaRoot, "attachment.signUrl");
     const entries = deps.groupFileStore.list(scope, args.sessionId);
     const entry = entries.find((e) => {
-      const storedAbs = import_node_path31.default.isAbsolute(e.relPath) ? import_node_path31.default.resolve(e.relPath) : import_node_path31.default.resolve(cwdAbs, e.relPath);
+      const storedAbs = import_node_path32.default.isAbsolute(e.relPath) ? import_node_path32.default.resolve(e.relPath) : import_node_path32.default.resolve(cwdAbs, e.relPath);
       return storedAbs === candidateAbs && !e.stale;
     });
     if (!entry) {
@@ -30212,7 +30217,7 @@ function buildAttachmentHandlers(deps) {
     if (!ctx || ctx.principal.kind !== "guest" || !deps.personaRoot || !deps.sessionStore) return;
     const f = deps.sessionStore.read(sessionId);
     if (!f) return;
-    assertGuestAttachmentPath(ctx, import_node_path31.default.resolve(f.cwd), deps.personaRoot, method);
+    assertGuestAttachmentPath(ctx, import_node_path32.default.resolve(f.cwd), deps.personaRoot, method);
   }
   const groupAdd = async (frame, _client, ctx) => {
     if (!deps.groupFileStore || !deps.getSessionScope) {
@@ -30454,7 +30459,7 @@ function computeGrantForFrame(method, frame) {
 async function startDaemon(config) {
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path32.default.join(config.dataDir, "clawd.log")
+    file: import_node_path33.default.join(config.dataDir, "clawd.log")
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
@@ -30541,7 +30546,7 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path32.default.join(config.dataDir, "personas"));
+  const personaStore = new PersonaStore(import_node_path33.default.join(config.dataDir, "personas"));
   const defaultsRoot = findDefaultsRoot();
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -30558,7 +30563,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path32.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path33.default.join(config.dataDir, "personas"),
     personaStore,
     ownerDisplayName,
     ownerPrincipalId,
@@ -30582,7 +30587,7 @@ async function startDaemon(config) {
     // 文件可能 agent 写完又被自己删（罕见），用 size=0 / fallback mime 兜底。
     attachmentGroup: {
       onFileEdit: (input) => {
-        const absPath = import_node_path32.default.isAbsolute(input.relPath) ? input.relPath : import_node_path32.default.join(input.cwd, input.relPath);
+        const absPath = import_node_path33.default.isAbsolute(input.relPath) ? input.relPath : import_node_path33.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
           size = import_node_fs29.default.statSync(absPath).size;
@@ -30705,10 +30710,10 @@ async function startDaemon(config) {
       // 'persona/<pid>/owner'，default 走 'default'。
       getSessionScope: (sid) => manager.findOwnedSessionScope(sid),
       // guest path guard：candidate 必须在 personaRoot 子树下
-      personaRoot: import_node_path32.default.join(config.dataDir, "personas")
+      personaRoot: import_node_path33.default.join(config.dataDir, "personas")
     },
     // workspace/git/history/skills/agents handler 共用的 guest path guard 锚点
-    personaRoot: import_node_path32.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path33.default.join(config.dataDir, "personas"),
     // capability:list / delete handler 依赖
     capabilityManager,
     // personal-cap:get 返回的 shareBaseUrl 用此 base URL：
@@ -30897,7 +30902,7 @@ async function startDaemon(config) {
     tunnelMgr = new TunnelManager({
       dataDir: config.dataDir,
       clawosApi: config.clawosApi,
-      deviceKey: deriveStableDeviceKey(),
+      deviceKey: deriveStableDeviceKey({ dataDir: config.dataDir }),
       frpcBinaryOverride: config.frpcBinary,
       noPersist: config.noTunnelPersist,
       logger,
@@ -30915,8 +30920,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path32.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path32.default.join(config.dataDir, "frpc.log")}`
+        `Frpc config: ${import_node_path33.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path33.default.join(config.dataDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -30929,7 +30934,7 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path32.default.join(config.dataDir, "connect.txt");
+        const connectPath = import_node_path33.default.join(config.dataDir, "connect.txt");
         import_node_fs29.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
@@ -30995,7 +31000,7 @@ ${bar}
   };
 }
 function migrateDropPersonsDir(dataDir) {
-  const dir = import_node_path32.default.join(dataDir, "persons");
+  const dir = import_node_path33.default.join(dataDir, "persons");
   try {
     import_node_fs29.default.rmSync(dir, { recursive: true, force: true });
   } catch {

package/package.json

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