@qwen-code/qwen-code 0.19.2 → 0.19.3-nightly.20260630.e00fe6a27

package/chunks/{chunk-2TJ3YN6Q.js → chunk-2RJA6J57.js}

@@ -2,9 +2,11 @@
 "use strict";
 import {
   isValidSessionId,
-  require_undici,
   validateAuthMethod
-} from "./chunk-ZUAXI2OA.js";
+} from "./chunk-BOJWHRMX.js";
+import {
+  contextCommand
+} from "./chunk-JYPQTRA3.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   calculateCost,
@@ -15,40 +17,41 @@ import {
   getSystemInfoFields,
   useKeypress,
   writeOsc52
-} from "./chunk-JTYRZODB.js";
-import {
-  Text
-} from "./chunk-UAARJR2G.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-JZSY4WP3.js";
-import {
-  contextCommand
-} from "./chunk-TZM5JIAX.js";
+} from "./chunk-FOOIZCWL.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-KSPVDFE4.js";
+import {
+  Text
+} from "./chunk-WQT5SOI6.js";
 import {
   require_react
 } from "./chunk-KYMBIKIW.js";
+import {
+  themeManager
+} from "./chunk-I4H7PRWQ.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-JZSY4WP3.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-5R4SBCX6.js";
+} from "./chunk-SL5MOGQH.js";
 import {
-  themeManager
-} from "./chunk-TMBPDHXD.js";
+  GITHUB_WORKFLOW_PATHS,
+  setupGithub
+} from "./chunk-NDOC6M5S.js";
 import {
-  formatUnsupportedVoiceModelMessage,
-  isSelectableVoiceModel
-} from "./chunk-NYOHZYHM.js";
+  require_undici
+} from "./chunk-M2U5NM24.js";
 import {
-  stripUnsafeCharacters
-} from "./chunk-CGOMICBE.js";
+  stripUnsafeCharacters,
+  toCodePoints
+} from "./chunk-BSZEQNUA.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-CI5O6SQL.js";
+} from "./chunk-6FKEVYCD.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -56,16 +59,22 @@ import {
 } from "./chunk-KHDZHZMH.js";
 import {
   parseAcpModelOption
-} from "./chunk-RS4HRC75.js";
+} from "./chunk-QI2CFVRF.js";
+import {
+  formatUnsupportedVoiceModelMessage,
+  getVoiceSettingsScope,
+  isSelectableVoiceModel,
+  isVoiceEnabled,
+  readVoiceMode,
+  readVoiceModel
+} from "./chunk-5XQ4A26L.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getPersistScopeForModelSelection,
   isAutoLanguage,
-  isFolderTrustEnabled,
-  loadTrustedFolders,
   resolveOutputLanguage,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-OQHQHJRK.js";
+} from "./chunk-HEVBZSXG.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
@@ -73,10 +82,14 @@ import {
   resolveSupportedLanguage,
   setLanguageAsync,
   t
-} from "./chunk-5JZLXFPD.js";
+} from "./chunk-MTHMXSNT.js";
+import {
+  isFolderTrustEnabled,
+  loadTrustedFolders
+} from "./chunk-ARYCHZ4B.js";
 import {
   require_strip_json_comments
-} from "./chunk-UN3C6GOR.js";
+} from "./chunk-QYUE6W3T.js";
 import {
   APPROVAL_MODES,
   ArenaManager,
@@ -108,18 +121,21 @@ import {
   flatMapTextParts,
   generateSessionRecap,
   getActiveGoal,
+  getArenaSystemReminder,
   getExtensionDescription,
   getExtensionDisplayName,
   getIdeInstaller,
   getInsightPrompt,
   getLastGoalTerminal,
   getMCPServerPrompts,
+  getPlanModeSystemReminder,
   getProjectSummaryPrompt,
   getShellConfiguration,
   glob,
   hookEventSupportsMatcher,
   ideContextStore,
   isGitRepository,
+  isImageCapable,
   isSuccessStatus,
   isTerminalStatus,
   listSavedWorkflows,
@@ -143,21 +159,21 @@ import {
   stripStartupContext,
   tryGenerateSessionTitle,
   unregisterGoalHook
-} from "./chunk-PXFFKNCO.js";
+} from "./chunk-RIP623NO.js";
 import {
   external_exports
 } from "./chunk-K5PGHDBN.js";
 import {
   runSideQuery
-} from "./chunk-BG4BIP7F.js";
+} from "./chunk-SBBN4BWR.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunk-OTBK43JR.js";
+} from "./chunk-HYCC3XM3.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-HGNSRCRB.js";
+} from "./chunk-NL4C3H6C.js";
 import {
   IdeConnectionEvent,
   formatTokenUsageSummaryAsCsv,
@@ -167,16 +183,17 @@ import {
   logIdeConnection,
   queryTokenUsage,
   read,
+  recordSkillInvocation,
   resolveOpenAILogDir,
   uiTelemetryService
-} from "./chunk-WA5OJGFL.js";
+} from "./chunk-SS6WJMQK.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-BNXANYLH.js";
+} from "./chunk-RD6YJJJ6.js";
 import {
   ToolNames
-} from "./chunk-TOEGRAVX.js";
+} from "./chunk-BX5YO7UW.js";
 import {
   openBrowserSecurely
 } from "./chunk-22IFUCVR.js";
@@ -186,12 +203,12 @@ import {
   getErrorMessage,
   isSubpath,
   updateSymlink
-} from "./chunk-C4K3FEQ2.js";
+} from "./chunk-UX4SGCGN.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-PF523XJX.js";
+} from "./chunk-HPGTGMP3.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -325,20 +342,26 @@ var getUrlOpenCommand = /* @__PURE__ */ __name(() => {
   }
   return openCmd;
 }, "getUrlOpenCommand");
+function isMidInputCompletableCommand(cmd) {
+  return cmd.modelInvocable === true && !cmd.hidden;
+}
+__name(isMidInputCompletableCommand, "isMidInputCompletableCommand");
 function findMidInputSlashCommand(input, cursorOffset) {
   if (input.startsWith("/")) return null;
-  const beforeCursor = input.slice(0, cursorOffset);
+  const codePoints = toCodePoints(input);
+  const beforeCursor = codePoints.slice(0, cursorOffset).join("");
   const match = beforeCursor.match(/\s\/([a-zA-Z0-9_:-]*)$/);
-  if (!match || match.index === void 0) return null;
-  const slashPos = match.index + 1;
-  const textAfterSlash = input.slice(slashPos + 1);
+  if (!match) return null;
+  const partialCommand = match[1];
+  const slashPos = cursorOffset - 1 - partialCommand.length;
+  const textAfterSlash = codePoints.slice(slashPos + 1).join("");
   const commandMatch = textAfterSlash.match(/^[a-zA-Z0-9_:-]*/);
   const fullCommand = commandMatch ? commandMatch[0] : "";
   if (cursorOffset !== slashPos + 1 + fullCommand.length) return null;
   return {
     token: "/" + fullCommand,
     startPos: slashPos,
-    partialCommand: input.slice(slashPos + 1, cursorOffset)
+    partialCommand
   };
 }
 __name(findMidInputSlashCommand, "findMidInputSlashCommand");
