@qwen-code/qwen-code 0.21.1-simplify-system-prompt.0 → 0.21.1

package/chunks/{chunk-M4UKFCZ2.js → chunk-J7OACQDE.js}

@@ -9,34 +9,35 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-BYFNTGKI.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-PQNHRFJC.js";
-import {
-  contextCommand
-} from "./chunk-5THCYPLO.js";
+} from "./chunk-7BAU433D.js";
 import {
   calculateCost,
   computeSessionStats,
   diffCommand,
   filterCommandsForMode,
+  findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-52O2CIUL.js";
+} from "./chunk-7AEJDLRA.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-PQNHRFJC.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   writeOsc52
-} from "./chunk-J56UI34H.js";
+} from "./chunk-M7OONWYU.js";
 import {
-  rollbackStandaloneUpdate
-} from "./chunk-ZE5WPL4I.js";
+  contextCommand
+} from "./chunk-65PQENQP.js";
 import {
   themeManager
-} from "./chunk-L5UHQJTJ.js";
+} from "./chunk-GATT5TKW.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-VFSJ5VRH.js";
+} from "./chunk-T3O2B4XO.js";
+import {
+  rollbackStandaloneUpdate
+} from "./chunk-7DXQIJID.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -50,11 +51,11 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-DM22XS4K.js";
+} from "./chunk-LO4ROVP4.js";
 import {
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-IPUUTYMV.js";
+} from "./chunk-YDLJGZHL.js";
 import {
   formatUnsupportedVoiceModelMessage,
   getVoiceSettingsScope,
@@ -62,12 +63,12 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-KIUFNBHR.js";
+} from "./chunk-JTV5K7NH.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-SASBXAQL.js";
+} from "./chunk-QIZKCVM3.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -76,10 +77,7 @@ import {
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-LG4GZIVV.js";
-import {
-  getInstallationInfo
-} from "./chunk-LNARWLZQ.js";
+} from "./chunk-KCO4FLFJ.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -91,7 +89,7 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-JALU3ZDU.js";
+} from "./chunk-EIF3FXTB.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
@@ -99,11 +97,14 @@ import {
   resolveSupportedLanguage,
   setLanguageAsync,
   t
-} from "./chunk-VV6XU5L7.js";
+} from "./chunk-TCIFAA7K.js";
+import {
+  getInstallationInfo
+} from "./chunk-VWOOBLTY.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-VCBZUOSI.js";
+} from "./chunk-Q43KPN7X.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -174,36 +175,36 @@ import {
   runForkedAgent,
   tryGenerateSessionTitle,
   unregisterGoalHook
-} from "./chunk-DM4Q4JJH.js";
+} from "./chunk-X5WNMMIA.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
 import {
   resolveModelId
-} from "./chunk-PSWQZHEA.js";
+} from "./chunk-BMFALVGQ.js";
+import {
+  HookEventName,
+  sanitizeUserPromptExpansionAdditionalContext
+} from "./chunk-XWWKIXVD.js";
 import {
   APPROVAL_MODES,
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-L26JL52R.js";
-import {
-  HookEventName,
-  sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-3QMGYBFN.js";
+} from "./chunk-JSD33JG6.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
 } from "./chunk-JCW2R7WC.js";
 import {
   openBrowserSecurely
-} from "./chunk-JESCGQM3.js";
+} from "./chunk-NAVJD2PQ.js";
 import {
   REASONING_EFFORT_TIERS,
   normalizeReasoningEffort
-} from "./chunk-XVNQMZ2I.js";
+} from "./chunk-DGEIYUC3.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-YAF5VNU7.js";
+} from "./chunk-5KTQXHPY.js";
 import {
   IdeConnectionEvent,
   formatTokenUsageSummaryAsCsv,
@@ -217,14 +218,14 @@ import {
   recordSkillInvocation,
   runSideQuery,
   uiTelemetryService
-} from "./chunk-RWS5VYWC.js";
+} from "./chunk-PT722TDT.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-MUP3T3AD.js";
+} from "./chunk-SGFT55XI.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-PR75REBZ.js";
+} from "./chunk-Y6AXW2OG.js";
 import {
   Storage,
   createDebugLogger,
@@ -233,12 +234,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-32MVHM4T.js";
+} from "./chunk-RCUQIPTN.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -250,6 +251,108 @@ import {
 // packages/cli/src/ui/utils/commandUtils.ts
 init_esbuild_shims();
 import { spawn } from "node:child_process";
