@qwen-code/qwen-code 0.23.3 → 0.23.4

package/chunks/{create-sub-session-YWASE5VH.js → create-sub-session-JK3SSJKO.js}

@@ -4,109 +4,120 @@ import {
   isReservedStandaloneSessionSourceType,
   isScheduledTaskRunSource
 } from "./chunk-N4QWUPDM.js";
+import {
+  createSessionOrganizationService
+} from "./chunk-PRWRNC64.js";
+import {
+  ACTIVE_WORK_CLOSE_TIMEOUT_MS
+} from "./chunk-TBSCTWKF.js";
 import {
   SessionNotFoundError
 } from "./chunk-FAWTMDX7.js";
 import "./chunk-6PLDPT2C.js";
-import "./chunk-BZM5U74J.js";
+import "./chunk-I6JRN375.js";
 import "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
-import "./chunk-AEY27Z35.js";
-import "./chunk-Y2MYW47X.js";
+import "./chunk-6WXVEDT2.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-F42YYSCK.js";
-import "./chunk-NUQVB25K.js";
-import "./chunk-ZKZHSB5W.js";
-import "./chunk-MSNHNAQZ.js";
+import "./chunk-7JGH6IMU.js";
+import "./chunk-KLGCF6G7.js";
+import "./chunk-EKMJR7M3.js";
+import "./chunk-EDB556X7.js";
+import "./chunk-QR4Q425T.js";
+import "./chunk-UUT7EFX3.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-ZKYR7QS4.js";
-import "./chunk-532WHF4F.js";
+import "./chunk-5VQR2DD7.js";
 import "./chunk-BUQN5LTI.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-LK2WUCDQ.js";