@@ -346,7 +369,7 @@ function getBestSlashCommandMatch(partialCommand, commands, recentCommands) {
   if (!partialCommand) return null;
   const query = partialCommand.toLowerCase();
   const matches = commands.filter((cmd) => {
-    if (!cmd.modelInvocable) return false;
+    if (!isMidInputCompletableCommand(cmd)) return false;
     const name = cmd.name.toLowerCase();
     return name.startsWith(query) && (name !== query || !!cmd.argumentHint);
   }).sort((left, right) => {
@@ -2650,7 +2673,7 @@ init_esbuild_shims();
 // packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts
 init_esbuild_shims();
 var import_react = __toESM(require_react(), 1);
-var AUTO_MODE_FIRST_TIME_MESSAGE = "\u2728 Auto mode enabled.\n   An LLM classifier evaluates each tool call and auto-approves safe actions,\n   blocks risky ones. Most read-only operations and in-cwd edits skip the\n   classifier for speed. To exit: Shift+Tab or /approval-mode default.\n   (This notice will not appear again.)";
+var AUTO_MODE_FIRST_TIME_MESSAGE = "Auto mode enabled.\n   An LLM classifier evaluates each tool call \u2014 safe actions auto-approve,\n   risky ones are blocked. Exit: Shift+Tab or /approval-mode default.";
 function useAutoAcceptIndicator({
   config,
   settings,
@@ -3255,7 +3278,13 @@ var directoryCommand = {
           }
           if (added.length > 0) {
             try {
-              if (config.shouldLoadMemoryFromIncludeDirectories()) {
+              if (config.isSafeMode()) {
+                messages.push(
+                  t(
+                    "Safe mode active \u2014 skipping memory reload from include directories."
+                  )
+                );
+              } else if (config.shouldLoadMemoryFromIncludeDirectories()) {
                 const {
                   memoryContent,
                   fileCount,
@@ -6788,7 +6817,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./src-4F6FBZFI.js");
+    const { getGitRepoName } = await import("./src-IU5GDBEH.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;
@@ -7382,10 +7411,10 @@ function formatToolCall(message) {
           lines.push(createCodeBlock(contentData.text, language));
         }
       } else if (item.type === "diff") {
-        const path21 = item["path"];
+        const path20 = item["path"];
         const diffText = item["newText"];
         lines.push(`
-*Diff for \`${sanitizeText(path21)}\`:*`);
+*Diff for \`${sanitizeText(path20)}\`:*`);
         lines.push(createCodeBlock(diffText, "diff"));
       }
     }
@@ -7422,8 +7451,8 @@ function buildFence(value) {
   return "`".repeat(fenceLength);
 }
 __name(buildFence, "buildFence");
-function getLanguageFromPath(path21) {
-  const ext = path21.split(".").pop()?.toLowerCase();
+function getLanguageFromPath(path20) {
+  const ext = path20.split(".").pop()?.toLowerCase();
   switch (ext) {
     case "ts":
     case "tsx":
@@ -10629,10 +10658,16 @@ var memoryCommand = {
 
 // packages/cli/src/ui/commands/modelCommand.ts
 init_esbuild_shims();
+
+// packages/cli/src/ui/voice/voice-model.ts
+init_esbuild_shims();
+
+// packages/cli/src/ui/commands/modelCommand.ts
 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.";
-function persistSetting(settings, path21, value) {
-  settings.setValue(getPersistScopeForModelSelection(settings), path21, value);
+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.";
+function persistSetting(settings, path20, value) {
+  settings.setValue(getPersistScopeForModelSelection(settings), path20, value);
 }
 __name(persistSetting, "persistSetting");
 async function switchMainModel(config, settings, currentAuthType, modelArg) {
@@ -10659,21 +10694,47 @@ 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 : MAIN_MODEL_CONFIGURATION_HINT;
   return `${kind} '${modelName}' is not available for auth type '${authType}'.
 ${availableModelsLine}
-` + (kind === "Fast model" ? FAST_MODEL_CONFIGURATION_HINT : MAIN_MODEL_CONFIGURATION_HINT);
+` + hint;
 }
 __name(formatUnavailableModelMessage, "formatUnavailableModelMessage");
-function formatUnavailableFastModelMessage(modelName, availableModels) {
+function formatUnavailableAuxModelMessage(label, modelName, availableModels, hint) {
   const availableModelIds = Array.from(
     new Set(availableModels.map((model) => model.id))
   );
   const availableModelsLine = availableModelIds.length === 0 ? "No models are configured." : `Configured models: ${availableModelIds.join(", ")}.`;
-  return `Fast model '${modelName}' is not configured for any auth type.
+  return `${label} '${modelName}' is not configured for any auth type.
 ${availableModelsLine}
-` + FAST_MODEL_CONFIGURATION_HINT;
+` + hint;
+}
+__name(formatUnavailableAuxModelMessage, "formatUnavailableAuxModelMessage");
+function formatUnavailableFastModelMessage(modelName, availableModels) {
+  return formatUnavailableAuxModelMessage(
+    "Fast model",
+    modelName,
+    availableModels,
+    FAST_MODEL_CONFIGURATION_HINT
+  );
 }
 __name(formatUnavailableFastModelMessage, "formatUnavailableFastModelMessage");
+function formatUnavailableVisionModelMessage(modelName, availableModels) {
+  return formatUnavailableAuxModelMessage(
+    "Vision model",
+    modelName,
+    availableModels,
+    VISION_MODEL_CONFIGURATION_HINT
+  );
+}
+__name(formatUnavailableVisionModelMessage, "formatUnavailableVisionModelMessage");
+function formatNonVisionModelWarning(modelName) {
+  return t(
+    "\u26A0 '{{model}}' is not a known image-capable model; the vision bridge may fail on images.",
+    { model: modelName }
+  );
+}
+__name(formatNonVisionModelWarning, "formatNonVisionModelWarning");
 function formatUnavailableVoiceModelMessage(modelName, availableModels) {
   const availableModelIds = Array.from(
     new Set(availableModels.map((model) => model.id))
@@ -10707,10 +10768,10 @@ var modelCommand = {
   completionPriority: 100,
   get description() {
     return t(
-      "Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, [model-id] to switch immediately)."
+      "Switch the model for this session (--fast for suggestion model, --voice for voice transcription model, --vision for the vision bridge model, [model-id] to switch immediately)."
     );
   },
-  argumentHint: "[--fast|--voice] [<model-id>]",
+  argumentHint: "[--fast|--voice|--vision] [<model-id>]",
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
   completion: /* @__PURE__ */ __name(async (context, partialArg) => {
@@ -10725,6 +10786,12 @@ var modelCommand = {
         {
           value: "--voice",
           description: t("Set the model for voice transcription")
+        },
+        {
+          value: "--vision",
+          description: t(
+            "Set the image-capable model used to transcribe images for a text-only main model"
+          )
         }
       ].filter((item) => item.value.startsWith(partialArg));
       if (flagCompletions.length > 0) {
@@ -10740,6 +10807,9 @@ var modelCommand = {
         } else if (trimmed.startsWith("--voice ")) {
           mode = "voice";
           modelPrefix = trimmed.slice("--voice ".length);
+        } else if (trimmed.startsWith("--vision ")) {
+          mode = "vision";
+          modelPrefix = trimmed.slice("--vision ".length);
         }
         return getAvailableModelIds(context, mode).filter(
           (id) => id.startsWith(modelPrefix)
@@ -10893,6 +10963,83 @@ Use "/model --fast <model-id>" to set fast model.`
         content: t("Fast Model") + ": " + modelName2
       };
     }
+    const isVisionModelCommand = args === "--vision" || args.startsWith("--vision ");
+    if (isVisionModelCommand) {
+      const modelName2 = args.replace("--vision", "").trim();
+      if (!modelName2) {
+        if (context.executionMode !== "interactive") {
+          const visionModel = context.services.settings?.merged?.visionModel?.trim() || t("not set");
+          return {
+            type: "message",
+            messageType: "info",
+            content: t(
+              'Current vision model: {{visionModel}}\nUse "/model --vision <model-id>" to set the vision bridge model.',
+              { visionModel }
+            )
+          };
+        }
+        return {
+          type: "dialog",
+          dialog: "vision-model"
+        };
+      }
+      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: formatUnavailableVisionModelMessage(modelName2, [])
+        };
+      }
+      const availableModels = (selector.authType ? config.getAvailableModelsForAuthType(selector.authType) : config.getAllConfiguredModels()).filter((m) => !m.fastOnly && !m.voiceOnly);
+      const matched = availableModels.find(
+        (model) => model.id === selector.modelId
+      );
+      if (!matched) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: selector.authType ? formatUnavailableModelMessage(
+            "Vision model",
+            selector.modelId,
+            selector.authType,
+            availableModels
+          ) : formatUnavailableVisionModelMessage(modelName2, availableModels)
+        };
+      }
+      if (config.isCurrentPrimaryModel(matched)) {
+        return {
+          type: "message",
+          messageType: "error",
+          content: t(
+            "'{{model}}' is the current primary model and cannot be used as the vision bridge. Choose a different image-capable model.",
+            { model: modelName2 }
+          )
+        };
+      }
+      persistSetting(settings, "visionModel", modelName2);
+      config.setVisionModel(modelName2);
+      const visionWarning = isImageCapable(matched) ? "" : `
+${formatNonVisionModelWarning(modelName2)}`;
+      return {
+        type: "message",
+        messageType: "info",
+        content: t("Vision Model") + ": " + modelName2 + visionWarning
+      };
+    }
     const contentGeneratorConfig = config.getContentGeneratorConfig();
     if (!contentGeneratorConfig) {
       return {
@@ -10988,7 +11135,7 @@ var rememberCommand = {
         content: t("Config not loaded.")
       };
     }
-    const useManagedMemory = config?.getManagedAutoMemoryEnabled() ?? false;
+    const useManagedMemory = config?.isManagedMemoryAvailable() ?? false;
     if (useManagedMemory) {
       const projectDir = config ? getAutoMemoryRoot(config.getProjectRoot()) : void 0;
       const userDir = getUserAutoMemoryRoot();
@@ -11711,6 +11858,12 @@ import * as fs11 from "node:fs/promises";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import path13 from "node:path";
 var VALID_EXPORT_FORMATS = /* @__PURE__ */ new Set(["csv", "json"]);
+var EMPTY_SKILL_METRICS = {
+  totalCalls: 0,
+  totalSuccess: 0,
+  totalFail: 0,
+  byName: {}
+};
 function formatInteger(value) {
   return new Intl.NumberFormat(getCurrentLanguage()).format(value);
 }
@@ -11732,6 +11885,32 @@ function formatGroupLines(titleKey, groups) {
   ];
 }
 __name(formatGroupLines, "formatGroupLines");
+function formatSkillStats(skills) {
+  const skillNames = Object.keys(skills.byName).sort((a, b) => {
+    const countDelta = skills.byName[b].count - skills.byName[a].count;
+    return countDelta !== 0 ? countDelta : a.localeCompare(b);
+  });
+  if (skillNames.length === 0) {
+    return t("No skill usage data yet.");
+  }
+  return [
+    t("Skill calls: {{total}} ({{success}} ok, {{fail}} fail)", {
+      total: String(skills.totalCalls),
+      success: String(skills.totalSuccess),
+      fail: String(skills.totalFail)
+    }),
+    ...skillNames.map((name) => {
+      const stats = skills.byName[name];
+      return t("  {{name}}: {{count}} ({{success}} ok, {{fail}} fail)", {
+        name,
+        count: String(stats.count),
+        success: String(stats.success),
+        fail: String(stats.fail)
+      });
+    })
+  ].join("\n");
+}
+__name(formatSkillStats, "formatSkillStats");
 function formatTokenUsageSummary(summary) {
   const label = summary.period === "day" ? t("Daily token usage for {{value}}", { value: summary.value }) : t("Monthly token usage for {{value}}", { value: summary.value });
   return [
@@ -12205,7 +12384,7 @@ var statsCommand = {
   get description() {
     return t("Show usage statistics dashboard.");
   },
-  argumentHint: "[model|tools|daily|monthly|export]",
+  argumentHint: "[model|tools|skills|daily|monthly|export]",
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
   action: /* @__PURE__ */ __name((context) => {
@@ -12325,6 +12504,30 @@ var statsCommand = {
         );
       }, "action")
     },
+    {
+      name: "skills",
+      get description() {
+        return t("Show skill-specific usage statistics.");
+      },
+      kind: "built-in" /* BUILT_IN */,
+      supportedModes: ["interactive", "non_interactive", "acp"],
+      action: /* @__PURE__ */ __name((context) => {
+        if (context.executionMode !== "interactive") {
+          const skills = context.session.stats.metrics.skills ?? EMPTY_SKILL_METRICS;
+          return {
+            type: "message",
+            messageType: "info",
+            content: formatSkillStats(skills)
+          };
+        }
+        context.ui.addItem(
+          {
+            type: "skill_stats" /* SKILL_STATS */
+          },
+          Date.now()
+        );
+      }, "action")
+    },
     {
       name: "daily",
       altNames: ["day"],
@@ -13018,27 +13221,6 @@ function getVoiceUnavailableReason(environment = {
 __name(getVoiceUnavailableReason, "getVoiceUnavailableReason");
 
 // packages/cli/src/ui/commands/voice-command.ts
-function getVoiceModel(settings) {
-  const value = settings.merged?.voiceModel;
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : void 0;
-}
-__name(getVoiceModel, "getVoiceModel");
-function isVoiceEnabled(settings) {
-  return settings.merged?.general?.voice?.enabled === true;
-}
-__name(isVoiceEnabled, "isVoiceEnabled");
-function getVoiceMode(settings) {
-  return settings.merged?.general?.voice?.mode === "tap" ? "tap" : "hold";
-}
-__name(getVoiceMode, "getVoiceMode");
-function getVoiceScope(settings) {
-  return settings.isTrusted === true && typeof settings.workspace?.settings?.general?.voice?.enabled === "boolean" ? "Workspace" /* Workspace */ : "User" /* User */;
-}
-__name(getVoiceScope, "getVoiceScope");
 var voiceCommand = {
   name: "voice",
   get description() {
@@ -13051,7 +13233,7 @@ var voiceCommand = {
     const settings = context.services.settings;
     const command = args.trim().toLowerCase();
     if (command === "status") {
-      const voiceModel2 = getVoiceModel(settings);
+      const voiceModel2 = readVoiceModel(settings);
       const status = isVoiceEnabled(settings) ? "enabled" : "disabled";
       const modelText = voiceModel2 ? t("model: {{voiceModel}}", { voiceModel: voiceModel2 }) : t("no voice model selected");
       return {
@@ -13061,7 +13243,7 @@ var voiceCommand = {
           "Voice dictation: {{status}} (mode: {{mode}}, {{modelText}}).",
           {
             status,
-            mode: getVoiceMode(settings),
+            mode: readVoiceMode(settings),
             modelText
           }
         )
@@ -13069,7 +13251,7 @@ var voiceCommand = {
     }
     if (command === "off") {
       settings.setValue(
-        getVoiceScope(settings),
+        getVoiceSettingsScope(settings),
         "general.voice.enabled",
         false
       );
@@ -13088,7 +13270,7 @@ var voiceCommand = {
     }
     if (command === "" && isVoiceEnabled(settings)) {
       settings.setValue(
-        getVoiceScope(settings),
+        getVoiceSettingsScope(settings),
         "general.voice.enabled",
         false
       );
@@ -13098,7 +13280,7 @@ var voiceCommand = {
         content: t("Voice dictation disabled.")
       };
     }
-    const voiceModel = getVoiceModel(settings);
+    const voiceModel = readVoiceModel(settings);
     if (!voiceModel) {
       return {
         type: "message",
@@ -13116,8 +13298,8 @@ var voiceCommand = {
         content: unavailableReason
       };
     }
-    const scope = getVoiceScope(settings);
-    const mode = command === "tap" ? "tap" : command === "hold" ? "hold" : getVoiceMode(settings);
+    const scope = getVoiceSettingsScope(settings);
+    const mode = command === "tap" ? "tap" : command === "hold" ? "hold" : readVoiceMode(settings);
     settings.setValue(scope, "general.voice.mode", mode);
     settings.setValue(scope, "general.voice.enabled", true);
     return {
@@ -13136,172 +13318,14 @@ var voiceCommand = {
 
 // packages/cli/src/ui/commands/setupGithubCommand.ts
 init_esbuild_shims();
-var import_undici3 = __toESM(require_undici(), 1);
-import path16 from "node:path";
-import * as fs13 from "node:fs";
-import { Writable } from "node:stream";
-
-// packages/cli/src/utils/gitUtils.ts
-init_esbuild_shims();
-var import_undici2 = __toESM(require_undici(), 1);
-import { execSync as execSync2 } from "node:child_process";
-var debugLogger13 = createDebugLogger("GIT");
-var isGitHubRepository = /* @__PURE__ */ __name(() => {
-  try {
-    const remotes = (execSync2("git remote -v", {
-      encoding: "utf-8"
-    }) || "").trim();
-    return remotes.split("\n").some((line) => {
-      const remoteUrl = line.trim().split(/\s+/)[1];
-      return remoteUrl ? isGitHubRemoteUrl(remoteUrl) : false;
-    });
-  } catch (_error) {
-    debugLogger13.debug(`Failed to get git remote:`, _error);
-    return false;
-  }
-}, "isGitHubRepository");
-function isGitHubRemoteUrl(remoteUrl) {
-  if (remoteUrl.startsWith("git@github.com:")) {
-    return true;
-  }
-  if (remoteUrl.startsWith("git@")) {
-    return false;
-  }
-  try {
-    return new URL(remoteUrl).hostname === "github.com";
-  } catch {
-    return false;
-  }
-}
-__name(isGitHubRemoteUrl, "isGitHubRemoteUrl");
-var getGitRepoRoot = /* @__PURE__ */ __name(() => {
-  const gitRepoRoot = (execSync2("git rev-parse --show-toplevel", {
-    encoding: "utf-8"
-  }) || "").trim();
-  if (!gitRepoRoot) {
-    throw new Error(`Git repo returned empty value`);
-  }
-  return gitRepoRoot;
-}, "getGitRepoRoot");
-var getLatestGitHubRelease = /* @__PURE__ */ __name(async (proxy) => {
-  try {
-    const controller = new AbortController();
-    const endpoint = `https://api.github.com/repos/QwenLM/qwen-code-action/releases/latest`;
-    const response = await fetch(endpoint, {
-      method: "GET",
-      headers: {
-        Accept: "application/vnd.github+json",
-        "Content-Type": "application/json",
-        "X-GitHub-Api-Version": "2022-11-28"
-      },
-      dispatcher: proxy ? new import_undici2.ProxyAgent(proxy) : void 0,
-      signal: AbortSignal.any([AbortSignal.timeout(3e4), controller.signal])
-    });
-    if (!response.ok) {
-      throw new Error(
-        `Invalid response code: ${response.status} - ${response.statusText}`
-      );
-    }
-    const releaseTag = (await response.json()).tag_name;
-    if (!releaseTag) {
-      throw new Error(`Response did not include tag_name field`);
-    }
-    return releaseTag;
-  } catch (_error) {
-    debugLogger13.debug(
-      `Failed to determine latest qwen-code-action release:`,
-      _error
-    );
-    throw new Error(
-      `Unable to determine the latest qwen-code-action release on GitHub.`
-    );
-  }
-}, "getLatestGitHubRelease");
-function getGitHubRepoInfo() {
-  const remoteUrl = execSync2("git remote get-url origin", {
-    encoding: "utf-8"
-  }).trim();
-  let urlToParse = remoteUrl;
-  if (remoteUrl.startsWith("git@github.com:")) {
-    urlToParse = remoteUrl.replace("git@github.com:", "");
-  } else if (remoteUrl.startsWith("git@")) {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`
-    );
-  }
-  let parsedUrl;
-  try {
-    parsedUrl = new URL(urlToParse, "https://github.com");
-  } catch {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`
-    );
-  }
-  if (parsedUrl.hostname !== "github.com") {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`
-    );
-  }
-  const parts = parsedUrl.pathname.split("/").filter((part) => part !== "");
-  if (parts.length !== 2 || !parts[0] || !parts[1]) {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`
-    );
-  }
-  return { owner: parts[0], repo: parts[1].replace(/\.git$/, "") };
-}
-__name(getGitHubRepoInfo, "getGitHubRepoInfo");
-
-// packages/cli/src/ui/commands/setupGithubCommand.ts
-var debugLogger14 = createDebugLogger("SETUP_GITHUB");
-var GITHUB_WORKFLOW_PATHS = [
-  "qwen-dispatch/qwen-dispatch.yml",
-  "qwen-assistant/qwen-invoke.yml",
-  "issue-triage/qwen-triage.yml",
-  "issue-triage/qwen-scheduled-triage.yml",
-  "pr-review/qwen-review.yml"
-];
-function getOpenUrlsCommands(readmeUrl) {
+function getOpenUrlsCommands(readmeUrl, secretsUrl) {
   const openCmd = getUrlOpenCommand();
   const urlsToOpen = [readmeUrl];
-  const repoInfo = getGitHubRepoInfo();
-  if (repoInfo) {
-    urlsToOpen.push(
-      `https://github.com/${repoInfo.owner}/${repoInfo.repo}/settings/secrets/actions`
-    );
-  }
+  if (secretsUrl) urlsToOpen.push(secretsUrl);
   const commands = urlsToOpen.map((url) => `${openCmd} "${url}"`);
   return commands;
 }
 __name(getOpenUrlsCommands, "getOpenUrlsCommands");
-async function updateGitignore(gitRepoRoot) {
-  const gitignoreEntries = [".qwen/", "gha-creds-*.json"];
-  const gitignorePath = path16.join(gitRepoRoot, ".gitignore");
-  try {
-    let existingContent = "";
-    let fileExists = true;
-    try {
-      existingContent = await fs13.promises.readFile(gitignorePath, "utf8");
-    } catch (_error) {
-      fileExists = false;
-    }
-    if (!fileExists) {
-      const contentToWrite = gitignoreEntries.join("\n") + "\n";
-      await fs13.promises.writeFile(gitignorePath, contentToWrite);
-    } else {
-      const missingEntries = gitignoreEntries.filter(
-        (entry) => !existingContent.split(/\r?\n/).some((line) => line.split("#")[0].trim() === entry)
-      );
-      if (missingEntries.length > 0) {
-        const contentToAdd = "\n" + missingEntries.join("\n") + "\n";
-        await fs13.promises.appendFile(gitignorePath, contentToAdd);
-      }
-    }
-  } catch (error) {
-    debugLogger14.debug("Failed to update .gitignore:", error);
-  }
-}
-__name(updateGitignore, "updateGitignore");
 var setupGithubCommand = {
   name: "setup-github",
   get description() {
@@ -13318,84 +13342,17 @@ var setupGithubCommand = {
         { once: true }
       );
     }
-    if (!isGitHubRepository()) {
-      throw new Error(
-        "Unable to determine the GitHub repository. /setup-github must be run from a git repository."
-      );
-    }
-    let gitRepoRoot;
-    try {
-      gitRepoRoot = getGitRepoRoot();
-    } catch (_error) {
-      debugLogger14.debug(`Failed to get git repo root:`, _error);
-      throw new Error(
-        "Unable to determine the GitHub repository. /setup-github must be run from a git repository."
-      );
-    }
     const proxy = context?.services?.config?.getProxy();
-    const releaseTag = await getLatestGitHubRelease(proxy);
-    const readmeUrl = `https://github.com/QwenLM/qwen-code-action/blob/${releaseTag}/README.md#quick-start`;
-    const githubWorkflowsDir = path16.join(gitRepoRoot, ".github", "workflows");
-    try {
-      await fs13.promises.mkdir(githubWorkflowsDir, { recursive: true });
-    } catch (_error) {
-      debugLogger14.debug(
-        `Failed to create ${githubWorkflowsDir} directory:`,
-        _error
-      );
-      throw new Error(
-        `Unable to create ${githubWorkflowsDir} directory. Do you have file permissions in the current directory?`
-      );
-    }
-    const downloads = [];
-    for (const workflow of GITHUB_WORKFLOW_PATHS) {
-      downloads.push(
-        (async () => {
-          const endpoint = `https://raw.githubusercontent.com/QwenLM/qwen-code-action/refs/tags/${releaseTag}/examples/workflows/${workflow}`;
-          const response = await fetch(endpoint, {
-            method: "GET",
-            dispatcher: proxy ? new import_undici3.ProxyAgent(proxy) : void 0,
-            signal: AbortSignal.any([
-              AbortSignal.timeout(3e4),
-              abortController.signal
-            ])
-          });
-          if (!response.ok) {
-            throw new Error(
-              `Invalid response code downloading ${endpoint}: ${response.status} - ${response.statusText}`
-            );
-          }
-          const body = response.body;
-          if (!body) {
-            throw new Error(
-              `Empty body while downloading ${endpoint}: ${response.status} - ${response.statusText}`
-            );
-          }
-          const destination = path16.resolve(
-            githubWorkflowsDir,
-            path16.basename(workflow)
-          );
-          const fileStream = fs13.createWriteStream(destination, {
-            mode: 420,
-            // -rw-r--r--, user(rw), group(r), other(r)
-            flags: "w",
-            // write and overwrite
-            flush: true
-          });
-          await body.pipeTo(Writable.toWeb(fileStream));
-        })()
-      );
-    }
-    await Promise.all(downloads).finally(() => {
-      abortController.abort();
-    });
-    await updateGitignore(gitRepoRoot);
+    const result = await setupGithub({
+      proxy,
+      abortSignal: abortController.signal
+    }).finally(() => abortController.abort());
     const commands = [];
     commands.push("set -eEuo pipefail");
     commands.push(
-      `echo "Successfully downloaded ${GITHUB_WORKFLOW_PATHS.length} workflows and updated .gitignore. Follow the steps in ${readmeUrl} (skipping the /setup-github step) to complete setup."`
+      `echo "Successfully downloaded ${GITHUB_WORKFLOW_PATHS.length} workflows and updated .gitignore. Follow the steps in ${result.readmeUrl} (skipping the /setup-github step) to complete setup."`
     );
-    commands.push(...getOpenUrlsCommands(readmeUrl));
+    commands.push(...getOpenUrlsCommands(result.readmeUrl, result.secretsUrl));
     const command = `(${commands.join(" && ")})`;
     return {
       type: "tool",
@@ -13416,13 +13373,13 @@ import { pathToFileURL } from "node:url";
 
 // packages/cli/src/services/insight/generators/StaticInsightGenerator.ts
 init_esbuild_shims();
-import fs15 from "fs/promises";
-import path18 from "path";
+import fs14 from "fs/promises";
+import path17 from "path";
 
 // packages/cli/src/services/insight/generators/DataProcessor.ts
 init_esbuild_shims();
-import fs14 from "fs/promises";
-import path17 from "path";
+import fs13 from "fs/promises";
+import path16 from "path";
 
 // packages/cli/node_modules/p-limit/index.js
 init_esbuild_shims();
@@ -13577,8 +13534,8 @@ function pLimit(concurrency) {
     },
     map: {
       async value(iterable, function_) {
-        const promises2 = Array.from(iterable, (value, index) => this(function_, value, index));
-        return Promise.all(promises2);
+        const promises = Array.from(iterable, (value, index) => this(function_, value, index));
+        return Promise.all(promises);
       }
     }
   });
@@ -14376,19 +14333,19 @@ None captured`;
   async scanChatFiles(baseDir) {
     const allChatFiles = [];
     try {
-      const projectDirs = await fs14.readdir(baseDir);
+      const projectDirs = await fs13.readdir(baseDir);
       for (const projectDir of projectDirs) {
-        const projectPath = path17.join(baseDir, projectDir);
-        const stats = await fs14.stat(projectPath);
+        const projectPath = path16.join(baseDir, projectDir);
+        const stats = await fs13.stat(projectPath);
         if (stats.isDirectory()) {
-          const chatsDir = path17.join(projectPath, "chats");
+          const chatsDir = path16.join(projectPath, "chats");
           try {
-            const files = await fs14.readdir(chatsDir);
+            const files = await fs13.readdir(chatsDir);
             const chatFiles = files.filter((file) => file.endsWith(".jsonl"));
             for (const file of chatFiles) {
-              const filePath = path17.join(chatsDir, file);
+              const filePath = path16.join(chatsDir, file);
               try {
-                const fileStats = await fs14.stat(filePath);
+                const fileStats = await fs13.stat(filePath);
                 allChatFiles.push({ path: filePath, mtime: fileStats.mtimeMs });
               } catch (e) {
                 logger.error(`Failed to stat file ${filePath}:`, e);
@@ -14566,12 +14523,12 @@ None captured`;
           if (records.length > 0 && facetsOutputDir) {
             const sessionId = records[0].sessionId;
             if (sessionId) {
-              const existingFacetPath = path17.join(
+              const existingFacetPath = path16.join(
                 facetsOutputDir,
                 `${sessionId}.json`
               );
               try {
-                const existingData = await fs14.readFile(
+                const existingData = await fs13.readFile(
                   existingFacetPath,
                   "utf-8"
                 );
@@ -14589,7 +14546,7 @@ None captured`;
                 const normalizedData = JSON.stringify(normalizedFacet, null, 2);
                 if (existingData !== normalizedData) {
                   try {
-                    await fs14.writeFile(
+                    await fs13.writeFile(
                       existingFacetPath,
                       normalizedData,
                       "utf-8"
@@ -14624,11 +14581,11 @@ None captured`;
           const facet = await this.analyzeSession(records);
           if (facet && facetsOutputDir) {
             try {
-              const facetPath = path17.join(
+              const facetPath = path16.join(
                 facetsOutputDir,
                 `${facet.session_id}.json`
               );
-              await fs14.writeFile(
+              await fs13.writeFile(
                 facetPath,
                 JSON.stringify(facet, null, 2),
                 "utf-8"
@@ -14726,8 +14683,8 @@ var StaticInsightGenerator = class {
   }
   // Ensure the output directory exists
   async ensureOutputDirectory() {
-    const outputDir = path18.join(Storage.getRuntimeBaseDir(), "insights");
-    await fs15.mkdir(outputDir, { recursive: true });
+    const outputDir = path17.join(Storage.getRuntimeBaseDir(), "insights");
+    await fs14.mkdir(outputDir, { recursive: true });
     return outputDir;
   }
   // Generate timestamped filename with collision detection
@@ -14735,23 +14692,23 @@ var StaticInsightGenerator = class {
     const now = /* @__PURE__ */ new Date();
     const date = now.toISOString().split("T")[0];
     const time = now.toTimeString().slice(0, 8).replace(/:/g, "");
-    let outputPath = path18.join(outputDir, `insight-${date}.html`);
+    let outputPath = path17.join(outputDir, `insight-${date}.html`);
     try {
-      await fs15.access(outputPath);
-      outputPath = path18.join(outputDir, `insight-${date}-${time}.html`);
+      await fs14.access(outputPath);
+      outputPath = path17.join(outputDir, `insight-${date}-${time}.html`);
     } catch {
     }
     return outputPath;
   }
   async updateInsightSymlink(outputDir, targetPath) {
-    const latestPath = path18.join(outputDir, "insight.html");
+    const latestPath = path17.join(outputDir, "insight.html");
     await updateSymlink(latestPath, targetPath);
   }
   // Generate the static insight HTML file
   async generateStaticInsight(baseDir, onProgress) {
     const outputDir = await this.ensureOutputDirectory();
-    const facetsDir = path18.join(outputDir, "facets");
-    await fs15.mkdir(facetsDir, { recursive: true });
+    const facetsDir = path17.join(outputDir, "facets");
+    await fs14.mkdir(facetsDir, { recursive: true });
     const insights = await this.dataProcessor.generateInsights(
       baseDir,
       facetsDir,
@@ -14759,7 +14716,7 @@ var StaticInsightGenerator = class {
     );
     const html = await this.templateRenderer.renderInsightHTML(insights);
     const outputPath = await this.generateOutputPath(outputDir);
-    await fs15.writeFile(outputPath, html, "utf-8");
+    await fs14.writeFile(outputPath, html, "utf-8");
     await this.updateInsightSymlink(outputDir, outputPath);
     return outputPath;
   }
@@ -15153,7 +15110,7 @@ var BuiltinCommandLoader = class {
       initCommand,
       languageCommand,
       mcpCommand,
-      ...this.config?.getManagedAutoMemoryEnabled() ? [dreamCommand, forgetCommand] : [],
+      ...this.config?.isManagedMemoryAvailable() ? [dreamCommand, forgetCommand] : [],
       goalCommand,
       memoryCommand,
       modelCommand,
@@ -15194,7 +15151,7 @@ var BuiltinCommandLoader = class {
 // packages/cli/src/services/BundledSkillLoader.ts
 init_esbuild_shims();
 import { dirname as dirname4 } from "node:path";
-var debugLogger15 = createDebugLogger("BUNDLED_SKILL_LOADER");
+var debugLogger13 = createDebugLogger("BUNDLED_SKILL_LOADER");
 var BundledSkillLoader = class {
   constructor(config) {
     this.config = config;
@@ -15204,12 +15161,12 @@ var BundledSkillLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger15.debug("Bare mode enabled, skipping bundled skills");
+      debugLogger13.debug("Bare mode enabled, skipping bundled skills");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger15.debug("SkillManager not available, skipping bundled skills");
+      debugLogger13.debug("SkillManager not available, skipping bundled skills");
       return [];
     }
     try {
@@ -15217,7 +15174,7 @@ var BundledSkillLoader = class {
       const cronEnabled = this.config?.isCronEnabled() ?? false;
       const cronVisible = allSkills.filter((skill) => {
         if (!cronEnabled && skill.allowedTools?.some((t2) => t2.startsWith("cron_"))) {
-          debugLogger15.debug(
+          debugLogger13.debug(
             `Hiding skill "${skill.name}" because cron is not enabled`
           );
           return false;
@@ -15228,7 +15185,7 @@ var BundledSkillLoader = class {
       const skills = cronVisible.filter(
         (skill) => !disabled.has(skill.name.toLowerCase())
       );
-      debugLogger15.debug(
+      debugLogger13.debug(
         `Loaded ${skills.length} bundled skill(s) as slash commands; ${cronVisible.length - skills.length} hidden by skills.disabled`
       );
       return skills.map((skill) => ({
@@ -15279,7 +15236,7 @@ ${body}`;
         }, "action")
       }));
     } catch (error) {
-      debugLogger15.error("Failed to load bundled skills:", error);
+      debugLogger13.error("Failed to load bundled skills:", error);
       return [];
     }
   }
@@ -15288,9 +15245,9 @@ ${body}`;
 // packages/cli/src/services/FileCommandLoader.ts
 init_esbuild_shims();
 var import_toml = __toESM(require_toml(), 1);
-import { promises as fs16 } from "node:fs";
+import { promises as fs15 } from "node:fs";
 import * as fsSync from "node:fs";
-import path20 from "node:path";
+import path19 from "node:path";
 
 // packages/cli/src/services/markdown-command-parser.ts
 init_esbuild_shims();
@@ -15335,7 +15292,7 @@ __name(parseMarkdownCommand, "parseMarkdownCommand");
 
 // packages/cli/src/services/command-factory.ts
 init_esbuild_shims();
-import path19 from "node:path";
+import path18 from "node:path";
 
 // packages/cli/src/services/prompt-processors/argumentProcessor.ts
 init_esbuild_shims();
@@ -15559,7 +15516,7 @@ var ShellProcessor = class {
 
 // packages/cli/src/services/prompt-processors/atFileProcessor.ts
 init_esbuild_shims();
-var debugLogger16 = createDebugLogger("AT_FILE_PROCESSOR");
+var debugLogger14 = createDebugLogger("AT_FILE_PROCESSOR");
 var AtFileProcessor = class {
   constructor(commandName) {
     this.commandName = commandName;
@@ -15605,7 +15562,7 @@ var AtFileProcessor = class {
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
           const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
-          debugLogger16.error(
+          debugLogger14.error(
             `[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`
           );
           context.ui.addItem(
@@ -15630,15 +15587,15 @@ var AtFileProcessor = class {
 };
 
 // packages/cli/src/services/command-factory.ts
-var debugLogger17 = createDebugLogger("COMMAND_FACTORY");
+var debugLogger15 = createDebugLogger("COMMAND_FACTORY");
 function createSlashCommandFromDefinition(filePath, baseDir, definition, extensionName, fileExtension) {
-  const relativePathWithExt = path19.relative(baseDir, filePath);
+  const relativePathWithExt = path18.relative(baseDir, filePath);
   const relativePath = relativePathWithExt.substring(
     0,
     relativePathWithExt.length - fileExtension.length
   );
-  const baseCommandName = relativePath.split(path19.sep).map((segment) => segment.replaceAll(":", "_")).join(":");
-  const defaultDescription = `Custom command from ${path19.basename(filePath)}`;
+  const baseCommandName = relativePath.split(path18.sep).map((segment) => segment.replaceAll(":", "_")).join(":");
+  const defaultDescription = `Custom command from ${path18.basename(filePath)}`;
   let description = definition.description || defaultDescription;
   if (extensionName) {
     description = `[${extensionName}] ${description}`;
@@ -15674,7 +15631,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
     whenToUse: definition.whenToUse,
     action: /* @__PURE__ */ __name(async (context, _args) => {
       if (!context.invocation) {
-        debugLogger17.error(
+        debugLogger15.error(
           `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`
         );
         return {
@@ -15712,7 +15669,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
 __name(createSlashCommandFromDefinition, "createSlashCommandFromDefinition");
 
 // packages/cli/src/services/FileCommandLoader.ts
-var debugLogger18 = createDebugLogger("FILE_COMMAND_LOADER");
+var debugLogger16 = createDebugLogger("FILE_COMMAND_LOADER");
 var TomlCommandDefSchema = external_exports.object({
   prompt: external_exports.string({
     required_error: "The 'prompt' field is required.",
@@ -15746,7 +15703,7 @@ var FileCommandLoader = class {
    */
   async loadCommands(signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger18.debug("Bare mode enabled, skipping auto-discovered commands");
+      debugLogger16.debug("Bare mode enabled, skipping auto-discovered commands");
       return [];
     }
     const allCommands = [];
@@ -15772,14 +15729,14 @@ var FileCommandLoader = class {
         }
         const tomlCommandPromises = tomlFiles.map(
           (file) => this.parseAndAdaptTomlFile(
-            path20.join(dirInfo.path, file),
+            path19.join(dirInfo.path, file),
             dirInfo.path,
             dirInfo.extensionName
           )
         );
         const mdCommandPromises = mdFiles.map(
           (file) => this.parseAndAdaptMarkdownFile(
-            path20.join(dirInfo.path, file),
+            path19.join(dirInfo.path, file),
             dirInfo.path,
             dirInfo.extensionName
           )
@@ -15790,7 +15747,7 @@ var FileCommandLoader = class {
         const isEnoent = error.code === "ENOENT";
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (!isEnoent && !isAbortError) {
-          debugLogger18.error(
+          debugLogger16.error(
             `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
             error
           );
@@ -15829,14 +15786,14 @@ var FileCommandLoader = class {
    */
   getExtensionCommandsPaths(ext) {
     try {
-      const configPath = path20.join(ext.path, EXTENSIONS_CONFIG_FILENAME);
+      const configPath = path19.join(ext.path, EXTENSIONS_CONFIG_FILENAME);
       if (fsSync.existsSync(configPath)) {
         const configContent = fsSync.readFileSync(configPath, "utf-8");
         const config = JSON.parse(configContent);
         if (config.commands) {
           const commandsArray = Array.isArray(config.commands) ? config.commands : [config.commands];
           return commandsArray.map(
-            (cmdPath) => path20.isAbsolute(cmdPath) ? cmdPath : path20.join(ext.path, cmdPath)
+            (cmdPath) => path19.isAbsolute(cmdPath) ? cmdPath : path19.join(ext.path, cmdPath)
           ).filter((cmdPath) => {
             try {
               return fsSync.existsSync(cmdPath);
@@ -15847,12 +15804,12 @@ var FileCommandLoader = class {
         }
       }
     } catch (error) {
-      debugLogger18.warn(
+      debugLogger16.warn(
         `Failed to read extension config for ${ext.name}:`,
         error
       );
     }
-    const defaultPath = path20.join(ext.path, "commands");
+    const defaultPath = path19.join(ext.path, "commands");
     try {
       if (fsSync.existsSync(defaultPath)) {
         return [defaultPath];
@@ -15871,9 +15828,9 @@ var FileCommandLoader = class {
   async parseAndAdaptTomlFile(filePath, baseDir, extensionName) {
     let fileContent;
     try {
-      fileContent = await fs16.readFile(filePath, "utf-8");
+      fileContent = await fs15.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15883,7 +15840,7 @@ var FileCommandLoader = class {
     try {
       parsed = import_toml.default.parse(fileContent);
     } catch (error) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to parse TOML file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15891,7 +15848,7 @@ var FileCommandLoader = class {
     }
     const validationResult = TomlCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15916,9 +15873,9 @@ var FileCommandLoader = class {
   async parseAndAdaptMarkdownFile(filePath, baseDir, extensionName) {
     let fileContent;
     try {
-      fileContent = await fs16.readFile(filePath, "utf-8");
+      fileContent = await fs15.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15928,7 +15885,7 @@ var FileCommandLoader = class {
     try {
       parsed = parseMarkdownCommand(fileContent);
     } catch (error) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to parse Markdown file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15936,7 +15893,7 @@ var FileCommandLoader = class {
     }
     const validationResult = MarkdownCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger18.error(
+      debugLogger16.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15962,7 +15919,7 @@ var FileCommandLoader = class {
 
 // packages/cli/src/services/saved-workflow-loader.ts
 init_esbuild_shims();
-var debugLogger19 = createDebugLogger("SavedWorkflowLoader");
+var debugLogger17 = createDebugLogger("SavedWorkflowLoader");
 var SavedWorkflowLoader = class {
   constructor(config) {
     this.config = config;
@@ -15981,7 +15938,7 @@ var SavedWorkflowLoader = class {
     try {
       entries = await listSavedWorkflows(this.config);
     } catch (e) {
-      debugLogger19.debug(`listSavedWorkflows failed: ${e}`);
+      debugLogger17.debug(`listSavedWorkflows failed: ${e}`);
       return [];
     }
     if (signal.aborted) return [];
@@ -16279,7 +16236,7 @@ var McpPromptLoader = class {
 // packages/cli/src/services/SkillCommandLoader.ts
 init_esbuild_shims();
 import { dirname as dirname5 } from "node:path";
-var debugLogger20 = createDebugLogger("SKILL_COMMAND_LOADER");
+var debugLogger18 = createDebugLogger("SKILL_COMMAND_LOADER");
 var SkillCommandLoader = class {
   constructor(config) {
     this.config = config;
@@ -16289,12 +16246,12 @@ var SkillCommandLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger20.debug("Bare mode enabled, skipping skill commands");
+      debugLogger18.debug("Bare mode enabled, skipping skill commands");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger20.debug("SkillManager not available, skipping skill commands");
+      debugLogger18.debug("SkillManager not available, skipping skill commands");
       return [];
     }
     try {
@@ -16311,7 +16268,7 @@ var SkillCommandLoader = class {
       const nonUserInvocableCount = visibleSkills.filter(
         (skill) => skill.userInvocable === false
       ).length;
-      debugLogger20.debug(
+      debugLogger18.debug(
         `Loaded ${userSkills.length} user + ${projectSkills.length} project + ${extensionSkills.length} extension skill(s) as slash commands; ${allSkills.length - visibleSkills.length} hidden by skills.disabled; ${nonUserInvocableCount} marked non-user-invocable`
       );
       return visibleSkills.map((skill) => {
@@ -16354,7 +16311,7 @@ var SkillCommandLoader = class {
         };
       });
     } catch (error) {
-      debugLogger20.error("Failed to load skill commands:", error);
+      debugLogger18.error("Failed to load skill commands:", error);
       return [];
     }
   }
@@ -16429,7 +16386,11 @@ function formatUserPromptExpansionBlockedMessage(reason) {
 __name(formatUserPromptExpansionBlockedMessage, "formatUserPromptExpansionBlockedMessage");
 
 // packages/cli/src/nonInteractiveCliCommands.ts
-var debugLogger21 = createDebugLogger("NON_INTERACTIVE_COMMANDS");
+var debugLogger19 = createDebugLogger("NON_INTERACTIVE_COMMANDS");
+function getSkillCommandName(command) {
+  return command.skillDetail?.name ?? command.name;
+}
+__name(getSkillCommandName, "getSkillCommandName");
 function handleCommandResult(result, outputHistoryItems) {
   switch (result.type) {
     case "submit_prompt":
@@ -16697,7 +16658,25 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
       args
     }
   };
-  const result = await commandToExecute.action(context, args);
+  const isSkillCommand = commandToExecute.kind === "skill" /* SKILL */;
+  let skillInvocationRecorded = false;
+  const recordSkillCommandInvocation = /* @__PURE__ */ __name((success) => {
+    if (!isSkillCommand || skillInvocationRecorded) {
+      return;
+    }
+    recordSkillInvocation(config, {
+      skillName: getSkillCommandName(commandToExecute),
+      success
+    });
+    skillInvocationRecorded = true;
+  }, "recordSkillCommandInvocation");
+  let result;
+  try {
+    result = await commandToExecute.action(context, args);
+  } catch (error) {
+    recordSkillCommandInvocation(false);
+    throw error;
+  }
   if (!result) {
     return {
       type: "message",
@@ -16706,16 +16685,24 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     };
   }
   if (result.type === "submit_prompt") {
-    const hookResult = await fireUserPromptExpansionHook(
-      config,
-      commandToExecute.name,
-      args,
-      result.content,
-      abortController.signal
-    );
+    let hookResult;
+    try {
+      hookResult = await fireUserPromptExpansionHook(
+        config,
+        commandToExecute.name,
+        args,
+        result.content,
+        abortController.signal
+      );
+    } catch (error) {
+      recordSkillCommandInvocation(false);
+      throw error;
+    }
     if (hookResult.blockedResult) {
+      recordSkillCommandInvocation(false);
       return hookResult.blockedResult;
     }
+    recordSkillCommandInvocation(true);
     return handleCommandResult(
       { ...result, content: hookResult.content },
       outputHistoryItems
@@ -16747,14 +16734,14 @@ var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mo
     );
     return commandService.getCommandsForMode(mode);
   } catch (error) {
-    debugLogger21.error("Error loading available commands:", error);
+    debugLogger19.error("Error loading available commands:", error);
     return [];
   }
 }, "getAvailableCommands");
 
 // packages/cli/src/utils/nonInteractiveHelpers.ts
 init_esbuild_shims();
-var debugLogger22 = createDebugLogger("NON_INTERACTIVE");
+var debugLogger20 = createDebugLogger("NON_INTERACTIVE");
 function normalizePartList(parts) {
   if (!parts) {
     return [];
@@ -16817,6 +16804,31 @@ function computeUsageFromMetrics(metrics) {
   return usage2;
 }
 __name(computeUsageFromMetrics, "computeUsageFromMetrics");
+function buildInitialSystemReminders(config) {
+  const reminders = [];
+  if (config.getApprovalMode() === "plan" /* PLAN */) {
+    reminders.push({ text: getPlanModeSystemReminder(config.getSdkMode?.()) });
+  }
+  const arenaManager = config.getArenaManager?.();
+  if (arenaManager) {
+    try {
+      const sessionDir = arenaManager.getArenaSessionDir();
+      const configPath = `${sessionDir}/config.json`;
+      reminders.push({ text: getArenaSystemReminder(configPath) });
+    } catch {
+    }
+  }
+  return reminders;
+}
+__name(buildInitialSystemReminders, "buildInitialSystemReminders");
+function insertAfterFunctionResponses(parts, additions) {
+  const firstNonFunctionResponse = parts.findIndex(
+    (part) => !part.functionResponse
+  );
+  const insertAt = firstNonFunctionResponse === -1 ? parts.length : firstNonFunctionResponse;
+  return [...parts.slice(0, insertAt), ...additions, ...parts.slice(insertAt)];
+}
+__name(insertAfterFunctionResponses, "insertAfterFunctionResponses");
 async function loadSlashCommandNames(config) {
   const controller = new AbortController();
   try {
@@ -16827,7 +16839,7 @@ async function loadSlashCommandNames(config) {
     );
     return commands.map((cmd) => cmd.name).sort();
   } catch (error) {
-    debugLogger22.error(
+    debugLogger20.error(
       "[buildSystemMessage] Failed to load slash commands:",
       error
     );
@@ -16852,7 +16864,7 @@ async function buildSystemMessage(config, sessionId, permissionMode) {
     const subagents = await subagentManager.listSubagents();
     agentNames = subagents.map((subagent) => subagent.name);
   } catch (error) {
-    debugLogger22.error("[buildSystemMessage] Failed to load subagents:", error);
+    debugLogger20.error("[buildSystemMessage] Failed to load subagents:", error);
   }
   const systemMessage = {
     type: "system",
@@ -17024,6 +17036,7 @@ export {
   hasSlashCommandPathSeparator,
   isSlashCommand,
   isBtwCommand,
+  isMidInputCompletableCommand,
   findMidInputSlashCommand,
   getBestSlashCommandMatch,
   findSlashCommandTokens,
@@ -17055,6 +17068,8 @@ export {
   normalizePartList,
   extractPartsFromUserMessage,
   computeUsageFromMetrics,
+  buildInitialSystemReminders,
+  insertAfterFunctionResponses,
   buildSystemMessage,
   createToolProgressHandler,
   createAgentToolProgressHandler,