@qwen-code/qwen-code 0.23.3 → 0.23.4

package/chunks/{chunk-2PJRI3EH.js → chunk-J4DRBDHX.js}

@@ -5,48 +5,55 @@ import {
   parseChannelDelivery,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-Z3GF56ME.js";
+} from "./chunk-FRISMWG3.js";
 import {
   parseCallerSuppliedSessionId
 } from "./chunk-ZEZKIS2K.js";
+import {
+  createSessionOrganizationService
+} from "./chunk-PRWRNC64.js";
 import {
   isInternalWorkspaceRuntime
 } from "./chunk-NYWWQ437.js";
 import {
   SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-3KQBQ6FM.js";
+} from "./chunk-SYDMM6IX.js";
 import {
   SessionNotFoundError
 } from "./chunk-FAWTMDX7.js";
-import {
-  isChannelDeliveryError
-} from "./chunk-RKFGE7JH.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-6PLDPT2C.js";
+import {
+  isChannelDeliveryError
+} from "./chunk-RKFGE7JH.js";
 import {
   isWithinRoot
 } from "./chunk-MR3PXB6E.js";
 import {
   SessionService,
   stripTerminalControlSequences
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-DCRVSIK6.js";
 import {
   MAX_JOBS,
   nextDurableFireMs
-} from "./chunk-IAEXTMED.js";
+} from "./chunk-GNV2SFO7.js";
 import {
   nextFireTime,
   parseCron
-} from "./chunk-IRH27ZC2.js";
+} from "./chunk-5EZRLTLQ.js";
 import {
+  MAX_CRON_TASK_ROUTING_ID_LENGTH,
   annotateCronRunSession,
   appendCronRun,
+  cronTaskSessionDeletionId,
   generateCronTaskId,
+  getCronFilePath,
+  isValidCronTaskRoutingId,
   readCronTasks,
   taskHasLegacyCondition,
   updateCronTasks
-} from "./chunk-F53KKZUD.js";
+} from "./chunk-3LMDSCLU.js";
 import {
   Storage
 } from "./chunk-ZAFYHRVY.js";
@@ -63,6 +70,7 @@ import {
 // packages/cli/src/serve/routes/scheduled-tasks.ts
 init_esbuild_shims();
 import { isDeepStrictEqual } from "node:util";
+import { access } from "node:fs/promises";
 
 // packages/cli/src/serve/workspace-route-runtime.ts
 init_esbuild_shims();
@@ -335,6 +343,7 @@ var MAX_SCHEDULED_TASKS = MAX_JOBS;
 var MAX_PROMPT_LENGTH = 1e5;
 var MAX_NAME_LENGTH = 200;
 var MAX_CRON_LENGTH = 200;
+var MAX_ROUTING_ID_LENGTH = MAX_CRON_TASK_ROUTING_ID_LENGTH;
 var MAX_SESSION_NAME_LENGTH = 60;
 function scheduledTaskSessionName(label) {
   const cleaned = stripTerminalControlSequences(label).replace(/[\u061c\u200e\u200f\u202a-\u202e\u2066-\u2069]/g, "").trim().replace(/\s+/g, " ");
@@ -521,6 +530,8 @@ async function createScheduledTaskWithExistingSession(target, input, options) {
     sessionId: input.sessionId,
     sessionOwnedByTask: false,
     sessionMode: input.sessionMode === "per_run" ? "per_run" : "persistent",
+    ...input.sessionMode === "per_run" && input.modelServiceId !== void 0 ? { modelServiceId: input.modelServiceId } : {},
+    ...input.sessionMode === "per_run" && input.groupId !== void 0 ? { groupId: input.groupId } : {},
     ...input.delivery !== void 0 ? { delivery: input.delivery } : {},
     ...input.name !== void 0 ? { name: input.name } : {}
   };
@@ -592,18 +603,36 @@ async function rollbackCronMutation(target, before, after, route) {
   });
 }
 __name(rollbackCronMutation, "rollbackCronMutation");