+
+// packages/cli/src/utils/commands.ts
+init_esbuild_shims();
+var MAX_STACKED_SKILLS = 5;
+var isStackedSkillCompletableCommand = /* @__PURE__ */ __name((command) => command.kind === "skill" /* SKILL */ && command.userInvocable !== false && !command.hidden, "isStackedSkillCompletableCommand");
+var isValidStackedSkillPrefix = /* @__PURE__ */ __name((prefix, commands) => {
+  const trimmed = prefix.trim();
+  if (!trimmed) return false;
+  const tokens = trimmed.split(/\s+/);
+  if (tokens.length >= MAX_STACKED_SKILLS) return false;
+  return tokens.every((token) => {
+    if (!token.startsWith("/")) return false;
+    const command = findCommandByName(token.slice(1), commands);
+    return command !== void 0 && isStackedSkillCompletableCommand(command);
+  });
+}, "isValidStackedSkillPrefix");
+var parseSlashCommand = /* @__PURE__ */ __name((query, commands) => {
+  const trimmed = query.trim();
+  const commandText = trimmed.substring(1).trim();
+  const parts = commandText.split(/\s+/);
+  const commandPath = parts.filter((p) => p);
+  let currentCommands = commands;
+  let commandToExecute;
+  let pathIndex = 0;
+  const canonicalPath = [];
+  let argsStart = 0;
+  for (const part of commandPath) {
+    let foundCommand = currentCommands.find((cmd) => cmd.name === part);
+    if (!foundCommand) {
+      foundCommand = currentCommands.find(
+        (cmd) => cmd.altNames?.includes(part)
+      );
+    }
+    if (foundCommand) {
+      commandToExecute = foundCommand;
+      canonicalPath.push(foundCommand.name);
+      pathIndex++;
+      const partIndex = commandText.indexOf(part, argsStart);
+      argsStart = partIndex + part.length;
+      if (foundCommand.subCommands) {
+        currentCommands = foundCommand.subCommands;
+      } else {
+        break;
+      }
+    } else {
+      break;
+    }
+  }
+  const args = commandToExecute ? commandText.slice(argsStart).trim() : parts.slice(pathIndex).join(" ");
+  return { commandToExecute, args, canonicalPath };
+}, "parseSlashCommand");
+var parseStackedSlashCommands = /* @__PURE__ */ __name((query, commands) => {
+  const trimmed = query.trim();
+  if (!trimmed.startsWith("/")) {
+    return { skills: [], remainingText: trimmed, exceededMax: false };
+  }
+  const commandText = trimmed.substring(1);
+  const skills = [];
+  let pos = 0;
+  let restPos = 0;
+  let exceededMax = false;
+  while (pos < commandText.length) {
+    while (pos < commandText.length && /\s/.test(commandText[pos])) pos++;
+    if (pos >= commandText.length) {
+      restPos = pos;
+      break;
+    }
+    const tokenStart = pos;
+    while (pos < commandText.length && !/\s/.test(commandText[pos])) pos++;
+    const token = commandText.slice(tokenStart, pos);
+    if (skills.length === 0) {
+      if (token.startsWith("/")) break;
+      const cmd2 = findCommandByName(token, commands);
+      if (!cmd2 || cmd2.kind !== "skill" /* SKILL */) break;
+      skills.push(cmd2);
+      restPos = pos;
+      continue;
+    }
+    if (!token.startsWith("/")) break;
+    const name = token.substring(1);
+    if (!name) break;
+    const cmd = findCommandByName(name, commands);
+    if (!cmd || cmd.kind !== "skill" /* SKILL */) break;
+    if (skills.length >= MAX_STACKED_SKILLS) {
+      exceededMax = true;
+      break;
+    }
+    skills.push(cmd);
+    restPos = pos;
+  }
+  if (skills.length < 2) {
+    return { skills: [], remainingText: trimmed, exceededMax: false };
+  }
+  const afterSkills = commandText.slice(restPos).trim();
+  return { skills, remainingText: afterSkills, exceededMax };
+}, "parseStackedSlashCommands");
+function findCommandByName(name, commands) {
+  return commands.find((cmd) => cmd.name === name) ?? commands.find((cmd) => cmd.altNames?.includes(name));
+}
+__name(findCommandByName, "findCommandByName");
+
+// packages/cli/src/ui/utils/commandUtils.ts
 var CodePage = {
   UTF8: 65001,
   GBK: 936,
@@ -377,7 +480,6 @@ function isMidInputCompletableCommand(cmd) {
 }
 __name(isMidInputCompletableCommand, "isMidInputCompletableCommand");
 function findMidInputSlashCommand(input, cursorOffset) {
-  if (input.startsWith("/")) return null;
   const codePoints = toCodePoints(input);
   const beforeCursor = codePoints.slice(0, cursorOffset).join("");
   const match = beforeCursor.match(/\s\/([a-zA-Z0-9_:-]*)$/);
@@ -445,7 +547,8 @@ function findSlashCommandTokens(text, commands) {
       if (isLineStart) {
         valid = cmd.userInvocable !== false && !cmd.hidden;
       } else {
-        valid = cmd.modelInvocable === true;
+        const prefix = text.slice(0, start);
+        valid = cmd.modelInvocable === true || isStackedSkillCompletableCommand(cmd) && isValidStackedSkillPrefix(prefix, commands);
       }
     }
     tokens.push({ start, end, commandName, valid });
@@ -457,94 +560,6 @@ __name(findSlashCommandTokens, "findSlashCommandTokens");
 // packages/cli/src/nonInteractiveCliCommands.ts
 init_esbuild_shims();
 
-// packages/cli/src/utils/commands.ts
-init_esbuild_shims();
-var MAX_STACKED_SKILLS = 5;
-var parseSlashCommand = /* @__PURE__ */ __name((query, commands) => {
-  const trimmed = query.trim();
-  const commandText = trimmed.substring(1).trim();
-  const parts = commandText.split(/\s+/);
-  const commandPath = parts.filter((p) => p);
-  let currentCommands = commands;
-  let commandToExecute;
-  let pathIndex = 0;
-  const canonicalPath = [];
-  let argsStart = 0;
-  for (const part of commandPath) {
-    let foundCommand = currentCommands.find((cmd) => cmd.name === part);
-    if (!foundCommand) {
-      foundCommand = currentCommands.find(
-        (cmd) => cmd.altNames?.includes(part)
-      );
-    }
-    if (foundCommand) {
-      commandToExecute = foundCommand;
-      canonicalPath.push(foundCommand.name);
-      pathIndex++;
-      const partIndex = commandText.indexOf(part, argsStart);
-      argsStart = partIndex + part.length;
-      if (foundCommand.subCommands) {
-        currentCommands = foundCommand.subCommands;
-      } else {
-        break;
-      }
-    } else {
-      break;
-    }
-  }
-  const args = commandToExecute ? commandText.slice(argsStart).trim() : parts.slice(pathIndex).join(" ");
-  return { commandToExecute, args, canonicalPath };
-}, "parseSlashCommand");
-var parseStackedSlashCommands = /* @__PURE__ */ __name((query, commands) => {
-  const trimmed = query.trim();
-  if (!trimmed.startsWith("/")) {
-    return { skills: [], remainingText: trimmed, exceededMax: false };
-  }
-  const commandText = trimmed.substring(1);
-  const skills = [];
-  let pos = 0;
-  let restPos = 0;
-  let exceededMax = false;
-  while (pos < commandText.length) {
-    while (pos < commandText.length && /\s/.test(commandText[pos])) pos++;
-    if (pos >= commandText.length) {
-      restPos = pos;
-      break;
-    }
-    const tokenStart = pos;
-    while (pos < commandText.length && !/\s/.test(commandText[pos])) pos++;
-    const token = commandText.slice(tokenStart, pos);
-    if (skills.length === 0) {
-      if (token.startsWith("/")) break;
-      const cmd2 = findCommandByName(token, commands);
-      if (!cmd2 || cmd2.kind !== "skill" /* SKILL */) break;
-      skills.push(cmd2);
-      restPos = pos;
-      continue;
-    }
-    if (!token.startsWith("/")) break;
-    const name = token.substring(1);
-    if (!name) break;
-    const cmd = findCommandByName(name, commands);
-    if (!cmd || cmd.kind !== "skill" /* SKILL */) break;
-    if (skills.length >= MAX_STACKED_SKILLS) {
-      exceededMax = true;
-      break;
-    }
-    skills.push(cmd);
-    restPos = pos;
-  }
-  if (skills.length < 2) {
-    return { skills: [], remainingText: trimmed, exceededMax: false };
-  }
-  const afterSkills = commandText.slice(restPos).trim();
-  return { skills, remainingText: afterSkills, exceededMax };
-}, "parseStackedSlashCommands");
-function findCommandByName(name, commands) {
-  return commands.find((cmd) => cmd.name === name) ?? commands.find((cmd) => cmd.altNames?.includes(name));
-}
-__name(findCommandByName, "findCommandByName");
-
 // packages/cli/src/services/CommandService.ts
 init_esbuild_shims();
 var debugLogger2 = createDebugLogger("CLI_COMMANDS");
@@ -1918,7 +1933,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-CHSTZLZD.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-JH6BCF7S.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -2625,7 +2640,16 @@ var cdCommand = {
       };
     }
     if (trustedTargetPath) {
-      loadTrustedFolders().setValue(trustedTargetPath, "TRUST_FOLDER" /* TRUST_FOLDER */);
+      try {
+        loadTrustedFolders().setValue(
+          trustedTargetPath,
+          "TRUST_FOLDER" /* TRUST_FOLDER */
+        );
+      } catch (error) {
+        warnings.push(
+          `Trust setting update failed: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
     }
     try {
       await config.getGeminiClient()?.addWorkingDirectoryChangedContext(realOldDir, realTargetPath);
@@ -3436,11 +3460,6 @@ var compressFastCommand = {
 
 // packages/cli/src/ui/commands/copyCommand.ts
 init_esbuild_shims();
-var INLINE_MATH_MAX_CHARS = 1024;
-var INLINE_MATH_REGEX = new RegExp(
-  String.raw`(?<![\w$])\$(?![\s\d$])(?=[^$\n]{1,${INLINE_MATH_MAX_CHARS}}\S\$)([^$\n]{1,${INLINE_MATH_MAX_CHARS}})\$(?![\w$])`,
-  "g"
-);
 function parseFencedCodeBlocks(markdown) {
   const blocks = [];
   const lines = markdown.split(/\r?\n/);
@@ -3514,14 +3533,11 @@ function parseInlineLatexExpressions(markdown) {
       inLatexBlock = true;
       continue;
     }
-    for (const match of line.matchAll(INLINE_MATH_REGEX)) {
-      const content = match[1];
-      if (content) {
-        expressions.push({
-          content,
-          index: expressions.length + 1
-        });
-      }
+    for (const content of findInlineMathExpressions(line)) {
+      expressions.push({
+        content,
+        index: expressions.length + 1
+      });
     }
   }
   return expressions;
@@ -3623,10 +3639,7 @@ function selectCodeBlock(markdown, args) {
   if (blocks.length === 0) return null;
   let lang = null;
   let requestedIndex = null;
-  const selectorTokens = firstToken === "code" ? tokens.slice(1) : tokens.map((token) => token);
-  if (firstToken !== "code") {
-    lang = firstToken;
-  }
+  const selectorTokens = firstToken === "code" ? tokens.slice(1) : tokens;
   for (const token of selectorTokens) {
     if (/^\d+$/.test(token)) {
       requestedIndex = Number(token);
@@ -6250,7 +6263,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-65OX3SGJ.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-PFPM2GWM.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -6496,7 +6509,7 @@ function getHookDescription(eventName) {
       "Input to command is JSON with file_path, memory_type, load_reason, and optional trigger_file_path and parent_file_path."
     ),
     ["UserPromptSubmit" /* UserPromptSubmit */]: t(
-      "Input to command is JSON with original user prompt text."
+      'Input to command is JSON with "prompt" (the current model-bound prompt) and optional "submitted_prompt" (the supported interactive TUI text projection).'
     ),
     ["UserPromptExpansion" /* UserPromptExpansion */]: t(
       "Input to command is JSON with command_name, command_args, and expanded prompt text."
@@ -7687,7 +7700,7 @@ var initCommand = {
         if (existing && existing.trim().length > 0) {
           if (!context.overwriteConfirmed) {
             const [{ Text }, { default: React }] = await Promise.all([
-              import("./build-RV63TIRH.js"),
+              import("./build-S6DO7LMM.js"),
               import("./react-SG7JAQSZ.js")
             ]);
             return {
@@ -9858,6 +9871,28 @@ var EMPTY_SKILL_METRICS = {
   totalFail: 0,
   byName: {}
 };
+function formatGenerationMetrics(metrics) {
+  const last = metrics?.last;
+  if (!metrics || !last) {
+    return [];
+  }
+  const lastTps = last.generationDurationMs > 0 ? last.outputTokens / (last.generationDurationMs / 1e3) : void 0;
+  const averageTtft = metrics.timedRequests > 0 ? metrics.totalTtftMs / metrics.timedRequests : void 0;
+  const sessionTps = metrics.totalGenerationDurationMs > 0 ? metrics.totalThroughputOutputTokens / (metrics.totalGenerationDurationMs / 1e3) : void 0;
+  return [
+    "",
+    `${t("Generation Metrics")} (${t("Latest Request")})`,
+    `${t("Model")}: ${last.model}`,
+    `TTFT: ${formatDuration(last.ttftMs)}`,
+    `${t("Generation Time")}: ${formatDuration(last.generationDurationMs)}`,
+    `${t("Output Tokens")}: ${formatInteger(last.outputTokens)}`,
+    `TPS: ${lastTps === void 0 ? "\u2014" : `${lastTps.toFixed(1)} tok/s`}`,
+    `${t("Requests")}: ${formatInteger(metrics.timedRequests)}`,
+    `${t("Average TTFT")}: ${averageTtft === void 0 ? "\u2014" : formatDuration(averageTtft)}`,
+    `${t("Session TPS")}: ${sessionTps === void 0 ? "\u2014" : `${sessionTps.toFixed(1)} tok/s`}`
+  ];
+}
+__name(formatGenerationMetrics, "formatGenerationMetrics");
 function formatInteger(value) {
   return new Intl.NumberFormat(getCurrentLanguage()).format(value);
 }
@@ -10407,6 +10442,7 @@ var statsCommand = {
             prompt: String(totalPromptTokens),
             output: String(totalCandidateTokens)
           }),
+          ...formatGenerationMetrics(metrics.generation),
           t("Tool calls: {{total}} ({{success}} ok, {{fail}} fail)", {
             total: String(metrics.tools.totalCalls),
             success: String(metrics.tools.totalSuccess),
@@ -13178,10 +13214,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-WUJGHWZZ.js"),
-      import("./processUtils-V2LCK6T6.js"),
-      import("./standalone-update-ZMFNKAEY.js"),
-      import("./installationInfo-5UUQJI6Y.js")
+      import("./updateCheck-KAQH67DV.js"),
+      import("./processUtils-COKZAMUP.js"),
+      import("./standalone-update-MK3Z7KBI.js"),
+      import("./installationInfo-6AM4I2Y3.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -15366,6 +15402,8 @@ __name(functionResponsePartsToString, "functionResponsePartsToString");
 
 export {
   MAX_STACKED_SKILLS,
+  isStackedSkillCompletableCommand,
+  isValidStackedSkillPrefix,
   parseSlashCommand,
   parseStackedSlashCommands,
   CommandService,

package/chunks/{chunk-3HBZKBMQ.js → chunk-JFMA7Y5M.js}

@@ -3,24 +3,24 @@
 import {
   AUTO_THEME_NAME,
   themeManager
-} from "./chunk-L5UHQJTJ.js";
+} from "./chunk-GATT5TKW.js";
 import {
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-VV6XU5L7.js";
+} from "./chunk-TCIFAA7K.js";
 import {
   IdeClient
-} from "./chunk-DM4Q4JJH.js";
+} from "./chunk-X5WNMMIA.js";
 import {
   AuthEvent,
   IdeConnectionEvent,
   logAuth,
   logIdeConnection
-} from "./chunk-RWS5VYWC.js";
+} from "./chunk-PT722TDT.js";
 import {
   getErrorMessage
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";