@clawos-dev/clawd 0.2.226 → 0.2.228

package/dist/cli.cjs

@@ -6136,7 +6136,12 @@ var init_dispatch = __esm({
       prompt: external_exports.string(),
       // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
       // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
-      targetDeviceId: external_exports.string().min(1).optional()
+      targetDeviceId: external_exports.string().min(1).optional(),
+      // 可选：override B session 使用的 claude 模型。缺省 = 用 persona 默认。
+      // 合法值集与 claude adapter capabilities.models[].id 一致（见 daemon
+      // tools/claude.ts CLAUDE_MODEL_IDS）；handler 层做二次校验，非法值 fail-fast。
+      // protocol 层保持 string 便于未来跨 tool 扩展（届时 union 收合法字面量）。
+      model: external_exports.string().min(1).optional()
     });
     DispatchCompleteArgsSchema = external_exports.object({
       dispatchId: external_exports.string().min(1),
@@ -12542,7 +12547,7 @@ function encodeClaudeStdin(text) {
   };
   return JSON.stringify(frame) + "\n";
 }
-var import_node_child_process, import_node_child_process2, import_node_fs15, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODELS, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
+var import_node_child_process, import_node_child_process2, import_node_fs15, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODEL_IDS, CLAUDE_MODELS, _assertModelIdsAligned, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
 var init_claude = __esm({
   "src/tools/claude.ts"() {
     "use strict";
@@ -12568,13 +12573,17 @@ var init_claude = __esm({
       gif: "image/gif",
       webp: "image/webp"
     };
+    CLAUDE_MODEL_IDS = ["opus", "fable", "sonnet", "haiku"];
     CLAUDE_MODELS = [
-      { id: "", label: "Default", description: "CLI default model", contextWindowSize: 2e5, default: true },
+      { id: "", label: "Default", description: "CLI default model", contextWindowSize: 1e6, default: true },
       { id: "opus", label: "Opus", description: "Most capable", contextWindowSize: 1e6 },
-      { id: "fable", label: "Fable", contextWindowSize: 2e5 },
-      { id: "sonnet", label: "Sonnet", description: "Fast, balanced", contextWindowSize: 2e5 },
-      { id: "haiku", label: "Haiku", description: "Fastest, lightest", contextWindowSize: 2e5 }
+      { id: "fable", label: "Fable", contextWindowSize: 1e6 },
+      { id: "sonnet", label: "Sonnet", description: "Fast, balanced", contextWindowSize: 1e6 },
+      { id: "haiku", label: "Haiku", description: "Fastest, lightest", contextWindowSize: 1e6 }
     ];
+    _assertModelIdsAligned = CLAUDE_MODELS.filter(
+      (m2) => m2.id !== ""
+    ).map((m2) => m2.id);
     CLAUDE_PERMISSION_MODES = [
       { id: "", label: "Default", description: "Ask for every tool call" },
       { id: "plan", label: "Plan", description: "Read-only, no code changes" },
@@ -44602,6 +44611,8 @@ var SessionManager = class {
         creatorPrincipalId: args.guestPrincipalId,
         ...args.guestDisplayName ? { creatorDisplayName: args.guestDisplayName } : {}
       } : {},
+      // T-20：dispatch model override 落盘（reducer spawn 路径读 SessionFile.model 生成 --model flag）
+      ...args.model ? { model: args.model } : {},
       createdAt: now,
       updatedAt: now
     };
@@ -48364,6 +48375,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 +48399,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 +48440,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 +48459,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 +48556,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;
@@ -48806,12 +48830,19 @@ function canAccessPersona(grants, personaId, action) {
 }
 
 // src/handlers/persona-dispatch.ts
+init_claude();
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
   const run = async (frame, _client, ctx) => {
     const { type: _t, requestId: _r, ...rest } = frame;
     const sourceSessionId = typeof rest.sessionId === "string" ? rest.sessionId : void 0;
     const args = DispatchRunArgsSchema.parse(rest);
+    if (args.model !== void 0 && !CLAUDE_MODEL_IDS.includes(args.model)) {
+      throw new ClawdError(
+        ERROR_CODES.INVALID_PARAM,
+        `model '${args.model}' not supported; allowed: ${CLAUDE_MODEL_IDS.join(", ")}`
+      );
+    }
     if (args.targetDeviceId) {
       if (ctx?.principal.kind === "guest") {
         throw new ClawdError(
@@ -48829,7 +48860,8 @@ function buildPersonaDispatchHandlers(deps) {
       const outcome2 = await deps.forwardToPeer({
         targetDeviceId: args.targetDeviceId,
         targetPersona: args.targetPersona,
-        prompt: args.prompt
+        prompt: args.prompt,
+        ...args.model ? { model: args.model } : {}
       });
       return {
         response: { type: "personaDispatch:run:ok", outcome: outcome2 }
@@ -48859,7 +48891,8 @@ function buildPersonaDispatchHandlers(deps) {
         targetPersona: args.targetPersona,
         prompt: args.prompt,
         guestPrincipalId: ctx.principal.id,
-        guestDisplayName: ctx.principal.displayName
+        guestDisplayName: ctx.principal.displayName,
+        ...args.model ? { model: args.model } : {}
       }).then(() => logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2 })).catch((err) => {
         const reason = err instanceof Error ? err.message : String(err);
         logger?.warn("dispatch.spawnB.failed", { dispatchId: dispatchId2, reason });
@@ -48892,7 +48925,8 @@ function buildPersonaDispatchHandlers(deps) {
       dispatchId,
       sourceSessionId,
       targetPersona: args.targetPersona,
-      prompt: args.prompt
+      prompt: args.prompt,
+      ...args.model ? { model: args.model } : {}
     }).then(() => {
       logger?.info("dispatch.spawnB.ok", { dispatchId });
     }).catch((err) => {
@@ -48950,7 +48984,12 @@ async function forwardDispatchToPeer(args) {
         authorization: `Bearer ${args.contact.connectToken}`
       },
       // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
-      body: JSON.stringify({ targetPersona: args.targetPersona, prompt: args.prompt })
+      body: JSON.stringify({
+        targetPersona: args.targetPersona,
+        prompt: args.prompt,
+        // T-20: 条件展开防 undefined 污染 JSON。远端 daemon handler 会再校验一次 model 合法性。
+        ...args.model ? { model: args.model } : {}
+      })
     });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -60173,11 +60212,13 @@ async function startDaemon(config) {
         sourceJsonlPath,
         // B 角色（跨设备）：非空 → guest scope + creatorPrincipalId/creatorDisplayName = A。
         guestPrincipalId: args.guestPrincipalId,
-        guestDisplayName: args.guestDisplayName
+        guestDisplayName: args.guestDisplayName,
+        // T-20: 可选 model override 透到 SessionFile.model
+        ...args.model ? { model: args.model } : {}
       });
     },
     // A 角色：从 ContactStore 取 peer 可达 URL + connect token，转发到对端 daemon /rpc。
-    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt }) => {
+    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt, model }) => {
       const contact = contactStore.get(targetDeviceId);
       if (!contact || !contact.remoteUrl || !contact.connectToken) {
         return {
@@ -60188,7 +60229,9 @@ async function startDaemon(config) {
       return forwardDispatchToPeer({
         contact: { remoteUrl: contact.remoteUrl, connectToken: contact.connectToken },
         targetPersona,
-        prompt
+        prompt,
+        // T-20: 跨设备也透 model，让远端 daemon 用同一 claude 模型 spawn B
+        ...model ? { model } : {}
       });
     },
     // B 角色：判断 targetPersona 是否 public（跨设备授权边界，private 拒）。