@clawos-dev/clawd 0.2.225 → 0.2.227

package/dist/cli.cjs

@@ -41919,7 +41919,7 @@ var CONTACT_SSH_SYSTEM_PROMPT_HINT = `## \u8DE8\u8BBE\u5907\u6587\u4EF6\u8BBF\u9
 
 **\u6CE8\u610F**\uFF1A
 - \u6388\u6743\u76EE\u5F55\u6570\u636E\u6E90\u5B9E\u65F6\uFF08jail \u6BCF\u6B21\u8BFB A \u4FA7\u6700\u65B0\u914D\u7F6E\uFF09\uFF0CA \u6539\u4E86\u6388\u6743\u540E\u4F60\u4E0B\u4E00\u6B21\u62E8\u53F7\u7ACB\u5373\u611F\u77E5
-- \u6392\u969C\uFF1A\u672C\u673A debug \u65E5\u5FD7\u5728 \`~/.clawd/contact-ssh.log\`\uFF08\u7528\u6237\u53EF \`tail -f\` \u770B\u6BCF\u4E00\u6B65\uFF09\uFF0C\u4F60\u51FA\u9519\u65F6\u544A\u8BC9\u7528\u6237\u67E5\u8FD9\u4E2A\u6587\u4EF6
+- \u6392\u969C\uFF1A\u672C\u673A debug \u65E5\u5FD7\u5728 \`~/.clawd/log/contact-ssh.log\`\uFF08\u7528\u6237\u53EF \`tail -f\` \u770B\u6BCF\u4E00\u6B65\uFF09\uFF0C\u4F60\u51FA\u9519\u65F6\u544A\u8BC9\u7528\u6237\u67E5\u8FD9\u4E2A\u6587\u4EF6
 - \u5982\u679C \`ls ~/.clawd/contact-ssh-keys/\` \u4E3A\u7A7A\uFF0C\u8BF4\u660E\u8FD8\u6CA1\u6709\u5BF9\u7AEF\u6388\u6743\u4F60\u6216 key \u8FD8\u6CA1\u62C9\u5230\uFF08B \u4FA7 daemon \u6BCF 60s \u4E00\u6B21\u81EA\u52A8\u62C9\uFF09\uFF0C\u5982\u5B9E\u544A\u8BC9\u7528\u6237
 `;
 
@@ -48364,6 +48364,12 @@ function computeNextRunAtMs(schedule, fromMs) {
 }
 
 // src/shift/store.ts
+function normalizeSchedule(schedule, nowMs) {
+  if (schedule.kind === "every" && schedule.anchorMs === void 0) {
+    return { ...schedule, anchorMs: nowMs };
+  }
+  return schedule;
+}
 function createShiftStore(deps) {
   let shifts = [];
   let flushTimer = null;
@@ -48382,7 +48388,15 @@ function createShiftStore(deps) {
     if (parsed.version !== 1) {
       throw new Error(`shift.json: unsupported version ${parsed.version}`);
     }
-    shifts = parsed.shifts ?? [];
+    const now = deps.now();
+    shifts = (parsed.shifts ?? []).map((s) => {
+      const schedule = normalizeSchedule(s.schedule, s.createdAtMs);
+      if (schedule === s.schedule) return s;
+      const gridNext = computeNextRunAtMs(schedule, now) ?? void 0;
+      const oldNext = s.state.nextRunAtMs;
+      const nextRunAtMs = gridNext !== void 0 && (oldNext === void 0 || gridNext < oldNext) ? gridNext : oldNext;
+      return { ...s, schedule, state: { ...s.state, nextRunAtMs } };
+    });
   }
   async function flushNow() {
     if (flushTimer) {
@@ -48415,9 +48429,11 @@ function createShiftStore(deps) {
   }
   function add(input) {
     const now = deps.now();
-    const nextRunAtMs = computeNextRunAtMs(input.schedule, now) ?? void 0;
+    const schedule = normalizeSchedule(input.schedule, now);
+    const nextRunAtMs = computeNextRunAtMs(schedule, now) ?? void 0;
     const shift = {
       ...input,
+      schedule,
       id: (0, import_node_crypto6.randomUUID)(),
       createdAtMs: now,
       updatedAtMs: now,
@@ -48432,8 +48448,8 @@ function createShiftStore(deps) {
     const idx = shifts.findIndex((s) => s.id === id);
     if (idx < 0) throw new Error(`shift not found: ${id}`);
     const now = deps.now();
-    const newSchedule = patch.schedule ?? shifts[idx].schedule;
-    const nextRunAtMs = patch.schedule ? computeNextRunAtMs(patch.schedule, now) ?? void 0 : shifts[idx].state.nextRunAtMs;
+    const newSchedule = patch.schedule ? normalizeSchedule(patch.schedule, now) : shifts[idx].schedule;
+    const nextRunAtMs = patch.schedule ? computeNextRunAtMs(newSchedule, now) ?? void 0 : shifts[idx].state.nextRunAtMs;
     const merged = {
       ...shifts[idx],
       ...patch,
@@ -48529,13 +48545,10 @@ function createShiftScheduler(deps) {
   async function tickNow() {
     const now = deps.now();
     if (now < lastTickAtMs || now - lastTickAtMs > CLOCK_JUMP_THRESHOLD_MS) {
-      for (const shift of deps.store.list()) {
-        const next = computeNextRunAtMs(shift.schedule, now) ?? void 0;
-        deps.store.patchState(shift.id, { nextRunAtMs: next });
-      }
       deps.logger?.warn("shift.scheduler.clock_jump", {
         lastTickAtMs,
-        now
+        now,
+        gapMs: now - lastTickAtMs
       });
     }
     lastTickAtMs = now;
@@ -53190,7 +53203,9 @@ var TunnelManager = class {
       const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logFilePath = import_node_path35.default.join(this.deps.dataDir, "frpc.log");
+      const logDir = import_node_path35.default.join(this.deps.dataDir, "log");
+      import_node_fs34.default.mkdirSync(logDir, { recursive: true });
+      const logFilePath = import_node_path35.default.join(logDir, "frpc.log");
       const logStream = import_node_fs34.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
@@ -53431,8 +53446,11 @@ var CLAWD_SSH_JAIL_SCRIPT = String.raw`#!/usr/bin/env bash
 
 set -euo pipefail
 
-# 用户可读审计日志：追加到 ~/.clawd/contact-ssh.log（跟 daemon TS 侧 contact-ssh-log.ts 共写）
-CONTACT_SSH_LOG="${"${HOME}"}/.clawd/contact-ssh.log"
+# 用户可读审计日志：追加到 ~/.clawd/log/contact-ssh.log（跟 daemon TS 侧 contact-ssh-log.ts 共写）
+# bash 侧写死 ~/.clawd/log/，因为 jail 脚本在 authorized_keys command= 里被 sshd 起，
+# 拿不到 daemon --data-dir 覆盖。dev daemon 用 --data-dir=/tmp/x 时 jail 仍写 ~/.clawd/log/，
+# 跟改动前 (~/.clawd/contact-ssh.log) 一样的分歧行为，不做统一。
+CONTACT_SSH_LOG="${"${HOME}"}/.clawd/log/contact-ssh.log"
 log_line() {
   # 参数: level tag msg
   local ts
@@ -53629,7 +53647,9 @@ var SshdManager = class {
     const proc = (this.deps.spawnImpl ?? import_node_child_process11.spawn)(sshdBin, ["-D", "-e", "-f", configPath], {
       stdio: ["ignore", "pipe", "pipe"]
     });
-    const logStream = import_node_fs38.default.createWriteStream(import_node_path39.default.join(this.sshdDir, "sshd.log"), {
+    const sshdLogDir = import_node_path39.default.join(this.deps.dataDir, "log");
+    import_node_fs38.default.mkdirSync(sshdLogDir, { recursive: true });
+    const logStream = import_node_fs38.default.createWriteStream(import_node_path39.default.join(sshdLogDir, "sshd.log"), {
       flags: "a",
       mode: 384
     });
@@ -53810,7 +53830,7 @@ var import_node_path42 = __toESM(require("path"), 1);
 var import_node_fs40 = __toESM(require("fs"), 1);
 var import_node_path41 = __toESM(require("path"), 1);
 function createContactSshLog(dataDir) {
-  const file = import_node_path41.default.join(dataDir, "contact-ssh.log");
+  const file = import_node_path41.default.join(dataDir, "log", "contact-ssh.log");
   function append(level, tag, message, meta) {
     const time = (/* @__PURE__ */ new Date()).toISOString();
     let line = `[${time}] [${level}] [${tag}] ${message}`;
@@ -59421,18 +59441,20 @@ async function startDaemon(config) {
     sampling: logShippingCfg.sampling,
     homeDir: import_node_os21.default.homedir()
   });
+  const logDir = import_node_path64.default.join(config.dataDir, "log");
+  import_node_fs51.default.mkdirSync(logDir, { recursive: true });
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path64.default.join(config.dataDir, "clawd.log"),
+    file: import_node_path64.default.join(logDir, "clawd.log"),
     logClient
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const screenIdleProbeLogger = createFileOnlyLogger({
-    file: import_node_path64.default.join(config.dataDir, "screen-idle-probe.log"),
+    file: import_node_path64.default.join(logDir, "screen-idle-probe.log"),
     level: "debug"
   });
   logger.info("screen-idle probe logger enabled", {
-    file: import_node_path64.default.join(config.dataDir, "screen-idle-probe.log")
+    file: import_node_path64.default.join(logDir, "screen-idle-probe.log")
   });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
   const pre = stateMgr.preflight();
@@ -59603,7 +59625,7 @@ async function startDaemon(config) {
   const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let dispatchMcpConfigPath2;
   if (dispatchServerScriptPath) {
-    const dispatchLogPath = import_node_path64.default.join(config.dataDir, "dispatch-mcp-server.log");
+    const dispatchLogPath = import_node_path64.default.join(logDir, "dispatch-mcp-server.log");
     dispatchMcpConfigPath2 = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
@@ -59626,7 +59648,7 @@ async function startDaemon(config) {
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let ticketMcpConfigPath2;
   if (ticketServerScriptPath) {
-    const ticketLogPath = import_node_path64.default.join(config.dataDir, "ticket-mcp-server.log");
+    const ticketLogPath = import_node_path64.default.join(logDir, "ticket-mcp-server.log");
     ticketMcpConfigPath2 = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
@@ -59651,7 +59673,7 @@ async function startDaemon(config) {
   const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let shiftMcpConfigPath2;
   if (shiftServerScriptPath) {
-    const shiftLogPath = import_node_path64.default.join(config.dataDir, "shift-mcp-server.log");
+    const shiftLogPath = import_node_path64.default.join(logDir, "shift-mcp-server.log");
     shiftMcpConfigPath2 = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
@@ -59675,7 +59697,7 @@ async function startDaemon(config) {
   const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
   let inboxMcpConfigPath2;
   if (inboxServerScriptPath) {
-    const inboxLogPath = import_node_path64.default.join(config.dataDir, "inbox-mcp-server.log");
+    const inboxLogPath = import_node_path64.default.join(logDir, "inbox-mcp-server.log");
     inboxMcpConfigPath2 = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
@@ -60487,7 +60509,7 @@ async function startDaemon(config) {
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
         `Frpc config: ${import_node_path64.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path64.default.join(config.dataDir, "frpc.log")}`
+        `Frpc log:    ${import_node_path64.default.join(logDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);

package/package.json

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