-import "./chunk-UKZ45TJL.js";
-import "./chunk-RLLRJJDR.js";
+import "./chunk-YM6KUQ2S.js";
+import "./chunk-LMDMYMSS.js";
+import "./chunk-TJDUJSVH.js";
 import {
   SessionService,
   stripTerminalControlSequences
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-DCRVSIK6.js";
 import "./chunk-GOFAQQZA.js";
+import "./chunk-HEOH7JZY.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-65I7S4Z3.js";
-import "./chunk-6HUXPLB5.js";
 import "./chunk-7CLLH5TI.js";
-import "./chunk-XKBFYTCD.js";
-import "./chunk-ZTTC7T4X.js";
-import "./chunk-E4UEO3XM.js";
-import "./chunk-IAEXTMED.js";
-import "./chunk-IRH27ZC2.js";
+import "./chunk-WK6DEH3Q.js";
+import "./chunk-6PVPNMXU.js";
+import "./chunk-5JG3DAKS.js";
+import "./chunk-ME4JBHSB.js";
+import "./chunk-GNV2SFO7.js";
+import "./chunk-5EZRLTLQ.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-F53KKZUD.js";
+import "./chunk-3LMDSCLU.js";
 import "./chunk-O6GEWCJA.js";
-import "./chunk-36HCNKDS.js";
-import "./chunk-6PVPNMXU.js";
-import "./chunk-2SZH22YO.js";
-import "./chunk-DTNV6UZY.js";
+import "./chunk-WKVZES7O.js";
+import "./chunk-NJ2OFVUX.js";
+import "./chunk-HFJSQ4GL.js";
 import "./chunk-QJNDUTOL.js";
-import "./chunk-JXNIF2O5.js";
-import "./chunk-NFYEQRLG.js";
+import "./chunk-V545KI73.js";
+import "./chunk-MQRLLBMQ.js";
 import "./chunk-ELRMZTPF.js";
+import "./chunk-U6H3XTFA.js";
+import "./chunk-ACHCT36C.js";
 import "./chunk-CHEIIBT3.js";
-import "./chunk-PLLIWEM3.js";
-import "./chunk-5GLDOLNQ.js";
+import "./chunk-AEWCOE64.js";
+import "./chunk-OWUAZXXN.js";
 import "./chunk-CH2YDT6X.js";
 import "./chunk-JX6XHPTX.js";
 import "./chunk-ZSTCM3MX.js";
 import "./chunk-MLXTMF7H.js";
-import "./chunk-LILGKQ4B.js";
-import "./chunk-3CZ2BQV6.js";
-import "./chunk-SAH4BD2J.js";
-import "./chunk-CXTPVBFA.js";
-import "./chunk-U7O65WKL.js";
+import "./chunk-AXZMWAJV.js";
+import "./chunk-NXUZFW3G.js";
+import "./chunk-WFNEY5G7.js";
+import "./chunk-GSS4SZNG.js";
+import "./chunk-BW2SMO6L.js";
 import "./chunk-S6LOFUVP.js";
-import "./chunk-FN3JNDRU.js";
-import "./chunk-EUURTIV6.js";
+import "./chunk-VVI7MK3V.js";
+import "./chunk-WBSJ6VPZ.js";
 import {
   escapeXml
 } from "./chunk-G6UUOCUT.js";
 import "./chunk-IZ2U57NY.js";
+import "./chunk-Z72PLR74.js";
 import "./chunk-NUQ4GK5I.js";
-import "./chunk-K2OJUPOE.js";
-import "./chunk-AXTFYDXT.js";
+import "./chunk-CXXAZ2LZ.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-YBUMTY7B.js";
-import "./chunk-HNLMYDQE.js";
-import "./chunk-QHMLYMMS.js";
+import "./chunk-66N6C4EH.js";
+import "./chunk-FMLBBXHB.js";
 import "./chunk-VNOVK4I7.js";
-import "./chunk-CFKIH3D3.js";
+import "./chunk-S7UQ3V2H.js";
 import "./chunk-JL6APGBX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-4ALNJDHL.js";
-import "./chunk-NOO4QFXM.js";
+import "./chunk-ZKIAGIGH.js";
+import "./chunk-VGY2RGXL.js";
+import "./chunk-C75BXMPM.js";
 import "./chunk-KFFCDLKV.js";
-import "./chunk-ZW2EUO2A.js";
-import "./chunk-HBU7EKY4.js";
+import "./chunk-KP2FHIFR.js";
+import "./chunk-L6DIANLD.js";
+import "./chunk-TRKIKBUW.js";
 import "./chunk-5ETULJLP.js";
-import "./chunk-ZHKTKHMO.js";
+import "./chunk-7MIBD3LG.js";
 import "./chunk-VGC4I5JJ.js";
+import "./chunk-QZW6WRB7.js";
 import "./chunk-EDIDYZBT.js";
 import "./chunk-HD7O6WLV.js";
-import "./chunk-J6MB5ZHZ.js";
+import "./chunk-CFMZLE3L.js";
 import "./chunk-WZAD4ZNJ.js";
-import "./chunk-3FPYT6QC.js";
+import "./chunk-ARDHE6MM.js";
 import "./chunk-FPGTNKCP.js";
 import "./chunk-TIGXX4PA.js";
-import "./chunk-3UXUOFO6.js";
+import "./chunk-7W2Y3PZD.js";
 import "./chunk-XFFRI3WM.js";
 import "./chunk-ERU3SDXT.js";
 import "./chunk-EWJTAP3Y.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-W5ZQMAEM.js";
+import "./chunk-4Y2I3CI3.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-HUXPEUFL.js";
-import "./chunk-TP6FYVQT.js";
+import "./chunk-SYROIHU7.js";
+import "./chunk-RSWBT7AZ.js";
 import {
+  Storage,
   createDebugLogger
 } from "./chunk-ZAFYHRVY.js";
 import "./chunk-TBWQLLFO.js";
@@ -136,6 +147,7 @@ var SENT_MODE_DRAIN_TIMEOUT_MS = 30 * 6e4;
 var RECOVERED_PARENT_NOTIFICATION_TIMEOUT_MS = 30 * 6e4;
 var SENT_COMPLETION_DELIVERY_RETRY_MS = 100;
 var SENT_COMPLETION_DELIVERY_MAX_RETRY_MS = 3e4;
+var ROLLBACK_CLOSE_WATCHDOG_SLACK_MS = 5e3;
 var MAX_RESULT_CHARS = 32e3;
 var MAX_SENT_COMPLETION_MODEL_TEXT_CHARS = 32768;
 var SENT_COMPLETION_RESULT_TRUNCATION_MARKER = "\n[\u2026result truncated]";
@@ -550,6 +562,7 @@ function createSubSessionLauncher(opts) {
     getBridge,
     getStandaloneSessionService,
     boundWorkspace,
+    runtimeBaseDir,
     notifySentCompletion = false,
     isolatedWorkspace
   } = opts;
@@ -620,7 +633,7 @@ function createSubSessionLauncher(opts) {
       release(key);
     }, "releaseOnce");
     let spawnedSession;
