@qwen-code/qwen-code 0.22.2 → 0.22.3-nightly.20260829.e5cb60ad48

package/chunks/chunk-WLEYH7CD.js

@@ -0,0 +1,332 @@
+// Force strict mode and setup for ESM
+"use strict";
+import {
+  init_esbuild_shims
+} from "./chunk-5O2XNYP6.js";
+
+// packages/cli/src/config/top-level-options.ts
+init_esbuild_shims();
+var APPROVAL_MODES = [
+  "plan",
+  "default",
+  "auto-edit",
+  "auto",
+  "yolo"
+];
+var APPROVAL_MODE_DESCRIPTIONS = {
+  plan: "Analyze only, do not modify files or execute commands",
+  default: "Require approval for file edits or shell commands",
+  "auto-edit": "Automatically approve file edits",
+  auto: "LLM classifier auto-approves safe actions, blocks risky ones",
+  yolo: "Automatically approve all tools"
+};
+var AUTH_TYPE_CHOICES = [
+  "openai",
+  "anthropic",
+  "qwen-oauth",
+  "gemini",
+  "vertex-ai"
+];
+var TOP_LEVEL_USAGE = "Usage: qwen [options] [command]\n\nQwen Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode";
+var DEFAULT_COMMAND = "$0 [query..]";
+var DEFAULT_COMMAND_DESC = "Launch Qwen Code CLI";
+var QUERY_POSITIONAL = {
+  description: "Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive."
+};
+var TOP_LEVEL_GLOBAL_OPTIONS = {
+  telemetry: {
+    type: "boolean",
+    description: "Enable telemetry? This flag specifically controls if telemetry is sent. Other --telemetry-* flags set specific values but do not enable telemetry on their own."
+  },
+  "telemetry-target": {
+    type: "string",
+    choices: ["local", "gcp"],
+    description: "Set the telemetry target (local or gcp). Overrides settings files."
+  },
+  "telemetry-otlp-endpoint": {
+    type: "string",
+    description: "Set the OTLP endpoint for telemetry. Overrides environment variables and settings files."
+  },
+  "telemetry-otlp-protocol": {
+    type: "string",
+    choices: ["grpc", "http"],
+    description: "Set the OTLP protocol for telemetry (grpc or http). Overrides settings files."
+  },
+  "telemetry-log-prompts": {
+    type: "boolean",
+    description: "Enable or disable logging of user prompts for telemetry. Overrides settings files."
+  },
+  "telemetry-outfile": {
+    type: "string",
+    description: "Redirect all telemetry output to the specified file."
+  },
+  debug: {
+    alias: "d",
+    type: "boolean",
+    description: "Run in debug mode?",
+    default: false
+  },
+  bare: {
+    type: "boolean",
+    description: "Minimal mode: skip implicit startup auto-discovery and only honor explicitly provided CLI inputs.",
+    default: false
+  },
+  "safe-mode": {
+    type: "boolean",
+    description: "Disable all customizations (context files, hooks, extensions, skills, MCP servers) for troubleshooting."
+  },
+  proxy: {
+    type: "string",
+    description: "Proxy for Qwen Code, like schema://user:password@host:port"
+  },
+  insecure: {
+    type: "boolean",
+    description: "Skip TLS certificate verification for API connections (for self-signed certs in trusted/lab environments). Equivalent to setting QWEN_TLS_INSECURE=1. WARNING: removes protection against man-in-the-middle attacks.",
+    default: false
+  },
+  "chat-recording": {
+    type: "boolean",
+    description: "Enable chat recording to disk. If false, chat history is not saved and --continue/--resume will not work."
+  }
+};
+var TOP_LEVEL_DEPRECATED_OPTIONS = {
+  telemetry: 'Use the "telemetry.enabled" setting in settings.json instead. This flag will be removed in a future version.',
+  "telemetry-target": 'Use the "telemetry.target" setting in settings.json instead. This flag will be removed in a future version.',
+  "telemetry-otlp-endpoint": 'Use the "telemetry.otlpEndpoint" setting in settings.json instead. This flag will be removed in a future version.',
+  "telemetry-otlp-protocol": 'Use the "telemetry.otlpProtocol" setting in settings.json instead. This flag will be removed in a future version.',
+  "telemetry-log-prompts": 'Use the "telemetry.logPrompts" setting in settings.json instead. This flag will be removed in a future version.',
+  "telemetry-outfile": 'Use the "telemetry.outfile" setting in settings.json instead. This flag will be removed in a future version.',
+  proxy: 'Use the "proxy" setting in settings.json instead. This flag will be removed in a future version.',
+  "sandbox-image": 'Use the "tools.sandboxImage" setting in settings.json instead. This flag will be removed in a future version.',
+  prompt: "Use the positional prompt instead. This flag will be removed in a future version."
+};
+var DEFAULT_COMMAND_OPTIONS = {
+  model: {
+    alias: "m",
+    type: "string",
+    description: "Model"
+  },
+  "fallback-model": {
+    type: "array",
+    description: "Fallback model(s) for capacity errors (429/503/529), repeatable or comma-separated (max 3)"
+  },
+  prompt: {
+    alias: "p",
+    type: "string",
+    description: "Prompt. Appended to input on stdin (if any)."
+  },
+  "prompt-interactive": {
+    alias: "i",
+    type: "string",
+    description: "Execute the provided prompt and continue in interactive mode"
+  },
+  "system-prompt": {
+    type: "string",
+    description: "Override the main session system prompt for this run. Can be combined with --append-system-prompt."
+  },
+  "append-system-prompt": {
+    type: "string",
+    description: "Append instructions to the main session system prompt for this run. Can be combined with --system-prompt."
+  },
+  sandbox: {
+    alias: "s",
+    type: "boolean",
+    description: "Run in sandbox?"
+  },
+  "sandbox-image": {
+    type: "string",
+    description: "Sandbox image URI."
+  },
+  yolo: {
+    alias: "y",
+    type: "boolean",
+    description: "Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?",
+    default: false
+  },
+  "approval-mode": {
+    type: "string",
+    choices: APPROVAL_MODES,
+    description: `Set the approval mode: ${APPROVAL_MODES.map(
+      (mode) => `${mode} (${APPROVAL_MODE_DESCRIPTIONS[mode]})`
+    ).join(", ")}`
+  },
+  acp: {
+    type: "boolean",
+    description: "Starts the agent in ACP mode"
+  },
+  "experimental-lsp": {
+    type: "boolean",
+    description: "Enable experimental LSP (Language Server Protocol) feature for code intelligence",
+    default: false
+  },
+  "restore-ask-user-question": {
+    type: "boolean",
+    description: "On daemon session load/resume, re-hang a trailing unanswered ask_user_question instead of synthesizing a failed tool result",
+    default: false
+  },
+  channel: {
+    type: "string",
+    choices: ["VSCode", "ACP", "SDK", "CI", "desktop", "daemon"],
+    description: "Channel identifier (VSCode, ACP, SDK, CI, desktop, daemon)"
+  },
+  "allowed-mcp-server-names": {
+    type: "array",
+    description: "Allowed MCP server names"
+  },
+  "mcp-config": {
+    type: "string",
+    description: 'MCP server configuration as JSON string or file path. Can be a path to a JSON file or inline JSON with {"mcpServers": {...}} format.'
+  },
+  "allowed-tools": {
+    type: "array",
+    // Pre-PR the default-command builder registered this option twice and
+    // yargs rendered the LAST registration's description; keep that wording
+    // so the consolidated help output is unchanged.
+    description: "Tools to allow, will bypass confirmation"
+  },
+  extensions: {
+    alias: "e",
+    type: "array",
+    description: "A list of extensions to use. If not provided, all extensions are used."
+  },
+  "list-extensions": {
+    alias: "l",
+    type: "boolean",
+    description: "List all available extensions and exit."
+  },
+  "include-directories": {
+    alias: "add-dir",
+    type: "array",
+    description: "Additional directories to include in the workspace (comma-separated or multiple --include-directories)"
+  },
+  "openai-logging": {
+    type: "boolean",
+    description: "Enable logging of OpenAI API calls for debugging and analysis"
+  },
+  "openai-logging-dir": {
+    type: "string",
+    description: "Custom directory path for OpenAI API logs. Overrides settings files."
+  },
+  "openai-api-key": {
+    type: "string",
+    description: "OpenAI API key to use for authentication"
+  },
+  "openai-base-url": {
+    type: "string",
+    description: "OpenAI base URL (for custom endpoints)"
+  },
+  "screen-reader": {
+    type: "boolean",
+    description: "Enable screen reader mode for accessibility."
+  },
+  "input-format": {
+    type: "string",
+    choices: ["text", "stream-json"],
+    description: "The format consumed from standard input.",
+    default: "text"
+  },
+  "output-format": {
+    alias: "o",
+    type: "string",
+    description: "The format of the CLI output.",
+    choices: ["text", "json", "stream-json"]
+  },
+  "include-partial-messages": {
+    type: "boolean",
+    description: "Include partial assistant messages when using stream-json output.",
+    default: false
+  },
+  "json-fd": {
+    type: "number",
+    description: "File descriptor for structured JSON event output (dual output mode). The TUI renders normally on stdout while JSON events are written to this fd. The caller must provide this fd via spawn stdio configuration."
+  },
+  "json-file": {
+    type: "string",
+    description: "File path for structured JSON event output (dual output mode). Can be a regular file, FIFO (named pipe), or /dev/fd/N."
+  },
+  "json-schema": {
+    type: "string",
+    description: 'JSON Schema that the model\'s final output must conform to (headless mode only). Accepts a JSON literal or "@path/to/schema.json". Registers a synthetic `structured_output` tool; the session ends on the first valid call.'
+  },
+  "input-file": {
+    type: "string",
+    description: "File path for receiving remote input commands (bidirectional sync). An external process writes JSONL commands; the TUI watches and processes them."
+  },
+  continue: {
+    alias: "c",
+    type: "boolean",
+    description: "Resume the most recent session for the current project.",
+    default: false
+  },
+  resume: {
+    alias: "r",
+    type: "string",
+    description: "Resume a specific session by its ID. Use without an ID to show session picker."
+  },
+  "session-id": {
+    type: "string",
+    description: "Specify a session ID for this run."
+  },
+  "fork-session": {
+    type: "boolean",
+    description: "Create a new forked session from the resumed session. Must be used with --resume or --continue.",
+    default: false
+  },
+  worktree: {
+    type: "string",
+    description: "Start the session inside a git worktree at <repoRoot>/.qwen/worktrees/<slug>/. Pass a slug (`--worktree my-feature`), a PR reference (`--worktree=#123` or a full GitHub pull-request URL), or use bare `--worktree` to auto-generate a slug. On exit, the WorktreeExitDialog prompts to keep or remove the worktree."
+  },
+  "max-session-turns": {
+    type: "number",
+    description: "Maximum number of session turns (must be an integer)"
+  },
+  "max-wall-time": {
+    type: "string",
+    description: "Run-level wall-clock budget for headless / unattended runs. Accepts seconds (e.g. `90`), or a duration string with unit (e.g. `30s`, `5m`, `1h`, `1.5h`). Minimum 1s \u2014 sub-second values (`500ms`, `0.5`) are rejected as typos; max ~24 days. Aborts the run with exit code 55 when exceeded."
+  },
+  "max-tool-calls": {
+    type: "number",
+    description: 'Maximum cumulative tool calls executed during the run (success or failure; `structured_output` under --json-schema is exempt). Aborts with exit code 55 when exceeded. -1 / unset means no limit; 0 means "no tool calls allowed" (first call aborts). Capped at 1,000,000 to catch typos.'
+  },
+  "max-subagent-depth": {
+    type: "number",
+    description: "Maximum sub-agent nesting depth (1-based levels). 1 keeps sub-agents available but disables nesting; capped at 100. Overrides model.maxSubagentDepth from settings. Defaults to 5."
+  },
+  "core-tools": {
+    type: "array",
+    description: "Core tool paths"
+  },
+  "exclude-tools": {
+    type: "array",
+    description: "Tools to exclude"
+  },
+  "disabled-slash-commands": {
+    type: "array",
+    description: "Slash command names to hide/disable (comma-separated or repeated). Merged with the `slashCommands.disabled` setting and QWEN_DISABLED_SLASH_COMMANDS. Matched case-insensitively against the final command name."
+  },
+  "auth-type": {
+    type: "string",
+    choices: AUTH_TYPE_CHOICES,
+    description: "Authentication type"
+  }
+};
+var TOP_LEVEL_HELP_OPTIONS = Object.freeze([
+  ...Object.entries(TOP_LEVEL_GLOBAL_OPTIONS),
+  ...Object.entries(DEFAULT_COMMAND_OPTIONS)
+]);
+
+export {
+  TOP_LEVEL_USAGE,
+  DEFAULT_COMMAND,
+  DEFAULT_COMMAND_DESC,
+  QUERY_POSITIONAL,
+  TOP_LEVEL_GLOBAL_OPTIONS,
+  TOP_LEVEL_DEPRECATED_OPTIONS,
+  DEFAULT_COMMAND_OPTIONS,
+  TOP_LEVEL_HELP_OPTIONS
+};
+/**
+ * @license
+ * Copyright 2026 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/chunks/{chunk-PKAYJDB3.js → chunk-WNPDGUJO.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   hasControlCharacter
-} from "./chunk-6IUNAPLR.js";
+} from "./chunk-K5KXUXWC.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -36,6 +36,11 @@ var FINDING_SOURCES = [
   "probe",
   "lint"
 ];
+var FINDING_DIRECTIONS = [
+  "certifies-falsely",
+  "fails-closed"
+];
+var FINDING_BASELINES = ["regression", "new-surface"];
 var REPORT_FINDINGS_LEVELS = ["low", "medium", "high"];
 var REPORT_FINDINGS_MAX = 50;
 var SHORT_SUMMARY_MAX = 60;
@@ -53,7 +58,7 @@ function compressFindingSummary(summary, max = SHORT_SUMMARY_MAX) {
   return `${cut.trimEnd()}\u2026`;
 }
 __name(compressFindingSummary, "compressFindingSummary");
-var DESCRIPTION = `Reports code-review findings as typed data so clients (the terminal UI, the Web Shell, ACP hosts) can render a per-finding list. Use it only when an active review flow (such as the bundled review skill) instructs you to report findings with it; otherwise present findings as ordinary text. Call it once per report with the complete list, most severe first \u2014 a later call replaces the whole list, it never appends. When the review wrote a findings artifact, copy each field verbatim from it (id, severity, confidence, source, file/line, summary, shortSummary, failureScenario, category); do not re-derive or re-word values \u2014 the artifact is the oracle.
+var DESCRIPTION = `Reports code-review findings as typed data so clients (the terminal UI, the Web Shell, ACP hosts) can render a per-finding list. Use it only when an active review flow (such as the bundled review skill) instructs you to report findings with it; otherwise present findings as ordinary text. Call it once per report with the complete list, most severe first \u2014 a later call replaces the whole list, it never appends. When the review wrote a findings artifact, copy each field verbatim from it (id, severity, confidence, source, file/line, summary, shortSummary, failureScenario, category, direction, baseline); do not re-derive or re-word values \u2014 the artifact is the oracle.
 
 After fixes are applied \u2014 at the review's own fix step, or ANY later time in the session a reported finding's disposition changes \u2014 call it again with the same findings, each carrying "outcome" ("fixed", "skipped", or "no_change_needed"; "outcomeNote" for the reason). Client per-finding status trusts only a call that carries outcomes, and a call where some findings carry an outcome and others do not is refused: account for every finding.
 
@@ -109,6 +114,16 @@ var FINDING_ITEM_SCHEMA = {
       maxLength: 64,
       description: 'Free-form kebab-case tag ("correctness", "security", "test-coverage", \u2026).'
     },
+    direction: {
+      type: "string",
+      enum: [...FINDING_DIRECTIONS],
+      description: 'Which way a Critical fails, from the artifact: "certifies-falsely" (a wrong result presented as correct) or "fails-closed" (refuses, wedges or degrades without a wrong result). Omit when the artifact carries none.'
+    },
+    baseline: {
+      type: "string",
+      enum: [...FINDING_BASELINES],
+      description: 'What a Critical is measured against, from the artifact: "regression" (the merge base handled the trigger correctly) or "new-surface" (the failing path does not exist at the merge base). Omit when the artifact carries none.'
+    },
     outcome: {
       type: "string",
       enum: [...FINDING_OUTCOMES],
@@ -172,6 +187,8 @@ function normalizeFinding(raw) {
     shortSummary: compressFindingSummary(shortSource),
     failureScenario: raw.failureScenario.trim(),
     ...raw.category?.trim() ? { category: raw.category.trim() } : {},
+    ...raw.direction ? { direction: raw.direction } : {},
+    ...raw.baseline ? { baseline: raw.baseline } : {},
     ...raw.outcome ? { outcome: raw.outcome } : {},
     ...raw.outcomeNote?.trim() ? { outcomeNote: raw.outcomeNote.trim() } : {}
   };
@@ -332,6 +349,8 @@ export {
   FINDING_CONFIDENCES,
   FINDING_OUTCOMES,
   FINDING_SOURCES,
+  FINDING_DIRECTIONS,
+  FINDING_BASELINES,
   REPORT_FINDINGS_LEVELS,
   REPORT_FINDINGS_MAX,
   SHORT_SUMMARY_MAX,

package/chunks/{chunk-IZIVM7LZ.js → chunk-WXEA74YB.js}

@@ -3,7 +3,7 @@
 import {
   getTasksDir,
   sanitizeName
-} from "./chunk-SFPGAQUL.js";
+} from "./chunk-42IDLQWS.js";
 import {
   require_proper_lockfile
 } from "./chunk-MLXTMF7H.js";

package/chunks/{chunk-YRLW2MSX.js → chunk-XBVNNDPK.js}

@@ -41,7 +41,9 @@ var MODALITY_PATTERNS = [
   [/^qwen3\.5-plus/, { image: true, video: true }],
   [/^qwen3\.6-plus/, { image: true, video: true }],
   [/^qwen3\.7-plus/, { image: true, video: true }],
-  // Qwen Max models (3.8+): image support
+  // Qwen 3.8 series: flash/plus support image + video; max supports image only
+  [/^qwen3\.8-flash/, { image: true, video: true }],
+  [/^qwen3\.8-plus/, { image: true, video: true }],
   [/^qwen3\.8-max/, { image: true }],
   [/^coder-model$/, { image: true, video: true }],
   // Qwen VL (vision-language) models: image + video
@@ -53,13 +55,18 @@ var MODALITY_PATTERNS = [
   [/^qwen3\.6-35b/, { image: true, video: true }],
   [/^qwen/, {}],
   // -------------------
-  // DeepSeek — text-only
+  // DeepSeek — text-only, except explicit vision variants
+  // (QwenLM/qwen-code#10270)
   // -------------------
+  [/^deepseek-.*vision/, { image: true }],
   [/^deepseek/, {}],
   // -------------------
-  // Zhipu GLM
+  // Zhipu GLM — v-suffix ids are vision models; others are text-only
+  // (QwenLM/qwen-code#10270)
   // -------------------
-  [/^glm-4\.5v/, { image: true }],
+  [/^glm-[0-9.]+v/, { image: true }],
+  // glm-5.3-flash natively integrates vision input (no v suffix)
+  [/^glm-5\.3-flash/, { image: true }],
   [/^glm-5(?:-|$)/, {}],
   [/^glm-/, {}],
   // -------------------

package/chunks/{chunk-HVQ3B7FF.js → chunk-Y5S7LBOZ.js}

@@ -1,12 +1,12 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  resolveChannelCwd
-} from "./chunk-7JPW6IYH.js";
 import {
   getPlugin,
   supportedTypes
-} from "./chunk-5XBFCMWD.js";
+} from "./chunk-3XKLXHGK.js";
+import {
+  resolveChannelCwd
+} from "./chunk-HVC3PNVC.js";
 import {
   APPROVAL_MODES
 } from "./chunk-V5J4J5TP.js";
@@ -57,6 +57,26 @@ function resolveOptionalStringField(channelName, rawConfig, field, envResolution
 }
 __name(resolveOptionalStringField, "resolveOptionalStringField");
 var KNOWN_CREDENTIAL_FIELDS = /* @__PURE__ */ new Set(["token", "clientId", "clientSecret"]);
