@qwen-code/qwen-code 0.21.7 → 0.21.8

package/chunks/{chunk-ZJ3VGYHK.js → chunk-2ILAOM2I.js}

@@ -2,17 +2,17 @@
 "use strict";
 import {
   JsonOutputAdapter
-} from "./chunk-SHZYHGQH.js";
+} from "./chunk-WG6542MA.js";
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-3NB7TSE2.js";
+} from "./chunk-U5SLIG7E.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-72LNFGUY.js";
+} from "./chunk-77QVBFCU.js";
 import {
   handleAtCommand
-} from "./chunk-KR4ZSC7K.js";
+} from "./chunk-FWBXMANW.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -24,11 +24,11 @@ import {
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-RUL4S3K3.js";
+} from "./chunk-YHJFF7KH.js";
 import {
   RunBudgetEnforcer,
   cleanupReviewWorktreeLeases
-} from "./chunk-KKJJB5X6.js";
+} from "./chunk-7VUERJHS.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -36,14 +36,13 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-TDXGKHDN.js";
+} from "./chunk-IYES5WOT.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-CSZEXZBE.js";
+} from "./chunk-GBDINRIL.js";
 import {
   PLAN_MODE_ENTRY_SIBLING_SKIP_MESSAGE,
   buildSessionRecoveryPlanFromApiHistory,
-  canonicalToolName,
   clampInlineMediaPart,
   createDuplicateProviderToolCallResponse,
   detectAutonomousSentinel,
@@ -57,7 +56,7 @@ import {
   parseAndFormatApiError,
   partitionByConcurrencySafety,
   restoreWorktreeContext
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-GXSNGY5M.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -66,10 +65,10 @@ import {
 } from "./chunk-O6GEWCJA.js";
 import {
   GoalPersistenceUnavailableError
-} from "./chunk-3K7FH2KQ.js";
+} from "./chunk-67N6HB5H.js";
 import {
   isSystemReminderContent
-} from "./chunk-LZC3B5N2.js";
+} from "./chunk-IA7TGCN2.js";
 import {
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
@@ -79,10 +78,11 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-2U3WZGZG.js";
+} from "./chunk-3PY4LPJF.js";
 import {
-  ToolNames
-} from "./chunk-IC4Z6LX6.js";
+  ToolNames,
+  canonicalToolName
+} from "./chunk-PYQADEFD.js";
 import {
   isTelemetrySdkInitialized,
   shutdownTelemetry
@@ -93,7 +93,7 @@ import {
 } from "./chunk-OIVKILPI.js";
 import {
   registerCleanup
-} from "./chunk-EORNAQDT.js";
+} from "./chunk-6TR7CFXH.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -104,6 +104,15 @@ import {
 // packages/cli/src/nonInteractiveCli.ts
 init_esbuild_shims();
 var debugLogger = createDebugLogger("NON_INTERACTIVE_CLI");
+var TurnInterruptedError = class extends Error {
+  static {
+    __name(this, "TurnInterruptedError");
+  }
+  constructor() {
+    super("Operation cancelled.");
+    this.name = "TurnInterruptedError";
+  }
+};
 var restoredBackgroundAgentSessions = /* @__PURE__ */ new WeakMap();
 var STRUCTURED_SHUTDOWN_HOLDBACK_MS = 500;
 function isHeadlessLoopSentinel(prompt) {
@@ -473,6 +482,9 @@ async function runNonInteractive(config, settings, input, prompt_id, options = {
         await handleBudgetExceededError(config, exceeded);
         throw new Error(exceeded.message);
       }
+      if (options.recoverableCancellation === true && abortController.signal.reason instanceof TurnInterruptedError) {
+        throw abortController.signal.reason;
+      }
       await handleCancellationError(config);
       throw new Error("Operation cancelled.");
     }, "routeAbort");
@@ -1836,7 +1848,8 @@ ${text}
       flushQueuedNotificationsToSdk(localQueue);
       finalizeOneShotMonitors();
       const budgetExceeded = budgetEnforcer.getExceeded();
-      const message = budgetExceeded ? budgetExceeded.message : error instanceof Error ? error.message : String(error);
+      const recoverableCancellation = !budgetExceeded && options.recoverableCancellation === true && abortController.signal.reason instanceof TurnInterruptedError;
+      const message = budgetExceeded ? budgetExceeded.message : recoverableCancellation ? abortController.signal.reason.message : error instanceof Error ? error.message : String(error);
       const metrics = uiTelemetryService.getMetrics();
       const usage = computeUsageFromMetrics(metrics);
       const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
@@ -1863,6 +1876,9 @@ ${text}
       if (budgetExceeded) {
         await handleBudgetExceededError(config, budgetExceeded);
       }
+      if (recoverableCancellation) {
+        return 130;
+      }
       await handleError(error, config);
     } finally {
       await failClosedActiveGoalTurn(
@@ -1910,6 +1926,7 @@ ${text}
 __name(runNonInteractive, "runNonInteractive");
 
 export {
+  TurnInterruptedError,
   skipHeadlessLoopSentinel,
   runNonInteractive
 };

package/chunks/{chunk-6XJMFJ4D.js → chunk-2M4K4KYS.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   formatHistoryGapNotice
-} from "./chunk-KXSDEOFU.js";
+} from "./chunk-4ALIARFY.js";
 import {
   sanitizeTerminalText
 } from "./chunk-4NFY2S7N.js";
@@ -19,15 +19,18 @@ import {
   setGoalTerminalObserver,
   setLastGoalTerminal,
   unregisterGoalHook
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-GXSNGY5M.js";
+import {
+  projectUserTranscriptForDisplay
+} from "./chunk-67N6HB5H.js";
 import {
   apiActivityTracker,
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-2U3WZGZG.js";
+} from "./chunk-3PY4LPJF.js";
 import {
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";
@@ -695,21 +698,42 @@ init_esbuild_shims();
 // packages/core/dist/src/goals/goal-protocol.js
 init_esbuild_shims();
 var GOAL_STATE_VERSION = 2;
+var GOAL_CHECKPOINT_CLAIM_LIMIT = 32;
+var GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS = 2e3;
+var GOAL_CHECKPOINT_CLAIM_MAX_BYTES = 16e3;
+var GOAL_CHECKPOINT_SOURCE_REFERENCE_LIMIT = 32;
+function isGoalEvidenceProofKind(value) {
+  return value === "user_input" || value === "delivered_output" || value === "external_fact";
+}
+__name(isGoalEvidenceProofKind, "isGoalEvidenceProofKind");
 
 // packages/core/dist/src/goals/goal-reducer.js
 init_esbuild_shims();
 var MAX_BLOCKED_AUDIT_COUNT = 3;
 function parseGoalStateRecordPayloadV2(value) {
-  if (!isRecord(value) || !hasOnlyKeys(value, ["v", "cause", "snapshot", "blockedAudit"]) || value["v"] !== GOAL_STATE_VERSION || !isGoalStateCause(value["cause"]) || !isBlockedAudit(value["blockedAudit"])) {
+  if (!isRecord(value) || !hasOnlyKeys(value, [
+    "v",
+    "cause",
+    "snapshot",
+    "checkpointPending",
+    "blockedAudit"
+  ]) || value["v"] !== GOAL_STATE_VERSION || !isGoalStateCause(value["cause"]) || !isCheckpointPending(value["checkpointPending"]) || !isBlockedAudit(value["blockedAudit"])) {
     return void 0;
   }
   const parsedSnapshot = parseGoalSnapshotV2(value["snapshot"]);
-  return parsedSnapshot?.activity === "idle" ? {
+  if (parsedSnapshot?.activity !== "idle")
+    return void 0;
+  const checkpointPending = value["checkpointPending"];
+  if (checkpointPending && (parsedSnapshot.goal?.status !== "active" || checkpointPending.permit.goalId !== parsedSnapshot.goal.goalId || checkpointPending.permit.revision !== parsedSnapshot.goal.revision || checkpointPending.recordUuid === parsedSnapshot.goal.evidenceCursor.recordId || value["cause"] !== "turn_finished" && value["cause"] !== "verifier_reject")) {
+    return void 0;
+  }
+  return {
     v: GOAL_STATE_VERSION,
     cause: value["cause"],
     snapshot: parsedSnapshot,
+    ...checkpointPending ? { checkpointPending: structuredClone(checkpointPending) } : {},
     ...value["blockedAudit"] ? { blockedAudit: structuredClone(value["blockedAudit"]) } : {}
-  } : void 0;
+  };
 }
 __name(parseGoalStateRecordPayloadV2, "parseGoalStateRecordPayloadV2");
 function parseGoalSnapshotV2(value) {
@@ -727,6 +751,10 @@ function parseGoalSnapshotV2(value) {
   return goal ? { v: GOAL_STATE_VERSION, goal, activity: value["activity"] } : void 0;
 }
 __name(parseGoalSnapshotV2, "parseGoalSnapshotV2");
+function parseGoalStateCause(value) {
+  return isGoalStateCause(value) ? value : void 0;
+}
+__name(parseGoalStateCause, "parseGoalStateCause");
 function copyCursor(cursor) {
   return { recordId: cursor.recordId };
 }
@@ -742,8 +770,12 @@ function parseGoalRecord(value) {
     "activeTimeMs",
     "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"]) || value["lastReason"] !== void 0 && typeof value["lastReason"] !== "string") {
+  ]) || 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") {
+    return void 0;
+  }
+  if (value["evidenceCheckpoint"] && value["evidenceCursor"].recordId !== value["evidenceCheckpoint"].checkpointId) {
     return void 0;
   }
   return {
@@ -756,6 +788,9 @@ function parseGoalRecord(value) {
     activeTimeMs: value["activeTimeMs"],
     createdAt: value["createdAt"],
     updatedAt: value["updatedAt"],
+    ...value["evidenceCheckpoint"] === void 0 ? {} : {
+      evidenceCheckpoint: structuredClone(value["evidenceCheckpoint"])
+    },
     ...value["lastReason"] === void 0 ? {} : { lastReason: value["lastReason"] }
   };
 }
@@ -773,9 +808,35 @@ function isGoalActivity(value) {
 }
 __name(isGoalActivity, "isGoalActivity");
 function isGoalStateCause(value) {
-  return value === "create" || value === "replace" || value === "edit" || value === "pause" || value === "resume" || value === "turn_finished" || value === "verifier_accept" || value === "verifier_reject" || value === "complete" || value === "blocked" || value === "usage_limited" || value === "clear" || value === "migrated";
+  return value === "create" || value === "replace" || value === "edit" || value === "pause" || value === "resume" || value === "turn_finished" || value === "checkpoint" || value === "verifier_accept" || value === "verifier_reject" || value === "complete" || value === "blocked" || value === "usage_limited" || value === "clear" || value === "migrated";
 }
 __name(isGoalStateCause, "isGoalStateCause");
+function isGoalEvidenceCheckpoint(value) {
+  if (value === void 0)
+    return true;
+  if (!isRecord(value) || !hasOnlyKeys(value, ["checkpointId", "createdAt", "claims"]) || typeof value["checkpointId"] !== "string" || value["checkpointId"].length === 0 || !isFiniteNumber(value["createdAt"]) || !Array.isArray(value["claims"]) || value["claims"].length === 0 || value["claims"].length > GOAL_CHECKPOINT_CLAIM_LIMIT) {
+    return false;
+  }
+  let checkpointBytes = 0;
+  for (const [index, claim] of value["claims"].entries()) {
+    if (!isRecord(claim) || !hasOnlyKeys(claim, ["id", "proofKind", "claim", "sourceRefs"]) || claim["id"] !== `${value["checkpointId"]}:${index + 1}` || !isGoalEvidenceProofKind(claim["proofKind"]) || typeof claim["claim"] !== "string" || claim["claim"].trim().length === 0 || [...claim["claim"]].length > GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS || !Array.isArray(claim["sourceRefs"]) || claim["sourceRefs"].length === 0 || claim["sourceRefs"].length > GOAL_CHECKPOINT_SOURCE_REFERENCE_LIMIT || new Set(claim["sourceRefs"]).size !== claim["sourceRefs"].length || claim["sourceRefs"].some((reference) => typeof reference !== "string" || reference.length === 0)) {
+      return false;
+    }
+    checkpointBytes += new TextEncoder().encode(claim["claim"]).byteLength;
+    if (checkpointBytes > GOAL_CHECKPOINT_CLAIM_MAX_BYTES)
+      return false;
+  }
+  return true;
+}
+__name(isGoalEvidenceCheckpoint, "isGoalEvidenceCheckpoint");
+function isCheckpointPending(value) {
+  return value === void 0 || isRecord(value) && hasOnlyKeys(value, ["permit", "recordUuid"]) && isGoalTurnPermit(value["permit"]) && typeof value["recordUuid"] === "string" && value["recordUuid"].length > 0;
+}
+__name(isCheckpointPending, "isCheckpointPending");
+function isGoalTurnPermit(value) {
+  return isRecord(value) && hasOnlyKeys(value, ["goalId", "revision", "turnId"]) && typeof value["goalId"] === "string" && value["goalId"].length > 0 && isNonNegativeInteger(value["revision"]) && value["revision"] > 0 && typeof value["turnId"] === "string" && value["turnId"].length > 0;
+}
+__name(isGoalTurnPermit, "isGoalTurnPermit");
 function isBlockedAudit(value) {
   return value === void 0 || isRecord(value) && hasOnlyKeys(value, ["fingerprint", "count", "turnIds"]) && typeof value["fingerprint"] === "string" && value["fingerprint"].length > 0 && isNonNegativeInteger(value["count"]) && value["count"] > 0 && value["count"] <= MAX_BLOCKED_AUDIT_COUNT && Array.isArray(value["turnIds"]) && value["turnIds"].length === value["count"] && value["turnIds"].every((turnId) => typeof turnId === "string" && turnId.length > 0);
 }
@@ -835,6 +896,24 @@ function projectGoalStateToLegacy(payload, previousGoal = null) {
   };
 }
 __name(projectGoalStateToLegacy, "projectGoalStateToLegacy");
+function isGoalCheckpointBookkeepingTransition(previous, next) {
+  const previousGoal = previous?.goal;
+  const nextGoal = next.goal;
+  if (!previousGoal || !nextGoal)
+    return false;
+  return previousGoal.goalId === nextGoal.goalId && previousGoal.revision === nextGoal.revision && previousGoal.objective === nextGoal.objective && previousGoal.status === nextGoal.status && previousGoal.turnCount === nextGoal.turnCount && previousGoal.createdAt === nextGoal.createdAt && previousGoal.lastReason === nextGoal.lastReason;
+}
+__name(isGoalCheckpointBookkeepingTransition, "isGoalCheckpointBookkeepingTransition");
+function isGoalCheckpointBookkeepingCause(cause, previousCause) {
+  if (cause === "checkpoint")
+    return true;
+  return cause === "verifier_reject" && (previousCause === "verifier_reject" || previousCause === "checkpoint");
+}
+__name(isGoalCheckpointBookkeepingCause, "isGoalCheckpointBookkeepingCause");
+function isGoalCheckpointBookkeepingRecord(input) {
+  return isGoalCheckpointBookkeepingTransition(input.previous, input.next) && isGoalCheckpointBookkeepingCause(input.cause, input.previousCause);
+}
+__name(isGoalCheckpointBookkeepingRecord, "isGoalCheckpointBookkeepingRecord");
 function legacyStatusKind(payload) {
   switch (payload.cause) {
     case "create":
@@ -853,6 +932,7 @@ function legacyStatusKind(payload) {
     case "usage_limited":
       return "aborted";
     case "turn_finished":
+    case "checkpoint":
     case "verifier_accept":
     case "verifier_reject":
       return payload.snapshot.goal?.status === "complete" ? "achieved" : payload.snapshot.goal?.status === "blocked" || payload.snapshot.goal?.status === "usage_limited" ? "aborted" : "checking";
@@ -866,27 +946,6 @@ function assertNever(value) {
 }
 __name(assertNever, "assertNever");
 
-// packages/core/dist/src/hooks/user-prompt-submit-context.js
-init_esbuild_shims();
-var USER_PROMPT_SUBMIT_CONTEXT_OPEN_TAG = "<qwen:user-prompt-submit-context>";
-var USER_PROMPT_SUBMIT_CONTEXT_CLOSE_TAG = "</qwen:user-prompt-submit-context>";
-function isUserPromptSubmitContextPartText(text) {
-  const trimmed = text.trim();
-  return trimmed.startsWith(USER_PROMPT_SUBMIT_CONTEXT_OPEN_TAG) && trimmed.endsWith(USER_PROMPT_SUBMIT_CONTEXT_CLOSE_TAG) && trimmed.length >= USER_PROMPT_SUBMIT_CONTEXT_OPEN_TAG.length + USER_PROMPT_SUBMIT_CONTEXT_CLOSE_TAG.length;
-}
-__name(isUserPromptSubmitContextPartText, "isUserPromptSubmitContextPartText");
-function stripTrailingUserPromptSubmitContextPart(parts) {
-  if (parts.length <= 1) {
-    return parts;
-  }
-  const last = parts[parts.length - 1];
-  if (!last || typeof last.text !== "string" || !isUserPromptSubmitContextPartText(last.text)) {
-    return parts;
-  }
-  return parts.slice(0, -1);
-}
-__name(stripTrailingUserPromptSubmitContextPart, "stripTrailingUserPromptSubmitContextPart");
-
 // packages/acp-bridge/src/transcript-replay.ts
 var MISSING_TRANSCRIPT_TOOL_RESULT_MESSAGE = "Tool result missing from saved history; the previous run likely ended before this tool completed.";
 var TRANSCRIPT_GOAL_STATUS_KINDS = /* @__PURE__ */ new Set([
@@ -901,6 +960,25 @@ function isObjectRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 __name(isObjectRecord, "isObjectRecord");
+function replaceTextPartsForDisplay(parts, displayText) {
+  const projected = [];
+  let replacedText = false;
+  for (const part of parts ?? []) {
+    if (isObjectRecord(part) && typeof part["text"] === "string") {
+      if (!replacedText && displayText.length > 0) {
+        projected.push({ text: displayText });
+      }
+      replacedText = true;
+    } else {
+      projected.push(part);
+    }
+  }
+  if (!replacedText && displayText.length > 0) {
+    projected.push({ text: displayText });
+  }
+  return projected;
+}
+__name(replaceTextPartsForDisplay, "replaceTextPartsForDisplay");
 function toTranscriptEpochMs(timestamp) {
   if (typeof timestamp === "number") {
     return Number.isFinite(timestamp) ? timestamp : void 0;
@@ -1060,6 +1138,7 @@ var DefaultTranscriptReplayMachine = class {
     );
     this.usage = { ...initialState.cumulativeUsage };
     this.goalState = initialState.goalState;
+    this.goalCause = initialState.goalCause;
     for (const pending of initialState.pendingToolCalls) {
       this.pendingToolCalls.set(pending.callId, pending);
       this.usedToolCallIds.add(pending.callId);
@@ -1079,6 +1158,7 @@ var DefaultTranscriptReplayMachine = class {
   usage;
   finalized = false;
   goalState;
+  goalCause;
   *project(record) {
     if (this.finalized) {
       throw new Error(
@@ -1167,16 +1247,17 @@ var DefaultTranscriptReplayMachine = class {
         ...pending
       })),
       cumulativeUsage: { ...this.usage },
-      ...this.goalState ? { goalState: this.goalState } : {}
+      ...this.goalState ? { goalState: this.goalState } : {},
+      ...this.goalCause ? { goalCause: this.goalCause } : {}
     };
   }
   *projectUserRecord(record, emit, meta) {
+    const payload = isObjectRecord(record.systemPayload) ? record.systemPayload : void 0;
     if (record.subtype === "goal_runtime" || record.subtype === "notification" || record.subtype === "cron" || record.subtype === "mid_turn_user_message") {
-      const payload = isObjectRecord(record.systemPayload) ? record.systemPayload : void 0;
       const displayText = payload && typeof payload["displayText"] === "string" ? payload["displayText"] : void 0;
-      const backgroundTask = payload && isObjectRecord(payload["backgroundTask"]) ? payload["backgroundTask"] : void 0;
       if (displayText) {
         const isNotification = record.subtype === "notification";
+        const backgroundTask = payload && isObjectRecord(payload["backgroundTask"]) ? payload["backgroundTask"] : void 0;
         yield emit(
           createTranscriptMessageUpdate({
             role: "user",
@@ -1194,80 +1275,30 @@ var DefaultTranscriptReplayMachine = class {
         return;
       }
       if (record.subtype !== "mid_turn_user_message") return;
-    } else if (!record.subtype) {
-      const payload = isObjectRecord(record.systemPayload) ? record.systemPayload : void 0;
-      const displayText = payload && typeof payload["displayText"] === "string" ? payload["displayText"] : void 0;
+    }
+    const projection = projectUserTranscriptForDisplay(record);
+    if (projection.displayText !== void 0) {
       yield* this.projectMessageParts(
-        displayText ? this.withUserPromptDisplayText(record, displayText) : this.withoutTrailingUserPromptSubmitContext(record),
+        record,
         "user",
         emit,
-        meta
+        meta,
+        void 0,
+        replaceTextPartsForDisplay(
+          record.message?.parts,
+          projection.displayText
+        )
       );
       return;
     }
-    yield* this.projectMessageParts(record, "user", emit, meta);
-  }
-  /**
-   * Drops a trailing message part that is entirely a tagged UserPromptSubmit
-   * context block. Injection always appends after the user's own part(s), so
-   * a sole matching part is treated as user-authored and kept.
-   */
-  withoutTrailingUserPromptSubmitContext(record) {
-    const parts = record.message?.parts;
-    if (!Array.isArray(parts)) {
-      return record;
-    }
-    const nextParts = stripTrailingUserPromptSubmitContextPart(parts);
-    if (nextParts === parts) {
-      return record;
-    }
-    return {
-      ...record,
-      message: {
-        ...record.message,
-        parts: [...nextParts]
-      }
-    };
-  }
-  /**
-   * Rebuilds a plain user record for display: strip trailing tagged hook
-   * context, then replace every text part with a single `displayText` part at
-   * the first text position so images keep their relative order.
-   */
-  withUserPromptDisplayText(record, displayText) {
-    const stripped = this.withoutTrailingUserPromptSubmitContext(record);
-    const parts = stripped.message?.parts;
-    if (!Array.isArray(parts) || parts.length === 0) {
-      return {
-        ...stripped,
-        message: {
-          ...stripped.message,
-          parts: [{ text: displayText }]
-        }
-      };
-    }
-    let replaced = false;
-    const nextParts = [];
-    for (const part of parts) {
-      if (isObjectRecord(part) && typeof part["text"] === "string") {
-        if (!replaced) {
-          nextParts.push({ text: displayText });
-          replaced = true;
-        }
-        continue;
-      }
-      nextParts.push(part);
-    }
-    if (!replaced) {
-      nextParts.push({ text: displayText });
-    }
-    return {
-      ...stripped,
-      message: {
-        ...stripped.message,
-        parts: nextParts
-      }
-    };
+    yield* this.projectMessageParts(
+      record,
+      "user",
+      emit,
+      meta,
+      void 0,
+      projection.parts
+    );
   }
   *projectAssistantRecord(record, emit, meta) {
     const usageMetadata = isObjectRecord(record.usageMetadata) ? record.usageMetadata : void 0;
@@ -1288,8 +1319,8 @@ var DefaultTranscriptReplayMachine = class {
     const trailingUsage = takeUsageUpdate();
     if (trailingUsage) yield emit(trailingUsage);
   }
-  *projectMessageParts(record, role, emit, meta, beforeToolCall) {
-    const parts = record.message?.parts;
+  *projectMessageParts(record, role, emit, meta, beforeToolCall, partsOverride) {
+    const parts = partsOverride ?? record.message?.parts;
     if (!parts) return;
     for (let partIndex = 0; partIndex < parts.length; partIndex += 1) {
       const part = parts[partIndex];
@@ -1443,11 +1474,19 @@ var DefaultTranscriptReplayMachine = class {
         );
         return;
       }
+      const bookkeepingOnly = isGoalCheckpointBookkeepingRecord({
+        cause: payload2.cause,
+        previousCause: this.goalCause,
+        previous: this.goalState,
+        next: payload2.snapshot
+      });
       const projection = projectGoalStateToLegacy(
         payload2,
         this.goalState?.goal ?? null
       );
       this.goalState = payload2.snapshot;
+      this.goalCause = payload2.cause;
+      if (bookkeepingOnly) return;
       const { type: _type, ...goalStatus } = projection.goalStatus;
       yield emit(
         createTranscriptMessageUpdate({
@@ -1685,6 +1724,16 @@ function parseInitialState(value, onDiagnostic) {
       affectsCompleteness: true
     });
   }
+  const rawGoalCause = value["goalCause"];
+  const goalCause = rawGoalCause === void 0 ? void 0 : parseGoalStateCause(rawGoalCause);
+  if (rawGoalCause !== void 0 && !goalCause) {
+    onDiagnostic?.({
+      code: "invalid_replay_state",
+      severity: "warning",
+      message: "Dropped a malformed Goal cause from replay state.",
+      affectsCompleteness: true
+    });
+  }
   return {
     v: 1,
     pendingToolCalls,
@@ -1694,7 +1743,8 @@ function parseInitialState(value, onDiagnostic) {
       candidateTokens: usage["candidateTokens"],
       apiTimeMs: usage["apiTimeMs"]
     } : emptyUsage(),
-    ...goalState ? { goalState } : {}
+    ...goalState ? { goalState } : {},
+    ...goalCause ? { goalCause } : {}
   };
 }
 __name(parseInitialState, "parseInitialState");
@@ -1894,6 +1944,13 @@ __name(dedupeStrings, "dedupeStrings");
 // packages/cli/src/acp-integration/session/emitters/MessageEmitter.ts
 init_esbuild_shims();
 
+// packages/cli/src/acp-integration/session/types.ts
+init_esbuild_shims();
+function hasFullSessionContext(context) {
+  return "config" in context;
+}
+__name(hasFullSessionContext, "hasFullSessionContext");
+
 // packages/cli/src/acp-integration/session/emitters/base-emitter.ts
 init_esbuild_shims();
 var BaseEmitter = class {
@@ -2088,6 +2145,19 @@ var MessageEmitter = class extends BaseEmitter {
         }
       })
     );
+    if (!Number.isFinite(durationMs) || subagentMeta || !hasFullSessionContext(this.ctx)) {
+      return;
+    }
+    const used = usageMetadata.promptTokenCount ?? usageMetadata.totalTokenCount;
+    const size = this.ctx.config.getContentGeneratorConfig()?.contextWindowSize;
+    if (typeof used !== "number" || !Number.isSafeInteger(used) || used < 0 || typeof size !== "number" || !Number.isSafeInteger(size) || size <= 0) {
+      return;
+    }
+    await this.sendUpdate({
+      sessionUpdate: "usage_update",
+      used,
+      size
+    });
   }
   /**
    * Emits a message chunk based on role and thought flag.
@@ -2154,15 +2224,6 @@ var PlanEmitter = class extends BaseEmitter {
 
 // packages/cli/src/acp-integration/session/emitters/tool-call-emitter.ts
 init_esbuild_shims();
-
-// packages/cli/src/acp-integration/session/types.ts
-init_esbuild_shims();
-function hasFullSessionContext(context) {
-  return "config" in context;
-}
-__name(hasFullSessionContext, "hasFullSessionContext");
-
-// packages/cli/src/acp-integration/session/emitters/tool-call-emitter.ts
 var KIND_MAP = {
   ["read" /* Read */]: "read",
   ["edit" /* Edit */]: "edit",
@@ -2556,7 +2617,8 @@ var HistoryReplayer = class {
         candidateTokens: 0,
         apiTimeMs: 0
       },
-      ...options.goalState ? { goalState: options.goalState } : {}
+      ...options.goalState ? { goalState: options.goalState } : {},
+      ...options.goalCause ? { goalCause: options.goalCause } : {}
     };
     return createTranscriptReplayMachine({
       initialState,
@@ -2869,7 +2931,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-BWRCCFTE.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-CBMSHPAU.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;
@@ -3759,11 +3821,6 @@ export {
  * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * @license
- * Copyright 2025 Qwen Code
- * SPDX-License-Identifier: Apache-2.0
- */
 /**
  * @license
  * Copyright 2025 Qwen

package/chunks/{chunk-CNIID3TV.js → chunk-2UUMVNYT.js}

@@ -22,7 +22,7 @@ import {
 } from "./chunk-GNPNYXJB.js";
 import {
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   Storage,
   createDebugLogger,

package/chunks/{chunk-22NBYCPD.js → chunk-3P2LV43B.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-NAVJD2PQ.js";
 import {
   formatFetchErrorForUser
-} from "./chunk-3ULCB3NE.js";
+} from "./chunk-HV76SFIA.js";
 import {
   combineAbortSignals
 } from "./chunk-DJ2GSRLV.js";