-    let promptDispatched = false;
+    let promptAdmitted = false;
     try {
       const promptId = randomUUID();
       let lastEventId;
@@ -633,6 +646,8 @@ function createSubSessionLauncher(opts) {
             sessionId: randomUUID(),
             parentSessionId: info.callerSessionId,
             promptId,
+            ...info.sourceType ? { sourceType: info.sourceType } : {},
+            ...info.sourceId ? { sourceId: info.sourceId } : {},
             ...info.model ? { modelServiceId: info.model } : {}
           },
           info.prompt
@@ -640,7 +655,6 @@ function createSubSessionLauncher(opts) {
         sub = created.session;
         lastEventId = created.initialPrompt.lastEventId;
         turn = created.initialPrompt.turn;
-        promptDispatched = true;
       } else {
         sub = await bridge.spawnOrAttach({
           workspaceCwd: boundWorkspace,
@@ -656,6 +670,9 @@ function createSubSessionLauncher(opts) {
       }
       spawnedSession = sub;
       const sessionId = sub.sessionId;
+      if (!standalone && isScheduledTaskRunSource(info) && info.model && sub.modelApplied === false) {
+        throw new Error(`sub-session model selection failed: ${info.model}`);
+      }
       if (isolatedWorkspace && !standalone) {
         const isolatedCwd = await isolatedWorkspace.materializeDirectory(sessionId);
         const changed = await bridge.changeSessionCwd(sessionId, {
@@ -689,6 +706,10 @@ function createSubSessionLauncher(opts) {
         promptAdmission = new Promise((resolve) => {
           markPromptAdmitted = resolve;
         });
+        const onPromptAdmitted = /* @__PURE__ */ __name(() => {
+          promptAdmitted = true;
+          markPromptAdmitted();
+        }, "onPromptAdmitted");
         turn = bridge.sendPrompt(
           sessionId,
           {
@@ -696,27 +717,46 @@ function createSubSessionLauncher(opts) {
             prompt: [{ type: "text", text: info.prompt }]
           },
           void 0,
-          { promptId, onPromptAdmitted: markPromptAdmitted }
+          { promptId, onPromptAdmitted }
         );
-        promptDispatched = true;
       }
       void turn.catch((err) => {
         log.debug("sub-session: sendPrompt rejected", sessionId, String(err));
       });
-      if (info.completion === "sent") {
-        if (isScheduledTaskRunSource(info) && promptAdmission) {
-          await Promise.race([
-            promptAdmission,
-            turn.then(
-              () => void 0,
-              (err) => Promise.reject(
-                new Error(
-                  `sub-session dispatch failed: ${err instanceof Error ? err.message : String(err)}`
-                )
+      if (isScheduledTaskRunSource(info) && promptAdmission) {
+        await Promise.race([
+          promptAdmission,
+          turn.then(
+            () => void 0,
+            (err) => Promise.reject(
+              new Error(
+                `sub-session dispatch failed: ${err instanceof Error ? err.message : String(err)}`
               )
             )
-          ]);
+          )
+        ]);
+      }
+      if (info.groupId) {
+        try {
+          const assign = /* @__PURE__ */ __name(() => createSessionOrganizationService(
+            boundWorkspace
+          ).updateSessionOrganization(sessionId, {
+            groupId: info.groupId,
+            color: null
+          }), "assign");
+          if (runtimeBaseDir) {
+            await Storage.runWithResolvedRuntimeBaseDir(runtimeBaseDir, assign);
+          } else {
+            await assign();
+          }
+          bridge.markSessionCatalogChanged();
+        } catch (error) {
+          writeStderrLine(
+            `qwen serve: scheduled-task session ${sessionId} could not be assigned to group ${info.groupId}: ${error instanceof Error ? error.message : String(error)}`
+          );
         }
+      }
+      if (info.completion === "sent") {
         const drainAc = new AbortController();
         const drainSignal = AbortSignal.any([stopAc.signal, drainAc.signal]);
         void (async () => {
@@ -831,64 +871,104 @@ function createSubSessionLauncher(opts) {
     } catch (err) {
       releaseOnce();
       if (spawnedSession !== void 0 && isolatedWorkspace && !standalone) {
+        const sessionId = spawnedSession.sessionId;
         let sessionClosed = false;
         try {
           if (spawnedSession.attached) {
             if (spawnedSession.clientId) {
-              await bridge.detachClient(
-                spawnedSession.sessionId,
-                spawnedSession.clientId
-              );
+              await bridge.detachClient(sessionId, spawnedSession.clientId);
             }
           } else {
-            sessionClosed = await bridge.killSession(spawnedSession.sessionId, {
+            sessionClosed = await bridge.killSession(sessionId, {
               requireZeroAttaches: true
             });
           }
         } catch (cleanupError) {
           log.debug(
             "sub-session: isolated session rollback failed",
-            spawnedSession.sessionId,
+            sessionId,
             cleanupError
           );
         }
         if (sessionClosed) {
-          if (!promptDispatched) {
+          if (!promptAdmitted) {
             try {
-              const transcriptRemoved = await new SessionService(
-                boundWorkspace
-              ).removeSession(spawnedSession.sessionId);
+              const removeTranscript = /* @__PURE__ */ __name(() => new SessionService(boundWorkspace).removeSession(sessionId), "removeTranscript");
+              const transcriptRemoved = runtimeBaseDir ? await Storage.runWithResolvedRuntimeBaseDir(
+                runtimeBaseDir,
+                removeTranscript
+              ) : await removeTranscript();
               if (transcriptRemoved) bridge.markSessionCatalogChanged();
             } catch (cleanupError) {
               log.debug(
                 "sub-session: isolated transcript cleanup failed",
-                spawnedSession.sessionId,
+                sessionId,
                 cleanupError
               );
             }
           }
           try {
-            await isolatedWorkspace.discardEmptyDirectory(
-              spawnedSession.sessionId
-            );
+            await isolatedWorkspace.discardEmptyDirectory(sessionId);
           } catch (cleanupError) {
             log.debug(
               "sub-session: isolated workspace cleanup failed",
-              spawnedSession.sessionId,
+              sessionId,
               cleanupError
             );
           }
         }
       } else if (spawnedSession !== void 0 && !standalone) {
+        const sessionId = spawnedSession.sessionId;
+        let sessionClosed = false;
+        let closeTimer;
         try {
-          void bridge.closeSession(spawnedSession.sessionId).catch(() => {
-          });
+          await Promise.race([
+            bridge.closeSession(sessionId, void 0, {
+              reason: "sub_session_rollback",
+              agentCloseTimeoutMs: ACTIVE_WORK_CLOSE_TIMEOUT_MS
+            }),
+            new Promise((_, reject) => {
+              closeTimer = setTimeout(
+                () => reject(
+                  new Error(
+                    `Timed out closing rolled-back sub-session ${sessionId}`
+                  )
+                ),
+                ACTIVE_WORK_CLOSE_TIMEOUT_MS + ROLLBACK_CLOSE_WATCHDOG_SLACK_MS
+              );
+              if (typeof closeTimer.unref === "function") closeTimer.unref();
+            })
+          ]);
+          sessionClosed = true;
         } catch (closeErr) {
-          log.debug(
-            "sub-session: closeSession threw",
-            spawnedSession.sessionId,
-            closeErr
-          );
+          log.debug("sub-session: closeSession threw", sessionId, closeErr);
+        } finally {
+          if (closeTimer !== void 0) clearTimeout(closeTimer);
+        }
+        if (!sessionClosed) {
+          try {
+            sessionClosed = await bridge.killSession(sessionId, {
+              requireZeroAttaches: true
+            });
+          } catch (killErr) {
+            log.debug("sub-session: killSession threw", sessionId, killErr);
+          }
+        }
+        if (sessionClosed && !promptAdmitted) {
+          try {
+            const removeTranscript = /* @__PURE__ */ __name(() => new SessionService(boundWorkspace).removeSession(sessionId), "removeTranscript");
+            const transcriptRemoved = runtimeBaseDir ? await Storage.runWithResolvedRuntimeBaseDir(
+              runtimeBaseDir,
+              removeTranscript
+            ) : await removeTranscript();
+            if (transcriptRemoved) bridge.markSessionCatalogChanged();
+          } catch (cleanupError) {
+            log.debug(
+              "sub-session: transcript cleanup failed",
+              sessionId,
+              cleanupError
+            );
+          }
         }
       }
       writeStderrLine(

package/chunks/{create-sub-session-TIGCFGCS.js → create-sub-session-MSGNIM37.js}

@@ -2,11 +2,14 @@
 "use strict";
 import {
   CreateSubSessionTool
-} from "./chunk-Y2MYW47X.js";
+} from "./chunk-6WXVEDT2.js";
 import {
   MAX_SUB_SESSION_PROMPT_CHARS
 } from "./chunk-LJZSMWOH.js";
-import "./chunk-TP6FYVQT.js";
+import "./chunk-3LMDSCLU.js";
+import "./chunk-VGC4I5JJ.js";
+import "./chunk-XFFRI3WM.js";
+import "./chunk-RSWBT7AZ.js";
 import "./chunk-ZAFYHRVY.js";
 import "./chunk-TBWQLLFO.js";
 import "./chunk-5O2XNYP6.js";

package/chunks/{cron-create-AKWX67FO.js → cron-create-U2JJ5CCF.js}

@@ -3,13 +3,13 @@
 import {
   nextFireTime,
   parseCron
-} from "./chunk-IRH27ZC2.js";
+} from "./chunk-5EZRLTLQ.js";
 import {
   humanReadableCron
 } from "./chunk-QHWCP53L.js";
 import {
   CRON_TASKS_DISPLAY_PATH
-} from "./chunk-F53KKZUD.js";
+} from "./chunk-3LMDSCLU.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
@@ -20,7 +20,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import {
   getErrorMessage
 } from "./chunk-ZAFYHRVY.js";

package/chunks/{cron-delete-XPB6IYZJ.js → cron-delete-7DM4LJWD.js}

@@ -3,7 +3,7 @@
 import {
   CRON_TASKS_DISPLAY_PATH,
   removeCronTasks
-} from "./chunk-F53KKZUD.js";
+} from "./chunk-3LMDSCLU.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-XFFRI3WM.js";
 import {
@@ -11,7 +11,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import {
   getErrorMessage
 } from "./chunk-ZAFYHRVY.js";

package/chunks/{cron-list-XBKO4WU5.js → cron-list-VCUSZK2Y.js}

@@ -7,7 +7,7 @@ import {
   CRON_TASKS_DISPLAY_PATH,
   readCronTasks,
   taskHasLegacyCondition
-} from "./chunk-F53KKZUD.js";
+} from "./chunk-3LMDSCLU.js";
 import "./chunk-VGC4I5JJ.js";
 import "./chunk-XFFRI3WM.js";
 import {
@@ -15,7 +15,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import "./chunk-ZAFYHRVY.js";
 import "./chunk-TBWQLLFO.js";
 import {

package/chunks/{daemon-G5TYKZD6.js → daemon-NJB4PWZ7.js}

@@ -21,6 +21,7 @@ import {
   DaemonStandaloneProtocolError,
   DaemonTransportClosedError,
   EXTENSION_ARCHIVE_UPLOAD_TIMEOUT_MS,
+  GOAL_CHECKPOINT_STALL_LIMIT,
   GOAL_PAUSE_REASON_COMMAND,
   MID_TURN_MESSAGE_INJECTED_EVENT,
   PENDING_PROMPT_ADDED_EVENT,
@@ -92,7 +93,7 @@ import {
   stringifyJson,
   stripOscSequences,
   transcriptBlockToTerminalText
-} from "./chunk-FCQJLMA2.js";
+} from "./chunk-Q3TFRP5G.js";
 import "./chunk-CJ3DHN5I.js";
 import "./chunk-5O2XNYP6.js";
 import "./chunk-J2S4EL5Y.js";
@@ -117,6 +118,7 @@ export {
   DaemonStandaloneProtocolError,
   DaemonTransportClosedError,
   EXTENSION_ARCHIVE_UPLOAD_TIMEOUT_MS,
+  GOAL_CHECKPOINT_STALL_LIMIT,
   GOAL_PAUSE_REASON_COMMAND,
   MID_TURN_MESSAGE_INJECTED_EVENT,
   PENDING_PROMPT_ADDED_EVENT,