@qwen-code/qwen-code 0.21.12 → 0.21.13

package/chunks/{chunk-HG3UBTJ4.js → chunk-O565M6A4.js}

@@ -12,9 +12,12 @@ import {
   MIN_CHILD_HEAP_MB,
   recommendedChildShareMb
 } from "./chunk-UXEO7E3V.js";
+import {
+  isInternalWorkspaceRuntime
+} from "./chunk-NYWWQ437.js";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG
-} from "./chunk-FQDCO3CJ.js";
+} from "./chunk-S5DWMTHO.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH,
   translateAndCheckAbsoluteWorkspacePath
@@ -1880,6 +1883,309 @@ async function createManagedScratchDirectory(root) {
 }
 __name(createManagedScratchDirectory, "createManagedScratchDirectory");
 
+// packages/cli/src/serve/conversations/conversation-runtime-errors.ts
+init_esbuild_shims();
+var DEFAULT_MESSAGES = {
+  conversation_runtime_in_use: "The Conversations runtime is owned by another daemon.",
+  conversation_runtime_unavailable: "The Conversations runtime is temporarily unavailable.",
+  conversation_root_compromised: "The Conversations root could not be verified.",
+  conversation_runtime_ownership_compromised: "The Conversations runtime ownership state could not be verified."
+};
+var ConversationRuntimeOwnershipError = class extends Error {
+  constructor(code, retryable, options) {
+    super(DEFAULT_MESSAGES[code], options);
+    this.code = code;
+    this.retryable = retryable;
+    this.name = "ConversationRuntimeOwnershipError";
+  }
+  static {
+    __name(this, "ConversationRuntimeOwnershipError");
+  }
+  status = 503;
+};
+function conversationRuntimeInUseError() {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_in_use",
+    true
+  );
+}
+__name(conversationRuntimeInUseError, "conversationRuntimeInUseError");
+function conversationRuntimeUnavailableError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_unavailable",
+    true,
+    { cause }
+  );
+}
+__name(conversationRuntimeUnavailableError, "conversationRuntimeUnavailableError");
+function conversationRuntimeOwnershipCompromisedError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_ownership_compromised",
+    false,
+    { cause }
+  );
+}
+__name(conversationRuntimeOwnershipCompromisedError, "conversationRuntimeOwnershipCompromisedError");
+function conversationRootCompromisedError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_root_compromised",
+    false,
+    { cause }
+  );
+}
+__name(conversationRootCompromisedError, "conversationRootCompromisedError");
+
+// packages/cli/src/serve/serve-app-lifecycle.ts
+init_esbuild_shims();
+var SERVE_APP_LIFECYCLE = Symbol("qwen.serveAppLifecycle");
+var DEFAULT_CLOSE_TIMEOUT_MS = 5e3;
+var SECONDARY_CLOSE_TIMEOUT_MS = 2e3;
+function deferred() {
+  let resolve2;
+  let reject;
+  const promise = new Promise((resolvePromise, rejectPromise) => {
+    resolve2 = resolvePromise;
+    reject = rejectPromise;
+  });
+  void promise.catch(() => void 0);
+  return { promise, resolve: resolve2, reject };
+}
+__name(deferred, "deferred");
+var ServeAppLifecycleController = class {
+  static {
+    __name(this, "ServeAppLifecycleController");
+  }
+  admission = deferred();
+  server;
+  startupReady = true;
+  listenerReady = false;
+  listenerClosed = false;
+  sealed = false;
+  closePending;
+  ownership;
+  appDrain;
+  hostDrain;
+  bootStarter;
+  bootPending;
+  bootStarted = false;
+  bindServer(server, options = {}) {
+    if (this.server || server.listening || this.bootStarted || this.sealed) {
+      throw new Error(
+        "Serve app lifecycle must bind one server before its first listen."
+      );
+    }
+    this.server = server;
+    this.hostDrain = options.drainHost;
+    this.startupReady = options.startupReady === void 0;
+    server.once("listening", () => {
+      this.listenerReady = true;
+      if (this.sealed) {
+        server.close();
+        server.closeAllConnections();
+        return;
+      }
+      this.openAdmissionIfReady();
+    });
+    server.on("close", () => {
+      this.listenerClosed = true;
+      this.seal();
+      void this.close().catch(() => void 0);
+    });
+    server.on("error", (error) => {
+      if (!this.listenerReady && options.startupReady === void 0) {
+        this.seal(error);
+        void this.close().catch(() => void 0);
+      }
+    });
+    if (options.startupReady) {
+      void options.startupReady.then(
+        () => {
+          this.startupReady = true;
+          this.openAdmissionIfReady();
+        },
+        (error) => {
+          this.seal(error instanceof Error ? error : new Error(String(error)));
+        }
+      );
+    }
+  }
+  close(options = {}) {
+    if (this.closePending) return this.closePending;
+    const pending = this.closeOnce(options);
+    this.closePending = pending;
+    void pending.catch(() => {
+      if (this.closePending === pending) this.closePending = void 0;
+    });
+    return pending;
+  }
+  setOwnership(ownership) {
+    if (this.ownership) {
+      throw new Error("Serve app lifecycle ownership is already configured.");
+    }
+    this.ownership = ownership;
+  }
+  setAppDrain(drain) {
+    this.appDrain = drain;
+  }
+  setBootStarter(starter) {
+    this.bootStarter = starter;
+    this.openAdmissionIfReady();
+  }
+  async awaitBootAdmission() {
+    if (!this.server || this.sealed) {
+      throw conversationRuntimeUnavailableError();
+    }
+    try {
+      await this.admission.promise;
+    } catch (error) {
+      throw conversationRuntimeUnavailableError(error);
+    }
+    if (this.sealed) {
+      throw conversationRuntimeUnavailableError();
+    }
+  }
+  async startBoot(starter = this.bootStarter) {
+    await this.awaitBootAdmission();
+    await this.beginBoot(starter);
+  }
+  getBootPromise() {
+    return this.bootPending;
+  }
+  isBootStarted() {
+    return this.bootStarted;
+  }
+  sealBoot() {
+    this.seal();
+  }
+  openAdmissionIfReady() {
+    if (this.sealed || !this.server || !this.listenerReady || !this.startupReady) {
+      return;
+    }
+    this.admission.resolve();
+    const bootStarter = this.bootStarter;
+    if (bootStarter && !this.bootStarted) {
+      void this.beginBoot(bootStarter)?.catch(() => void 0);
+    }
+  }
+  beginBoot(starter) {
+    if (!starter) return void 0;
+    if (this.sealed) {
+      return Promise.reject(conversationRuntimeUnavailableError());
+    }
+    if (this.bootPending) return this.bootPending;
+    this.bootStarted = true;
+    const pending = Promise.resolve().then(starter);
+    const tracked = pending.finally(() => {
+      if (this.bootPending === tracked) this.bootPending = void 0;
+    });
+    this.bootPending = tracked;
+    void tracked.catch(() => void 0);
+    return tracked;
+  }
+  seal(error) {
+    if (this.sealed) return;
+    this.sealed = true;
+    this.admission.reject(error ?? conversationRuntimeUnavailableError());
+  }
+  async closeOnce(options) {
+    this.seal();
+    const drains = [
+      this.startDrain(this.appDrain),
+      this.startDrain(this.hostDrain),
+      this.bootPending?.catch(() => void 0)
+    ].filter((value) => value !== void 0);
+    const listenerClose = this.closeListener(
+      options.timeoutMs ?? DEFAULT_CLOSE_TIMEOUT_MS
+    );
+    const results = await Promise.allSettled([...drains, listenerClose]);
+    const errors = results.filter(
+      (result) => result.status === "rejected"
+    ).map((result) => result.reason);
+    if (errors.length === 1) {
+      throw errors[0];
+    }
+    if (errors.length > 1) {
+      throw new AggregateError(errors, "Serve app shutdown is incomplete.");
+    }
+    await this.ownership?.release();
+  }
+  startDrain(drain) {
+    if (!drain) return void 0;
+    try {
+      return drain();
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  }
+  closeListener(timeoutMs) {
+    if (!this.server || this.listenerClosed || !this.listenerReady && !this.server.listening) {
+      return Promise.resolve();
+    }
+    const server = this.server;
+    if (!server.listening) {
+      return this.waitForClosingListener(server, timeoutMs);
+    }
+    return new Promise((resolve2, reject) => {
+      let secondaryTimer;
+      const forceTimer = setTimeout(
+        () => {
+          server.closeAllConnections();
+          secondaryTimer = setTimeout(() => {
+            reject(new Error("The serve listener did not confirm shutdown."));
+          }, SECONDARY_CLOSE_TIMEOUT_MS);
+          secondaryTimer.unref();
+        },
+        Math.max(0, timeoutMs)
+      );
+      forceTimer.unref();
+      server.close((error) => {
+        clearTimeout(forceTimer);
+        if (secondaryTimer) clearTimeout(secondaryTimer);
+        if (error) reject(error);
+        else {
+          this.listenerClosed = true;
+          resolve2();
+        }
+      });
+    });
+  }
+  waitForClosingListener(server, timeoutMs) {
+    return new Promise((resolve2, reject) => {
+      let secondaryTimer;
+      const onClose = /* @__PURE__ */ __name(() => {
+        server.off("close", onClose);
+        clearTimeout(forceTimer);
+        if (secondaryTimer) clearTimeout(secondaryTimer);
+        this.listenerClosed = true;
+        resolve2();
+      }, "onClose");
+      const forceTimer = setTimeout(
+        () => {
+          server.closeAllConnections();
+          secondaryTimer = setTimeout(() => {
+            server.off("close", onClose);
+            reject(new Error("The serve listener did not confirm shutdown."));
+          }, SECONDARY_CLOSE_TIMEOUT_MS);
+          secondaryTimer.unref();
+        },
+        Math.max(0, timeoutMs)
+      );
+      forceTimer.unref();
+      server.once("close", onClose);
+      if (this.listenerClosed) onClose();
+    });
+  }
+};
+function installServeAppLifecycle(app, lifecycle = new ServeAppLifecycleController()) {
+  const locals = app.locals;
+  if (locals[SERVE_APP_LIFECYCLE]) {
+    throw new Error("Serve app lifecycle is already installed.");
+  }
+  locals[SERVE_APP_LIFECYCLE] = lifecycle;
+  return lifecycle;
+}
+__name(installServeAppLifecycle, "installServeAppLifecycle");
+
 // packages/cli/src/serve/server/request-helpers.ts
 init_esbuild_shims();
 function sendJsonBodyParserError(res, err) {
@@ -2349,6 +2655,70 @@ __name(resolveAcpHttpEnabled, "resolveAcpHttpEnabled");
 // packages/cli/src/serve/daemon-status.ts
 init_esbuild_shims();
 
+// packages/cli/src/serve/acp-http/pre-attach-budget.ts
+init_esbuild_shims();
+var ACP_PRE_ATTACH_MAX_FRAMES_PER_STREAM = 256;
+var ACP_PRE_ATTACH_MAX_FRAMES_PER_CONNECTION = 1024;
+var ACP_PRE_ATTACH_MAX_FRAMES_GLOBAL = 4096;
+var ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_PER_CONNECTION = 64 * 1024 * 1024;
+var ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_GLOBAL = 256 * 1024 * 1024;
+var AcpPreAttachBudget = class {
+  constructor(limits = {
+    maxFrames: ACP_PRE_ATTACH_MAX_FRAMES_GLOBAL,
+    maxBytes: ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_GLOBAL
+  }) {
+    this.limits = limits;
+  }
+  static {
+    __name(this, "AcpPreAttachBudget");
+  }
+  usedFrames = 0;
+  usedBytes = 0;
+  pendingDeliveryFrames = 0;
+  highWaterFrames = 0;
+  highWaterBytes = 0;
+  guardFailures = 0;
+  tryReserve(bytes) {
+    if (this.usedFrames >= this.limits.maxFrames || bytes > this.limits.maxBytes - this.usedBytes) {
+      this.guardFailures += 1;
+      return void 0;
+    }
+    this.usedFrames += 1;
+    this.usedBytes += bytes;
+    this.highWaterFrames = Math.max(this.highWaterFrames, this.usedFrames);
+    this.highWaterBytes = Math.max(this.highWaterBytes, this.usedBytes);
+    let released = false;
+    let pendingDelivery = false;
+    return {
+      markPendingDelivery: /* @__PURE__ */ __name(() => {
+        if (released || pendingDelivery) return;
+        pendingDelivery = true;
+        this.pendingDeliveryFrames += 1;
+      }, "markPendingDelivery"),
+      release: /* @__PURE__ */ __name(() => {
+        if (released) return;
+        released = true;
+        if (pendingDelivery) this.pendingDeliveryFrames -= 1;
+        this.usedFrames -= 1;
+        this.usedBytes -= bytes;
+      }, "release")
+    };
+  }
+  recordGuardFailure() {
+    this.guardFailures += 1;
+  }
+  snapshot() {
+    return {
+      usedFrames: this.usedFrames,
+      usedBytes: this.usedBytes,
+      pendingDeliveryFrames: this.pendingDeliveryFrames,
+      highWaterFrames: this.highWaterFrames,
+      highWaterBytes: this.highWaterBytes,
+      guardFailures: this.guardFailures
+    };
+  }
+};
+
 // packages/cli/src/serve/daemon-memory-pressure.ts
 init_esbuild_shims();
 import { getHeapStatistics } from "node:v8";
@@ -2458,8 +2828,10 @@ async function buildDaemonStatusResponse(detail, input) {
   const bridgeSnapshot = input.bridge.getDaemonStatusSnapshot();
   const lastActivity = input.bridge.lastActivityAt ?? null;
   const workspaceRuntimes = input.workspaceRegistry?.list();
-  const workspaceSnapshots = workspaceRuntimes?.map((runtime) => ({
+  const aggregateRuntimes = input.workspaceRegistry?.listAll?.() ?? workspaceRuntimes;
+  const workspaceSnapshots = aggregateRuntimes?.map((runtime) => ({
     workspaceCwd: runtime.workspaceCwd,
+    internal: isInternalWorkspaceRuntime(runtime),
     snapshot: runtime.bridge === input.bridge ? bridgeSnapshot : runtime.bridge.getDaemonStatusSnapshot(),
     lastActivity: runtime.bridge === input.bridge ? lastActivity : runtime.bridge.lastActivityAt ?? null
   })) ?? [
@@ -2485,7 +2857,7 @@ async function buildDaemonStatusResponse(detail, input) {
   if (memoryBudget) {
     const managedRuntimes = input.workspaceRegistry?.listManaged();
     const activeAcpChildCount = managedRuntimes ? managedRuntimes.filter((runtime) => runtime.bridge.isChannelLive()).length : workspaceSnapshots.filter((item) => item.snapshot.channelLive).length;
-    const registeredWorkspaceCount = input.workspaceRegistry ? input.workspaceRegistry.listEntries().length : workspaceSnapshots.length;
+    const registeredWorkspaceCount = input.workspaceRegistry ? (input.workspaceRegistry.listAllEntries?.() ?? input.workspaceRegistry.listEntries()).length : workspaceSnapshots.length;
     let childRssBytesTotal = 0;
     let childRssSampled = 0;
     let oldestChildReadingAgeMs = null;
@@ -2558,7 +2930,7 @@ async function buildDaemonStatusResponse(detail, input) {
     }
     derivedQueuedPromptsByWorkspace[index] = derivedQueuedPromptsForWorkspace;
   }
-  const queuedPrompts = workspaceRuntimes?.reduce(
+  const queuedPrompts = aggregateRuntimes?.reduce(
     (sum, runtime, index) => sum + (runtime.bridge.pendingPromptTotal ?? derivedQueuedPromptsByWorkspace[index] ?? 0),
     0
   ) ?? input.bridge.pendingPromptTotal ?? derivedQueuedPrompts;
@@ -2616,7 +2988,7 @@ async function buildDaemonStatusResponse(detail, input) {
     full = await buildFullStatus(
       input,
       acpAggregate,
-      workspaceSnapshots.flatMap((item) => item.snapshot.sessions)
+      workspaceSnapshots.filter((item) => item.internal !== true).flatMap((item) => item.snapshot.sessions)
     );
     pushFullIssues(issues, full);
   }
@@ -2668,6 +3040,11 @@ async function buildDaemonStatusResponse(detail, input) {
       channelIdleTimeoutMs: bridgeSnapshot.limits.channelIdleTimeoutMs,
       sessionIdleTimeoutMs: bridgeSnapshot.limits.sessionIdleTimeoutMs,
       acpConnectionCap: acpSnapshot?.connectionCap ?? null,
+      acpPreAttachMaxFramesPerStream: acpSnapshot !== void 0 ? ACP_PRE_ATTACH_MAX_FRAMES_PER_STREAM : null,
+      acpPreAttachMaxFramesPerConnection: acpSnapshot !== void 0 ? ACP_PRE_ATTACH_MAX_FRAMES_PER_CONNECTION : null,
+      acpPreAttachMaxFramesGlobal: acpSnapshot !== void 0 ? ACP_PRE_ATTACH_MAX_FRAMES_GLOBAL : null,
+      acpPreAttachMaxPayloadBytesPerConnection: acpSnapshot !== void 0 ? ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_PER_CONNECTION : null,
+      acpPreAttachMaxPayloadBytesGlobal: acpSnapshot !== void 0 ? ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_GLOBAL : null,
       memory: toDaemonStatusMemoryLimits(
         memoryBudget,
         input.getChildHeapPolicySnapshot?.(),
@@ -2712,7 +3089,17 @@ async function buildDaemonStatusResponse(detail, input) {
           sessionStreams: acpAggregate?.sessionStreams ?? 0,
           sseStreams: acpAggregate?.sseStreams ?? 0,
           wsStreams: acpAggregate?.wsStreams ?? 0,
-          pendingClientRequests: acpAggregate?.pendingClientRequests ?? 0
+          pendingClientRequests: acpAggregate?.pendingClientRequests ?? 0,
+          preAttach: {
+            bufferedConnectionFrames: acpAggregate?.bufferedConnectionFrames ?? 0,
+            bufferedSessionFrames: acpAggregate?.bufferedSessionFrames ?? 0,
+            pendingDeliveryFrames: acpAggregate?.pendingDeliveryFrames ?? 0,
+            usedFrames: acpAggregate?.preAttach.usedFrames ?? 0,
+            usedBytes: acpAggregate?.preAttach.usedBytes ?? 0,
+            highWaterFrames: acpAggregate?.preAttach.highWaterFrames ?? 0,
+            highWaterBytes: acpAggregate?.preAttach.highWaterBytes ?? 0,
+            guardFailures: acpAggregate?.preAttach.guardFailures ?? 0
+          }
         }
       },
       rateLimit: {
@@ -2722,7 +3109,7 @@ async function buildDaemonStatusResponse(detail, input) {
       ...input.getPerfSnapshot ? { perf: input.getPerfSnapshot() } : {},
       ...input.getMetricsSeries ? { metrics: { series: input.getMetricsSeries() } } : {},
       activity: {
-        activePrompts: workspaceRuntimes?.reduce(
+        activePrompts: aggregateRuntimes?.reduce(
           (sum, runtime) => sum + (runtime.bridge.activePromptCount ?? 0),
           0
         ) ?? input.bridge.activePromptCount ?? 0,
@@ -2793,6 +3180,7 @@ async function buildFullStatus(input, acpSnapshot, sessions) {
   ]);
   return {
     sessions,
+    acpMounts: acpSnapshot?.mounts ?? [],
     acpConnections: acpSnapshot?.connections ?? [],
     workspace: {
       mcp,
@@ -2851,12 +3239,12 @@ async function withTimeout(promise, section, timeoutMs) {
 }
 __name(withTimeout, "withTimeout");
 function pushRuntimeIssues(issues, acpSnapshot, acpAggregate, rateLimitHits, input, channelWorker, channelWorkers, totalAdmissionSnapshot, workspaceSnapshots) {
-  for (const { workspaceCwd, snapshot } of workspaceSnapshots) {
+  for (const { workspaceCwd, internal, snapshot } of workspaceSnapshots) {
     if (snapshot.limits.maxSessions !== null && snapshot.limits.maxSessions > 0 && snapshot.sessionCount / snapshot.limits.maxSessions >= CAPACITY_WARNING_RATIO) {
       issues.push({
         code: "session_capacity_high",
         severity: "warning",
-        message: workspaceSnapshots.length > 1 ? `Workspace ${workspaceCwd} active sessions are at ${snapshot.sessionCount}/${snapshot.limits.maxSessions}.` : `Active sessions are at ${snapshot.sessionCount}/${snapshot.limits.maxSessions}.`
+        message: workspaceSnapshots.length > 1 ? internal ? `An internal runtime's active sessions are at ${snapshot.sessionCount}/${snapshot.limits.maxSessions}.` : `Workspace ${workspaceCwd} active sessions are at ${snapshot.sessionCount}/${snapshot.limits.maxSessions}.` : `Active sessions are at ${snapshot.sessionCount}/${snapshot.limits.maxSessions}.`
       });
     }
   }
@@ -2907,7 +3295,7 @@ function pushRuntimeIssues(issues, acpSnapshot, acpAggregate, rateLimitHits, inp
     issues.push({
       code: "acp_channel_down",
       severity: "error",
-      message: downWorkspaces.length === 1 ? `Active sessions exist but the ACP channel is not live for ${downWorkspaces[0].workspaceCwd}.` : `Active sessions exist but the ACP channel is not live for ${downWorkspaces.length} workspace(s).`
+      message: downWorkspaces.length === 1 ? downWorkspaces[0].internal ? "Active sessions exist but the ACP channel is not live for an internal runtime." : `Active sessions exist but the ACP channel is not live for ${downWorkspaces[0].workspaceCwd}.` : `Active sessions exist but the ACP channel is not live for ${downWorkspaces.length} workspace(s).`
     });
   }
   if (input.opts.rateLimit === true && sumRateHits(rateLimitHits) > 0) {
@@ -3510,6 +3898,13 @@ export {
   isScratchRootCompatible,
   prepareManagedScratchRoot,
   createManagedScratchDirectory,
+  ConversationRuntimeOwnershipError,
+  conversationRuntimeInUseError,
+  conversationRuntimeUnavailableError,
+  conversationRuntimeOwnershipCompromisedError,
+  conversationRootCompromisedError,
+  ServeAppLifecycleController,
+  installServeAppLifecycle,
   sendJsonBodyParserError,
   CLIENT_ID_HEADER,
   MAX_CLIENT_ID_LENGTH,
@@ -3534,6 +3929,12 @@ export {
   setRateLimiter,
   getRateLimiter,
   resolveAcpHttpEnabled,
+  ACP_PRE_ATTACH_MAX_FRAMES_PER_STREAM,
+  ACP_PRE_ATTACH_MAX_FRAMES_PER_CONNECTION,
+  ACP_PRE_ATTACH_MAX_FRAMES_GLOBAL,
+  ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_PER_CONNECTION,
+  ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_GLOBAL,
+  AcpPreAttachBudget,
   toDaemonStatusMemoryLimits,
   parseDaemonStatusDetail,
   buildDaemonStatusResponse,

package/chunks/{chunk-BSR5AXZR.js → chunk-OD2WU5QY.js}

@@ -6,7 +6,7 @@ import {
 import {
   getPlugin,
   supportedTypes
-} from "./chunk-OK47XBYH.js";
+} from "./chunk-A4QRWUDE.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-DPTMKFIH.js → chunk-OMLJNPBE.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   runSideQuery
-} from "./chunk-LSRI3ND3.js";
+} from "./chunk-MA2HEDVP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -21,6 +21,20 @@ var GOAL_CHECKPOINT_CLAIM_MAX_BYTES = 16e3;
 var GOAL_CHECKPOINT_SOURCE_REFERENCE_LIMIT = 32;
 var GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON = "The current Goal revision exceeded the bounded evidence catalog. Automatic retries cannot recover. Edit or replace the Goal before resuming it.";
 var GOAL_CHECKPOINT_REQUEST_TOO_LARGE_REASON = "The current Goal revision exceeded the checkpoint verifier request limit. Automatic retries cannot recover. Edit or replace the Goal before resuming it.";
+function isGoalLimitKind(value) {
+  return value === "evidence_catalog" || value === "checkpoint_request";
+}
+__name(isGoalLimitKind, "isGoalLimitKind");
+function goalLimitKindForReason(reason) {
+  if (reason === GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON) {
+    return "evidence_catalog";
+  }
+  if (reason === GOAL_CHECKPOINT_REQUEST_TOO_LARGE_REASON) {
+    return "checkpoint_request";
+  }
+  return void 0;
+}
+__name(goalLimitKindForReason, "goalLimitKindForReason");
 var PAUSED_GOAL_SYSTEM_REMINDER = "<system-reminder>\nThe Goal is paused. Do not continue its objective unless the user resumes it. Treat this message as ordinary conversation.\n</system-reminder>";
 function isGoalEvidenceProofKind(value) {
   return value === "user_input" || value === "delivered_output" || value === "external_fact";
@@ -92,6 +106,7 @@ var KNOWN_RECORD_SUBTYPES = /* @__PURE__ */ new Set([
   "agent_retry",
   "file_history_snapshot",
   "session_source",
+  "branch_checkpoint",
   "goal_state",
   "goal_runtime",
   ...ARTIFACT_RECORD_SUBTYPES
@@ -1359,7 +1374,8 @@ function reduceGoalControl(current, transition) {
       objective: normalizeObjective(request.objective, snapshotOf(current)),
       evidenceCursor: copyCursor(transition.cursor),
       evidenceCheckpoint: void 0,
-      lastReason: void 0
+      lastReason: void 0,
+      limitKind: void 0
     });
   }
   if (request.action === "pause") {
@@ -1383,7 +1399,7 @@ function reduceGoalControl(current, transition) {
       snapshotOf(current)
     );
   }
-  if (current.status === "usage_limited" && (current.lastReason === GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON || current.lastReason === GOAL_CHECKPOINT_REQUEST_TOO_LARGE_REASON)) {
+  if (current.status === "usage_limited" && isEvidenceLimited(current)) {
     throw new GoalInvalidTransitionError(
       "An evidence-limited Goal cannot be resumed; edit or replace the Goal first",
       snapshotOf(current)
@@ -1485,6 +1501,10 @@ function normalizeObjective(objective, current) {
   return normalized;
 }
 __name(normalizeObjective, "normalizeObjective");
+function isEvidenceLimited(goal) {
+  return goal.limitKind !== void 0 || goal.lastReason !== void 0 && goalLimitKindForReason(goal.lastReason) !== void 0;
+}
+__name(isEvidenceLimited, "isEvidenceLimited");
 function transitionGoal(goal, now, changes) {
   return {
     ...goal,
@@ -1514,8 +1534,9 @@ function parseGoalRecord(value) {
     "createdAt",
     "updatedAt",
     "evidenceCheckpoint",
-    "lastReason"
-  ]) || typeof value["goalId"] !== "string" || !value["goalId"] || !isNonNegativeInteger(value["revision"]) || value["revision"] === 0 || typeof value["objective"] !== "string" || !value["objective"].trim() || !isGoalStatus(value["status"]) || !isTranscriptCursor(value["evidenceCursor"]) || !isNonNegativeInteger(value["turnCount"]) || !isNonNegativeNumber(value["activeTimeMs"]) || !isFiniteNumber(value["createdAt"]) || !isFiniteNumber(value["updatedAt"]) || !isGoalEvidenceCheckpoint(value["evidenceCheckpoint"]) || value["lastReason"] !== void 0 && typeof value["lastReason"] !== "string") {
+    "lastReason",
+    "limitKind"
+  ]) || typeof value["goalId"] !== "string" || !value["goalId"] || !isNonNegativeInteger(value["revision"]) || value["revision"] === 0 || typeof value["objective"] !== "string" || !value["objective"].trim() || !isGoalStatus(value["status"]) || !isTranscriptCursor(value["evidenceCursor"]) || !isNonNegativeInteger(value["turnCount"]) || !isNonNegativeNumber(value["activeTimeMs"]) || !isFiniteNumber(value["createdAt"]) || !isFiniteNumber(value["updatedAt"]) || !isGoalEvidenceCheckpoint(value["evidenceCheckpoint"]) || value["lastReason"] !== void 0 && typeof value["lastReason"] !== "string" || value["limitKind"] !== void 0 && (!isGoalLimitKind(value["limitKind"]) || value["status"] !== "usage_limited")) {
     return void 0;
   }
   if (value["evidenceCheckpoint"] && value["evidenceCursor"].recordId !== value["evidenceCheckpoint"].checkpointId) {
@@ -1534,7 +1555,8 @@ function parseGoalRecord(value) {
     ...value["evidenceCheckpoint"] === void 0 ? {} : {
       evidenceCheckpoint: structuredClone(value["evidenceCheckpoint"])
     },
-    ...value["lastReason"] === void 0 ? {} : { lastReason: value["lastReason"] }
+    ...value["lastReason"] === void 0 ? {} : { lastReason: value["lastReason"] },
+    ...value["limitKind"] === void 0 ? {} : { limitKind: value["limitKind"] }
   };
 }
 __name(parseGoalRecord, "parseGoalRecord");
@@ -2332,7 +2354,8 @@ function createGoalRuntime(options) {
           status: "usage_limited",
           activeTimeMs: elapsedActiveTime(snapshot.goal, now),
           updatedAt: now,
-          lastReason: outcome.reason
+          lastReason: outcome.reason,
+          ...outcome.limitKind === void 0 ? {} : { limitKind: outcome.limitKind }
         },
         activity: "idle"
       };
@@ -2435,7 +2458,11 @@ function createGoalRuntime(options) {
     } catch (error) {
       if (attempt.controller.signal.aborted) return;
       if (error instanceof InvalidGoalEvidenceReferenceError) {
-        outcome = error.code === "catalog_truncated" ? { kind: "usage_limited", reason: error.message } : {
+        outcome = error.code === "catalog_truncated" ? {
+          kind: "usage_limited",
+          reason: error.message,
+          limitKind: "evidence_catalog"
+        } : {
           kind: "decision",
           result: { decision: "reject", reason: error.message }
         };
@@ -2482,7 +2509,7 @@ function createGoalRuntime(options) {
       }
     });
   }, "finishCheckpointCheck");
-  const recordCheckpointFailure = /* @__PURE__ */ __name(async (attempt, reason) => {
+  const recordCheckpointFailure = /* @__PURE__ */ __name(async (attempt, reason, limitKind) => {
     await enqueue(async () => {
       if (!isCurrentCheckpointAttempt(attempt) || !snapshot.goal) return;
       const now = Date.now();
@@ -2493,7 +2520,8 @@ function createGoalRuntime(options) {
           status: "usage_limited",
           activeTimeMs: elapsedActiveTime(snapshot.goal, now),
           updatedAt: now,
-          lastReason: reason
+          lastReason: reason,
+          ...limitKind === void 0 ? {} : { limitKind }
         },
         activity: "idle"
       };
@@ -2569,7 +2597,8 @@ function createGoalRuntime(options) {
       if (window.truncated) {
         await recordCheckpointFailure(
           attempt,
-          GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON
+          GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON,
+          "evidence_catalog"
         );
         return;
       }
@@ -2604,7 +2633,8 @@ function createGoalRuntime(options) {
         if (error instanceof GoalCheckpointVerifierInputTooLargeError) {
           await recordCheckpointFailure(
             attempt,
-            GOAL_CHECKPOINT_REQUEST_TOO_LARGE_REASON
+            GOAL_CHECKPOINT_REQUEST_TOO_LARGE_REASON,
+            "checkpoint_request"
           );
           return;
         }