mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-05-05 15:31:27 +00:00
Merge origin/main into feat/skills-parallel-load-and-path-activation
Brings the branch up to date (36 commits behind). Two source-level conflicts in the skills area, both resolved by keeping additions from both sides — the new `argument-hint:` parsing from #3593 and this branch's `paths:` / `parsePathsField` work are independent features that touch the same parser entry points but do not interact: - packages/core/src/skills/skill-manager.test.ts: combined the two new branches in `mockParseYaml.mockImplementation` (one for `argument-hint:`, one for `paths:`) so both feature paths get exercised, and combined the two new `parseSkillContent` test blocks (argument-hint frontmatter + paths frontmatter variants). Other touched files (skill-manager.ts, skill-load.ts, skill-load.test.ts, types.ts) auto-merged cleanly: argumentHint extraction lives next to model/whenToUse, and the parsePathsField helper call is the last optional-field extraction before the SkillConfig is constructed. Validation after merge: - 210 skill-area tests pass (skill-manager + skill-activation + skill-load + tools/skill + coreToolScheduler). - typecheck clean. - lint clean.
This commit is contained in:
wenshao
commit
f6f3f3d5dd
262 changed files with 31219 additions and 1931 deletions
|
|
@ -330,6 +330,7 @@ You'll see a selector with arrow-key navigation:
|
|||
Select authentication method:
|
||||
|
||||
Alibaba Cloud Coding Plan - Paid · Up to 6,000 requests/5 hrs · All Alibaba Cloud Coding Plan Models
|
||||
API Key - Bring your own API key
|
||||
Qwen OAuth - Discontinued — switch to Coding Plan or API Key
|
||||
|
||||
(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)
|
||||
|
|
@ -340,9 +341,10 @@ Select authentication method:
|
|||
| Command | Description |
|
||||
| ---------------------------------------------------- | ------------------------------------------------- |
|
||||
| `qwen auth` | Interactive authentication setup |
|
||||
| `qwen auth qwen-oauth` | Authenticate with Qwen OAuth |
|
||||
| `qwen auth coding-plan` | Authenticate with Alibaba Cloud Coding Plan |
|
||||
| `qwen auth coding-plan --region china --key sk-sp-…` | Non-interactive Coding Plan setup (for scripting) |
|
||||
| `qwen auth api-key` | Authenticate with an API key |
|
||||
| `qwen auth qwen-oauth` | Authenticate with Qwen OAuth (discontinued) |
|
||||
| `qwen auth status` | Show current authentication status |
|
||||
|
||||
**Examples:**
|
||||
|
|
@ -357,6 +359,9 @@ qwen auth coding-plan
|
|||
# Set up Coding Plan non-interactively (useful for CI/scripting)
|
||||
qwen auth coding-plan --region china --key sk-sp-xxxxxxxxx
|
||||
|
||||
# Set up API key (ModelStudio Standard or custom provider)
|
||||
qwen auth api-key
|
||||
|
||||
# Check your current auth configuration
|
||||
qwen auth status
|
||||
```
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@ Settings are organized into categories. All settings should be placed within the
|
|||
| `ui.enableFollowupSuggestions` | boolean | Enable [followup suggestions](../features/followup-suggestions) that predict what you want to type next after the model responds. Suggestions appear as ghost text and can be accepted with Tab, Enter, or Right Arrow. | `true` |
|
||||
| `ui.enableCacheSharing` | boolean | Use cache-aware forked queries for suggestion generation. Reduces cost on providers that support prefix caching (experimental). | `true` |
|
||||
| `ui.enableSpeculation` | boolean | Speculatively execute accepted suggestions before submission. Results appear instantly when you accept (experimental). | `false` |
|
||||
| `experimental.emitToolUseSummaries` | boolean | Generate short LLM-based labels summarizing each tool-call batch. See [Tool-Use Summaries](../features/tool-use-summaries). Requires `fastModel` to be configured; silently skipped otherwise. Can be overridden per-session with `QWEN_CODE_EMIT_TOOL_USE_SUMMARIES=0` or `=1`. | `true` |
|
||||
|
||||
#### ide
|
||||
|
||||
|
|
@ -133,17 +134,17 @@ Settings are organized into categories. All settings should be placed within the
|
|||
|
||||
#### model
|
||||
|
||||
| Setting | Type | Description | Default |
|
||||
| -------------------------------------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
|
||||
| `model.name` | string | The Qwen model to use for conversations. | `undefined` |
|
||||
| `model.maxSessionTurns` | number | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited. | `-1` |
|
||||
| `model.generationConfig` | object | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, `enableCacheControl`, `contextWindowSize` (override model's context window size), `modalities` (override auto-detected input modalities), `customHeaders` (custom HTTP headers for API requests), and `extra_body` (additional body parameters for OpenAI-compatible API requests only), along with fine-tuning knobs under `samplingParams` (for example `temperature`, `top_p`, `max_tokens`). Leave unset to rely on provider defaults. | `undefined` |
|
||||
| `model.chatCompression.contextPercentageThreshold` | number | Sets the threshold for chat history compression as a percentage of the model's total token limit. This is a value between 0 and 1 that applies to both automatic compression and the manual `/compress` command. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit. Use `0` to disable compression entirely. | `0.7` |
|
||||
| `model.skipNextSpeakerCheck` | boolean | Skip the next speaker check. | `false` |
|
||||
| `model.skipLoopDetection` | boolean | Disables loop detection checks. Loop detection prevents infinite loops in AI responses but can generate false positives that interrupt legitimate workflows. Enable this option if you experience frequent false positive loop detection interruptions. | `false` |
|
||||
| `model.skipStartupContext` | boolean | Skips sending the startup workspace context (environment summary and acknowledgement) at the beginning of each session. Enable this if you prefer to provide context manually or want to save tokens on startup. | `false` |
|
||||
| `model.enableOpenAILogging` | boolean | Enables logging of OpenAI API calls for debugging and analysis. When enabled, API requests and responses are logged to JSON files. | `false` |
|
||||
| `model.openAILoggingDir` | string | Custom directory path for OpenAI API logs. If not specified, defaults to `logs/openai` in the current working directory. Supports absolute paths, relative paths (resolved from current working directory), and `~` expansion (home directory). | `undefined` |
|
||||
| Setting | Type | Description | Default |
|
||||
| -------------------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
|
||||
| `model.name` | string | The Qwen model to use for conversations. | `undefined` |
|
||||
| `model.maxSessionTurns` | number | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited. | `-1` |
|
||||
| `model.generationConfig` | object | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, `enableCacheControl`, `splitToolMedia` (set `true` for strict OpenAI-compatible servers like LM Studio that reject non-text content on `role: "tool"` messages — splits media into a follow-up user message), `contextWindowSize` (override model's context window size), `modalities` (override auto-detected input modalities), `customHeaders` (custom HTTP headers for API requests), and `extra_body` (additional body parameters for OpenAI-compatible API requests only), along with fine-tuning knobs under `samplingParams` (for example `temperature`, `top_p`, `max_tokens`). Leave unset to rely on provider defaults. | `undefined` |
|
||||
| `model.chatCompression.contextPercentageThreshold` | number | Sets the threshold for chat history compression as a percentage of the model's total token limit. This is a value between 0 and 1 that applies to both automatic compression and the manual `/compress` command. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit. Use `0` to disable compression entirely. | `0.7` |
|
||||
| `model.skipNextSpeakerCheck` | boolean | Skip the next speaker check. | `false` |
|
||||
| `model.skipLoopDetection` | boolean | Disables loop detection checks. Loop detection prevents infinite loops in AI responses but can generate false positives that interrupt legitimate workflows. Enable this option if you experience frequent false positive loop detection interruptions. | `false` |
|
||||
| `model.skipStartupContext` | boolean | Skips sending the startup workspace context (environment summary and acknowledgement) at the beginning of each session. Enable this if you prefer to provide context manually or want to save tokens on startup. | `false` |
|
||||
| `model.enableOpenAILogging` | boolean | Enables logging of OpenAI API calls for debugging and analysis. When enabled, API requests and responses are logged to JSON files. | `false` |
|
||||
| `model.openAILoggingDir` | string | Custom directory path for OpenAI API logs. If not specified, defaults to `logs/openai` in the current working directory. Supports absolute paths, relative paths (resolved from current working directory), and `~` expansion (home directory). | `undefined` |
|
||||
|
||||
**Example model.generationConfig:**
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ export default {
|
|||
commands: 'Commands',
|
||||
'code-review': 'Code Review',
|
||||
'followup-suggestions': 'Followup Suggestions',
|
||||
'tool-use-summaries': 'Tool-Use Summaries',
|
||||
'sub-agents': 'SubAgents',
|
||||
arena: 'Agent Arena',
|
||||
skills: 'Skills',
|
||||
|
|
|
|||
|
|
@ -240,9 +240,10 @@ In addition to the in-session `/auth` slash command, Qwen Code provides standalo
|
|||
| Command | Description |
|
||||
| ---------------------------------------------------- | ------------------------------------------------------------- |
|
||||
| `qwen auth` | Interactive authentication setup |
|
||||
| `qwen auth qwen-oauth` | ~~Authenticate with Qwen OAuth~~ (discontinued on 2026-04-15) |
|
||||
| `qwen auth coding-plan` | Authenticate with Alibaba Cloud Coding Plan |
|
||||
| `qwen auth coding-plan --region china --key sk-sp-…` | Non-interactive Coding Plan setup (for scripting) |
|
||||
| `qwen auth api-key` | Authenticate with an API key |
|
||||
| `qwen auth qwen-oauth` | ~~Authenticate with Qwen OAuth~~ (discontinued on 2026-04-15) |
|
||||
| `qwen auth status` | Show current authentication status |
|
||||
|
||||
> [!tip]
|
||||
|
|
|
|||
178
docs/users/features/tool-use-summaries.md
Normal file
178
docs/users/features/tool-use-summaries.md
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
# Tool-Use Summaries
|
||||
|
||||
Qwen Code can generate a short, git-commit-subject-style label after each tool batch completes, summarizing what the batch accomplished. The label appears inline in the transcript and replaces the generic `Tool × N` header in compact mode.
|
||||
|
||||
This is a UX aid for parallel tool calls: when the model fans out into several `Read` + `Grep` + `Bash` calls at once, the summary tells you the intent at a glance instead of forcing you to scan the tool list.
|
||||
|
||||
The feature is enabled by default and runs silently in the background. It requires a configured [fast model](./followup-suggestions#fast-model).
|
||||
|
||||
## What You See
|
||||
|
||||
### Full mode (default)
|
||||
|
||||
The summary appears as a dim badge line directly below the tool group:
|
||||
|
||||
```
|
||||
╭──────────────────────────────────────────────╮
|
||||
│ ✓ ReadFile a.txt │
|
||||
│ ✓ ReadFile b.txt │
|
||||
│ ✓ ReadFile c.txt │
|
||||
│ ✓ ReadFile d.txt │
|
||||
╰──────────────────────────────────────────────╯
|
||||
|
||||
● Read 4 text files
|
||||
```
|
||||
|
||||
### Compact mode (`Ctrl+O` or `ui.compactMode: true`)
|
||||
|
||||
The label replaces the generic `Tool × N` header in the compact one-liner:
|
||||
|
||||
```
|
||||
╭──────────────────────────────────────────────╮
|
||||
│✓ Read txt files · 4 tools │
|
||||
│Press Ctrl+O to show full tool output │
|
||||
╰──────────────────────────────────────────────╯
|
||||
```
|
||||
|
||||
The individual tool calls are still a keystroke away (`Ctrl+O` to toggle to full mode).
|
||||
|
||||
## How It Works
|
||||
|
||||
After a tool batch finalizes, Qwen Code fires a fire-and-forget call to the configured fast model with:
|
||||
|
||||
- The tool names, truncated arguments, and truncated results (each capped at 300 characters).
|
||||
- The assistant's most recent text output (first 200 characters) as an intent prefix.
|
||||
- A system prompt instructing the model to return a past-tense, 30-character label in git-commit-subject style.
|
||||
|
||||
The call runs in parallel with the next turn's API streaming, so its ~1s latency is hidden behind the main model's response. When the label resolves, it is appended to the transcript as a `tool_use_summary` entry.
|
||||
|
||||
Example labels: `Searched in auth/`, `Fixed NPE in UserService`, `Created signup endpoint`, `Read config.json`, `Ran failing tests`.
|
||||
|
||||
## When It Appears
|
||||
|
||||
The summary is generated when **all** of the following are true:
|
||||
|
||||
- `experimental.emitToolUseSummaries` is `true` (default).
|
||||
- A `fastModel` is configured (via settings or `/model --fast`).
|
||||
- At least one tool completed in the batch.
|
||||
- The turn was not aborted before tool completion.
|
||||
- The fast model returned a non-empty, non-error response.
|
||||
|
||||
Subagent tool calls do not trigger summary generation — only the main session's tool batches do.
|
||||
|
||||
## When It Doesn't Appear
|
||||
|
||||
The summary is silently skipped (no error, no UI change) when:
|
||||
|
||||
- No fast model is configured.
|
||||
- The fast model call fails, times out, or returns empty.
|
||||
- The model returned an obvious error-message-like string (e.g., `Error: ...`, `I cannot ...`) — filtered out by the client so the UI does not show misleading labels.
|
||||
- The turn was aborted (`Ctrl+C`) before the model finished.
|
||||
|
||||
In all these cases, the tool group renders as it always has.
|
||||
|
||||
## Fast Model
|
||||
|
||||
The label is generated using the [fast model](./followup-suggestions#fast-model) — the same model you configure for prompt suggestions and speculative execution. Configure it via:
|
||||
|
||||
### Via command
|
||||
|
||||
```
|
||||
/model --fast qwen3-coder-flash
|
||||
```
|
||||
|
||||
### Via `settings.json`
|
||||
|
||||
```json
|
||||
{
|
||||
"fastModel": "qwen3-coder-flash"
|
||||
}
|
||||
```
|
||||
|
||||
When no fast model is configured, summary generation is skipped entirely — the feature has no effect until you set one up.
|
||||
|
||||
## Configuration
|
||||
|
||||
These settings can be configured in `settings.json`:
|
||||
|
||||
| Setting | Type | Default | Description |
|
||||
| ----------------------------------- | ------- | ------- | -------------------------------------------------------------------------------------------------- |
|
||||
| `experimental.emitToolUseSummaries` | boolean | `true` | Master switch for summary generation. Turn off to disable the extra fast-model call. |
|
||||
| `fastModel` | string | `""` | Fast model used for summary generation (shared with prompt suggestions). Required; no-op if empty. |
|
||||
|
||||
### Environment override
|
||||
|
||||
`QWEN_CODE_EMIT_TOOL_USE_SUMMARIES` overrides the `experimental.emitToolUseSummaries` setting for the current session:
|
||||
|
||||
- `QWEN_CODE_EMIT_TOOL_USE_SUMMARIES=0` or `=false` — force off.
|
||||
- `QWEN_CODE_EMIT_TOOL_USE_SUMMARIES=1` or `=true` — force on.
|
||||
- Unset — use the `experimental.emitToolUseSummaries` setting.
|
||||
|
||||
### Example
|
||||
|
||||
```json
|
||||
{
|
||||
"fastModel": "qwen3-coder-flash",
|
||||
"experimental": {
|
||||
"emitToolUseSummaries": true
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Scope & lifecycle
|
||||
|
||||
Three points that tend to trip up a first read of this feature:
|
||||
|
||||
1. **One generation per batch, shared by both display modes.** The fast-model call happens exactly once in `handleCompletedTools` when a tool batch finalizes. Toggling `Ctrl+O` afterwards does **not** trigger a new call — both modes read from the same `tool_use_summary` history entry that was captured the first time. You can flip compact mode on and off freely without extra cost.
|
||||
2. **No backfill on toggle or on session resume.** A `tool_group` that completed before the feature was enabled (or before you flipped the setting on, or in a resumed session — `ChatRecordingService` does not persist summary entries) will never get a label. There is no "sweep existing history" pass. If you turn this setting on mid-session, only _future_ batches will show a label; older groups keep the default rendering with no indicator that a label is missing.
|
||||
3. **Main-agent batches only.** The trigger lives in the main session's turn loop (`useGeminiStream`), so:
|
||||
- ✅ Shell, MCP, file operations, and the `Task` / subagent tool _call itself_ (as it appears in the main batch) are summarized.
|
||||
- ❌ A subagent's **internal** tool batches (run through `packages/core/src/agents/runtime/`) are not summarized.
|
||||
|
||||
An outer batch that _contains_ a `Task` tool will still be labeled, but the fast model sees only the subagent tool call and its aggregated output — not the individual tool calls inside the subagent. Expect labels like `Ran research-agent` or `Delegated file search` rather than `Searched 14 files`. This is intentional — summarizing subagent internals would multiply the fast-model cost and surface noise that never shows up in the primary UI.
|
||||
|
||||
## Recommended pairing: enable compact mode
|
||||
|
||||
For batches of 3+ parallel tool calls, pairing this feature with `ui.compactMode: true` produces the cleanest transcript. The compact view folds the whole batch into a single labeled row (`✓ Read txt files · 4 tools`) instead of showing every tool line plus the trailing summary. Details remain one keystroke away via `Ctrl+O`.
|
||||
|
||||
```json
|
||||
{
|
||||
"fastModel": "qwen3-coder-flash",
|
||||
"ui": {
|
||||
"compactMode": true
|
||||
},
|
||||
"experimental": {
|
||||
"emitToolUseSummaries": true
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
In full mode (the default), the summary renders as a trailing `● <label>` line below the tool group — useful for large or heterogeneous batches, but for small same-type batches (e.g. `Read × 3`) the label can read as a restatement of the visible tool lines. If that matches your usual workflow, either turn compact mode on as above, or turn the summary off entirely via `experimental.emitToolUseSummaries: false`.
|
||||
|
||||
## Monitoring
|
||||
|
||||
Summary model usage appears in `/stats` output under the fast-model token totals, with the `prompt_id` `tool_use_summary_generation` so it can be distinguished from prompt suggestions and other background tasks.
|
||||
|
||||
## Data flow & privacy
|
||||
|
||||
The summary call sends each successful tool's name, truncated `args`, and truncated result (each field capped at 300 characters) to the **fast model**, plus the first 200 characters of the assistant's most recent text as an intent prefix.
|
||||
|
||||
If your fast model is configured for the same provider/auth as your main session model, the data flows along the same boundary your main session already uses — no change in trust scope. If you have configured a fast model from a **different provider**, tool inputs and outputs (potentially including file contents read by `read_file`, command output from shell calls, or values surfaced through MCP tools) will be sent to that other provider as part of the summarization prompt. That is a strictly larger data-sharing scope than the main session alone.
|
||||
|
||||
If this matters for your workflow, you have two clean options:
|
||||
|
||||
- Configure `fastModel` to a model under the same provider as your main session, so the summary call doesn't cross any new auth/data boundary.
|
||||
- Disable the feature entirely with `experimental.emitToolUseSummaries: false` (or `QWEN_CODE_EMIT_TOOL_USE_SUMMARIES=0`).
|
||||
|
||||
The 300-character per-field cap limits exposure but does not eliminate it — secrets discovered in tool output during the cap window can still be sent. Treat the fast model's data boundary the same way you treat the main model's.
|
||||
|
||||
## Cost
|
||||
|
||||
One fast-model call per qualifying tool batch. Input is a small fixed system prompt plus the truncated tool inputs/outputs (each capped at 300 characters per field). Output is a single short line (capped at 100 characters, typically 20 tokens or fewer). On a typical fast model this is roughly $0.001 per batch.
|
||||
|
||||
If you do not want the extra cost, turn the feature off via `experimental.emitToolUseSummaries: false` or `QWEN_CODE_EMIT_TOOL_USE_SUMMARIES=0`.
|
||||
|
||||
## Related
|
||||
|
||||
- [Compact Mode](../configuration/settings#ui.compactMode) — toggle with `Ctrl+O`; the summary replaces the generic tool-group header when compact mode is on.
|
||||
- [Followup Suggestions](./followup-suggestions) — another fast-model-driven UX enhancement that shares the same `fastModel` setting.
|
||||
|
|
@ -223,6 +223,7 @@ Here are the most important commands for daily use:
|
|||
| `qwen` | start Qwen Code | `qwen` |
|
||||
| `/auth` | Change authentication method (in session) | `/auth` |
|
||||
| `qwen auth` | Configure authentication from the terminal | `qwen auth` |
|
||||
| `qwen auth api-key` | Configure API key authentication | `qwen auth api-key` |
|
||||
| `qwen auth status` | Check current authentication status | `qwen auth status` |
|
||||
| `/help` | Display help information for available commands | `/help` or `/?` |
|
||||
| `/compress` | Replace chat history with summary to save Tokens | `/compress` |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue