* feat(cli, webui): add follow-up suggestions feature
Implement context-aware follow-up suggestions that appear after task
completion, suggesting relevant next actions like "commit this", "run
tests", etc.
- Add `followup/` module with types, generator, and rule-based provider
- Export follow-up types and functions from core index
- 8 default suggestion rules covering common workflows
- Add `useFollowupSuggestionsCLI` hook for Ink/React
- Integrate suggestion generation in AppContainer when streaming completes
- Add Tab key to accept, arrow keys to cycle through suggestions
- Display suggestions as ghost text in input prompt
- Add `useFollowupSuggestions` hook for React
- Update InputForm to display suggestions as placeholder
- Add CSS styling for suggestion appearance with counter
- Add keyboard handlers (Tab, arrow keys)
- After streaming completes with tool calls, suggestions appear
- Tab accepts the current suggestion
- Left/Right arrows cycle through multiple suggestions
- Typing or pasting dismisses the suggestion
- Shell command rules (tests, git, npm install) don't work yet due to
history not storing tool arguments
- VSCode extension integration pending
- Web UI needs parent app integration for suggestion generation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: resolve merge conflicts and build errors
- Rebased on upstream main (5d02260c8)
- Fixed JSX structure in InputPrompt.tsx
- Changed `return;` to `return true;` in follow-up handlers
- Added @agentclientprotocol/sdk to core package dependencies
- Restored correct BaseTextInput usage (self-closing, no children)
- Follow-up suggestions now shown via placeholder prop only
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: remove @agentclientprotocol/sdk from core package.json
The types are imported in fileSystemService.ts but the package
should not be a runtime dependency of core. It's provided by
the CLI package which depends on core. This was causing
package-lock.json sync issues on Node.js 24.x CI.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* fix: restore alphabetical order of dependencies in core/package.json
* fix: restore package-lock.json from upstream to fix Node 24.x CI
* fix: resolve acpConnection test failure and ESLint warning
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* style: apply prettier formatting after merge
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* fix(followup): address review issues in follow-up suggestions
- Export followupState.ts from core index (was dead code)
- Refactor CLI and WebUI hooks to use shared followupReducers (eliminate duplication)
- Move side effects out of setState updaters via queueMicrotask
- Fix AppContainer useEffect dependency on unstable historyManager.history reference
- Reorder matchesRule to check pattern before condition (cheaper first)
- Make RuleBasedProvider collect from all matching rules with dedup and limit
- Add missing resetGenerator export for testing
- Add explicit implements SuggestionProvider to RuleBasedProvider
- Fix unstable followup object in useEffect dependency arrays
- Merge duplicate imports to fix eslint import/no-duplicates warnings
- Standardize copyright year to 2025
- Add test files for followupState, ruleBasedProvider, suggestionGenerator
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address review feedback from PR #2525
- Fix acceptingRef race: set lock synchronously before queueMicrotask
- Derive hasError/wasCancelled from actual tool call statuses
- Incorporate rule priority into suggestion priority calculation
- Clear suggestions immediately when setSuggestions([]) is called
- Add !completion.showSuggestions guard to Tab handler
- Fix onAcceptFollowup type from (string) => void to () => void
- Fix ToolCallInfo.name doc examples to match display names
- Scope CSS counter ::after to data-has-suggestion + empty conditions
- Reset regex lastIndex before test() for g/y flag safety
- Stabilize hook return with useMemo + onAcceptRef pattern
- Add @qwen-code/qwen-code-core as webui external + peerDependency
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address second round of review feedback
- Scope CSS max-width to match counter condition (not count=1)
- Only dismiss followup on printable character input, not navigation keys
- Restrict tool_group scan to most recent contiguous block (current turn)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): clear suggestions on new turn, add search guards
- Clear followupSuggestions when streaming starts (Idle → Responding)
to prevent stale suggestions from previous turns
- Add !reverseSearchActive && !commandSearchActive guards to Tab handler
to avoid keybinding conflicts with search modes
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address third round of review feedback
- Fix string pattern asymmetry: only match tool names when matchMessage=false
- Collect tool_groups from last user message boundary, not contiguous tail
- Flatten to individual tool calls before slicing to cap at 10 actual calls
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): fix arrow cycling guard and align rule conditions with patterns
- Remove unreliable textContent check for arrow cycling in WebUI InputForm;
rely on inputText state which already accounts for zero-width spaces
- Add 'error' to fix/bug rule condition to match its regex pattern
- Add 'clean up' to refactor rule condition to match its regex pattern
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): reset acceptingRef in clear() to prevent deadlock
If clear() is called during accept debounce window, acceptingRef
could remain stuck true permanently. Now reset in clear().
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): cancel pending timeout in dismiss() and accept()
Prevents stale suggestion timeout from re-showing suggestions
after user dismisses or accepts during the 300ms delay window.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): reset lastIndex in removeRules() for g/y flag safety
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(vscode-ide-companion): mark @qwen-code/qwen-code-core as external in webview esbuild
The webui package now declares @qwen-code/qwen-code-core as external in its
vite build config. Without this change, the vscode-ide-companion webview
esbuild (platform: 'browser') would try to bundle core's Node.js-only
dependencies (undici, @grpc/grpc-js, fs, stream, etc.), causing 562 build
errors during `npm ci`.
* fix: restore node_modules/@google/gemini-cli-test-utils workspace link in lockfile
The top-level workspace symlink entry was accidentally removed by a local
npm install in commit 004baaeb, which replaced it with a nested
packages/cli/node_modules/ entry. npm ci requires the top-level link entry
to be present in the lockfile, otherwise it fails with:
"Missing: @google/gemini-cli-test-utils@0.13.0 from lock file"
Also syncs @qwen-code/qwen-code-core peerDependency into the lockfile
to match the updated packages/webui/package.json.
* refactor(followup): extract controller and improve rule matching
- Extract createFollowupController for unified state management across CLI and WebUI
- Refactor rule-based provider to match via assistant message keywords instead of tool arguments
- Add enableFollowupSuggestions user setting in UI category
- Decouple WebUI from @qwen-code/qwen-code-core by copying browser-safe state logic
- Add followupHistory.ts for extracting suggestion context from CLI history
- Add comprehensive tests for controller and rule matching scenarios
- Use --app-primary CSS variable for consistency
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* refactor(webui): import followup state from core package
- Remove followupState.ts from webui (moved to core)
- Import FollowupSuggestion, FollowupState types from core
- Add @qwen-code/qwen-code-core as peerDependency
- Add core to vite external list
- Update test to include id field in HistoryItem
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* refactor(followup): simplify generator, revert unrelated changes
- Collapse FollowupSuggestionsGenerator class into a single
generateFollowupSuggestions() function (152 → 26 lines)
- Inline extractSuggestionContext into followupHistory.ts
- Remove unused RuleBasedProvider.addRule/removeRules methods
- Revert unrelated acpConnection.test.ts refactor
- Fix followupHistory.test.ts HistoryItem missing id field
- Reduce test verbosity (162 → 36 lines for generator tests)
* fix(followup): fix accept() deadlock and restore UMD globals mapping
- Wrap queueMicrotask callback in try/catch/finally to prevent accepting
lock from being permanently held when onAccept throws
- Restore '@qwen-code/qwen-code-core': 'QwenCodeCore' in webui
vite.config.ts globals (regression from d0f38a5f)
- Add test case verifying accept() recovers after callback exception
* fix(followup): log accept callback errors instead of swallowing them
Replace empty catch {} with console.error to ensure onAccept errors
remain visible for debugging while still preventing deadlock via finally.
Update test to verify error is logged.
* refactor(webui): move followup hook to separate subpath entry
Move useFollowupSuggestions from the root entry to a dedicated
'@qwen-code/webui/followup' subpath so that consumers who only need
UI components are not forced to install @qwen-code/qwen-code-core.
- Add src/followup.ts as separate Vite lib entry
- Remove followup exports from src/index.ts
- Add ./followup exports map in package.json
- Mark @qwen-code/qwen-code-core as optional peerDependency
- Switch build from single-entry UMD to multi-entry ESM/CJS
* fix(webui): restore UMD build and isolate core from root type boundary
- Restore UMD output for root entry (used by CDN demos, export-html, etc.)
- Build followup subpath via separate vite.config.followup.ts to avoid
Vite's multi-entry + UMD limitation
- Replace FollowupState import in InputForm.tsx with a local structural
type (InputFormFollowupState) so root .d.ts no longer references
@qwen-code/qwen-code-core
- Root entry (JS + UMD + .d.ts) is now fully free of core dependency;
core is only required by '@qwen-code/webui/followup' subpath
* refactor(followup): replace rule-based suggestions with LLM-based prompt suggestion
Replace the hardcoded rule-based follow-up suggestion engine with an LLM-based
prompt suggestion system, aligned with Claude Code's NES (Next-step Suggestion)
architecture.
Core changes:
- Replace ruleBasedProvider with generatePromptSuggestion using BaseLlmClient.generateJson()
- Port Claude Code's SUGGESTION_PROMPT and 14 filter rules (shouldFilterSuggestion)
- Simplify state from multi-suggestion array to single string (FollowupState)
- Add framework-agnostic controller with Object.freeze'd initial state
Guard conditions (9 checks):
- Settings toggle, non-interactive/SDK mode, plan mode
- Permission/confirmation/loop-detection dialogs, elicitation requests
- API error response detection, conversation history limit (slice -40)
UI interaction (CLI + WebUI):
- Tab: fill suggestion into input
- Enter: accept and submit
- Right Arrow: fill without submitting
- Typing/paste: dismiss suggestion
- Autocomplete conflict prevention
Telemetry (PromptSuggestionEvent):
- outcome (accepted/ignored/suppressed), accept_method (tab/enter/right)
- time_to_accept_ms, time_to_ignore_ms, time_to_first_keystroke_ms
- suggestion_length, similarity, was_focused_when_shown, prompt_id
- Per-rule suppression logging with reason strings
Deleted files:
- ruleBasedProvider.ts/test, followupHistory.ts/test, types.ts (dead FollowupSuggestion type)
13 rounds of adversarial audit, 17 issues found and fixed.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address qwen3.6-plus-preview review findings
P0: Fix API error detection — check pendingGeminiHistoryItems for error
items (API errors go to pending items, not historyManager.history).
P1: Don't log abort as 'error' in telemetry — aborts are normal user
behavior (user started typing), not errors.
P3: Early return in dismiss() when state already cleared, avoiding
redundant applyState call after accept().
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(settings): update suggestion feature description to match current behavior
Remove outdated "arrow keys to cycle" text — the feature now uses
Tab/Right Arrow to accept and Enter to accept+submit (no cycling).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): fix WebUI Enter submitting empty text + defend onOutcome
P0/P1: WebUI Enter handler now passes suggestion text explicitly via
onSubmit(e, followupSuggestion) instead of relying on React setState
(which is async and would leave inputText as "" in the closure).
P3: Wrap onOutcome callbacks in try/catch in both accept() and dismiss()
so telemetry errors cannot block state transitions.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): allow setSuggestion(null) when disabled + fix dts clobber
- setSuggestion(null) now always clears state/timers even when disabled,
preventing stale suggestions from lingering after feature toggle.
- Set insertTypesEntry: false in followup vite config to prevent
overwriting the main build's index.d.ts.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(webui): thread explicitText through submit chain for Enter accept
handleSubmit and handleSubmitWithScroll now accept an optional
explicitText parameter. When provided (e.g., from prompt suggestion
Enter accept), it is used instead of the closure-captured inputText,
fixing the React setState race where onSubmit reads stale empty text.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address Copilot review — 4 fixes
- Enter accept: use buffer.text.length === 0 instead of !trim() to
prevent whitespace-only input from triggering suggestion accept
- Move ref tracking from render body to useEffect to avoid
render-time side effects in StrictMode/concurrent rendering
- Align PromptSuggestionEvent event.name to 'qwen-code.prompt_suggestion'
matching the EVENT_PROMPT_SUGGESTION constant used by the logger
- Fix onOutcome JSDoc: remove mention of 'suppressed' (handled separately)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address Copilot review — curated history, type compat, peer version
- Use curated history (getChat().getHistory(true)) to avoid invalid
entries causing API 400 errors in suggestion generation
- Use method signature for onSubmit in InputFormProps to maintain
bivariant compatibility with existing consumers under strictFunctionTypes
- Tighten @qwen-code/qwen-code-core peer dependency to >=0.13.1
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): add prompt cache sharing + speculation engine
Phase 1 — Forked Query (cache sharing):
- CacheSafeParams: snapshot of generationConfig (systemInstruction + tools)
+ curated history + model + version, saved after each successful main turn
- createForkedChat: isolated GeminiChat sharing the same cache prefix for
DashScope cache_control hit
- runForkedQuery: single-turn request via forked chat with JSON schema support
- suggestionGenerator: uses forked query when CacheSafeParams available,
falls back to BaseLlmClient.generateJson otherwise
- GeminiChat.getGenerationConfig(): new getter for cache param snapshots
- Feature flag: enableCacheSharing (default: false)
Phase 2 — Speculation (predictive execution):
- OverlayFs: copy-on-write filesystem for speculation file isolation
(/tmp/qwen-speculation/{pid}/{id}/), handles new files + existing files
- speculationToolGate: tool boundary enforcement using AST-based shell
checker (not deprecated regex), write tools gated by ApprovalMode
(only auto-edit/yolo allow overlay writes)
- speculation.ts: startSpeculation (on suggestion display), acceptSpeculation
(on Tab/Enter — copies overlay to real FS, injects history via addHistory),
abortSpeculation (on user input/new turn — cleanup overlay)
- Custom execution loop: toolRegistry.getTool → tool.build → invocation.execute
(bypasses CoreToolScheduler — permission handled by toolGate)
- ensureToolResultPairing: strips unpaired functionCalls at boundary
- Boundary-aware tool result preservation: keeps executed tool results
even when boundary truncates remaining calls
- Feature flag: enableSpeculation (default: false)
Telemetry:
- SpeculationEvent: outcome, turns_used, files_written, tool_use_count,
duration_ms, boundary_type, had_pipelined_suggestion
- logSpeculation logger function
Security:
- Write tools only allowed in auto-edit/yolo mode during speculation
- Shell commands gated by isShellCommandReadOnlyAST (AST parser)
- Unknown/MCP tools always hit boundary (safe default)
- All structuredClone for cache param isolation
4 rounds of adversarial audit, 20+ issues found and fixed.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): address Copilot review — curated history, type compat, peer version
- Move web_fetch/web_search from SAFE_READ_ONLY to BOUNDARY tools
(they require user confirmation for network requests)
- Add overlay read path resolution for read tools (resolveReadPaths)
so speculative reads see overlay-written files
- Wire enableCacheSharing setting into generatePromptSuggestion
- Fix esbuild comment to not hardcode webui version
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(speculation): use index-based tracking for boundary tool pairing
Track executed function calls by order (first N matching
functionResponses.length) instead of by name. Fixes incorrect
pairing when model emits multiple calls with the same tool name.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(speculation): handle undefined functionCall.name + wrap rewritePathArgs
- Skip functionCall parts with missing name instead of non-null assertion
- Wrap rewritePathArgs in try/catch — treat path rewrite failure as boundary
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): pipelined suggestion, UI rendering, dismiss abort
- Pipelined suggestion: after speculation completes, generate next
suggestion using augmented context. Promoted on accept.
- UI rendering: completed speculation results rendered via historyManager.
- Dismiss abort: typing/pasting calls dismissPromptSuggestion → clears
promptSuggestion → useEffect aborts running speculation immediately.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): clear cache on reset, truncate history, fix test + comment
- Clear CacheSafeParams on startChat/resetChat to prevent cross-session leakage
- Truncate history to 40 entries before deep clone in saveCacheSafeParams
to reduce CPU/memory overhead on long sessions
- Update stale comment about speculation dismiss lifecycle
- Add onAccept assertion to accept test with proper microtask flush
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(design): add prompt suggestion design documentation
- prompt-suggestion-design.md: architecture, generation, filtering, state
management, keyboard interaction, telemetry, feature flags
- speculation-design.md: copy-on-write overlay, tool gate security, boundary
handling, pipelined suggestion, forked query cache sharing
- prompt-suggestion-implementation.md: implementation status, test coverage,
audit history, Claude Code alignment tracking
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(overlay): align catch comment with silent behavior
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): wire augmented context into pipelined suggestion + guard Tab/Right
- Pipelined suggestion now includes the accepted suggestion text and
speculated model response as context for the next prediction
- Tab/ArrowRight handlers only preventDefault when onAcceptFollowup
is provided, preventing key interception without a wired callback
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(speculation): filter thought parts + add filePath to path keys
- Skip thought/reasoning parts from model responses to prevent leaking
internal reasoning into speculated history
- Add 'filePath' to path rewrite key list for LSP and other tools that
use camelCase argument names
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(overlay): resolve relative paths against realCwd not process.cwd
Relative tool paths are now resolved against the overlay's realCwd
before computing the relative path, preventing incorrect outside-cwd
detection when process.cwd() differs from config.getCwd().
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(design): fix 4 doc-code inconsistencies
- Guard conditions: clarify 13 code checks vs 11 table categories,
separate feature flags from guard block, add streaming transition
- Filter rules: 14 → 12 (actual count in code and table)
- BOUNDARY_TOOLS: add todo_write + exit_plan_mode to doc table
- SpeculationEvent: 8 → 7 fields (matching code)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): turns_used metric + reuse SUGGESTION_PROMPT + reduce clones
- turns_used: count only model messages (not all Content entries)
to accurately reflect LLM round-trips instead of inflated 3x count
- Pipelined suggestion: reuse exported SUGGESTION_PROMPT from
suggestionGenerator instead of a degraded local copy, ensuring
consistent quality (EXAMPLES, NEVER SUGGEST rules included)
- createForkedChat: replace redundant structuredClone with shallow
copies since params are already deep-cloned snapshots
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): speculation UI tool rendering + speculationModel setting
- Speculation UI: render tool calls as tool_group HistoryItems with
structured name/description/result instead of plain text only
- speculationModel setting: allows using a cheaper/faster model for
speculation and pipelined suggestion. Leave empty to use main model.
Passed through startSpeculation → runSpeculativeLoop → pipelined.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(design): sync docs with latest code changes
- Add speculationModel setting to feature flags table
- Document tool_group UI rendering in speculation accept flow
- Fix createForkedChat: deep clone → shallow copy (already cloned snapshots)
- Document pipelined suggestion SUGGESTION_PROMPT reuse
- Add Model Override and UI Rendering sections to speculation-design
- Update line counts to match actual file sizes
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* test(followup): add unit tests for overlayFs, toolGate, forkedQuery
overlayFs (15 tests): COW write, read resolution, apply, cleanup, path traversal
speculationToolGate (24 tests): tool categories, approval mode gating, shell AST, path rewrite
forkedQuery (6 tests): cache params save/get/clear, deep clone, version detection
Total: 27 → 173 tests
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* test(followup): P0-P2 test coverage for speculation + controller + toolGate
speculation.test.ts (7 tests):
- ensureToolResultPairing: empty, no calls, paired, unpaired text+call,
unpaired call-only, user-ending, empty parts
followupState.test.ts (+8 tests = 15 total):
- onOutcome: accepted/tab, ignored/dismiss, error caught, no-op when cleared
- clear(): resets accepting lock allowing re-accept
- double accept blocked by debounce
- setSuggestion replaces pending timer
speculationToolGate.test.ts (+3 tests = 27 total):
- resolveReadPaths: overlay path after write, unchanged when not written
- rewritePathArgs: path key coverage
Total: 173 → 190 tests
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* test(followup): smoke tests + P0-P2 coverage gaps
smoke.test.ts (21 tests): E2E verification across modules
- Filter against realistic LLM outputs (9 good + 7 bad + reason check)
- OverlayFs full round-trip (write → read → apply → verify)
- ToolGate → OverlayFs integration (write redirect → read resolve)
- CacheSafeParams lifecycle (save → mutate → isolation → clear)
- ensureToolResultPairing orphaned functionCalls
followupState.test.ts (+8 tests):
- onOutcome: accepted/tab, ignored/dismiss, error caught, no-op cleared
- clear(): resets accepting lock
- double accept debounce
- setSuggestion replaces pending timer
speculationToolGate.test.ts (+3 tests):
- resolveReadPaths through overlay after write
- path key coverage for rewritePathArgs
Export ensureToolResultPairing for testing.
Total: 190 → 211 tests
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): dismiss aborts suggestion, boundary skip inject, parentSignal check
- dismissPromptSuggestion now also aborts suggestionAbortRef to prevent
race between dismiss and in-flight startSpeculation
- Boundary speculation: skip acceptSpeculation (which injects history),
fall through to normal addMessage to avoid duplicate user turns
- startSpeculation: check parentSignal.aborted upfront before starting
- Speculation rendering: use index-based loop instead of indexOf O(n²)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(design): fix speculation accept diagram — boundary skips inject
The architecture diagram now shows the branching logic: completed
speculations go through acceptSpeculation (inject + render), while
boundary speculations are discarded and the query is submitted fresh
via addMessage.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): enable cache sharing by default
enableCacheSharing now defaults to true. This is a pure cost
optimization with no behavioral change — suggestion generation
uses the forked query path (sharing the main conversation's
prompt cache prefix) when CacheSafeParams are available.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): aborted parent skips loop, acceptSpeculation try/finally, doc sync
- startSpeculation: return aborted state immediately when parentSignal
is already aborted, without creating overlay or starting loop
- acceptSpeculation: wrap in try/finally to guarantee overlay cleanup
even if applyToReal or addHistory throws
- Doc: enableCacheSharing default false → true (matches code)
- Doc: update test count table (7 → 15 followupState, add 6 new files)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): remove debug logs, add function calling fallback for non-FC models
- Remove all followup-debug process.stderr.write logs
- Add direct text fallback in generateViaBaseLlm when generateJson
returns {} (model doesn't support function calling, e.g., glm-5.1)
- Add CJK text support in filter: skip whitespace-based word count
for Chinese/Japanese/Korean text, use character count instead
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): add suggestionModel setting for faster suggestion generation
New setting `suggestionModel` allows using a smaller/faster model
(e.g., qwen-turbo) for prompt suggestion generation instead of the
main conversation model. Reduces suggestion latency significantly.
Passed through: settings → AppContainer → generatePromptSuggestion
→ generateViaForkedQuery / generateViaBaseLlm (both paths).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(followup): suggestionModel setting, /stats tracking, /about display
- suggestionModel: new setting to use a faster model for suggestion
generation (e.g., qwen3.5-flash instead of main model glm-5.1)
- /stats: suggestion API calls now report usage to UiTelemetryService
so token consumption appears in /stats model breakdown
- /about: shows Suggestion Model field (configured or main model)
Also:
- Function calling fallback for non-FC models (direct text generation)
- CJK text support in word count filter (character-based for Chinese)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* i18n: add Suggestion Model translations for /about display
en: Suggestion Model | zh: 建议模型 | ja: 提案モデル
de: Vorschlagsmodell | pt: Modelo de Sugestão | ru: Модель предложений
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): always use generateContent for suggestion (not generateJson)
generateJson doesn't expose usageMetadata, so /stats can't track
suggestion model tokens. Switch to direct generateContent which
always returns usage data. Also simplifies the code by removing
the function-calling + fallback dual path.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): fix /stats tracking — use ApiResponseEvent constructor
Use ApiResponseEvent class constructor with proper response_id and
override event.name to match UiEvent type for UiTelemetryService
switch statement. This ensures suggestion model token usage appears
in /stats model output.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* i18n: fix Chinese translation for Suggestion Model
"建议模型" → "提示建议模型" to avoid ambiguity.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* refactor(followup): merge suggestionModel + speculationModel into fastModel
Single unified setting for all background tasks: suggestion generation,
speculation, pipelined suggestions, and future background tasks.
Users only need to understand one concept: main model for conversation,
fast model for background tasks.
- Remove: suggestionModel, speculationModel
- Add: fastModel (ui.fastModel in settings.json)
- Update /about display: "Fast Model" with i18n translations
- Update all 6 locale files (en/zh/ja/de/pt/ru)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* refactor(settings): move fastModel to top-level (parallel to model)
fastModel is an independent model concept, not a property of the
main model. Move from model.fastModel to top-level settings.fastModel.
Config: { "fastModel": "qwen3.5-flash", "model": { "name": "glm-5.1" } }
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): report usage in both forkedQuery and baseLlm paths
The forkedQuery path (used when enableCacheSharing=true) was not
reporting token usage to UiTelemetryService, so /stats model didn't
show the fast model. Now both paths report usage.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(cli): add /model --fast command to set fast model
Usage:
/model --fast qwen3.5-flash — set fast model
/model --fast — show current fast model
/model — open model selection dialog (unchanged)
Saves to user settings (SettingScope.User).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(design): update to fastModel (replace suggestionModel/speculationModel)
- prompt-suggestion-design.md: speculationModel → fastModel (top-level)
- speculation-design.md: Model Override → Fast Model, update description
- prompt-suggestion-implementation.md: update settings description
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(cli): /model --fast opens model selection dialog for fast model
When called without a model name, /model --fast now opens the same
model selection dialog used by /model, but selecting a model saves
it as fastModel instead of switching the main model.
- useModelCommand: add isFastModelMode state
- ModelDialog: intercept selection in fast model mode, save to fastModel
- DialogManager: pass isFastModelMode prop to ModelDialog
- types.ts: add 'fast-model' dialog type
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): pass resolved model (not undefined) to runForkedQuery
model: modelOverride → model: model (which has the fallback applied)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(cli): /model --fast defaults to current fast model in dialog
When opening the model selection dialog via /model --fast, the
currently configured fastModel is pre-selected instead of the
main model.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat(cli): add --fast tab completion for /model command
/model <Tab> now shows --fast as a completion option with description.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(schema): regenerate settings.schema.json with new followup settings
Adds enableCacheSharing, enableSpeculation, and fastModel to the
generated JSON schema so CI validation passes.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(test): update tests for new Fast Model field in system info
Add "Fast Model" to expected labels in systemInfoFields and bugCommand
tests to match the new field added to /about and bug report output.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* ci: trigger PR synchronize event
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: address Copilot review comments (batch 4)
- modelCommand: use getPersistScopeForModelSelection for fastModel,
return meaningful info message instead of empty content
- ModelDialog: handle $runtime|authType|modelId format in fast-model mode
- forkedQuery: return structuredClone from getCacheSafeParams
- client: fix stale comment about history truncation order
- speculation: detect abort in .then() handler, set 'aborted' status
and cleanup overlay to prevent leaks
- docs: update test count table
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(users): add followup suggestions user manual
- New feature page: followup-suggestions.md covering usage, keybindings,
fast model configuration, settings, and quality filters
- commands.md: add /model --fast command reference
- settings.md: add enableFollowupSuggestions, enableCacheSharing,
enableSpeculation, and fastModel settings documentation
- _meta.ts: register new page in navigation
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs(users): audit fixes for followup suggestions documentation
- followup-suggestions.md: add 300ms delay, WebUI support, plan mode
guard, non-interactive guard, slash commands as single-word, meta/error
filters, character limit
- settings.md: move fastModel next to model section, add /model --fast
cross-reference and link to feature page
- overview.md: add followup suggestions to feature list
- i18n: add missing translations for 'Set fast model for background
tasks' and 'Fast model updated.' in all 6 locales
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: address Copilot review comments (batch 5)
- modelCommand: remove duplicate info message (keep addItem only)
- followup-suggestions.md: clarify WebUI requires host app wiring
- speculation-design.md: fix abort telemetry description
- i18n: add missing translations for fast model strings
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(cli): remove duplicate message in /model --fast command
Use return message instead of addItem + empty return to avoid
blank INFO line in history. Also handle missing settings service.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(i18n): remove unused 'Fast model updated.' translations
The /model --fast command now returns the model name directly
instead of using this string. Remove dead translations.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix(followup): disable thinking mode for suggestion and speculation
Forked queries inherit the main conversation's generationConfig which
may have thinkingConfig enabled. This wastes tokens and adds latency
for background tasks that don't need reasoning. Explicitly set
thinkingConfig.includeThoughts=false in both paths:
- createForkedChat (covers forked query + speculation)
- generateViaBaseLlm (non-cache-sharing fallback)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* docs: document thinking mode auto-disable for background tasks
- User docs: note that thinking is auto-disabled for suggestions/speculation
- Design docs: detail thinkingConfig override in both forked query and
BaseLlm paths, explain why cache hits are unaffected
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: jinjing.zzj <jinjing.zzj@alibaba-inc.com>
Co-authored-by: yiliang114 <1204183885@qq.com>
Carry the active pane model into a newly opened editor chat tab.
Add regression coverage for the handler, command, and provider session initialization flow.
- Add connectWithRetry() method with exponential backoff (3 retries max)
- Add cleanupForRetry() to clean partial state between retry attempts
- Improve readiness detection with proper timeout and exit handling
- Add timeout for ACP initialize handshake (15s)
- Add auto-reconnect on unexpected subprocess exit (max 1 attempt)
- Track intentionalDisconnect flag to skip auto-reconnect for user-initiated disconnects
- Add onAutoReconnectFailed callback for user notification when auto-reconnect fails
- Show VS Code warning notification with 'Retry Connection' action button
- Add comprehensive tests for retry logic, cleanup, and intentional disconnect flag
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
The panel onDidDispose and webviewView onDidDispose callbacks were not
calling agentManager.disconnect(), so closing a chat tab or sidebar
view left the CLI child process running as an orphan. Only the
WebViewProvider.dispose() method (called on extension deactivation)
had the disconnect call.
Add agentManager.disconnect() to both dispose callbacks so the CLI
process receives SIGTERM when the user closes the tab.
When the CLI process crashes during initialization (e.g. due to a malformed
settings.json), the extension now surfaces the error instead of hanging
indefinitely on "Preparing Qwen Code...":
- Collect stderr output from the child process for inclusion in error messages
- Race SDK initialize() against a process-exit promise so a crash rejects
immediately rather than leaving a dangling await
- Add a 30-second safety-net timeout in App.tsx to clear the loading spinner
when initialization stalls for any reason
Closes#2382
Made-with: Cursor
Flip the context key logic from negative (`doesNotSupportSecondarySidebar`) to
positive (`supportsSecondarySidebar`) so that the secondary sidebar container is
only declared when the VS Code version is known to support it. This prevents the
"container 'qwen-code-secondary' does not exist" warning on older versions and
avoids accidentally relocating other extensions' views to the Explorer container.
Closes#2432Closes#2416
Made-with: Cursor
This ensures the test has a properly initialized mock child process,
fixing potential test failures during the task-to-agent-tool refactor.
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* feat(vscode-ide-companion): add image paste support
- Add clipboard image paste functionality with drag-and-drop support
- Implement image preview component with removal capability
- Support multimodal content in ACP session manager for text and images
- Save pasted images to temporary .gemini-clipboard directory
- Add image attachment display in user messages
- Update CSP to allow data: URIs for inline image display
- Add comprehensive image utilities with size validation (max 10MB)
- Include tests for image processing utilities
* refactor: simplify VS Code paste image implementation
- Remove dead code and redundant error handling
- Extract common isAuthError() helper function
- Simplify SessionMessageHandler methods (80% reduction)
- Change temp directory from .gemini-clipboard to clipboard (aligned with CLI)
- Keep multimodal image sending format (type: image + base64)
Stats:
- 6 files changed
- 367 insertions (+)
- 1176 deletions (-)
* refactor: align paste image handling
* chore: trim paste image diff
* refactor(vscode-ide-companion): remove unused attachments logic
- Remove unused ImageAttachment type imports
- Remove attachments field from TextMessage interface
- Remove attachments from message data sent to WebView
- Clean up debug console.log statements
- Simplify SessionMessageHandler handleSendMessage method
This removes dead code from the previous image paste implementation
that was no longer needed after switching to @path reference approach.
* refactor(vscode-ide-companion/webview): extract image handling into dedicated hooks and utils
- extract ImagePreview and ImageMessageRenderer components from App.tsx
- create useImageAttachments hook for managing image attachments
- create useImageResolution hook for image path resolution
- add imageAttachmentHandler for saving images to temp files
- add imageMessageUtils for message expansion and resolution
- add imagePathResolver for resolving image paths in webview
- integrate image resolution in useWebViewMessages
- extract shouldSendMessage utility from useMessageSubmit
- add getLocalResourceRoots in PanelManager for resource access
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* fix: harden vscode image handling and webview hosts
* fix: remove this alias in acp connection
* feat: add path escaping utility functions and tests
* feat: add support for image attachments and improve prompt handling
* refactor(webview): Optimize editing mode switching function
* refactor(vscode-ide-companion): move path escaping utilities to local module
- Move escapePath and unescapePath functions from qwen-code-core to local utils
- Add pathEscaping.ts with shell special characters handling
- Update imports in imageFormats.ts, imageAttachmentHandler.ts, and imageMessageUtils.ts
- Add unit tests for path escaping round-trip and browser bundle verification
- Fix browser bundling issue by avoiding node-only module dependencies in webview
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* refactor: consolidate image handling logic across vscode-ide-companion and webui
- Merge分散的 image hooks (useImageAttachments, useImageResolution, usePasteHandler) into unified useImage hook
- Replace image utils (imageMessageUtils, imagePathResolver, imageUtils) with imageHandler and imageSupport
- Remove clipboard image storage from core package
- Consolidate webui image components into ImageComponents.tsx
- Update imports and tests to reflect new structure
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* chore: drop unrelated core tool changes
* test: fix webview provider mocks and drop unrelated core diffs
* fix(cli): resolve original prompt through standard path in no_command case
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---------
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Add exitCode fallback in startup failure message to handle edge case
where exit event hasn't fired yet
- Add guard check in exit handler to avoid redundant cleanup if
disconnect() already ran
- Add JSDoc for onDisconnected callback
- Add comment explaining exit code 143 (SIGTERM) in test
Made-with: Cursor
- Record lastExitCode/lastExitSignal for better error messages on startup failure
- Reset exit info on reconnect to avoid stale data
- Add onDisconnected callback so upper layers can react to process exit
- Add clarifying comment on ensureConnection defense-in-depth checks
- Expand tests: onDisconnected contract, disconnect kill verification, exit info init
Made-with: Cursor
When the ACP child process exits unexpectedly (e.g., user cancels execution),
the connection state (sdkConnection, sessionId, child) was not being cleaned up.
This caused subsequent message sends to fail with cryptic errors instead of
a clear "Not connected" message.
Changes:
- Clear sdkConnection/sessionId/child in the exit handler
- Check child.exitCode in isConnected to detect spontaneous exits
- Add isConnected check to ensureConnection as defense-in-depth
- Add unit tests for isConnected, ensureConnection, and disconnect cleanup
Made-with: Cursor
* feat(vscode-ide-companion): add Tab key fill-only behavior for completions
- Separate Tab and Enter key handling in CompletionMenu
- Tab now inserts completion text without executing (useful for slash commands)
- Enter/click continues to select and execute immediately
- Allow users to append arguments after Tab-filling slash commands
* feat(vscode-ide-companion): add Tab key fill-only behavior for completions
- Separate Tab and Enter key handling in CompletionMenu
- Tab now inserts completion text without executing (useful for slash commands)
- Enter/click continues to select and execute immediately
- Allow users to append arguments after Tab-filling slash commands
Co-authored-by: Mingholy <14246397+Mingholy@users.noreply.github.com>
* feat: add command selection behavior logic and tests
Co-developed-by: Aone Copilot <noreply@alibaba-inc.com>
* feat(vscode-ide-companion): add Tab key completion fill behavior with tests
- Add onCompletionFill prop to InputForm for Tab key handling
- Distinguish Tab (fill) and Enter (select) completion behaviors
- Add keyboard handling tests for completion items
- Remove 'skills' command from non-interactive CLI allowed list
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
* refactor: add itemId variable for command handling in App component
Co-developed-by: Aone Copilot <noreply@alibaba-inc.com>
* refactor: remove unused command selection behavior utils and tests
---------
Co-authored-by: Mingholy <14246397+Mingholy@users.noreply.github.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Removed client-side filtering for search queries; fuzzy search is now handled by the backend.
- Enhanced file search initialization and caching mechanisms in FileMessageHandler.
- Added file watchers for cache invalidation on file system changes.
- Updated completion trigger logic to prioritize '@' over '/' for path-like queries.
- Reset last query on file selection to ensure fresh search results.
This refactor improves search efficiency and maintains accurate file references in the application.
- Install AbortController before awaiting previous prompt so session/cancel
during the wait targets the correct prompt
- Check if cancelled after waiting for previous prompt to complete
- Drop untagged streamEnd events when a tagged stream is active
This prevents race conditions where a new prompt could be incorrectly
cancelled or have its state cleared by stale events from a previous prompt.
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Add `forRequestId` parameter to `sendStreamEnd()` to detect and ignore
stale calls when a newer request has taken over shared state.
This prevents stale handleSendMessage invocations from emitting
streamEnd events tagged with the wrong request ID.
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Add pendingPromptCompletion tracking to ensure new prompts wait for
previous prompt's tool results before reading chat history
- Add requestId correlation between streamStart/streamEnd to detect and
discard stale events from cancelled requests
- Guard against duplicate streamEnd messages
- Preserve isWaitingForResponse during cancel to prevent auto-submit
This fixes malformed history issues in VS Code extension where rapid
prompt cancellation and resubmission caused tool_call → user_query →
tool_result ordering instead of the correct sequence.
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
- Add error handling in readTextFile to catch and map file system errors
- Convert ENOENT errors to RequestError with RESOURCE_NOT_FOUND code
- Add unit tests for the error mapping logic
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Adopt Claude Code's approach for webview view registration:
- Use mutual-exclusive sidebar/secondary sidebar with `when` conditions
- Detect secondary sidebar support via VS Code version >= 1.106
- Share single ChatWebviewViewProvider instance across both view IDs
- Only set context key when secondary sidebar is NOT supported
- Pass supportsSecondarySidebar as closure variable to commands
Additional fixes:
- Fix WebViewContent.generate() to accept both Webview and WebviewPanel
- Fix permission handler leak (cancel old promise before new)
- Fix double diff command execution in resolve callback
- Add initializationPromise dedup for auth-restore races
- Add attachToView() for sidebar/secondary sidebar hosting
- Add missing AskUserQuestionResponseMessage import
Co-authored-by: buaoyezz <buaoyezz@users.noreply.github.com>
