@qwen-code/qwen-code 0.21.2 → 0.21.3

package/chunks/{chunk-FNDXMN7I.js → chunk-4AGGSHCH.js}

@@ -1,8 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  contextCommand
-} from "./chunk-H6I4PGRV.js";
 import {
   ExtensionRefreshState,
   clearSkillArgs,
@@ -12,7 +9,13 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-DEEABGH2.js";
+} from "./chunk-QPSYIV2O.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-NYX53SV4.js";
+import {
+  contextCommand
+} from "./chunk-SKSF3LGQ.js";
 import {
   calculateCost,
   computeSessionStats,
@@ -21,23 +24,20 @@ import {
   findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-UV6KF7T3.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-PQNHRFJC.js";
+} from "./chunk-LZV2BZPL.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   writeOsc52
-} from "./chunk-NBD76HUW.js";
+} from "./chunk-3LGZEYOF.js";
+import {
+  rollbackStandaloneUpdate
+} from "./chunk-YWMDTMAU.js";
 import {
   themeManager
-} from "./chunk-IGTHU3T4.js";
+} from "./chunk-KKN2IE7Q.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-CU47KXB5.js";
-import {
-  rollbackStandaloneUpdate
-} from "./chunk-OFZKFPYG.js";
+} from "./chunk-EGYJRIDF.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -51,11 +51,11 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-PZEXDV3H.js";
+} from "./chunk-VUNRNRN6.js";
 import {
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-YDLJGZHL.js";
+} from "./chunk-4NFY2S7N.js";
 import {
   formatUnsupportedVoiceModelMessage,
   getVoiceSettingsScope,
@@ -63,21 +63,20 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-P5VC5USY.js";
+} from "./chunk-BKGA75MU.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-Q5WZTTWE.js";
+} from "./chunk-QWDVZH24.js";
 import {
   formatDuration,
-  formatMemoryUsage,
   formatTokenCount
-} from "./chunk-E5Z2AVNV.js";
+} from "./chunk-3SH53ANB.js";
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-6TAASXWL.js";
+} from "./chunk-5VYFXHY2.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -89,7 +88,7 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-W3UKBMSI.js";
+} from "./chunk-22YFMJBW.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
@@ -97,14 +96,14 @@ import {
   resolveSupportedLanguage,
   setLanguageAsync,
   t
-} from "./chunk-3F2WDAV6.js";
+} from "./chunk-KXWERR6P.js";
 import {
   getInstallationInfo
-} from "./chunk-GJ2GBPBD.js";
+} from "./chunk-FXVHVCNA.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-P755N4CS.js";
+} from "./chunk-M5LIY7Y6.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -138,6 +137,7 @@ import {
   escapeShellArg,
   findProviderByCredentials,
   flatMapTextParts,
+  formatMemoryUsage,
   generateSessionRecap,
   getActiveGoal,
   getArenaSystemReminder,
@@ -162,7 +162,6 @@ import {
   normalizeClaudeMcpServer,
   normalizeContent,
   normalizeSkillPriority,
-  parse,
   parseInstallSource,
   parseLearnVideoInput,
   parseVisionModelSetting,
@@ -175,22 +174,32 @@ import {
   runForkedAgent,
   tryGenerateSessionTitle,
   unregisterGoalHook
-} from "./chunk-54YCNSK5.js";
+} from "./chunk-UQDFEU47.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
 import {
   resolveModelId
-} from "./chunk-ZMOJ7ISP.js";
+} from "./chunk-XUMAD5IT.js";
+import {
+  getAutoSkillCuratorStatus,
+  parse,
+  recordAutoSkillUsage,
+  restoreArchivedAutoSkill,
+  runAutoSkillCurator,
+  setAutoSkillPinned
+} from "./chunk-MISUEWB4.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-3APUUXRF.js";
+} from "./chunk-A5YZ3FA2.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-TZTBZ25J.js";
 import {
-  APPROVAL_MODES,
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-CBBP4BMC.js";
+} from "./chunk-SRY26X4H.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
@@ -204,7 +213,7 @@ import {
 } from "./chunk-DGEIYUC3.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-6CQWRWUC.js";
+} from "./chunk-EIMKVOSF.js";
 import {
   IdeConnectionEvent,
   formatTokenUsageSummaryAsCsv,
@@ -218,14 +227,14 @@ import {
   recordSkillInvocation,
   runSideQuery,
   uiTelemetryService
-} from "./chunk-DUNI4EBW.js";
+} from "./chunk-4K3RV3OA.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-3I6DUGQD.js";
+} from "./chunk-E4WHKETF.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-MM7TH7ZM.js";
+} from "./chunk-CFDR3GNL.js";
 import {
   Storage,
   createDebugLogger,
@@ -234,12 +243,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-E2BHWIDT.js";
+} from "./chunk-3RXUYQJI.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-6PQPKTXP.js";
+} from "./chunk-R7XNRHYD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -835,6 +844,7 @@ var aboutCommand = {
   },
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
+  canRunDuringStreaming: true,
   action: /* @__PURE__ */ __name(async (context) => {
     const systemInfo = await getExtendedSystemInfo(context);
     if (context.executionMode !== "interactive") {
@@ -871,6 +881,7 @@ var aboutCommand = {
       },
       kind: "built-in" /* BUILT_IN */,
       supportedModes: ["interactive", "non_interactive", "acp"],
+      canRunDuringStreaming: true,
       action: /* @__PURE__ */ __name(async (context) => {
         const info = await collectSessionPathInfo(context);
         const content = formatSessionPathInfo(info);
@@ -1103,6 +1114,7 @@ function snapshotToTask(s) {
     tokensSpent: s.tokensSpent ?? 0,
     tokenBudgetTotal: s.tokenBudgetTotal ?? null,
     perPhaseTokens: new Map(s.perPhaseTokens ?? []),
+    pendingApprovals: [],
     script: s.script ?? "",
     scriptPath: s.scriptPath,
     result: s.result,
@@ -1576,8 +1588,8 @@ function executeArenaCommand(config, ui, input) {
       debugLogger4.debug("Arena agents settled");
     },
     (error) => {
-      const message = error instanceof Error ? error.message : String(error);
-      addAndRecordArenaMessage("error" /* ERROR */, `${message}`);
+      const message2 = error instanceof Error ? error.message : String(error);
+      addAndRecordArenaMessage("error" /* ERROR */, `${message2}`);
       debugLogger4.error("Arena session failed:", error);
       config.setArenaManager(null);
       for (const detach of detachListeners) {
@@ -1933,7 +1945,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-Q5BMKZV3.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-ZRV56GVP.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -3042,17 +3054,17 @@ var configCommand = {
           })
         };
       }
-      let message2 = t("Set {{key}} = {{value}}", {
+      let message3 = t("Set {{key}} = {{value}}", {
         key,
         value: String(newValue)
       });
       if (def.requiresRestart) {
-        message2 += "\n" + t("(This setting requires a restart to take effect.)");
+        message3 += "\n" + t("(This setting requires a restart to take effect.)");
       }
       return {
         type: "message",
         messageType: "info",
-        content: message2
+        content: message3
       };
     }
     const result = coerceValue(def, rawValue);
@@ -3087,22 +3099,22 @@ var configCommand = {
       };
     }
     const displayValue = isSensitiveKey(key) ? maskValue(result.value) : formatValue(result.value);
-    let message = t("Set {{key}} = {{value}}", {
+    let message2 = t("Set {{key}} = {{value}}", {
       key,
       value: displayValue
     });
     if (def.requiresRestart) {
-      message += "\n" + t("(This setting requires a restart to take effect.)");
+      message2 += "\n" + t("(This setting requires a restart to take effect.)");
     }
     if (isSensitiveKey(key)) {
-      message += "\n" + t(
+      message2 += "\n" + t(
         "(Security-sensitive setting \u2014 verify you are not exposing credentials.)"
       );
     }
     return {
       type: "message",
       messageType: "info",
-      content: message
+      content: message2
     };
   }, "action"),
   completion: /* @__PURE__ */ __name(async (_context, partialArg) => {
@@ -3218,7 +3230,8 @@ var compressCommand = {
           }
           yield {
             messageType: "info",
-            content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`
+            content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).` + (compressed.warning ? `
+\u26A0\uFE0F ${compressed.warning}` : "")
           };
         } catch (e) {
           yield {
@@ -3275,12 +3288,19 @@ var compressCommand = {
           },
           Date.now()
         );
+        if (compressed.warning) {
+          ui.addItem(
+            { type: "info" /* INFO */, text: `\u26A0\uFE0F ${compressed.warning}` },
+            Date.now()
+          );
+        }
         return;
       }
       return {
         type: "message",
         messageType: "info",
-        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`
+        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).` + (compressed.warning ? `
+\u26A0\uFE0F ${compressed.warning}` : "")
       };
     } catch (e) {
       if (abortSignal?.aborted) {
@@ -3463,6 +3483,290 @@ var compressFastCommand = {
   }, "action")
 };
 
+// packages/cli/src/ui/commands/curator-command.ts
+init_esbuild_shims();
+function message(content, messageType = "info") {
+  return { type: "message", messageType, content };
+}
+__name(message, "message");
+function mutationGuard(config) {
+  if (config.isSafeMode()) {
+    return message(
+      t("Auto-skill curator changes are disabled in safe mode."),
+      "error"
+    );
+  }
+  if (!config.isTrustedFolder()) {
+    return message(
+      t(
+        "Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again."
+      ),
+      "error"
+    );
+  }
+  return void 0;
+}
+__name(mutationGuard, "mutationGuard");
+async function refreshSkillCache(config) {
+  try {
+    await config.getSkillManager()?.refreshCache();
+  } catch {
+  }
+}
+__name(refreshSkillCache, "refreshSkillCache");
+function displayName(entry) {
+  return entry.skillName === entry.directoryName ? entry.directoryName : `${entry.skillName} (${entry.directoryName})`;
+}
+__name(displayName, "displayName");
+function formatStatus(status) {
+  const lines = [
+    t("Auto-skill curator"),
+    t("Last run: {{time}}", { time: status.lastRunAt ?? t("never") }),
+    t("Active: {{count}}", { count: String(status.active.length) }),
+    t("Stale: {{count}}", { count: String(status.stale.length) }),
+    t("Archived: {{count}}", { count: String(status.archived.length) })
+  ];
+  if (status.stale.length > 0) {
+    lines.push("", t("Stale skills:"));
+    lines.push(...status.stale.map((entry) => `  ${displayName(entry)}`));
+  }
+  const pinned = [...status.active, ...status.stale].filter(
+    (entry) => entry.pinned
+  );
+  if (pinned.length > 0) {
+    lines.push("", t("Pinned skills:"));
+    lines.push(...pinned.map((entry) => `  ${displayName(entry)}`));
+  }
+  if (status.archived.length > 0) {
+    lines.push("", t("Archived skills:"));
+    lines.push(...status.archived.map((entry) => `  ${displayName(entry)}`));
+  }
+  return lines.join("\n");
+}
+__name(formatStatus, "formatStatus");
+function formatRun(result) {
+  const prefix = result.dryRun ? t("Dry run complete.") : t("Curator run complete.");
+  const lines = [
+    prefix,
+    t("Checked: {{count}}", { count: String(result.checked) }),
+    t("First observed: {{count}}", { count: String(result.seeded.length) }),
+    t("Marked stale: {{count}}", {
+      count: String(result.markedStale.length)
+    }),
+    t("Reactivated: {{count}}", {
+      count: String(result.reactivated.length)
+    }),
+    t("{{verb}}: {{count}}", {
+      verb: result.dryRun ? t("Would archive") : t("Archived"),
+      count: String(result.archived.length)
+    }),
+    t("Skipped archive collisions: {{count}}", {
+      count: String(result.skippedCollisions.length)
+    }),
+    t("Skipped rename errors: {{count}}", {
+      count: String(result.skippedErrors.length)
+    })
+  ];
+  if (result.archived.length > 0) {
+    lines.push(
+      "",
+      result.dryRun ? t("Archive candidates:") : t("Archived skills:")
+    );
+    lines.push(...result.archived.map((name) => `  ${name}`));
+  }
+  if (result.skippedCollisions.length > 0) {
+    lines.push("", t("Skipped archive collisions:"));
+    lines.push(
+      ...result.skippedCollisions.map(
+        (name) => `  ${name} \u2014 remove or rename .qwen/archived-skills/${name} to re-archive`
+      )
+    );
+  }
+  if (result.skippedErrors.length > 0) {
+    lines.push("", t("Skipped rename errors:"));
+    lines.push(...result.skippedErrors.map((name) => `  ${name}`));
+  }
+  return lines.join("\n");
+}
+__name(formatRun, "formatRun");
+async function statusAction(context) {
+  const config = context.services.config;
+  if (!config) return message(t("Config not loaded."), "error");
+  try {
+    return message(
+      formatStatus(await getAutoSkillCuratorStatus(config.getProjectRoot()))
+    );
+  } catch (error) {
+    return message(
+      t("Failed to read auto-skill curator status: {{message}}", {
+        message: error instanceof Error ? error.message : String(error)
+      }),
+      "error"
+    );
+  }
+}
+__name(statusAction, "statusAction");
+var statusCommand = {
+  name: "status",
+  get description() {
+    return t("Show project auto-skill lifecycle status.");
+  },
+  kind: "built-in" /* BUILT_IN */,
+  supportedModes: ["interactive", "non_interactive", "acp"],
+  action: statusAction
+};
+var runCommand = {
+  name: "run",
+  get description() {
+    return t("Run project auto-skill lifecycle maintenance.");
+  },
+  argumentHint: "[--dry-run]",
+  kind: "built-in" /* BUILT_IN */,
+  supportedModes: ["interactive", "non_interactive", "acp"],
+  action: /* @__PURE__ */ __name(async (context, args) => {
+    const config = context.services.config;
+    if (!config) return message(t("Config not loaded."), "error");
+    const normalized = args.trim();
+    if (normalized !== "" && normalized !== "--dry-run") {
+      return message(t("Usage: /curator run [--dry-run]"), "error");
+    }
+    if (normalized !== "--dry-run") {
+      const blocked = mutationGuard(config);
+      if (blocked) return blocked;
+    }
+    try {
+      const result = await runAutoSkillCurator(config.getProjectRoot(), {
+        dryRun: normalized === "--dry-run"
+      });
+      if (!result.dryRun && result.archived.length > 0) {
+        await refreshSkillCache(config);
+      }
+      return message(formatRun(result));
+    } catch (error) {
+      return message(
+        t("Failed to run auto-skill curator: {{message}}", {
+          message: error instanceof Error ? error.message : String(error)
+        }),
+        "error"
+      );
+    }
+  }, "action")
+};
+var restoreCommand = {
+  name: "restore",
+  get description() {
+    return t("Restore an archived project auto-skill.");
+  },
+  argumentHint: "<directory>",
+  kind: "built-in" /* BUILT_IN */,
+  supportedModes: ["interactive", "non_interactive", "acp"],
+  action: /* @__PURE__ */ __name(async (context, args) => {
+    const config = context.services.config;
+    if (!config) return message(t("Config not loaded."), "error");
+    const directoryName = args.trim();
+    if (!directoryName) {
+      return message(t("Usage: /curator restore <directory>"), "error");
+    }
+    const blocked = mutationGuard(config);
+    if (blocked) return blocked;
+    try {
+      await restoreArchivedAutoSkill(config.getProjectRoot(), directoryName);
+      await refreshSkillCache(config);
+      return message(
+        t("Restored auto-skill: {{name}}", { name: directoryName })
+      );
+    } catch (error) {
+      return message(
+        t("Failed to restore auto-skill: {{message}}", {
+          message: error instanceof Error ? error.message : String(error)
+        }),
+        "error"
+      );
+    }
+  }, "action"),
+  completion: /* @__PURE__ */ __name(async (context, partialArg) => {
+    const config = context.services.config;
+    if (!config) return [];
+    try {
+      const status = await getAutoSkillCuratorStatus(config.getProjectRoot());
+      return status.archived.map((entry) => entry.directoryName).filter((name) => name.startsWith(partialArg));
+    } catch {
+      return [];
+    }
+  }, "completion")
+};
+function pinCommand(name, pinned) {
+  return {
+    name,
+    get description() {
+      return pinned ? t("Exclude an auto-skill from automatic maintenance.") : t("Return a pinned auto-skill to automatic maintenance.");
+    },
+    argumentHint: "<directory>",
+    kind: "built-in" /* BUILT_IN */,
+    supportedModes: ["interactive", "non_interactive", "acp"],
+    action: /* @__PURE__ */ __name(async (context, args) => {
+      const config = context.services.config;
+      if (!config) return message(t("Config not loaded."), "error");
+      const directoryName = args.trim();
+      if (!directoryName) {
+        return message(
+          pinned ? t("Usage: /curator pin <directory>") : t("Usage: /curator unpin <directory>"),
+          "error"
+        );
+      }
+      const blocked = mutationGuard(config);
+      if (blocked) return blocked;
+      try {
+        await setAutoSkillPinned(
+          config.getProjectRoot(),
+          directoryName,
+          pinned
+        );
+        return message(
+          pinned ? t("Pinned auto-skill: {{name}}", { name: directoryName }) : t("Unpinned auto-skill: {{name}}", { name: directoryName })
+        );
+      } catch (error) {
+        return message(
+          t("Failed to update auto-skill pin: {{message}}", {
+            message: error instanceof Error ? error.message : String(error)
+          }),
+          "error"
+        );
+      }
+    }, "action"),
+    completion: /* @__PURE__ */ __name(async (context, partialArg) => {
+      const config = context.services.config;
+      if (!config) return [];
+      try {
+        const status = await getAutoSkillCuratorStatus(config.getProjectRoot());
+        return [...status.active, ...status.stale].filter((entry) => entry.pinned !== pinned).map((entry) => entry.directoryName).filter((directoryName) => directoryName.startsWith(partialArg));
+      } catch {
+        return [];
+      }
+    }, "completion")
+  };
+}
+__name(pinCommand, "pinCommand");
+var pinAutoSkillCommand = pinCommand("pin", true);
+var unpinAutoSkillCommand = pinCommand("unpin", false);
+var curatorCommand = {
+  name: "curator",
+  get description() {
+    return t("Maintain project auto-skills based on recent use.");
+  },
+  argumentHint: "[status|run [--dry-run]|pin <directory>|unpin <directory>|restore <directory>]",
+  kind: "built-in" /* BUILT_IN */,
+  supportedModes: ["interactive", "non_interactive", "acp"],
+  action: statusAction,
+  subCommands: [
+    statusCommand,
+    runCommand,
+    pinAutoSkillCommand,
+    unpinAutoSkillCommand,
+    restoreCommand
+  ]
+};
+
 // packages/cli/src/ui/commands/copyCommand.ts
 init_esbuild_shims();
 function parseFencedCodeBlocks(markdown) {
@@ -3765,12 +4069,12 @@ var copyCommand = {
           content: selectedCodeBlock ? `${selectedCodeBlock.label} copied to the clipboard` : isIndexed ? `AI message ${messageIndex} copied to the clipboard` : "Last output copied to the clipboard"
         };
       } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        context.services.config?.getDebugLogger().debug(message);
+        const message2 = error instanceof Error ? error.message : String(error);
+        context.services.config?.getDebugLogger().debug(message2);
         return {
           type: "message",
           messageType: "error",
-          content: `Failed to copy to the clipboard. ${message}`
+          content: `Failed to copy to the clipboard. ${message2}`
         };
       }
     } else {
@@ -4614,8 +4918,8 @@ function formatErrorMessage2(error) {
 }
 __name(formatErrorMessage2, "formatErrorMessage");
 function formatHeapSnapshotErrorMessage(error) {
-  const message = formatErrorMessage2(error);
-  return message.startsWith("Heap snapshot") ? message : `${t("Heap snapshot failed:")} ${message}`;
+  const message2 = formatErrorMessage2(error);
+  return message2.startsWith("Heap snapshot") ? message2 : `${t("Heap snapshot failed:")} ${message2}`;
 }
 __name(formatHeapSnapshotErrorMessage, "formatHeapSnapshotErrorMessage");
 var doctorCommand = {
@@ -6049,147 +6353,256 @@ var CLEAR_KEYWORDS = /* @__PURE__ */ new Set([
   "none",
   "cancel"
 ]);
-function sanitizeConditionForPrompt(condition) {
-  return condition.replace(/[\r\n]+/g, " ").replace(/"/g, "'");
-}
-__name(sanitizeConditionForPrompt, "sanitizeConditionForPrompt");
-var goalInstructionPrompt = /* @__PURE__ */ __name((condition) => `A session-scoped Stop hook is now active with condition: "${sanitizeConditionForPrompt(condition)}". Briefly acknowledge the goal, then immediately start (or continue) working toward it \u2014 treat the condition itself as your directive and do not pause to ask the user what to do. The hook will block stopping until the condition holds. It auto-clears once the condition is met \u2014 do not tell the user to run \`/goal clear\` after success; that's only for clearing a goal early.`, "goalInstructionPrompt");
-var formatTurns = /* @__PURE__ */ __name((n) => `${n} ${n === 1 ? "turn" : "turns"}`, "formatTurns");
-function assertNeverGoalKind(kind) {
-  throw new Error(`Unexpected terminal goal kind: ${kind}`);
-}
-__name(assertNeverGoalKind, "assertNeverGoalKind");
-function terminalGoalTitle(kind) {
-  switch (kind) {
+function formatLegacyTurns(count) {
+  return `${count} ${count === 1 ? "turn" : "turns"}`;
+}
+__name(formatLegacyTurns, "formatLegacyTurns");
+function assertNeverTerminalKind(kind) {
+  throw new Error(`Unexpected GoalTerminalKind: ${kind}`);
+}
+__name(assertNeverTerminalKind, "assertNeverTerminalKind");
+function formatLegacyTerminalSummary(event) {
+  let title;
+  switch (event.kind) {
     case "achieved":
-      return "Goal achieved";
+      title = "Goal achieved";
+      break;
     case "failed":
-      return "Goal could not be achieved";
+      title = "Goal could not be achieved";
+      break;
     case "aborted":
-      return "Goal aborted";
+      title = "Goal aborted";
+      break;
     default:
-      return assertNeverGoalKind(kind);
+      title = assertNeverTerminalKind(event.kind);
   }
-}
-__name(terminalGoalTitle, "terminalGoalTitle");
-function formatTerminalSummary(event) {
-  const title = terminalGoalTitle(event.kind);
   const stats = [];
-  if (event.iterations > 0) stats.push(formatTurns(event.iterations));
-  if (typeof event.durationMs === "number")
+  if (event.iterations > 0) stats.push(formatLegacyTurns(event.iterations));
+  if (typeof event.durationMs === "number") {
     stats.push(formatDuration(event.durationMs, { hideTrailingZeros: true }));
+  }
   const subtitle = stats.length > 0 ? ` \xB7 ${stats.join(" \xB7 ")}` : "";
   const reason = event.lastReason?.trim();
-  const reasonLine = reason ? `
-Last check: ${reason}` : "";
   return `${title}${subtitle}
-Goal: ${event.condition}${reasonLine}`;
+Goal: ${event.condition}${reason ? `
+Last check: ${reason}` : ""}`;
+}
+__name(formatLegacyTerminalSummary, "formatLegacyTerminalSummary");
+async function runLegacyGoalCommand(context, args, explicitSet = false) {
+  const { config } = context.services;
+  if (!config) return errorMessage("Configuration is not available.");
+  const sessionId = config.getSessionId();
+  const objective = args.trim();
+  if (!objective) {
+    const active = getActiveGoal(sessionId);
+    if (active) {
+      const turns = active.iterations === 0 ? "not yet evaluated" : formatLegacyTurns(active.iterations);
+      return {
+        type: "message",
+        messageType: "info",
+        content: `Goal active: ${active.condition} (${turns})${active.lastReason ? `
+Last check: ${active.lastReason}` : ""}`
+      };
+    }
+    const terminal = getLastGoalTerminal(sessionId);
+    return {
+      type: "message",
+      messageType: "info",
+      content: terminal ? formatLegacyTerminalSummary(terminal) : "No goal set. Usage: `/goal <condition>` (or `/goal clear`)."
+    };
+  }
+  if (!explicitSet && CLEAR_KEYWORDS.has(objective.toLowerCase())) {
+    const cleared = unregisterGoalHook(config, sessionId);
+    if (!cleared) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "No goal set."
+      };
+    }
+    const item = {
+      type: "goal_status" /* GOAL_STATUS */,
+      kind: "cleared",
+      condition: cleared.condition,
+      iterations: cleared.iterations,
+      durationMs: Date.now() - cleared.setAt
+    };
+    context.ui.addItem(item, Date.now());
+    return {
+      type: "message",
+      messageType: "info",
+      content: `Goal cleared: ${cleared.condition}`
+    };
+  }
+  if (!config.isTrustedFolder()) {
+    return errorMessage(
+      "/goal is only available in trusted workspaces. Trust this folder via `/trust` and try again."
+    );
+  }
+  if (config.getDisableAllHooks()) {
+    return errorMessage(
+      "/goal is disabled because hooks are turned off in this session (`disableAllHooks` or bare mode)."
+    );
+  }
+  if (!config.getHookSystem()) {
+    return errorMessage(
+      "Hook system is not initialized; cannot set a /goal in this session."
+    );
+  }
+  let registered;
+  try {
+    registered = registerGoalHook({
+      config,
+      sessionId,
+      condition: objective,
+      tokensAtStart: 0
+    });
+  } catch (error) {
+    return errorMessage(
+      `Failed to set goal: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  context.ui.addItem(
+    {
+      type: "goal_status" /* GOAL_STATUS */,
+      kind: "set",
+      condition: registered.condition,
+      setAt: registered.setAt
+    },
+    Date.now()
+  );
+  installGoalTerminalObserver({
+    sessionId,
+    config,
+    addItem: context.ui.addItem
+  });
+  const result = {
+    type: "submit_prompt",
+    content: [
+      {
+        text: `A session-scoped Stop hook is now active with condition: "${objective.replace(/[\r\n]+/g, " ").replace(/"/g, "'")}". Briefly acknowledge the goal, then immediately start (or continue) working toward it \u2014 treat the condition itself as your directive and do not pause to ask the user what to do. The hook will block stopping until the condition holds. It auto-clears once the condition is met \u2014 do not tell the user to run \`/goal clear\` after success; that is only for clearing a goal early.`
+      }
+    ]
+  };
+  return result;
 }
-__name(formatTerminalSummary, "formatTerminalSummary");
-function infoMessage(content) {
-  return { type: "message", messageType: "info", content };
+__name(runLegacyGoalCommand, "runLegacyGoalCommand");
+function parseGoalCommand(args) {
+  let input = args.trim();
+  if (/^\/goal(?:\s|$)/i.test(input)) {
+    input = input.slice("/goal".length).trim();
+  }
+  if (!input) return { kind: "status" };
+  const [head = "", ...tail] = input.split(/\s+/);
+  const keyword = head.toLowerCase();
+  const objective = tail.join(" ").trim();
+  if (keyword === "set") {
+    return objective ? { kind: "set", objective } : { kind: "error", message: "`/goal set` requires an objective." };
+  }
+  if (keyword === "edit") {
+    return objective ? { kind: "edit", objective } : { kind: "error", message: "`/goal edit` requires an objective." };
+  }
+  if (tail.length === 0) {
+    if (keyword === "pause") return { kind: "pause" };
+    if (keyword === "resume") return { kind: "resume" };
+    if (CLEAR_KEYWORDS.has(keyword)) return { kind: "clear" };
+  }
+  return { kind: "set", objective: input };
 }
-__name(infoMessage, "infoMessage");
+__name(parseGoalCommand, "parseGoalCommand");
 function errorMessage(content) {
   return { type: "message", messageType: "error", content };
 }
 __name(errorMessage, "errorMessage");
+function goalControl(operation, response, cause) {
+  return {
+    type: "goal_control",
+    operation,
+    response,
+    ...cause ? { cause } : {}
+  };
+}
+__name(goalControl, "goalControl");
 var goalCommand = {
   name: "goal",
   get description() {
-    return t("Set a goal \u2014 keep working until the condition is met");
+    return t("Set or control a session goal");
   },
-  argumentHint: "[<condition> | clear]",
+  argumentHint: "[<objective> | set <objective> | edit <objective> | pause | resume | clear]",
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
   action: /* @__PURE__ */ __name(async (context, args) => {
-    const { config } = context.services;
-    if (!config) {
-      return errorMessage("Configuration is not available.");
-    }
-    const sessionId = config.getSessionId();
-    const q = args.trim();
-    if (q === "") {
-      const active = getActiveGoal(sessionId);
-      if (active) {
-        const turns = active.iterations === 0 ? "not yet evaluated" : formatTurns(active.iterations);
-        const lastReason = active.lastReason ? `
-Last check: ${active.lastReason}` : "";
-        return infoMessage(
-          `Goal active: ${active.condition} (${turns})${lastReason}`
+    if (context.executionMode !== "interactive") {
+      const operation2 = parseGoalCommand(args);
+      if (operation2.kind === "error") return errorMessage(operation2.message);
+      if (operation2.kind !== "status" && operation2.kind !== "clear" && operation2.kind !== "set") {
+        return errorMessage(
+          `'/goal ${operation2.kind}' is only available in interactive mode.`
         );
       }
-      const last = getLastGoalTerminal(sessionId);
-      if (last) {
-        return infoMessage(formatTerminalSummary(last));
-      }
-      return infoMessage(
-        "No goal set. Usage: `/goal <condition>` (or `/goal clear`)."
-      );
-    }
-    if (CLEAR_KEYWORDS.has(q.toLowerCase())) {
-      const cleared = unregisterGoalHook(config, sessionId);
-      if (!cleared) {
-        return infoMessage("No goal set.");
-      }
-      const clearedItem = {
-        type: "goal_status" /* GOAL_STATUS */,
-        kind: "cleared",
-        condition: cleared.condition,
-        iterations: cleared.iterations,
-        durationMs: Date.now() - cleared.setAt
+      const explicitSet = operation2.kind === "set";
+      const legacyArgs = explicitSet ? operation2.objective : args;
+      return await runLegacyGoalCommand(context, legacyArgs, explicitSet) ?? {
+        type: "message",
+        messageType: "info",
+        content: "Command executed successfully."
       };
-      context.ui.addItem(clearedItem, Date.now());
-      if (context.executionMode !== "interactive") {
-        return infoMessage(`Goal cleared: ${cleared.condition}`);
-      }
-      return;
     }
-    if (!config.isTrustedFolder()) {
+    const { config } = context.services;
+    if (!config) return errorMessage("Configuration is not available.");
+    const operation = parseGoalCommand(args);
+    if (operation.kind === "error") return errorMessage(operation.message);
+    const requiresTrustedFolder = operation.kind === "set" || operation.kind === "edit" || operation.kind === "resume";
+    if (requiresTrustedFolder && !config.isTrustedFolder()) {
       return errorMessage(
         "/goal is only available in trusted workspaces. Trust this folder via `/trust` and try again."
       );
     }
-    if (config.getDisableAllHooks()) {
-      return errorMessage(
-        "/goal is disabled because hooks are turned off in this session (`disableAllHooks` or bare mode)."
-      );
-    }
-    if (!config.getHookSystem()) {
-      return errorMessage(
-        "Hook system is not initialized; cannot set a /goal in this session."
-      );
-    }
-    let registered;
     try {
-      registered = registerGoalHook({
-        config,
-        sessionId,
-        condition: q,
-        tokensAtStart: 0
-      });
-    } catch (err) {
+      const runtime = await config.getGoalRuntimeReady();
+      const snapshot = runtime.getSnapshot();
+      if (operation.kind === "status") {
+        return goalControl(operation, { snapshot });
+      }
+      const current = snapshot.goal;
+      if (operation.kind === "set") {
+        const request2 = current ? {
+          action: "replace",
+          objective: operation.objective,
+          expectedGoalId: current.goalId,
+          expectedRevision: current.revision
+        } : { action: "create", objective: operation.objective };
+        return goalControl(
+          operation,
+          await runtime.dispatch(request2),
+          request2.action
+        );
+      }
+      if (!current) {
+        if (operation.kind === "clear") {
+          return goalControl(operation, { snapshot });
+        }
+        return errorMessage(`Cannot ${operation.kind}: no Goal is active.`);
+      }
+      const version = {
+        expectedGoalId: current.goalId,
+        expectedRevision: current.revision
+      };
+      const request = operation.kind === "edit" ? {
+        action: "edit",
+        objective: operation.objective,
+        ...version
+      } : { action: operation.kind, ...version };
+      return goalControl(
+        operation,
+        await runtime.dispatch(request),
+        request.action
+      );
+    } catch (error) {
       return errorMessage(
-        `Failed to set goal: ${err instanceof Error ? err.message : String(err)}`
+        error instanceof Error ? error.message : String(error)
       );
     }
-    const setItem = {
-      type: "goal_status" /* GOAL_STATUS */,
-      kind: "set",
-      condition: registered.condition,
-      setAt: registered.setAt
-    };
-    context.ui.addItem(setItem, Date.now());
-    installGoalTerminalObserver({
-      sessionId,
-      config,
-      addItem: context.ui.addItem
-    });
-    const result = {
-      type: "submit_prompt",
-      content: [{ text: goalInstructionPrompt(q) }]
-    };
-    return result;
   }, "action")
 };
 
@@ -6200,6 +6613,7 @@ var helpCommand = {
   altNames: ["?"],
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
+  canRunDuringStreaming: true,
   get description() {
     return t("for help on Qwen Code");
   },
@@ -6268,7 +6682,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-BNBTP5AS.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-4QAMC2S6.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -6383,6 +6797,13 @@ function getHookExitCodes(eventName) {
       { code: 0, description: t("command completes successfully") },
       { code: "Other", description: t("show stderr to user only") }
     ],
+    ["SessionDelete" /* SessionDelete */]: [
+      { code: 0, description: t("fire-and-forget; exit status is ignored") },
+      {
+        code: "Other",
+        description: t("fire-and-forget; exit status is ignored")
+      }
+    ],
     ["SubagentStart" /* SubagentStart */]: [
       { code: 0, description: t("stdout shown to subagent") },
       {
@@ -6480,6 +6901,9 @@ function getHookShortDescription(eventName) {
       "When the turn ends due to an API error (fires instead of Stop)"
     ),
     ["SessionEnd" /* SessionEnd */]: t("When a session is ending"),
+    ["SessionDelete" /* SessionDelete */]: t(
+      "After an explicitly selected session is deleted"
+    ),
     ["PermissionRequest" /* PermissionRequest */]: t(
       "When a permission dialog is displayed"
     ),
@@ -6528,6 +6952,9 @@ function getHookDescription(eventName) {
     ["SessionEnd" /* SessionEnd */]: t(
       "Input to command is JSON with session end reason."
     ),
+    ["SessionDelete" /* SessionDelete */]: t(
+      "Input to command is JSON with deleted_session_id. It runs after an explicitly selected session is deleted; output and failures are ignored."
+    ),
     ["SubagentStart" /* SubagentStart */]: t(
       "Input to command is JSON with agent_id and agent_type."
     ),
@@ -6806,16 +7233,16 @@ function formatFileList(openFiles) {
     const basename3 = path6.basename(file.path);
     const isDuplicate = (basenameCounts.get(basename3) || 0) > 1;
     const parentDir = path6.basename(path6.dirname(file.path));
-    const displayName = isDuplicate ? `${basename3} (/${parentDir})` : basename3;
-    return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
+    const displayName2 = isDuplicate ? `${basename3} (/${parentDir})` : basename3;
+    return `  - ${displayName2}${file.isActive ? " (active)" : ""}`;
   }).join("\n");
-  const infoMessage2 = `
+  const infoMessage = `
 (Note: The file list is limited to a number of recently accessed files within your workspace and only includes local files on disk)`;
   return `
 
 Open files:
 ${fileList}
-${infoMessage2}`;
+${infoMessage}`;
 }
 __name(formatFileList, "formatFileList");
 async function getIdeStatusMessageWithFiles(ideClient) {
@@ -6891,7 +7318,7 @@ var ideCommand = /* @__PURE__ */ __name(async () => {
     supportedModes: ["interactive"],
     subCommands: []
   };
-  const statusCommand = {
+  const statusCommand2 = {
     name: "status",
     get description() {
       return t("check status of IDE integration");
@@ -7041,11 +7468,11 @@ var ideCommand = /* @__PURE__ */ __name(async () => {
   const { status } = ideClient.getConnectionStatus();
   const isConnected = status === "connected" /* Connected */;
   if (isConnected) {
-    ideSlashCommand.subCommands = [statusCommand, disableCommand];
+    ideSlashCommand.subCommands = [statusCommand2, disableCommand];
   } else {
     ideSlashCommand.subCommands = [
       enableCommand,
-      statusCommand,
+      statusCommand2,
       installCommand2
     ];
   }
@@ -8236,6 +8663,7 @@ init_esbuild_shims();
 var MAIN_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model without arguments to choose from configured models.";
 var FAST_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model --fast without a model to choose from configured models.";
 var VISION_MODEL_CONFIGURATION_HINT = "Configure an image-capable model in settings.modelProviders and ensure the required environment variables are set. Run /model --vision <model-id> to set it, or leave it unset to auto-pick a same-provider vision model.";
+var COMPACTION_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model --compaction without a model to choose from configured models.";
 var IMAGE_MODEL_CONFIGURATION_HINT = "Configure a model with imageOnly: true, baseUrl, and envKey in settings.modelProviders. Run /model --image <model-id> to select it.";
 function parseScopeFlags(args) {
   let scopeOverride;
@@ -8303,7 +8731,7 @@ function formatUnavailableModelMessage(kind, modelName, authType, availableModel
     new Set(availableModels.map((model) => model.id))
   );
   const availableModelsLine = availableModelIds.length === 0 ? `No models are configured for auth type '${authType}'.` : `Available models for '${authType}': ${availableModelIds.join(", ")}.`;
-  const hint = kind === "Fast model" ? FAST_MODEL_CONFIGURATION_HINT : kind === "Vision model" ? VISION_MODEL_CONFIGURATION_HINT : kind === "Image model" ? IMAGE_MODEL_CONFIGURATION_HINT : MAIN_MODEL_CONFIGURATION_HINT;
+  const hint = kind === "Fast model" ? FAST_MODEL_CONFIGURATION_HINT : kind === "Vision model" ? VISION_MODEL_CONFIGURATION_HINT : kind === "Compaction model" ? COMPACTION_MODEL_CONFIGURATION_HINT : kind === "Image model" ? IMAGE_MODEL_CONFIGURATION_HINT : MAIN_MODEL_CONFIGURATION_HINT;
   return `${kind} '${modelName}' is not available for auth type '${authType}'.
 ${availableModelsLine}
 ` + hint;
@@ -8337,6 +8765,15 @@ function formatUnavailableVisionModelMessage(modelName, availableModels) {
   );
 }
 __name(formatUnavailableVisionModelMessage, "formatUnavailableVisionModelMessage");
+function formatUnavailableCompactionModelMessage(modelName, availableModels) {
+  return formatUnavailableAuxModelMessage(
+    "Compaction model",
+    modelName,
+    availableModels,
+    COMPACTION_MODEL_CONFIGURATION_HINT
+  );
+}
+__name(formatUnavailableCompactionModelMessage, "formatUnavailableCompactionModelMessage");
 function formatUnavailableImageModelMessage(modelName, availableModels) {
   return formatUnavailableAuxModelMessage(
     "Image model",
@@ -8400,9 +8837,10 @@ function getAvailableModelIds(context, mode = "main") {
   const availableModels = models.filter((m) => {
     if (mode === "image")
       return m.imageOnly === true && !m.fastOnly && !m.voiceOnly;
-    if (mode === "fast") return !m.voiceOnly && !m.imageOnly;
-    if (mode === "voice") return !m.fastOnly && !m.imageOnly;
-    return !m.fastOnly && !m.voiceOnly && !m.imageOnly;
+    if (mode === "vision") return !m.fastOnly && !m.voiceOnly && !m.imageOnly;
+    if (mode === "fast") return !m.voiceOnly && !m.imageOnly && !m.visionOnly;
+    if (mode === "voice") return !m.fastOnly && !m.imageOnly && !m.visionOnly;
+    return !m.fastOnly && !m.voiceOnly && !m.imageOnly && !m.visionOnly;
   });
   return availableModels.map((model) => model.id);
 }
@@ -8412,10 +8850,10 @@ var modelCommand = {
   completionPriority: 100,
   get description() {
     return t(
-      "Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion)."
+      "Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, --compaction for chat compression model, --image for the image generation model, --project to persist to project settings, --global to persist to user settings, [model-id] to switch immediately, or [model-id] [prompt] to run a one-off prompt on another model; the inline prompt is sent verbatim without @file expansion)."
     );
   },
-  argumentHint: "[--fast|--voice|--vision|--image] [--project|--global] [<model-id>] | <model-id> <prompt>",
+  argumentHint: "[--fast|--voice|--vision|--compaction|--image] [--project|--global] [<model-id>] | <model-id> <prompt>",
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
   completion: /* @__PURE__ */ __name(async (context, partialArg) => {
@@ -8437,6 +8875,12 @@ var modelCommand = {
             "Set the image-capable model used to transcribe images for a text-only main model"
           )
         },
+        {
+          value: "--compaction",
+          description: t(
+            "Set the model used for chat compression (auto-compaction)"
+          )
+        },
         {
           value: "--image",
           description: t("Set the model used to generate images")
@@ -8460,10 +8904,12 @@ var modelCommand = {
       const trimmed = partialArg.trim();
       if (trimmed) {
         let mode = "main";
-        const modelPrefix = trimmed.replace(/(?:^|\s)--fast(?:\s|$)/, " ").replace(/(?:^|\s)--voice(?:\s|$)/, " ").replace(/(?:^|\s)--vision(?:\s|$)/, " ").replace(/(?:^|\s)--image(?:\s|$)/, " ").replace(/(?:^|\s)--project(?:\s|$)/, " ").replace(/(?:^|\s)--global(?:\s|$)/, " ").trim();
+        const modelPrefix = trimmed.replace(/(?:^|\s)--fast(?:\s|$)/, " ").replace(/(?:^|\s)--voice(?:\s|$)/, " ").replace(/(?:^|\s)--vision(?:\s|$)/, " ").replace(/(?:^|\s)--compaction(?:\s|$)/, " ").replace(/(?:^|\s)--image(?:\s|$)/, " ").replace(/(?:^|\s)--project(?:\s|$)/, " ").replace(/(?:^|\s)--global(?:\s|$)/, " ").trim();
         if (/(?:^|\s)--fast(?:\s|$)/.test(trimmed)) mode = "fast";
         else if (/(?:^|\s)--voice(?:\s|$)/.test(trimmed)) mode = "voice";
         else if (/(?:^|\s)--vision(?:\s|$)/.test(trimmed)) mode = "vision";
+        else if (/(?:^|\s)--compaction(?:\s|$)/.test(trimmed))
+          mode = "compaction";
         else if (/(?:^|\s)--image(?:\s|$)/.test(trimmed)) mode = "image";
         return getAvailableModelIds(context, mode).filter(
           (id) => id.startsWith(modelPrefix)
@@ -8536,7 +8982,7 @@ var modelCommand = {
           content: t("Settings service not available.")
         };
       }
-      const availableModels = config.getAllConfiguredModels().filter((m) => !m.fastOnly && !m.imageOnly);
+      const availableModels = config.getAllConfiguredModels().filter((m) => !m.fastOnly && !m.imageOnly && !m.visionOnly);
       const matches = availableModels.filter((model) => model.id === modelName2);
       if (matches.length === 0) {
         return {
@@ -8621,7 +9067,7 @@ Use "/model --fast <model-id>" to set fast model.`
           content: formatUnavailableFastModelMessage(modelName2, [])
         };
       }
-      const availableModels = (selector.authType ? config.getAvailableModelsForAuthType(selector.authType) : config.getAllConfiguredModels()).filter((m) => !m.voiceOnly && !m.imageOnly);
+      const availableModels = (selector.authType ? config.getAvailableModelsForAuthType(selector.authType) : config.getAllConfiguredModels()).filter((m) => !m.voiceOnly && !m.imageOnly && !m.visionOnly);
       if (!availableModels.some((model) => model.id === selector.modelId)) {
         return {
           type: "message",
@@ -8732,6 +9178,90 @@ ${formatNonVisionModelWarning(modelName2)}`;
         content: t("Vision Model") + ": " + modelName2 + scopeSuffix + visionWarning
       };
     }
+    const isCompactionModelCommand = args === "--compaction" || args.startsWith("--compaction ");
+    if (isCompactionModelCommand) {
+      const modelName2 = args.replace("--compaction", "").trim();
+      if (!modelName2 || modelName2 === "clear") {
+        if (modelName2 === "clear") {
+          if (!settings) {
+            return {
+              type: "message",
+              messageType: "error",
+              content: t("Settings service not available.")
+            };
+          }
+          persistSetting(settings, "compactionModel", void 0, scopeOverride);
+          config.setCompactionModel(void 0);
+          return {
+            type: "message",
+            messageType: "info",
+            content: t("Compaction model override cleared") + scopeSuffix
+          };
+        }
+        if (context.executionMode !== "interactive") {
+          const compactionModel = context.services.settings?.merged?.compactionModel?.trim() || t("not set (falls back to the main model)");
+          return {
+            type: "message",
+            messageType: "info",
+            content: t(
+              'Current compaction model: {{compactionModel}}\nUse "/model --compaction <model-id>" to set compaction model, or "/model --compaction clear" to clear the override.',
+              { compactionModel }
+            )
+          };
+        }
+        return {
+          type: "dialog",
+          dialog: "compaction-model",
+          ...persistScopeSpread(scopeOverride)
+        };
+      }
+      if (!settings) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: t("Settings service not available.")
+        };
+      }
+      const selector = (() => {
+        try {
+          return resolveModelId(modelName2);
+        } catch {
+          return void 0;
+        }
+      })();
+      if (!selector) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: formatUnavailableCompactionModelMessage(modelName2, [])
+        };
+      }
+      const availableModels = (selector.authType ? config.getAvailableModelsForAuthType(selector.authType) : config.getAllConfiguredModels()).filter(
+        (m) => !m.fastOnly && !m.voiceOnly && !m.imageOnly && !m.visionOnly
+      );
+      if (!availableModels.some((model) => model.id === selector.modelId)) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: selector.authType ? formatUnavailableModelMessage(
+            "Compaction model",
+            selector.modelId,
+            selector.authType,
+            availableModels
+          ) : formatUnavailableCompactionModelMessage(
+            modelName2,
+            availableModels
+          )
+        };
+      }
+      persistSetting(settings, "compactionModel", modelName2, scopeOverride);
+      config.setCompactionModel(modelName2);
+      return {
+        type: "message",
+        messageType: "info",
+        content: t("Compaction Model") + ": " + modelName2 + scopeSuffix
+      };
+    }
     const isImageModelCommand = args === "--image" || args.startsWith("--image ");
     if (isImageModelCommand) {
       const modelName2 = args.replace("--image", "").trim();
@@ -9686,7 +10216,7 @@ async function completion(context, _partialArg) {
   }
 }
 __name(completion, "completion");
-var restoreCommand = /* @__PURE__ */ __name((config) => {
+var restoreCommand2 = /* @__PURE__ */ __name((config) => {
   if (!config?.getFileCheckpointingEnabled()) {
     return null;
   }
@@ -9784,6 +10314,7 @@ var settingsCommand = {
   },
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
+  canRunDuringStreaming: true,
   action: /* @__PURE__ */ __name((_context, _args) => ({
     type: "dialog",
     dialog: "settings"
@@ -10669,9 +11200,9 @@ var summaryCommand = {
       }
     }, "validateChatHistory");
     const generateSummaryMarkdown = /* @__PURE__ */ __name(async (history2) => {
-      const conversationContext = history2.map((message) => ({
-        role: message.role,
-        parts: message.parts
+      const conversationContext = history2.map((message2) => ({
+        role: message2.role,
+        parts: message2.parts
       }));
       const rawSystemInstruction = geminiClient.getChat().getGenerationConfig().systemInstruction;
       const chatSystemInstruction = typeof rawSystemInstruction === "string" ? rawSystemInstruction : void 0;
@@ -11210,11 +11741,11 @@ var vimCommand = {
   supportedModes: ["interactive"],
   action: /* @__PURE__ */ __name(async (context, _args) => {
     const newVimState = await context.ui.toggleVimEnabled();
-    const message = newVimState ? "Entered Vim mode. Run /vim again to exit." : "Exited Vim mode.";
+    const message2 = newVimState ? "Entered Vim mode. Run /vim again to exit." : "Exited Vim mode.";
     return {
       type: "message",
       messageType: "info",
-      content: message
+      content: message2
     };
   }, "action")
 };
@@ -12835,8 +13366,8 @@ var insightCommand = {
           resume = null;
           resolve4();
         }, "flushResume");
-        const pushMessage = /* @__PURE__ */ __name((message) => {
-          pendingMessages.push(message);
+        const pushMessage = /* @__PURE__ */ __name((message2) => {
+          pendingMessages.push(message2);
           flushResume();
         }, "pushMessage");
         const streamMessages = /* @__PURE__ */ __name(async function* () {
@@ -12847,9 +13378,9 @@ var insightCommand = {
               });
             }
             while (pendingMessages.length > 0) {
-              const message = pendingMessages.shift();
-              if (message) {
-                yield message;
+              const message2 = pendingMessages.shift();
+              if (message2) {
+                yield message2;
               }
             }
           }
@@ -13219,10 +13750,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-4Q6RIKFW.js"),
-      import("./processUtils-PB5K2DYH.js"),
-      import("./standalone-update-JAKIM2NF.js"),
-      import("./installationInfo-4MGG4WVI.js")
+      import("./updateCheck-7EG4BLBH.js"),
+      import("./processUtils-2CSVE5BW.js"),
+      import("./standalone-update-E4V5V7WT.js"),
+      import("./installationInfo-2LIKCNVX.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -13314,7 +13845,7 @@ ${t(
           installInfo.standaloneDir,
           info.update.latest
         );
-        const message = result === "done" ? t(
+        const message2 = result === "done" ? t(
           "Update successful! The new version will be used on your next run."
         ) : t(
           "Update downloaded. It will be applied after you exit this session."
@@ -13324,17 +13855,17 @@ ${t(
           messageType: "info",
           content: `${info.message}
 ${t("Downloading update...")}
-${message}`
+${message2}`
         };
       } catch (err) {
-        const message = t("Update failed: {{error}}", {
+        const message2 = t("Update failed: {{error}}", {
           error: err instanceof Error ? err.message : String(err)
         });
         return {
           type: "message",
           messageType: "error",
           content: `${info.message}
-${message}`
+${message2}`
         };
       }
     }
@@ -13391,6 +13922,7 @@ var BuiltinCommandLoader = class {
       compressFastCommand,
       configCommand,
       contextCommand,
+      curatorCommand,
       copyCommand,
       diffCommand,
       deleteCommand,
@@ -13422,7 +13954,7 @@ var BuiltinCommandLoader = class {
       recapCommand,
       reloadPluginsCommand,
       renameCommand,
-      restoreCommand(this.config),
+      restoreCommand2(this.config),
       resumeCommand,
       rewindCommand,
       skillsCommand,
@@ -13514,6 +14046,8 @@ var BundledSkillLoader = class {
           );
           let body = skill.body;
           const modelId = this.config?.getModel()?.trim() || "";
+          const cliVersion = this.config?.getCliVersion()?.trim() || "unknown";
+          body = body.replaceAll("{{cliVersion}}", cliVersion);
           if (body.includes("{{model}}") || body.includes("YOUR_MODEL_ID")) {
             body = body.replaceAll("{{model}}", modelId);
             body = body.replaceAll("YOUR_MODEL_ID", modelId);
@@ -13678,8 +14212,8 @@ __name(extractInjections, "extractInjections");
 
 // packages/cli/src/services/prompt-processors/shellProcessor.ts
 var ConfirmationRequiredError = class extends Error {
-  constructor(message, commandsToConfirm) {
-    super(message);
+  constructor(message2, commandsToConfirm) {
+    super(message2);
     this.commandsToConfirm = commandsToConfirm;
     this.name = "ConfirmationRequiredError";
   }
@@ -13871,8 +14405,8 @@ var AtFileProcessor = class {
           }
           output.push(...fileContentParts);
         } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
+          const message2 = error instanceof Error ? error.message : String(error);
+          const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message2}`;
           debugLogger13.error(
             `[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`
           );
@@ -14566,6 +15100,24 @@ var McpPromptLoader = class {
 init_esbuild_shims();
 import { dirname as dirname3 } from "node:path";
 var debugLogger17 = createDebugLogger("SKILL_COMMAND_LOADER");
+async function recordAutoSkillCommandUsage(config, command) {
+  const detail = command.skillDetail;
+  if (!config || detail?.level !== "project" || !detail.filePath) {
+    return;
+  }
+  try {
+    await recordAutoSkillUsage(config.getProjectRoot(), {
+      name: detail.name,
+      level: "project",
+      filePath: detail.filePath
+    });
+  } catch (error) {
+    debugLogger17.warn(
+      `Failed to record auto-skill command usage: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+__name(recordAutoSkillCommandUsage, "recordAutoSkillCommandUsage");
 var SkillCommandLoader = class {
   constructor(config) {
     this.config = config;
@@ -14620,6 +15172,7 @@ var SkillCommandLoader = class {
             name: skill.name,
             description: skill.description,
             body: skill.body,
+            filePath: skill.filePath,
             level: skill.level,
             ...isExtension && skill.extensionName ? { extensionName: skill.extensionName } : {}
           },
@@ -14795,6 +15348,12 @@ function handleCommandResult(result, outputHistoryItems) {
         reason: "Action confirmation is not supported in non-interactive mode. Commands requiring confirmation cannot be executed.",
         originalType: "confirm_action"
       };
+    case "goal_control":
+      return {
+        type: "unsupported",
+        reason: "Goal control is not supported in non-interactive mode yet.",
+        originalType: "goal_control"
+      };
     default: {
       const _exhaustive = result;
       return {
@@ -14944,6 +15503,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     const combinedContent = [];
     let firstModelOverride;
     const onCompleteCallbacks = [];
+    const successfulSkillCommands = [];
     for (const skill of stackedResult.skills) {
       if (!skill.action) continue;
       const skillContext = {
@@ -14963,10 +15523,14 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
           onCompleteCallbacks.push(skillResult.onComplete);
         }
       }
+      const succeeded = skillResult?.type === "submit_prompt";
       recordSkillInvocation(config, {
         skillName: getSkillCommandName(skill),
-        success: skillResult?.type === "submit_prompt"
+        success: succeeded
       });
+      if (succeeded) {
+        successfulSkillCommands.push(skill);
+      }
     }
     if (stackedResult.remainingText) {
       combinedContent.push([{ text: stackedResult.remainingText }]);
@@ -14982,6 +15546,9 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     if (hookResult.blockedResult) {
       return hookResult.blockedResult;
     }
+    for (const skill of successfulSkillCommands) {
+      void recordAutoSkillCommandUsage(config, skill);
+    }
     return {
       type: "submit_prompt",
       content: hookResult.content,
@@ -15100,6 +15667,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
       return hookResult.blockedResult;
     }
     recordSkillCommandInvocation(true);
+    void recordAutoSkillCommandUsage(config, commandToExecute);
     return handleCommandResult(
       { ...result, content: hookResult.content },
       outputHistoryItems
@@ -15154,11 +15722,11 @@ function normalizePartList(parts) {
   return [parts];
 }
 __name(normalizePartList, "normalizePartList");
-function extractPartsFromUserMessage(message) {
-  if (!message) {
+function extractPartsFromUserMessage(message2) {
+  if (!message2) {
     return null;
   }
-  const content = message.message?.content;
+  const content = message2.message?.content;
   if (typeof content === "string") {
     return content;
   }
@@ -15456,6 +16024,7 @@ export {
   FileCommandLoader,
   SavedWorkflowLoader,
   McpPromptLoader,
+  recordAutoSkillCommandUsage,
   SkillCommandLoader,
   appendUserPromptExpansionAdditionalContext,
   serializeUserPromptExpansionPrompt,