+function multiSessionCompatibilityError(name, config) {
+  if (!config.multiSession) return void 0;
+  if (config.sessionScope !== "user") {
+    return `Channel "${name}" requires sessionScope "user" when multiSession is enabled.`;
+  }
+  if (typeof config.groupHistoryLimit === "number" && config.groupHistoryLimit !== 0) {
+    return `Channel "${name}" cannot use groupHistoryLimit when multiSession is enabled.`;
+  }
+  for (const [groupId, group] of Object.entries(config.groups ?? {})) {
+    const groupHistoryLimit = group !== null && typeof group === "object" && !Array.isArray(group) ? group["groupHistoryLimit"] : void 0;
+    if (typeof groupHistoryLimit === "number" && groupHistoryLimit !== 0) {
+      return `Channel "${name}" group "${groupId}" cannot use groupHistoryLimit when multiSession is enabled.`;
+    }
+  }
+  if (config.webhooks !== void 0 && config.webhooks !== null) {
+    return `Channel "${name}" cannot use webhooks when multiSession is enabled.`;
+  }
+  return void 0;
+}
+__name(multiSessionCompatibilityError, "multiSessionCompatibilityError");
 function resolveConfigEnvVar(value, mode) {
   if (mode === false) return value;
   if (value.startsWith("$$")) return value.substring(1);
@@ -359,6 +379,21 @@ async function parseChannelConfig(name, rawConfig, defaultCwd = process.cwd(), o
     envResolution
   );
   const configuredSessionScope = rawConfig["sessionScope"] || plugin.defaultSessionScope || "user";
+  const multiSession = optionalBooleanField(
+    name,
+    "multiSession",
+    rawConfig["multiSession"]
+  );
+  const groups = rawConfig["groups"] || {};
+  const webhooks = parseWebhookConfig(name, rawConfig);
+  const multiSessionError = multiSessionCompatibilityError(name, {
+    multiSession,
+    sessionScope: configuredSessionScope,
+    groupHistoryLimit: rawConfig["groupHistoryLimit"],
+    groups,
+    webhooks
+  });
+  if (multiSessionError) throw new Error(multiSessionError);
   return {
     ...resolvedRawConfig,
     type: channelType,
@@ -368,6 +403,7 @@ async function parseChannelConfig(name, rawConfig, defaultCwd = process.cwd(), o
     senderPolicy: rawConfig["senderPolicy"] || "allowlist",
     allowedUsers: rawConfig["allowedUsers"] || [],
     sessionScope: configuredSessionScope,
+    multiSession,
     cwd: resolveChannelCwd(rawConfig["cwd"], defaultCwd),
     approvalMode: parseApprovalModeConfig(name, rawConfig),
     instructions: rawConfig["instructions"],
@@ -380,14 +416,15 @@ async function parseChannelConfig(name, rawConfig, defaultCwd = process.cwd(), o
     model: rawConfig["model"],
     groupPolicy: rawConfig["groupPolicy"] || "disabled",
     dmPolicy: rawConfig["dmPolicy"] || "open",
-    groups: rawConfig["groups"] || {},
-    webhooks: parseWebhookConfig(name, rawConfig)
+    groups,
+    webhooks
   };
 }
 __name(parseChannelConfig, "parseChannelConfig");
 
 export {
   resolveEnvVars,
+  multiSessionCompatibilityError,
   parseChannelWebhookConfig,
   parseChannelWebhookConfigLenient,
   parseChannelConfig

package/chunks/{chunk-AGR5UROZ.js → chunk-YN44TEOZ.js}

@@ -2,16 +2,17 @@
 "use strict";
 import {
   t
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-CLWO3B77.js";
 import {
   computeThresholds,
+  estimateContextTextTokens,
   formatContextFileDisplayPath,
   getMainSessionBaseSystemPrompt
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ECE3UYVO.js";
 import {
   DiscoveredMCPTool,
   uiTelemetryService
-} from "./chunk-L2M46FP5.js";
+} from "./chunk-QYMAKPY5.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";
@@ -38,21 +39,6 @@ function currentTier(tokens, thresholds) {
   return "safe";
 }
 __name(currentTier, "currentTier");
-function estimateTokens(text) {
-  if (!text || text.length === 0) return 0;
-  let asciiChars = 0;
-  let nonAsciiChars = 0;
-  for (let i = 0; i < text.length; i++) {
-    const charCode = text.charCodeAt(i);
-    if (charCode < 128) {
-      asciiChars++;
-    } else {
-      nonAsciiChars++;
-    }
-  }
-  return Math.ceil(asciiChars / 4 + nonAsciiChars * 1.5);
-}
-__name(estimateTokens, "estimateTokens");
 function parseMemoryFiles(memoryContent, workingDir) {
   if (!memoryContent || memoryContent.trim().length === 0) return [];
   const results = [];
@@ -70,13 +56,13 @@ function parseMemoryFiles(memoryContent, workingDir) {
         path.resolve(workingDir, filePath),
         workingDir
       ),
-      tokens: estimateTokens(content)
+      tokens: estimateContextTextTokens(content)
     });
   }
   if (results.length === 0 && memoryContent.trim().length > 0) {
     results.push({
       path: t("memory"),
-      tokens: estimateTokens(memoryContent)
+      tokens: estimateContextTextTokens(memoryContent)
     });
   }
   return results;
@@ -86,17 +72,17 @@ async function collectContextData(config, showDetails) {
   const modelName = config.getModel() || "unknown";
   const contentGeneratorConfig = config.getContentGeneratorConfig();
   const contextWindowSize = contentGeneratorConfig.contextWindowSize ?? DEFAULT_TOKEN_LIMIT;
-  const geminiClient = config.getGeminiClient?.();
-  const activeChat = geminiClient?.isInitialized?.() ? geminiClient.getChat() : void 0;
+  const llmClient = config.getLlmClient?.();
+  const activeChat = llmClient?.isInitialized?.() ? llmClient.getChat() : void 0;
   const apiTotalTokens = activeChat ? activeChat.getLastPromptTokenCount() : uiTelemetryService.getLastPromptTokenCount();
   const apiCachedTokens = uiTelemetryService.getLastCachedContentTokenCount();
   const systemPromptText = getMainSessionBaseSystemPrompt(config);
-  const systemPromptTokens = estimateTokens(systemPromptText);
+  const systemPromptTokens = estimateContextTextTokens(systemPromptText);
   const toolRegistry = config.getToolRegistry();
   const allTools = toolRegistry ? toolRegistry.getAllTools() : [];
   const toolDeclarations = toolRegistry ? toolRegistry.getFunctionDeclarations() : [];
   const toolsJsonStr = JSON.stringify(toolDeclarations);
-  const allToolsTokens = estimateTokens(toolsJsonStr);
+  const allToolsTokens = estimateContextTextTokens(toolsJsonStr);
   const builtinTools = [];
   const mcpTools = [];
   for (const tool of allTools) {
@@ -104,7 +90,7 @@ async function collectContextData(config, showDetails) {
       continue;
     }
     const toolJsonStr = JSON.stringify(tool.schema);
-    const tokens = estimateTokens(toolJsonStr);
+    const tokens = estimateContextTextTokens(toolJsonStr);
     if (tool instanceof DiscoveredMCPTool) {
       mcpTools.push({
         name: `${tool.serverName}__${tool.serverToolName || tool.name}`,
@@ -123,19 +109,19 @@ async function collectContextData(config, showDetails) {
   if (autoMemoryPrompt) {
     memoryFiles.push({
       path: t("auto memory"),
-      tokens: estimateTokens(autoMemoryPrompt)
+      tokens: estimateContextTextTokens(autoMemoryPrompt)
     });
   }
   const memoryFilesTokens = memoryFiles.reduce((sum, f) => sum + f.tokens, 0);
   const skillTool = allTools.find((tool) => tool.name === ToolNames.SKILL);
-  const skillToolDefinitionTokens = skillTool ? estimateTokens(JSON.stringify(skillTool.schema)) : 0;
+  const skillToolDefinitionTokens = skillTool ? estimateContextTextTokens(JSON.stringify(skillTool.schema)) : 0;
   const loadedSkillNames = skillTool && "getLoadedSkillNames" in skillTool ? skillTool.getLoadedSkillNames() : /* @__PURE__ */ new Set();
   const skillManager = config.getSkillManager();
   const skillConfigs = skillManager ? await skillManager.listSkills() : [];
   const disabledSkillNames = config.getDisabledSkillNames();
   let loadedBodiesTokens = 0;
   const skills = skillConfigs.map((skill) => {
-    const listingTokens = estimateTokens(
+    const listingTokens = estimateContextTextTokens(
       `<skill>
 <name>
 ${skill.name}
@@ -152,7 +138,9 @@ ${skill.level}
     let bodyTokens;
     if (isLoaded && skill.body) {
       const baseDir = skill.filePath ? skill.filePath.replace(/\/[^/]+$/, "") : "";
-      bodyTokens = estimateTokens(buildSkillLlmContent(baseDir, skill.body));
+      bodyTokens = estimateContextTextTokens(
+        buildSkillLlmContent(baseDir, skill.body)
+      );
       loadedBodiesTokens += bodyTokens;
     }
     return {

package/chunks/{chunk-DZWPESIF.js → chunk-Z44FUM77.js}

@@ -3,7 +3,7 @@
 import {
   getUserSettingsPath,
   v1ToV2Migration
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-5SBVOOA2.js";
 import {
   getSystemDefaultsPath,
   getSystemSettingsPath
@@ -13,7 +13,7 @@ import {
   TrustLevel,
   getExplicitTrustLevel,
   getTrustedFoldersPath
-} from "./chunk-V4QXXQJ2.js";
+} from "./chunk-H4LCV44K.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -22,7 +22,7 @@ import {
 } from "./chunk-MR3PXB6E.js";
 import {
   ideContextStore
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ECE3UYVO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";