-async function restoreConsumedOneShot(target, before, id, route) {
+async function restoreConsumedOneShot(target, before, failedTask, removalGenerations, route) {
+  const id = failedTask.id;
   const index = before?.findIndex((t) => t.id === id) ?? -1;
   const original = index === -1 ? void 0 : before[index];
-  if (!original) return;
+  if (!original || !removalGenerations) return;
+  let restoreGenerations;
   await runWithScheduledTaskTarget(
     target,
-    () => updateCronTasks(target.workspaceCwd, (tasks) => {
-      if (tasks.some((t) => t.id === id)) return tasks;
-      const restored = [...tasks];
-      restored.splice(Math.min(index, restored.length), 0, original);
-      return restored;
-    })
+    () => updateCronTasks(
+      target.workspaceCwd,
+      (tasks) => {
+        if ([...removalGenerations].some(
+          ([key, generation]) => restoreGenerations?.get(key) !== generation
+        ))
+          return tasks;
+        if (tasks.some((t) => t.id === id)) return tasks;
+        const restored = [...tasks];
+        restored.splice(Math.min(index, restored.length), 0, {
+          ...failedTask,
+          enabled: false
+        });
+        return restored;
+      },
+      {
+        observeDeletionIds: [...removalGenerations.keys()],
+        onDeletionGenerations: /* @__PURE__ */ __name((generations) => {
+          restoreGenerations = generations;
+        }, "onDeletionGenerations")
+      }
+    )
   ).catch((error) => {
     writeStderrLine(
       `qwen serve: ${route} failed to restore the consumed one-shot task: ${error instanceof Error ? error.message : String(error)}`
@@ -636,6 +665,7 @@ async function dispatchTaskToFreshSession(target, task) {
     target,
     () => bridge.spawnOrAttach({
       workspaceCwd: target.workspaceCwd,
+      ...task.modelServiceId ? { modelServiceId: task.modelServiceId } : {},
       sessionScope: "thread",
       parentSessionId: task.sessionId,
       sourceType: SCHEDULED_TASK_RUN_SOURCE_TYPE,
@@ -643,16 +673,21 @@ async function dispatchTaskToFreshSession(target, task) {
     })
   );
   try {
-    bridge.updateSessionMetadata(child.sessionId, {
-      displayName: scheduledTaskRunSessionName(
-        task.name ?? task.prompt,
-        triggeredAt
-      ),
-      titleSource: "auto"
-    });
-  } catch {
-  }
-  try {
+    if (task.modelServiceId && child.modelApplied === false) {
+      throw new Error(
+        `Scheduled task model selection failed: ${task.modelServiceId}`
+      );
+    }
+    try {
+      bridge.updateSessionMetadata(child.sessionId, {
+        displayName: scheduledTaskRunSessionName(
+          task.name ?? task.prompt,
+          triggeredAt
+        ),
+        titleSource: "auto"
+      });
+    } catch {
+    }
     let markPromptAdmitted;
     const promptAdmitted = new Promise((resolve) => {
       markPromptAdmitted = resolve;
@@ -680,6 +715,11 @@ async function dispatchTaskToFreshSession(target, task) {
         onPromptAdmitted: markPromptAdmitted
       }
     );
+    void turn.catch((error) => {
+      writeStderrLine(
+        `qwen serve: scheduled-task session ${child.sessionId} prompt failed: ${error instanceof Error ? error.message : String(error)}`
+      );
+    });
     await Promise.race([
       promptAdmitted,
       turn.then(
@@ -687,11 +727,24 @@ async function dispatchTaskToFreshSession(target, task) {
         (error) => Promise.reject(error)
       )
     ]);
-    void turn.catch((error) => {
-      writeStderrLine(
-        `qwen serve: scheduled-task session ${child.sessionId} prompt failed: ${error instanceof Error ? error.message : String(error)}`
-      );
-    });
+    if (task.groupId) {
+      try {
+        await runWithScheduledTaskTarget(
+          target,
+          () => createSessionOrganizationService(
+            target.workspaceCwd
+          ).updateSessionOrganization(child.sessionId, {
+            groupId: task.groupId,
+            color: null
+          })
+        );
+        bridge.markSessionCatalogChanged?.();
+      } catch (error) {
+        writeStderrLine(
+          `qwen serve: scheduled-task session ${child.sessionId} could not be assigned to group ${task.groupId}: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
   } catch (error) {
     await teardownBoundSession(target, child.sessionId);
     throw error;
@@ -741,6 +794,8 @@ function toView(task) {
     // unbound tool-created/legacy task.
     sessionId: typeof task.sessionId === "string" && task.sessionId.length > 0 ? task.sessionId : null,
     sessionMode: task.sessionMode === "per_run" ? "per_run" : "persistent",
+    modelServiceId: task.modelServiceId ?? null,
+    groupId: task.groupId ?? null,
     // Absent runs (tool-created / never-fired) normalizes to [] so the client
     // never special-cases undefined.
     runs: Array.isArray(task.runs) ? task.runs : [],
@@ -893,6 +948,42 @@ function registerScheduledTaskCrudRoutes(app, deps) {
         });
         return;
       }
+      const modelServiceId = body["modelServiceId"];
+      if (modelServiceId !== void 0 && !isValidCronTaskRoutingId(modelServiceId)) {
+        res.status(400).json({
+          error: `\`modelServiceId\` must be a non-empty string of at most ${MAX_ROUTING_ID_LENGTH} characters without control characters`,
+          code: "invalid_model_service_id"
+        });
+        return;
+      }
+      const groupId = body["groupId"];
+      if (groupId !== void 0 && !isValidCronTaskRoutingId(groupId)) {
+        res.status(400).json({
+          error: `\`groupId\` must be a non-empty string of at most ${MAX_ROUTING_ID_LENGTH} characters without control characters`,
+          code: "invalid_group_id"
+        });
+        return;
+      }
+      if (sessionMode !== "per_run" && (modelServiceId !== void 0 || groupId !== void 0)) {
+        res.status(400).json({
+          error: '`modelServiceId` and `groupId` are only supported when `sessionMode` is "per_run"',
+          code: "session_routing_requires_per_run"
+        });
+        return;
+      }
+      if (typeof groupId === "string") {
+        const groups = await runWithScheduledTaskTarget(
+          target,
+          () => createSessionOrganizationService(workspaceCwd).listGroups()
+        );
+        if (!groups.groups.some((group) => group.id === groupId)) {
+          res.status(400).json({
+            error: `Group not found: ${groupId}`,
+            code: "group_not_found"
+          });
+          return;
+        }
+      }
       const parsedSessionId = parseCallerSuppliedSessionId(body["sessionId"]);
       if (parsedSessionId.kind === "invalid") {
         res.status(400).json({
@@ -945,6 +1036,8 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               recurring,
               enabled,
               sessionMode,
+              ...typeof modelServiceId === "string" ? { modelServiceId } : {},
+              ...typeof groupId === "string" ? { groupId } : {},
               ...delivery !== void 0 ? { delivery } : {},
               ...nameResult.value !== void 0 ? { name: nameResult.value } : {}
             },
@@ -1051,6 +1144,8 @@ function registerScheduledTaskCrudRoutes(app, deps) {
         lastFiredAt: now - now % 6e4,
         enabled,
         sessionMode,
+        ...typeof modelServiceId === "string" ? { modelServiceId } : {},
+        ...typeof groupId === "string" ? { groupId } : {},
         ...delivery !== void 0 ? { delivery } : {},
         ...boundSessionId !== void 0 ? {
           sessionId: boundSessionId
@@ -1144,6 +1239,9 @@ function registerScheduledTaskCrudRoutes(app, deps) {
       const patch = {};
       let clearName = false;
       let clearDelivery = false;
+      let clearModelServiceId = false;
+      let clearGroupId = false;
+      let missingGroupId;
       const removedPatchField = findRemovedTaskField(body);
       if (removedPatchField) {
         res.status(400).json(removedFieldError(removedPatchField));
@@ -1218,6 +1316,41 @@ function registerScheduledTaskCrudRoutes(app, deps) {
         }
         patch.sessionMode = body["sessionMode"];
       }
+      if ("modelServiceId" in body) {
+        const value = body["modelServiceId"];
+        if (value === null || value === "") {
+          clearModelServiceId = true;
+        } else if (!isValidCronTaskRoutingId(value)) {
+          res.status(400).json({
+            error: `\`modelServiceId\` must be null or a non-empty string of at most ${MAX_ROUTING_ID_LENGTH} characters without control characters`,
+            code: "invalid_model_service_id"
+          });
+          return;
+        } else {
+          patch.modelServiceId = value;
+        }
+      }
+      if ("groupId" in body) {
+        const value = body["groupId"];
+        if (value === null || value === "") {
+          clearGroupId = true;
+        } else if (!isValidCronTaskRoutingId(value)) {
+          res.status(400).json({
+            error: `\`groupId\` must be null or a non-empty string of at most ${MAX_ROUTING_ID_LENGTH} characters without control characters`,
+            code: "invalid_group_id"
+          });
+          return;
+        } else {
+          const groups = await runWithScheduledTaskTarget(
+            target,
+            () => createSessionOrganizationService(workspaceCwd).listGroups()
+          );
+          if (!groups.groups.some((group) => group.id === value)) {
+            missingGroupId = value;
+          }
+          patch.groupId = value;
+        }
+      }
       if ("delivery" in body) {
         if (body["delivery"] === null) {
           clearDelivery = true;
@@ -1231,7 +1364,7 @@ function registerScheduledTaskCrudRoutes(app, deps) {
           }
         }
       }
-      if (Object.keys(patch).length === 0 && !clearName && !clearDelivery) {
+      if (Object.keys(patch).length === 0 && !clearName && !clearDelivery && !clearModelServiceId && !clearGroupId) {
         res.status(400).json({
           error: "No updatable fields provided",
           code: "empty_patch"
@@ -1245,6 +1378,7 @@ function registerScheduledTaskCrudRoutes(app, deps) {
       let blockedSessionModeDelivery = false;
       let blockedSessionModeUnavailable = false;
       let blockedSessionModeUnbound = false;
+      let blockedGroupNotFound = false;
       let rollbackBefore;
       let rollbackAfter;
       try {
@@ -1257,6 +1391,10 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               if (idx === -1) return tasks;
               found = true;
               const current = tasks[idx];
+              if (missingGroupId !== void 0 && current.groupId !== missingGroupId) {
+                blockedGroupNotFound = true;
+                return tasks;
+              }
               const convertingToPerRun = patch.sessionMode === "per_run" && current.sessionMode !== "per_run";
               if (convertingToPerRun && (!bridge || !bridge.sendPrompt)) {
                 blockedSessionModeUnavailable = true;
@@ -1277,6 +1415,12 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               const next = { ...current, ...patch };
               if (clearName) delete next.name;
               if (clearDelivery) delete next.delivery;
+              if (clearModelServiceId) delete next.modelServiceId;
+              if (clearGroupId) delete next.groupId;
+              if (next.sessionMode !== "per_run") {
+                delete next.modelServiceId;
+                delete next.groupId;
+              }
               if (next.sessionMode === "per_run" && next.delivery) {
                 blockedSessionModeDelivery = true;
                 return tasks;
@@ -1285,12 +1429,13 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               const cronChanged = patch.cron !== void 0 && canonicalCron(patch.cron) !== canonicalCron(current.cron);
               const becameRecurring = patch.recurring === true && current.recurring !== true;
               const becameOneShot = patch.recurring === false && current.recurring !== false;
+              const retryFailedOneShot = !next.recurring && justReEnabled && !cronChanged && !becameOneShot && current.runs?.at(-1)?.sessionDispatchFailed === true;
               {
                 const now = Date.now();
                 const minute = now - now % 6e4;
                 if (next.recurring && (justReEnabled || cronChanged || becameRecurring)) {
                   next.lastFiredAt = minute;
-                } else if (!next.recurring && (justReEnabled || cronChanged || becameOneShot)) {
+                } else if (!next.recurring && !retryFailedOneShot && (justReEnabled || cronChanged || becameOneShot)) {
                   next.createdAt = now;
                   next.lastFiredAt = minute;
                 }
@@ -1329,6 +1474,17 @@ function registerScheduledTaskCrudRoutes(app, deps) {
           throw error;
         }
       }
+      if (!found) {
+        res.status(404).json({ error: "Task not found", code: "task_not_found" });
+        return;
+      }
+      if (missingGroupId !== void 0 && blockedGroupNotFound) {
+        res.status(400).json({
+          error: `Group not found: ${missingGroupId}`,
+          code: "group_not_found"
+        });
+        return;
+      }
       if (blockedLegacy) {
         res.status(409).json({
           error: "This task uses the removed isolated run mode with a precondition and can no longer be enabled or run. Recreate it (and call the `create_sub_session` tool from the prompt if you need per-run isolation).",
@@ -1364,7 +1520,7 @@ function registerScheduledTaskCrudRoutes(app, deps) {
         });
         return;
       }
-      if (!found || !updated) {
+      if (!updated) {
         res.status(404).json({ error: "Task not found", code: "task_not_found" });
         return;
       }
@@ -1415,9 +1571,14 @@ function registerScheduledTaskCrudRoutes(app, deps) {
       let rollbackBefore;
       let rollbackAfter;
       try {
-        await runWithScheduledTaskTarget(
-          target,
-          () => updateCronTasks(
+        await runWithScheduledTaskTarget(target, async () => {
+          try {
+            await access(getCronFilePath(workspaceCwd));
+          } catch (error) {
+            if (error.code === "ENOENT") return;
+            throw error;
+          }
+          await updateCronTasks(
             workspaceCwd,
             (tasks) => {
               const idx = tasks.findIndex((t) => t.id === id);
@@ -1432,9 +1593,12 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               rollbackAfter = tasks.filter((_, i) => i !== idx);
               return rollbackAfter;
             },
-            { assertCanCommit: target.assertGenerationOpen }
-          )
-        );
+            {
+              assertCanCommit: target.assertGenerationOpen,
+              deletionIds: [id]
+            }
+          );
+        });
       } catch (err) {
         if (sendActivityGateError(res, err)) return;
         if (sendGenerationClosedError(res, err)) return;
@@ -1502,6 +1666,7 @@ function registerScheduledTaskCrudRoutes(app, deps) {
       let updated;
       let rollbackBefore;
       let rollbackAfter;
+      let removalGenerations;
       try {
         await runWithScheduledTaskTarget(
           target,
@@ -1535,7 +1700,16 @@ function registerScheduledTaskCrudRoutes(app, deps) {
               rollbackAfter = nextTasks;
               return nextTasks;
             },
-            { assertCanCommit: target.assertGenerationOpen }
+            {
+              assertCanCommit: target.assertGenerationOpen,
+              observeDeletionIds: /* @__PURE__ */ __name((tasks) => {
+                const task = tasks.find((task2) => task2.id === id);
+                return task?.sessionId ? [id, cronTaskSessionDeletionId(task.sessionId)] : [id];
+              }, "observeDeletionIds"),
+              onDeletionGenerations: /* @__PURE__ */ __name((generations) => {
+                removalGenerations = generations;
+              }, "onDeletionGenerations")
+            }
           )
         );
       } catch (err) {
@@ -1615,7 +1789,8 @@ function registerScheduledTaskCrudRoutes(app, deps) {
             await restoreConsumedOneShot(
               target,
               rollbackBefore,
-              id,
+              updated,
+              removalGenerations,
               `POST ${base}/${id}/run fresh-session dispatch`
             );
           }

package/chunks/{chunk-XGYHNWL3.js → chunk-J7LBAKDH.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG
-} from "./chunk-PSPAM24S.js";
+} from "./chunk-TBSCTWKF.js";
 import {
   SessionNotFoundError
 } from "./chunk-FAWTMDX7.js";
 import {
   ChannelWorkerStartupError
-} from "./chunk-EDMXGXAK.js";
+} from "./chunk-IBRQG2MP.js";
 import {
   ChannelWebhookEnqueueError
 } from "./chunk-STUJ7IMZ.js";
@@ -20,7 +20,7 @@ import {
 } from "./chunk-CJ3DHN5I.js";
 import {
   CHANNEL_LOOP_MCP_SERVER_NAME
-} from "./chunk-7QYWGTHB.js";
+} from "./chunk-EPVEPTI3.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-W5FIP7FC.js → chunk-JLZ5YCMV.js}

@@ -2,26 +2,26 @@
 "use strict";
 import {
   t
-} from "./chunk-VZUCTJ2P.js";
+} from "./chunk-I6YJZGHS.js";
 import {
   computeThresholds,
   estimateContextTextTokens,
   formatContextFileDisplayPath,
   getMainSessionBaseSystemPrompt
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-DCRVSIK6.js";
 import {
   buildSkillLlmContent
-} from "./chunk-EUURTIV6.js";
+} from "./chunk-WBSJ6VPZ.js";
 import {
   DiscoveredMCPTool,
   uiTelemetryService
-} from "./chunk-HBU7EKY4.js";
+} from "./chunk-TRKIKBUW.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";
 import {
   ToolNames
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-LG5Y4OWO.js → chunk-JRHKM3YQ.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   MAX_INLINE_IMAGE_ENCODED_LENGTH
-} from "./chunk-WBCPROWX.js";
+} from "./chunk-C4HBZQNH.js";
 import {
   MAX_TERMINAL_IMAGE_BYTES
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-2ZN3O5FT.js → chunk-JZ3FFPES.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   loadSettings
-} from "./chunk-7BXXIQG4.js";
+} from "./chunk-PVKEYO5D.js";
 import {
   getCurrentLanguage
-} from "./chunk-VZUCTJ2P.js";
+} from "./chunk-I6YJZGHS.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-53GWJOLP.js";
+} from "./chunk-2P2IXKDR.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
 import {
   hashMcpServerConfig
-} from "./chunk-BZM5U74J.js";
+} from "./chunk-I6JRN375.js";
 import {
   Config,
   ExtensionManager,
@@ -25,11 +25,11 @@ import {
   isGatedMcpScope,
   normalizeClaudeMcpServer,
   runWithTimeout
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-DCRVSIK6.js";
 import {
   getMCPServerLastError,
   getMCPServerStatus
-} from "./chunk-HBU7EKY4.js";
+} from "./chunk-TRKIKBUW.js";
 import {
   atomicWriteFile
 } from "./chunk-XFFRI3WM.js";