@clawos-dev/clawd 0.2.176-beta.354.c832bc0 → 0.2.177-beta.355.6443d50

package/dist/cli.cjs

@@ -253,7 +253,11 @@ var init_events = __esm({
       "skill-hint",
       "meta-text",
       "attachment-skills",
-      "attachment-deferred-tools"
+      "attachment-deferred-tools",
+      // clawd shift v1：scheduler fire 时 daemon 给新 cc 的首条 user message 用
+      // <clawd-shift-fire> wrap 起头；classifyUserMessage 识别后路由到 UserMetaLine 折叠渲染，
+      // 不显示成 user 气泡（避免 instruction 文本被当 owner 实时对话）。
+      "clawd-shift-fire"
     ];
     SKILL_SOURCE_VALUES = ["builtin", "global", "project", "plugin"];
     AGENT_SOURCE_VALUES = [
@@ -4784,6 +4788,16 @@ var init_schemas = __esm({
        * 反查路径走错；按 #750 一族防线处理，跟 ownerPersonaId 同地点 strip）。
        */
       dispatchedFromSessionId: external_exports.string().min(1).optional(),
+      /**
+       * Shift fire 派生的 session 记录调 addShift 的 source cc session id（稳定 key）；
+       * sidebar 据此把 fire 出的 session 折叠在 source session 下，跟 dispatchedFromSessionId
+       * 平行但渲染不同 icon（AlarmClock 区别于 dispatch 的 CornerDownRight），让 owner 一眼
+       * 分清"派生于人为委派"还是"派生于定时唤起"。非 shift fire session 缺省。
+       * 跟 dispatchedFromSessionId / forkedFromSessionId 三者互斥（同一 session 不会兼任）。
+       * mirror SessionFile 同 dispatchedFromSessionId 处理（shift fire 本地概念，理论上不会
+       * mirror，留 strip 防御）。
+       */
+      shiftFiredFromSessionId: external_exports.string().min(1).optional(),
       createdAt: external_exports.string().min(1),
       updatedAt: external_exports.string().min(1)
     });
@@ -11230,6 +11244,7 @@ function classifyUserMessage(input) {
   if (SYSTEM_REMINDER_RE.test(text) || OPENSPEC_BLOCK_RE.test(text)) {
     return { meta: "system-reminder" };
   }
+  if (CLAWD_SHIFT_FIRE_RE.test(text)) return { meta: "clawd-shift-fire" };
   if (SKILL_HINT_RE.test(text)) return { meta: "skill-hint" };
   const flags = raw;
   if (flags.isMeta === true || flags.isSynthetic === true) return { meta: "meta-text" };
@@ -11444,7 +11459,7 @@ function readCurrentContent(filePath) {
     return null;
   }
 }
-var import_node_fs10, import_node_os5, import_node_path9, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
+var import_node_fs10, import_node_os5, import_node_path9, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, CLAWD_SHIFT_FIRE_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
 var init_claude_history = __esm({
   "src/tools/claude-history.ts"() {
     "use strict";
@@ -11461,6 +11476,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;
     ATTACHMENT_SILENT_SUBTYPES = /* @__PURE__ */ new Set([
       "hook_additional_context",
       "hook_success",
@@ -41261,6 +41277,22 @@ function composeGuestSandbox(base, userWorkDir, spawnCwd) {
   return s;
 }
 
+// src/shift/wrap.ts
+function wrapShiftFirePrompt(args) {
+  return [
+    `<clawd-shift-fire target-persona="${escapeAttr(args.targetPersona)}">`,
+    "This is a scheduled shift fire \u2014 not a live user message.",
+    "Respond as an assistant turn (start your output directly).",
+    "",
+    "Instruction:",
+    args.prompt,
+    "</clawd-shift-fire>"
+  ].join("\n");
+}
+function escapeAttr(v2) {
+  return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
 // src/session/reducer.ts
 init_runtime();
 
@@ -43242,10 +43274,14 @@ var SessionManager = class {
   // 强制走 deps.store（即 default scope），不走 scopeForFile：mirror 物理落 default 即可。
   // 远端 creator / origin 字段原值保留（不被本机 ctx 派生覆写）。
   //
-  // strip 远端 personaId / dispatchedFromSessionId：mirror SessionFile 上这两个字段都指向
-  // 朋友 daemon 上的本地 id，本机不持有对应 persona / 源 session。留着会让按这些字段反查的
-  // 本机消费者（MyPersonasSection 按 ownerPersonaId 反查 persona、sidebar 按
-  // dispatchedFromSessionId 折叠 sub-session）走错分支。写入前清掉。#750 一族防线。
+  // strip 远端 personaId / dispatchedFromSessionId / shiftFiredFromSessionId：mirror
+  // SessionFile 上这些字段都指向朋友 daemon 上的本地 id，本机不持有对应 persona /
+  // 源 session。留着会让按这些字段反查的本机消费者（MyPersonasSection 按 ownerPersonaId
+  // 反查 persona、sidebar 按 dispatchedFromSessionId / shiftFiredFromSessionId 折叠
+  // sub-session）走错分支。写入前清掉。#750 一族防线。
+  //
+  // shift fire 是本地 daemon scheduler 行为，理论上不产生 mirror SessionFile，但留 strip
+  // 防御（同 dispatchedFromSessionId 处理姿势对齐）。
   //
   // 与 manager.create / manager.update 区别：
   //   - 不走 newRunner / attachObserver / cwd 校验（mirror 是纯 metadata 层）
@@ -43254,6 +43290,7 @@ var SessionManager = class {
     const {
       ownerPersonaId: _strippedPid,
       dispatchedFromSessionId: _strippedDsp,
+      shiftFiredFromSessionId: _strippedSft,
       ...rest
     } = file;
     return this.deps.store.write(rest);
@@ -43956,6 +43993,7 @@ var SessionManager = class {
       cwd,
       tool: "claude",
       ownerPersonaId: args.targetPersona,
+      ...args.sourceSessionId ? { shiftFiredFromSessionId: args.sourceSessionId } : {},
       createdAt: now,
       updatedAt: now
     };
@@ -43991,7 +44029,16 @@ var SessionManager = class {
     });
     const runner = this.ensureRunnerForScope(file, scope);
     this.deps.logger?.info("shift.createShiftSession.runner-ready", { sessionId });
-    runner.input({ kind: "command", command: { kind: "send", text: args.prompt } });
+    runner.input({
+      kind: "command",
+      command: {
+        kind: "send",
+        text: wrapShiftFirePrompt({
+          prompt: args.prompt,
+          targetPersona: args.targetPersona
+        })
+      }
+    });
     const kill = () => {
       const r = this.runners.get(sessionId);
       if (!r) return;
@@ -47513,7 +47560,8 @@ function createShiftScheduler(deps) {
             shiftId: shift.id,
             targetPersona: shift.targetPersona,
             prompt: shift.prompt,
-            timeoutMs
+            timeoutMs,
+            ...shift.createdBySessionId ? { sourceSessionId: shift.createdBySessionId } : {}
           });
           sessionId = spawned.sessionId;
           const startRun = {
@@ -47567,8 +47615,12 @@ function createShiftScheduler(deps) {
 
 // src/shift/spawn.ts
 function createShiftSpawnFn(deps) {
-  return async ({ targetPersona, prompt, timeoutMs }) => {
-    const created = deps.sessionManager.createShiftSession({ targetPersona, prompt });
+  return async ({ targetPersona, prompt, timeoutMs, sourceSessionId }) => {
+    const created = deps.sessionManager.createShiftSession({
+      targetPersona,
+      prompt,
+      ...sourceSessionId ? { sourceSessionId } : {}
+    });
     let resolveOuter = () => {
     };
     const ended = new Promise((r) => {
@@ -47622,12 +47674,14 @@ function validateSchedule(schedule) {
 function buildShiftInternalHandlers(deps) {
   const add = async (frame) => {
     const persona = readPersonaId(frame);
+    const callerSessionId = typeof frame.sessionId === "string" ? frame.sessionId : void 0;
     const { type: _t, requestId: _r, personaId: _p, sessionId: _s, ...rest } = frame;
     const args = rest;
     validateSchedule(args.schedule);
     const shift = deps.store.add({
       ownerId: deps.ownerIdProvider(),
       createdByPersona: persona,
+      ...callerSessionId ? { createdBySessionId: callerSessionId } : {},
       name: args.name,
       enabled: true,
       schedule: args.schedule,

package/dist/shift/mcp-server.cjs

@@ -21251,7 +21251,9 @@ async function main() {
       inputSchema: {
         name: external_exports.string().describe("short label shown in shift.json + future UI"),
         schedule: ScheduleSchema,
-        prompt: external_exports.string().describe("first user message injected when the new cc starts"),
+        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)."
+        ),
         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.176-beta.354.c832bc0",
+  "version": "0.2.177-beta.355.6443d50",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",