@clawos-dev/clawd 0.2.177-beta.355.6443d50 → 0.2.177-beta.357.f436213

package/dist/cli.cjs

@@ -255,8 +255,9 @@ var init_events = __esm({
       "attachment-skills",
       "attachment-deferred-tools",
       // clawd shift v1：scheduler fire 时 daemon 给新 cc 的首条 user message 用
-      // <clawd-shift-fire> wrap 起头；classifyUserMessage 识别后路由到 UserMetaLine 折叠渲染，
-      // 不显示成 user 气泡（避免 instruction 文本被当 owner 实时对话）。
+      // `[clawd-shift-fire — ...]` plain text marker 起头任务包（不是 XML 标签，避开
+      // reducer 双源 dedup 失效雷，见 daemon shift/wrap.ts 注释）；classifyUserMessage
+      // 识别后路由到 UserMetaLine 折叠渲染，不显示成 user 气泡。
       "clawd-shift-fire"
     ];
     SKILL_SOURCE_VALUES = ["builtin", "global", "project", "plugin"];
@@ -11476,7 +11477,7 @@ var init_claude_history = __esm({
     SYSTEM_REMINDER_RE = /^\s*<system-reminder\b/i;
     OPENSPEC_BLOCK_RE = /^\s*<!--\s*OPENSPEC\b/i;
     SKILL_HINT_RE = /^\s*Base directory for this skill:\s/;
-    CLAWD_SHIFT_FIRE_RE = /^\s*<clawd-shift-fire\b/i;
+    CLAWD_SHIFT_FIRE_RE = /^\s*\[clawd-shift-fire\b/i;
     ATTACHMENT_SILENT_SUBTYPES = /* @__PURE__ */ new Set([
       "hook_additional_context",
       "hook_success",
@@ -41279,18 +41280,18 @@ function composeGuestSandbox(base, userWorkDir, spawnCwd) {
 
 // src/shift/wrap.ts
 function wrapShiftFirePrompt(args) {
+  const personaLabel = sanitizeMarkerValue(args.targetPersona);
   return [
-    `<clawd-shift-fire target-persona="${escapeAttr(args.targetPersona)}">`,
-    "This is a scheduled shift fire \u2014 not a live user message.",
+    `[clawd-shift-fire target-persona=${personaLabel} \u2014 scheduled shift fire, not a live user message from the owner]`,
+    "",
     "Respond as an assistant turn (start your output directly).",
     "",
     "Instruction:",
-    args.prompt,
-    "</clawd-shift-fire>"
+    args.prompt
   ].join("\n");
 }
-function escapeAttr(v2) {
-  return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+function sanitizeMarkerValue(v2) {
+  return v2.replace(/[\]\r\n\t]/g, "_");
 }
 
 // src/session/reducer.ts
@@ -41345,7 +41346,7 @@ function buildConnectionPrompt(args) {
   }
   if (args.workDir) {
     result += `
-\u4F60\u7684\u6587\u4EF6\u5DE5\u4F5C\u76EE\u5F55\u662F ${args.workDir}\uFF0C\u8FD9\u4E2A\u76EE\u5F55\u5BF9\u4F60\u53EF\u8BFB\u53EF\u5199\uFF0C\u6587\u4EF6\u7684\u8BFB\u53D6/\u521B\u5EFA/\u4FEE\u6539\u90FD\u5728\u8FD9\u91CC\u8FDB\u884C\u3002persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002`;
+\u4F60\u7684\u6587\u4EF6\u5DE5\u4F5C\u76EE\u5F55\u662F ${args.workDir}\uFF0C\u6240\u6709\u6587\u4EF6\u8BFB\u5199\u90FD\u653E\u5728\u8FD9\u4E2A\u76EE\u5F55\u4E0B\u3002persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002`;
   }
   return result;
 }
@@ -55660,11 +55661,22 @@ function buildAppBuilderHandlers(deps) {
 }
 
 // src/handlers/shift.ts
+var UI_DEFAULT_DURATION_MS = 30 * 6e4;
+var UI_MAX_DURATION_MS = 60 * 6e4;
+function pickUiDurationMs(timeoutMs) {
+  return Math.min(timeoutMs ?? UI_DEFAULT_DURATION_MS, UI_MAX_DURATION_MS);
+}
+function everyMsToCron(everyMs) {
+  if (everyMs <= 6e4) return "* * * * *";
+  const minutes = Math.floor(everyMs / 6e4);
+  if (minutes < 60) return `*/${minutes} * * * *`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `0 */${hours} * * *`;
+  const days = Math.max(1, Math.floor(hours / 24));
+  return `0 0 */${days} * *`;
+}
 function daemonShiftToUiShift(d, nowMs) {
-  if (d.schedule.kind === "at") {
-    const atMs = Date.parse(d.schedule.at);
-    if (Number.isNaN(atMs) || atMs <= nowMs) return null;
-  }
+  const durationMs = pickUiDurationMs(d.timeoutMs);
   const noteParts = [d.name];
   if (d.prompt && d.prompt.length > 0) {
     const promptPreview = d.prompt.length > 120 ? `${d.prompt.slice(0, 117)}\u2026` : d.prompt;
@@ -55672,12 +55684,49 @@ function daemonShiftToUiShift(d, nowMs) {
   }
   if (!d.enabled) noteParts.push("(disabled)");
   const note = noteParts.join(" \u2014 ");
-  return {
-    id: d.id,
-    agentId: d.targetPersona,
-    schedule: d.schedule,
-    note
-  };
+  switch (d.schedule.kind) {
+    case "at": {
+      const startMs = Date.parse(d.schedule.at);
+      if (Number.isNaN(startMs)) return null;
+      if (startMs + durationMs <= nowMs) return null;
+      return {
+        id: d.id,
+        agentId: d.targetPersona,
+        schedule: {
+          kind: "single",
+          start: new Date(startMs).toISOString(),
+          end: new Date(startMs + durationMs).toISOString()
+        },
+        note
+      };
+    }
+    case "cron": {
+      return {
+        id: d.id,
+        agentId: d.targetPersona,
+        schedule: {
+          kind: "recurring",
+          cron: d.schedule.expr,
+          ...d.schedule.tz ? { tz: d.schedule.tz } : {},
+          durationMs
+        },
+        note
+      };
+    }
+    case "every": {
+      const cron = everyMsToCron(d.schedule.everyMs);
+      return {
+        id: d.id,
+        agentId: d.targetPersona,
+        schedule: {
+          kind: "recurring",
+          cron,
+          durationMs
+        },
+        note
+      };
+    }
+  }
 }
 function buildShiftHandlers(deps) {
   return {

package/dist/shift/mcp-server.cjs

@@ -21252,7 +21252,7 @@ async function main() {
         name: external_exports.string().describe("short label shown in shift.json + future UI"),
         schedule: ScheduleSchema,
         prompt: external_exports.string().describe(
-          "instruction the spawned cc executes on startup (NOT a chat message from the owner). Write what you want the persona to DO or SAY at fire time, in instruction form \u2014 daemon wraps it in a <clawd-shift-fire> tag so the spawned cc treats it as a scheduled action and responds as an assistant turn (no user-bubble appears in the owner's UI)."
+          "instruction the spawned cc executes on startup (NOT a chat message from the owner). Write what you want the persona to DO or SAY at fire time, in instruction form \u2014 daemon wraps it in a `[clawd-shift-fire \u2014 ...]` task pack so the spawned cc treats it as a scheduled action and responds as an assistant turn (no user-bubble appears in the owner's UI)."
         ),
         targetPersona: external_exports.string().optional().describe("which persona to spawn; defaults to the calling persona"),
         timeoutMs: external_exports.number().optional().describe("hard timeout per fire; default 30 minutes")

package/package.json

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